0001-allow-topic-changes-to-be-hidden.patch
src/common/message.h | ||
---|---|---|
46 | 46 |
Server = 0x0400, |
47 | 47 |
Info = 0x0800, |
48 | 48 |
Error = 0x1000, |
49 |
DayChange = 0x2000 |
|
49 |
DayChange = 0x2000, |
|
50 |
Topic = 0x4000 |
|
50 | 51 |
}; |
51 | 52 | |
52 | 53 |
// DO NOT CHANGE without knowing what you do, some of these flags are stored in the database |
src/core/ircserverhandler.cpp | ||
---|---|---|
485 | 485 | |
486 | 486 |
channel->setTopic(topic); |
487 | 487 | |
488 |
emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel->name(), tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel->name()).arg(topic));
|
|
488 |
emit displayMsg(Message::Topic, BufferInfo::ChannelBuffer, channel->name(), tr("%1 has changed topic for %2 to: \"%3\"").arg(ircuser->nick()).arg(channel->name()).arg(topic));
|
|
489 | 489 |
} |
490 | 490 | |
491 | 491 |
/* RPL_WELCOME */ |
... | ... | |
884 | 884 |
if(chan) |
885 | 885 |
chan->setTopic(QString()); |
886 | 886 | |
887 |
emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("No topic is set for %1.").arg(channel));
|
|
887 |
emit displayMsg(Message::Topic, BufferInfo::ChannelBuffer, channel, tr("No topic is set for %1.").arg(channel));
|
|
888 | 888 |
} |
889 | 889 | |
890 | 890 |
/* RPL_TOPIC */ |
... | ... | |
899 | 899 |
if(chan) |
900 | 900 |
chan->setTopic(topic); |
901 | 901 | |
902 |
emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic));
|
|
902 |
emit displayMsg(Message::Topic, BufferInfo::ChannelBuffer, channel, tr("Topic for %1 is \"%2\"").arg(channel, topic));
|
|
903 | 903 |
} |
904 | 904 | |
905 | 905 |
/* Topic set by... */ |
... | ... | |
909 | 909 |
return; |
910 | 910 | |
911 | 911 |
QString channel = serverDecode(params[0]); |
912 |
emit displayMsg(Message::Server, BufferInfo::ChannelBuffer, channel,
|
|
912 |
emit displayMsg(Message::Topic, BufferInfo::ChannelBuffer, channel,
|
|
913 | 913 |
tr("Topic set by %1 on %2") .arg(serverDecode(params[1]), QDateTime::fromTime_t(channelDecode(channel, params[2]).toUInt()).toString())); |
914 | 914 |
} |
915 | 915 |
src/uisupport/contextmenuactionprovider.cpp | ||
---|---|---|
46 | 46 |
registerAction(HideNick, tr("Nick Changes"), true); |
47 | 47 |
registerAction(HideMode, tr("Mode Changes"), true); |
48 | 48 |
registerAction(HideDayChange, tr("Day Changes"), true); |
49 |
registerAction(HideTopic, tr("Topic Changes"), true); |
|
49 | 50 |
registerAction(HideApplyToAll, tr("Set as Default...")); |
50 | 51 |
registerAction(HideUseDefaults, tr("Use Defaults...")); |
51 | 52 | |
... | ... | |
79 | 80 |
hideEventsMenu->addAction(action(HideQuit)); |
80 | 81 |
hideEventsMenu->addAction(action(HideNick)); |
81 | 82 |
hideEventsMenu->addAction(action(HideMode)); |
83 |
hideEventsMenu->addAction(action(HideTopic)); |
|
82 | 84 |
hideEventsMenu->addAction(action(HideDayChange)); |
83 | 85 |
hideEventsMenu->addSeparator(); |
84 | 86 |
hideEventsMenu->addAction(action(HideApplyToAll)); |
... | ... | |
345 | 347 |
action(HideNick)->setChecked(filter & Message::Nick); |
346 | 348 |
action(HideMode)->setChecked(filter & Message::Mode); |
347 | 349 |
action(HideDayChange)->setChecked(filter & Message::DayChange); |
350 |
action(HideTopic)->setChecked(filter & Message::Topic); |
|
348 | 351 | |
349 | 352 |
menu->addAction(_hideEventsMenuAction); |
350 | 353 |
} |
src/uisupport/networkmodelcontroller.cpp | ||
---|---|---|
276 | 276 |
filter |= Message::Mode; |
277 | 277 |
if(NetworkModelController::action(HideDayChange)->isChecked()) |
278 | 278 |
filter |= Message::DayChange; |
279 |
if(NetworkModelController::action(HideTopic)->isChecked()) |
|
280 |
filter |= Message::Topic; |
|
279 | 281 | |
280 | 282 |
switch(type) { |
281 | 283 |
case HideJoin: |
... | ... | |
284 | 286 |
case HideNick: |
285 | 287 |
case HideMode: |
286 | 288 |
case HideDayChange: |
289 |
case HideTopic: |
|
287 | 290 |
if(_messageFilter) |
288 | 291 |
BufferSettings(_messageFilter->idString()).setMessageFilter(filter); |
289 | 292 |
else { |
src/uisupport/networkmodelcontroller.h | ||
---|---|---|
62 | 62 |
HideNick = 0x0400, |
63 | 63 |
HideMode = 0x0500, |
64 | 64 |
HideDayChange = 0x0600, |
65 |
HideTopic = 0x0700, |
|
65 | 66 |
HideUseDefaults = 0xe00, |
66 | 67 |
HideApplyToAll = 0xf00, |
67 | 68 |
src/uisupport/uistyle.cpp | ||
---|---|---|
328 | 328 |
t = tr("%D0%1").arg(txt); break; |
329 | 329 |
case Message::Notice: |
330 | 330 |
t = tr("%Dn%1").arg(txt); break; |
331 |
case Message::Topic: |
|
331 | 332 |
case Message::Server: |
332 | 333 |
t = tr("%Ds%1").arg(txt); break; |
333 | 334 |
case Message::Error: |
... | ... | |
386 | 387 |
return tr("<%1>").arg(plainSender()); break; |
387 | 388 |
case Message::Notice: |
388 | 389 |
return tr("[%1]").arg(plainSender()); break; |
390 |
case Message::Topic: |
|
389 | 391 |
case Message::Server: |
390 | 392 |
return tr("*"); break; |
391 | 393 |
case Message::Error: |
... | ... | |
429 | 431 |
} |
430 | 432 |
case Message::Notice: |
431 | 433 |
return UiStyle::NoticeMsg; break; |
434 |
case Message::Topic: |
|
432 | 435 |
case Message::Server: |
433 | 436 |
return UiStyle::ServerMsg; break; |
434 | 437 |
case Message::Error: |
435 |
- |