X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=1541a5678afbda06e88747237005cc995e0be766;hp=8b5bb1823c03223ad26d178f5ca3e469c35165ef;hb=77397f5e999830077fee13187c6a1ee044d92545;hpb=d2268cca78024ec7b67e1007dea41f87bef2fc4e

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 8b5bb182..1541a567 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -23,6 +23,7 @@
 #include "action.h"
 #include "actioncollection.h"
 #include "buffermodel.h"
+#include "bufferview.h"
 #include "bufferviewmanager.h"
 #include "bufferwidget.h"
 #include "channellistdlg.h"
@@ -34,8 +35,11 @@
 #include "clientbacklogmanager.h"
 #include "coreinfodlg.h"
 #include "coreconnectdlg.h"
+#include "debuglogwidget.h"
+#include "debugmessagemodelfilter.h"
 #include "iconloader.h"
 #include "inputwidget.h"
+#include "inputline.h"
 #include "irclistmodel.h"
 #include "jumpkeyhandler.h"
 #include "msgprocessorstatuswidget.h"
@@ -52,13 +56,18 @@
 #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/colorsettingspage.h"
+#include "settingspages/chatmonitorsettingspage.h"
 #include "settingspages/fontssettingspage.h"
 #include "settingspages/generalsettingspage.h"
 #include "settingspages/highlightsettingspage.h"
@@ -75,11 +84,13 @@ MainWin::MainWin(QWidget *parent)
     _trayIcon(new QSystemTrayIcon(this))
 {
   QtUiSettings uiSettings;
-  QString style = uiSettings.value("Style", QString("")).toString();
-  if(style != "") {
+  QString style = uiSettings.value("Style", QString()).toString();
+  if(!style.isEmpty()) {
     QApplication::setStyle(style);
   }
 
+  QApplication::setQuitOnLastWindowClosed(false);
+
   setWindowTitle("Quassel IRC");
   setWindowIconText("Quassel IRC");
   updateIcon();
@@ -88,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
@@ -107,27 +121,28 @@ 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);
+  setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
+  setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
+  setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
+  setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
 
   // Order is sometimes important
   setupActions();
   setupBufferWidget();
   setupMenus();
   setupViews();
+  setupTopicWidget();
   setupChatMonitor();
   setupNickWidget();
-  setupTopicWidget();
   setupInputWidget();
   setupStatusBar();
   setupSystray();
   setupTitleSetter();
 
-  // Setup Dock Areas
-  setDockNestingEnabled(true);
-  setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
-  setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
-  setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
-  setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
-
   // restore mainwin state
   restoreState(s.value("MainWinState").toByteArray());
 
@@ -137,7 +152,6 @@ void MainWin::init() {
   setDisconnectedState();  // Disable menus and stuff
 
   show();
-
   showCoreConnectionDlg(true); // autoconnect if appropriate
 }
 
@@ -192,10 +206,14 @@ void MainWin::setupActions() {
   // Help
   coll->addAction("AboutQuassel", new Action(SmallIcon("quassel"), tr("&About Quassel..."), coll,
                                               this, SLOT(showAboutDlg())));
-  coll->addAction("AboutQt", new Action(tr("About &Qt..."), coll,
+  coll->addAction("AboutQt", new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt..."), coll,
                                          qApp, SLOT(aboutQt())));
   coll->addAction("DebugNetworkModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &NetworkModel"), coll,
                                        this, SLOT(on_actionDebugNetworkModel_triggered())));
+  coll->addAction("DebugMessageModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &MessageModel"), coll,
+                                       this, SLOT(on_actionDebugMessageModel_triggered())));
+  coll->addAction("DebugLog", new Action(SmallIcon("tools-report-bug"), tr("Debug &Log"), coll,
+                                       this, SLOT(on_actionDebugLog_triggered())));
 }
 
 void MainWin::setupMenus() {
@@ -230,6 +248,8 @@ void MainWin::setupMenus() {
   _helpMenu->addSeparator();
   _helpDebugMenu = _helpMenu->addMenu(SmallIcon("tools-report-bug"), tr("Debug"));
   _helpDebugMenu->addAction(coll->action("DebugNetworkModel"));
+  _helpDebugMenu->addAction(coll->action("DebugMessageModel"));
+  _helpDebugMenu->addAction(coll->action("DebugLog"));
 }
 
 void MainWin::setupBufferWidget() {
@@ -259,8 +279,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);
@@ -269,7 +287,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) {
@@ -288,6 +306,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();
@@ -358,6 +383,8 @@ void MainWin::setupInputWidget() {
   inputWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
 
   _bufferWidget->setFocusProxy(inputWidget);
+
+  inputWidget->inputLine()->installEventFilter(_bufferWidget);
 }
 
 void MainWin::setupTopicWidget() {
@@ -370,7 +397,7 @@ void MainWin::setupTopicWidget() {
   topicwidget->setModel(Client::bufferModel());
   topicwidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
 
-  addDockWidget(Qt::TopDockWidgetArea, dock);
+  addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical);
 
   _viewMenu->addAction(dock->toggleViewAction());
   dock->toggleViewAction()->setText(tr("Show Topic Line"));
@@ -399,7 +426,7 @@ void MainWin::setupStatusBar() {
   _viewMenu->addSeparator();
   QAction *showStatusbar = QtUi::actionCollection("General")->action("ToggleStatusBar");
 
-  UiSettings uiSettings;
+  QtUiSettings uiSettings;
 
   bool enabled = uiSettings.value("ShowStatusBar", QVariant(true)).toBool();
   showStatusbar->setChecked(enabled);
@@ -407,10 +434,13 @@ void MainWin::setupStatusBar() {
 
   connect(showStatusbar, SIGNAL(toggled(bool)), statusBar(), SLOT(setVisible(bool)));
   connect(showStatusbar, SIGNAL(toggled(bool)), this, SLOT(saveStatusBarStatus(bool)));
+
+  connect(Client::backlogManager(), SIGNAL(messagesRequested(const QString &)), this, SLOT(showStatusBarMessage(const QString &)));
+  connect(Client::backlogManager(), SIGNAL(messagesProcessed(const QString &)), this, SLOT(showStatusBarMessage(const QString &)));
 }
 
 void MainWin::saveStatusBarStatus(bool enabled) {
-  UiSettings uiSettings;
+  QtUiSettings uiSettings;
   uiSettings.setValue("ShowStatusBar", enabled);
 }
 
@@ -429,7 +459,7 @@ void MainWin::setupSystray() {
 
   systemTrayIcon()->setContextMenu(systrayMenu);
 
-  UiSettings s;
+  QtUiSettings s;
   if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) {
     systemTrayIcon()->show();
   }
@@ -444,7 +474,7 @@ void MainWin::setupSystray() {
 void MainWin::changeEvent(QEvent *event) {
   if(event->type() == QEvent::WindowStateChange) {
     if(windowState() & Qt::WindowMinimized) {
-      UiSettings s;
+      QtUiSettings s;
       if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) {
         toggleVisibility();
         event->ignore();
@@ -459,7 +489,6 @@ void MainWin::connectedToCore() {
   connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigDeleted(int)), this, SLOT(removeBufferView(int)));
   connect(Client::bufferViewManager(), SIGNAL(initDone()), this, SLOT(loadLayout()));
 
-  Client::backlogManager()->requestInitialBacklog();
   setConnectedState();
 }
 
@@ -469,8 +498,7 @@ void MainWin::setConnectedState() {
   coll->action("ConnectCore")->setEnabled(false);
   coll->action("DisconnectCore")->setEnabled(true);
   coll->action("CoreInfo")->setEnabled(true);
-  _viewMenu->setEnabled(true);
-  _bufferWidget->show();
+  // _viewMenu->setEnabled(true);
   statusBar()->showMessage(tr("Connected to core."));
   if(sslLabel->width() == 0)
     sslLabel->setPixmap(SmallIcon("security-low"));
@@ -526,8 +554,7 @@ void MainWin::setDisconnectedState() {
   coll->action("ConnectCore")->setEnabled(true);
   coll->action("DisconnectCore")->setEnabled(false);
   coll->action("CoreInfo")->setEnabled(false);
-  _viewMenu->setEnabled(false);
-  _bufferWidget->hide();
+  //_viewMenu->setEnabled(false);
   statusBar()->showMessage(tr("Not connected to core."));
   sslLabel->setPixmap(QPixmap());
   updateIcon();
@@ -564,9 +591,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));
@@ -580,12 +609,13 @@ void MainWin::showAboutDlg() {
 }
 
 void MainWin::closeEvent(QCloseEvent *event) {
-  UiSettings s;
+  QtUiSettings s;
   if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
     toggleVisibility();
     event->ignore();
   } else {
     event->accept();
+    QApplication::quit();
   }
 }
 
@@ -729,6 +759,22 @@ void MainWin::on_actionDebugNetworkModel_triggered() {
   view->show();
 }
 
+void MainWin::on_actionDebugMessageModel_triggered() {
+  QTableView *view = new QTableView(0);
+  DebugMessageModelFilter *filter = new DebugMessageModelFilter(view);
+  filter->setSourceModel(Client::messageModel());
+  view->setModel(filter);
+  view->setAttribute(Qt::WA_DeleteOnClose, true);
+  view->verticalHeader()->hide();
+  view->horizontalHeader()->setStretchLastSection(true);
+  view->show();
+}
+
+void MainWin::on_actionDebugLog_triggered() {
+  DebugLogWidget *logWidget = new DebugLogWidget(0);
+  logWidget->show();
+}
+
 void MainWin::saveStateToSession(const QString &sessionId) {
   return;
   SessionSettings s(sessionId);
@@ -744,3 +790,7 @@ void MainWin::saveStateToSessionSettings(SessionSettings & s)
   s.setValue("MainWinPos", pos());
   s.setValue("MainWinState", saveState());
 }
+
+void MainWin::showStatusBarMessage(const QString &message) {
+  statusBar()->showMessage(message, 10000);
+}