X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=51d74d78ab356d0c8dc50b7651449a9e8c9128bc;hp=724a3c76a6e613fedb24929b7119eb27e6d09317;hb=34b122262eb2ca56832f763f046cf67f1f1e77de;hpb=4fc9a40ac1c6f34116cea134d4bfee8569e01c25 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 724a3c76..51d74d78 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -56,6 +56,9 @@ #ifdef HAVE_DBUS # include "desktopnotificationbackend.h" #endif +#ifdef HAVE_PHONON +# include "phononnotificationbackend.h" +#endif #include "systraynotificationbackend.h" #include "taskbarnotificationbackend.h" @@ -63,6 +66,7 @@ #include "settingspages/appearancesettingspage.h" #include "settingspages/backlogsettingspage.h" #include "settingspages/bufferviewsettingspage.h" +#include "settingspages/chatmonitorsettingspage.h" #include "settingspages/colorsettingspage.h" #include "settingspages/fontssettingspage.h" #include "settingspages/generalsettingspage.h" @@ -95,6 +99,9 @@ MainWin::MainWin(QWidget *parent) QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this)); QtUi::registerNotificationBackend(new SystrayNotificationBackend(this)); +#ifdef HAVE_PHONON + QtUi::registerNotificationBackend(new PhononNotificationBackend(this)); +#endif #ifdef HAVE_DBUS QtUi::registerNotificationBackend(new DesktopNotificationBackend(this)); #endif @@ -481,7 +488,7 @@ void MainWin::connectedToCore() { connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigAdded(int)), this, SLOT(addBufferView(int))); connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigDeleted(int)), this, SLOT(removeBufferView(int))); connect(Client::bufferViewManager(), SIGNAL(initDone()), this, SLOT(loadLayout())); - + setConnectedState(); } @@ -588,6 +595,7 @@ void MainWin::showSettingsDlg() { dlg->registerSettingsPage(new HighlightSettingsPage(dlg)); dlg->registerSettingsPage(new AliasesSettingsPage(dlg)); dlg->registerSettingsPage(new NotificationsSettingsPage(dlg)); + dlg->registerSettingsPage(new ChatMonitorSettingsPage(dlg)); //Category: General dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg)); dlg->registerSettingsPage(new NetworksSettingsPage(dlg));