X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=9eb74d446b82fd460713741392a4d923ff72a585;hp=3c0c702ba37ceeba8a2755aa21470d918c0b669a;hb=965183188ee726036685fcba379c2559bd183247;hpb=9996d2489e5e5ca23b0750f39f64d8d4b5990029

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 3c0c702b..9eb74d44 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -18,11 +18,17 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "mainwin.h"
-#include <QDir>
+
+#ifdef HAVE_KDE
+#  include <KMenuBar>
+#  include <KStatusBar>
+#endif
+
 #include "aboutdlg.h"
 #include "action.h"
 #include "actioncollection.h"
 #include "buffermodel.h"
+#include "bufferview.h"
 #include "bufferviewmanager.h"
 #include "bufferwidget.h"
 #include "channellistdlg.h"
@@ -55,12 +61,17 @@
 #ifdef HAVE_DBUS
 #  include "desktopnotificationbackend.h"
 #endif
+#ifdef HAVE_PHONON
+#  include "phononnotificationbackend.h"
+#endif
 #include "systraynotificationbackend.h"
 #include "taskbarnotificationbackend.h"
 
 #include "settingspages/aliasessettingspage.h"
 #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"
@@ -70,7 +81,11 @@
 #include "settingspages/notificationssettingspage.h"
 
 MainWin::MainWin(QWidget *parent)
+#ifdef HAVE_KDE
+  : KMainWindow(parent),
+#else
   : QMainWindow(parent),
+#endif
     coreLagLabel(new QLabel()),
     sslLabel(new QLabel()),
     msgProcessorStatusWidget(new MsgProcessorStatusWidget()),
@@ -93,6 +108,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
@@ -112,6 +130,7 @@ void MainWin::init() {
   connect(QApplication::instance(), SIGNAL(aboutToQuit()), SLOT(saveLayout()));
   connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), SLOT(clientNetworkCreated(NetworkId)));
   connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), SLOT(clientNetworkRemoved(NetworkId)));
+  connect(Client::mainUi()->actionProvider(), SIGNAL(showChannelList(NetworkId)), SLOT(showChannelList(NetworkId)));
 
   // Setup Dock Areas
   setDockNestingEnabled(true);
@@ -149,7 +168,7 @@ MainWin::~MainWin() {
   QtUiSettings s;
   s.setValue("MainWinSize", size());
   s.setValue("MainWinPos", pos());
-  s.setValue("MainWinState", saveState());
+  s.setValue("MainWinState", saveState()); qDebug() << "fini!";
 }
 
 void MainWin::updateIcon() {
@@ -269,8 +288,6 @@ void MainWin::addBufferView(BufferViewConfig *config) {
   view->setFilteredModel(Client::bufferModel(), config);
   view->show();
 
-  connect(&view->showChannelList, SIGNAL(triggered()), this, SLOT(showChannelList()));
-
   Client::bufferModel()->synchronizeView(view);
 
   dock->setWidget(view);
@@ -279,7 +296,7 @@ void MainWin::addBufferView(BufferViewConfig *config) {
   addDockWidget(Qt::LeftDockWidgetArea, dock);
   _bufferViewsMenu->addAction(dock->toggleViewAction());
 
-  _netViews.append(dock);
+  _bufferViews.append(dock);
 }
 
 void MainWin::removeBufferView(int bufferViewConfigId) {
@@ -298,6 +315,13 @@ void MainWin::removeBufferView(int bufferViewConfigId) {
   }
 }
 
+BufferView *MainWin::allBuffersView() const {
+  // "All Buffers" is always the first dock created
+  if(_bufferViews.count() > 0)
+    return _bufferViews[0]->bufferView();
+  return 0;
+}
+
 void MainWin::on_actionEditNetworks_triggered() {
   SettingsPageDlg dlg(new NetworksSettingsPage(this), this);
   dlg.exec();
@@ -475,7 +499,6 @@ void MainWin::connectedToCore() {
   connect(Client::bufferViewManager(), SIGNAL(initDone()), this, SLOT(loadLayout()));
 
   setConnectedState();
-  Client::backlogManager()->requestInitialBacklog();
 }
 
 void MainWin::setConnectedState() {
@@ -569,7 +592,7 @@ void MainWin::showCoreInfoDlg() {
 }
 
 void MainWin::showSettingsDlg() {
-  SettingsDlg *dlg = new SettingsDlg(this);
+  SettingsDlg *dlg = new SettingsDlg();
 
   //Category: Appearance
   dlg->registerSettingsPage(new ColorSettingsPage(dlg));
@@ -577,9 +600,11 @@ void MainWin::showSettingsDlg() {
   dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); //General
   //Category: Behaviour
   dlg->registerSettingsPage(new GeneralSettingsPage(dlg));
+  dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
   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));