X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=963f7a22617cc216935c8b9a13215746758e6b30;hb=3474e986630907fa2a3f4143012ac2a42796609e;hp=451bc240f52b0fc59b19764f3fe592b020feb4be;hpb=b6e6a7392b8c6f451baa7eaad472c978e19b3055;p=quassel.git

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 451bc240..963f7a22 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -93,6 +93,10 @@
 #  include "knotificationbackend.h"
 #endif /* HAVE_KDE */
 
+#ifdef HAVE_INDICATEQT
+  #include "indicatornotificationbackend.h"
+#endif
+
 #include "settingspages/aliasessettingspage.h"
 #include "settingspages/appearancesettingspage.h"
 #include "settingspages/backlogsettingspage.h"
@@ -108,6 +112,7 @@
 #include "settingspages/itemviewsettingspage.h"
 #include "settingspages/networkssettingspage.h"
 #include "settingspages/notificationssettingspage.h"
+#include "settingspages/topicwidgetsettingspage.h"
 
 MainWin::MainWin(QWidget *parent)
 #ifdef HAVE_KDE
@@ -147,6 +152,7 @@ void MainWin::init() {
   connect(Client::messageModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
            SLOT(messagesInserted(const QModelIndex &, int, int)));
   connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showChannelList(NetworkId)), SLOT(showChannelList(NetworkId)));
+  connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showIgnoreList(QString)), SLOT(showIgnoreList(QString)));
 
   // Setup Dock Areas
   setDockNestingEnabled(true);
@@ -183,6 +189,12 @@ void MainWin::init() {
   QtUi::registerNotificationBackend(new KNotificationBackend(this));
 #endif /* HAVE_KDE */
 
+#ifdef HAVE_INDICATEQT
+  QtUi::registerNotificationBackend(new IndicatorNotificationBackend(this));
+#endif
+
+  connect(bufferWidget(), SIGNAL(currentChanged(BufferId)), SLOT(currentBufferChanged(BufferId)));
+
   setDisconnectedState();  // Disable menus and stuff
 
 #ifdef HAVE_KDE
@@ -300,8 +312,11 @@ void MainWin::setupActions() {
 						0, 0, QKeySequence::Find))->setCheckable(true);
   coll->addAction("ShowAwayLog", new Action(tr("Show Away Log"), coll,
 					    this, SLOT(showAwayLog())));
+  coll->addAction("ToggleMenuBar", new Action(SmallIcon("show-menu"), tr("Show &Menubar"), coll,
+                                                0, 0, tr("Ctrl+M")))->setCheckable(true);
+
   coll->addAction("ToggleStatusBar", new Action(tr("Show Status &Bar"), coll,
-                                                 0, 0))->setCheckable(true);
+                                                0, 0))->setCheckable(true);
 
   // Settings
   coll->addAction("ConfigureQuassel", new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
@@ -357,20 +372,22 @@ void MainWin::setupMenus() {
   _bufferViewsMenu->addAction(coll->action("ConfigureBufferViews"));
   _toolbarMenu = _viewMenu->addMenu(tr("&Toolbars"));
   _viewMenu->addSeparator();
+
+  _viewMenu->addAction(coll->action("ToggleMenuBar"));
+  _viewMenu->addAction(coll->action("ToggleStatusBar"));
   _viewMenu->addAction(coll->action("ToggleSearchBar"));
 
   coreAction = coll->action("ShowAwayLog");
   flagRemoteCoreOnly(coreAction);
   _viewMenu->addAction(coreAction);
 
-  _viewMenu->addAction(coll->action("ToggleStatusBar"));
   _viewMenu->addSeparator();
   _viewMenu->addAction(coll->action("LockLayout"));
 
   _settingsMenu = menuBar()->addMenu(tr("&Settings"));
 #ifdef HAVE_KDE
-  _settingsMenu->addAction(KStandardAction::keyBindings(this, SLOT(showShortcutsDlg()), this));
   _settingsMenu->addAction(KStandardAction::configureNotifications(this, SLOT(showNotificationsDlg()), this));
+  _settingsMenu->addAction(KStandardAction::keyBindings(this, SLOT(showShortcutsDlg()), this));
 #endif
   _settingsMenu->addAction(coll->action("ConfigureQuassel"));
 
@@ -390,6 +407,17 @@ void MainWin::setupMenus() {
   _helpDebugMenu->addAction(coll->action("DebugLog"));
   _helpDebugMenu->addSeparator();
   _helpDebugMenu->addAction(coll->action("ReloadStyle"));
+
+  // Toggle visibility
+  QAction *showMenuBar = QtUi::actionCollection("General")->action("ToggleMenuBar");
+
+  QtUiSettings uiSettings;
+  bool enabled = uiSettings.value("ShowMenuBar", QVariant(true)).toBool();
+  showMenuBar->setChecked(enabled);
+  enabled ? menuBar()->show() : menuBar()->hide();
+
+  connect(showMenuBar, SIGNAL(toggled(bool)), menuBar(), SLOT(setVisible(bool)));
+  connect(showMenuBar, SIGNAL(toggled(bool)), this, SLOT(saveMenuBarStatus(bool)));
 }
 
 void MainWin::setupBufferWidget() {
@@ -618,6 +646,11 @@ void MainWin::setupHotList() {
   _bufferHotList = new BufferHotListFilter(flatProxy);
 }
 
+void MainWin::saveMenuBarStatus(bool enabled) {
+  QtUiSettings uiSettings;
+  uiSettings.setValue("ShowMenuBar", enabled);
+}
+
 void MainWin::saveStatusBarStatus(bool enabled) {
   QtUiSettings uiSettings;
   uiSettings.setValue("ShowStatusBar", enabled);
@@ -788,6 +821,14 @@ void MainWin::showChannelList(NetworkId netId) {
   channelListDlg->show();
 }
 
+void MainWin::showIgnoreList(QString newRule) {
+  SettingsPageDlg dlg(new IgnoreListSettingsPage(this), this);
+  // prepare config dialog for new rule
+  if(!newRule.isEmpty())
+    qobject_cast<IgnoreListSettingsPage *>(dlg.currentPage())->editIgnoreRule(newRule);
+  dlg.exec();
+}
+
 void MainWin::showCoreInfoDlg() {
   CoreInfoDlg(this).exec();
 }
@@ -815,6 +856,7 @@ void MainWin::showSettingsDlg() {
   dlg->registerSettingsPage(new ChatViewSettingsPage(dlg));
   dlg->registerSettingsPage(new ItemViewSettingsPage(dlg));
   dlg->registerSettingsPage(new InputWidgetSettingsPage(dlg));
+  dlg->registerSettingsPage(new TopicWidgetSettingsPage(dlg));
   dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
   dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
   dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
@@ -845,8 +887,11 @@ void MainWin::showShortcutsDlg() {
 /********************************************************************************************************/
 
 bool MainWin::event(QEvent *event) {
-  if(event->type() == QEvent::WindowActivate)
-    QtUi::closeNotifications();
+  if(event->type() == QEvent::WindowActivate) {
+    BufferId buffer = Client::bufferModel()->currentBuffer();
+    if(buffer.isValid())
+      QtUi::closeNotifications(buffer);
+  }
   return QMainWindow::event(event);
 }
 
@@ -954,7 +999,7 @@ 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);
 
-    if(hasFocus && bufId == _bufferWidget->currentBuffer())
+    if(hasFocus && bufId == Client::bufferModel()->currentBuffer())
       continue;
 
     if((flags & Message::Highlight || bufType == BufferInfo::QueryBuffer)
@@ -980,6 +1025,11 @@ void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) {
   }
 }
 
+void MainWin::currentBufferChanged(BufferId buffer) {
+  if(buffer.isValid())
+    QtUi::closeNotifications(buffer);
+}
+
 void MainWin::clientNetworkCreated(NetworkId id) {
   const Network *net = Client::network(id);
   QAction *act = new QAction(net->networkName(), this);