Fix includes

[quassel.git] / src / qtui / mainwin.cpp

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 00407ef..1432916 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,6 +19,11 @@
  ***************************************************************************/
 #include "mainwin.h"
 
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QStatusBar>
+#include <QToolBar>
+
 #ifdef HAVE_KDE
 #  include <KAction>
 #  include <KActionCollection>
@@ -304,7 +309,7 @@ void MainWin::updateIcon() {
   if(Client::isConnected())
     icon = DesktopIcon("quassel", size);
   else
-    icon = DesktopIcon("quassel_inactive", size);
+    icon = DesktopIcon("quassel-inactive", size);
   setWindowIcon(icon);
   qApp->setWindowIcon(icon);
 }
@@ -352,16 +357,31 @@ void MainWin::setupActions() {
   coll->addAction("ToggleFullscreen", fullScreenAct);
 
   // Settings
-  coll->addAction("ConfigureShortcuts", new Action(SmallIcon("configure-shortcuts"), tr("Configure &Shortcuts..."), coll,
-                                                  this, SLOT(showShortcutsDlg())));
-  coll->addAction("ConfigureQuassel", new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
-                                                  this, SLOT(showSettingsDlg()), QKeySequence(Qt::Key_F7)));
+  QAction *configureShortcutsAct = new Action(SmallIcon("configure-shortcuts"), tr("Configure &Shortcuts..."), coll,
+                                             this, SLOT(showShortcutsDlg()));
+  configureShortcutsAct->setMenuRole(QAction::NoRole);
+  coll->addAction("ConfigureShortcuts", configureShortcutsAct);
+
+  #ifdef Q_WS_MAC
+  QAction *configureQuasselAct = new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
+                                           this, SLOT(showSettingsDlg()));
+  configureQuasselAct->setMenuRole(QAction::PreferencesRole);
+  #else
+  QAction *configureQuasselAct = new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
+                                            this, SLOT(showSettingsDlg()), QKeySequence(Qt::Key_F7));
+  #endif
+  coll->addAction("ConfigureQuassel", configureQuasselAct);
 
   // Help
-  coll->addAction("AboutQuassel", new Action(SmallIcon("quassel"), tr("&About Quassel"), coll,
-                                              this, SLOT(showAboutDlg())));
-  coll->addAction("AboutQt", new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt"), coll,
-                                         qApp, SLOT(aboutQt())));
+  QAction *aboutQuasselAct = new Action(SmallIcon("quassel"), tr("&About Quassel"), coll,
+                                       this, SLOT(showAboutDlg()));
+  aboutQuasselAct->setMenuRole(QAction::AboutRole);
+  coll->addAction("AboutQuassel", aboutQuasselAct);
+
+  QAction *aboutQtAct = new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt"), coll,
+                                  qApp, SLOT(aboutQt()));
+  aboutQtAct->setMenuRole(QAction::AboutQtRole);
+  coll->addAction("AboutQt", aboutQtAct);
   coll->addAction("DebugNetworkModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &NetworkModel"), coll,
                                        this, SLOT(on_actionDebugNetworkModel_triggered())));
   coll->addAction("DebugBufferViewOverlay", new Action(SmallIcon("tools-report-bug"), tr("Debug &BufferViewOverlay"), coll,
@@ -375,6 +395,9 @@ void MainWin::setupActions() {
   coll->addAction("ReloadStyle", new Action(SmallIcon("view-refresh"), tr("Reload Stylesheet"), coll,
                                        QtUi::style(), SLOT(reload()), QKeySequence::Refresh));
 
+  coll->addAction("HideCurrentBuffer", new Action(tr("Hide Current Buffer"), coll,
+                                                  this, SLOT(hideCurrentBuffer()), QKeySequence::Close));
+
   // Navigation
   coll = QtUi::actionCollection("Navigation", tr("Navigation"));
 
@@ -698,6 +721,12 @@ void MainWin::previousBuffer() {
     view->previousBuffer();
 }
 
+void MainWin::hideCurrentBuffer() {
+  BufferView *view = activeBufferView();
+  if(view)
+    view->hideCurrentBuffer();
+}
+
 void MainWin::showNotificationsDlg() {
   SettingsPageDlg dlg(new NotificationsSettingsPage(this), this);
   dlg.exec();
@@ -1247,29 +1276,39 @@ void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) {
     BufferId bufId = idx.data(ChatLineModel::BufferIdRole).value<BufferId>();
     BufferInfo::Type bufType = Client::networkModel()->bufferType(bufId);
 
+    // check if bufferId belongs to the shown chatlists
+    if(!(Client::bufferViewOverlay()->bufferIds().contains(bufId) ||
+         Client::bufferViewOverlay()->tempRemovedBufferIds().contains(bufId)))
+      continue;
+
+    // check if it's the buffer currently displayed
     if(hasFocus && bufId == Client::bufferModel()->currentBuffer())
       continue;
 
-    if((flags & Message::Highlight || bufType == BufferInfo::QueryBuffer)
-      && !(Client::ignoreListManager() && Client::ignoreListManager()->match(idx.data(MessageModel::MessageRole).value<Message>(),
-                                                                             Client::networkModel()->networkName(bufId))))
-    {
-      QModelIndex senderIdx = Client::messageModel()->index(i, ChatLineModel::SenderColumn);
-      QString sender = senderIdx.data(ChatLineModel::EditRole).toString();
-      QString contents = idx.data(ChatLineModel::DisplayRole).toString();
-      AbstractNotificationBackend::NotificationType type;
-
-      if(bufType == BufferInfo::QueryBuffer && !hasFocus)
-        type = AbstractNotificationBackend::PrivMsg;
-      else if(bufType == BufferInfo::QueryBuffer && hasFocus)
-        type = AbstractNotificationBackend::PrivMsgFocused;
-      else if(flags & Message::Highlight && !hasFocus)
-        type = AbstractNotificationBackend::Highlight;
-      else
-        type = AbstractNotificationBackend::HighlightFocused;
-
-      QtUi::instance()->invokeNotification(bufId, type, sender, contents);
-    }
+    // only show notifications for higlights or queries
+    if(bufType != BufferInfo::QueryBuffer && !(flags & Message::Highlight))
+      continue;
+
+    // and of course: don't notify for ignored messages
+    if(Client::ignoreListManager() && Client::ignoreListManager()->match(idx.data(MessageModel::MessageRole).value<Message>(), Client::networkModel()->networkName(bufId)))
+      continue;
+
+    // seems like we have a legit notification candidate!
+    QModelIndex senderIdx = Client::messageModel()->index(i, ChatLineModel::SenderColumn);
+    QString sender = senderIdx.data(ChatLineModel::EditRole).toString();
+    QString contents = idx.data(ChatLineModel::DisplayRole).toString();
+    AbstractNotificationBackend::NotificationType type;
+
+    if(bufType == BufferInfo::QueryBuffer && !hasFocus)
+      type = AbstractNotificationBackend::PrivMsg;
+    else if(bufType == BufferInfo::QueryBuffer && hasFocus)
+      type = AbstractNotificationBackend::PrivMsgFocused;
+    else if(flags & Message::Highlight && !hasFocus)
+      type = AbstractNotificationBackend::Highlight;
+    else
+      type = AbstractNotificationBackend::HighlightFocused;
+
+    QtUi::instance()->invokeNotification(bufId, type, sender, contents);
   }
 }