X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=1b7380413bb56bde99ec68fbb043bf4a501698c4;hb=1aef6bf0d3d2a7ef469b9a9f68ceb891cc8a896c;hp=e977c6f741b35e0bcc38e67a49ddf31c89215340;hpb=42ed32344cdfcf2c4cd164ebd09782d7923b6547;p=quassel.git

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index e977c6f7..1b738041 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -38,26 +38,34 @@
 #include "verticaldock.h"
 #include "uisettings.h"
 #include "qtuisettings.h"
+#include "jumpkeyhandler.h"
 
 #include "selectionmodelsynchronizer.h"
 #include "mappedselectionmodel.h"
 
+#include "settingspages/colorsettingspage.h"
 #include "settingspages/fontssettingspage.h"
+#include "settingspages/generalsettingspage.h"
 #include "settingspages/identitiessettingspage.h"
 #include "settingspages/networkssettingspage.h"
-#include "settingspages/generalsettingspage.h"
+
 
 #include "debugconsole.h"
 
-MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) {
+MainWin::MainWin(QtUi *_gui, QWidget *parent)
+  : QMainWindow(parent),
+    gui(_gui),
+    settingsDlg(new SettingsDlg(this)),
+    debugConsole(new DebugConsole(this))
+{
   ui.setupUi(this);
   setWindowTitle("Quassel IRC");
   setWindowIcon(QIcon(":icons/quassel-icon.png"));
   setWindowIconText("Quassel IRC");
 
   statusBar()->showMessage(tr("Waiting for core..."));
-  settingsDlg = new SettingsDlg(this);
-  debugConsole = new DebugConsole(this);
+
+  installEventFilter(new JumpKeyHandler(this));
 }
 
 void MainWin::init() {
@@ -107,6 +115,8 @@ void MainWin::init() {
 #ifdef SPUTDEV
   //showSettingsDlg();
   //showAboutDlg();
+  showNetworkDlg();
+  exit(1);
 #endif
 
 }
@@ -166,12 +176,16 @@ QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel
 }
 
 void MainWin::setupSettingsDlg() {
-
+  //Category: Appearance
+  settingsDlg->registerSettingsPage(new ColorSettingsPage(settingsDlg));
   settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
+  //Category: Behaviour
+  settingsDlg->registerSettingsPage(new GeneralSettingsPage(settingsDlg));
+  //Category: General
   settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
   settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
-  settingsDlg->registerSettingsPage(new GeneralSettingsPage(settingsDlg));
-  
+
+
 #ifdef SPUTDEV
   connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit()));  // FIXME
 #endif
@@ -360,19 +374,25 @@ void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas
 }
 
 void MainWin::toggleVisibility() {
-  if(isHidden()) {
+  if(isHidden() || !isActiveWindow()) {
     show();
-    if(isMinimized()) {
-      if(isMaximized()) {
+    if(isMinimized())
+      if (isMaximized())
         showMaximized();
-      } else {
+      else
         showNormal();
-      }
-    }
+
     raise();
     activateWindow();
   } else {
-   hide();
+    if(systray->isSystemTrayAvailable ()) {
+      hide();
+      if(!systray->isVisible()) {
+        systray->show();
+      }
+    } else {
+      lower();
+    }
   }
 }
 
@@ -445,60 +465,3 @@ void MainWin::connectOrDisconnectFromNet() {
   else net->requestDisconnect();
 }
 
-void MainWin::keyPressEvent(QKeyEvent *event) {
-#ifdef Q_WS_MAC
-  int bindModifier = Qt::ControlModifier | Qt::AltModifier;
-  int jumpModifier = Qt::ControlModifier;
-#else
-  int bindModifier = Qt::ControlModifier;
-  int jumpModifier = Qt::AltModifier;
-#endif
-
-  if(event->modifiers() ==  bindModifier) {
-    event->accept();
-    return bindKey(event->key());
-  }
-  
-  if(event->modifiers() == jumpModifier) {
-    event->accept();
-    return jumpKey(event->key());
-  }
-  
-  event->ignore();
-}
-
-void MainWin::bindKey(int key) {
-  if(key < Qt::Key_0 || Qt::Key_9 < key)
-    return;
-  
-  QModelIndex bufferIdx = Client::bufferModel()->standardSelectionModel()->currentIndex();
-  NetworkId netId = bufferIdx.data(NetworkModel::NetworkIdRole).value<NetworkId>();
-  const Network *net = Client::network(netId);
-  if(!net)
-    return;
-  
-  QString bufferName = bufferIdx.sibling(bufferIdx.row(), 0).data().toString();
-  BufferId bufferId = bufferIdx.data(NetworkModel::BufferIdRole).value<BufferId>();
-  
-  _keyboardJump[key] = bufferId;
-  CoreAccountSettings().setJumpKeyMap(_keyboardJump);
-  statusBar()->showMessage(tr("Bound Buffer %1::%2 to Key %3").arg(net->networkName()).arg(bufferName).arg(key - Qt::Key_0), 10000);
-}
-
-void MainWin::jumpKey(int key) {
-  if(key < Qt::Key_0 || Qt::Key_9 < key)
-    return;
-
-  if(_keyboardJump.isEmpty())
-    _keyboardJump = CoreAccountSettings().jumpKeyMap();
-
-  if(!_keyboardJump.contains(key))
-    return;
-
-  QModelIndex source_bufferIdx = Client::networkModel()->bufferIndex(_keyboardJump[key]);
-  QModelIndex bufferIdx = Client::bufferModel()->mapFromSource(source_bufferIdx);
-
-  if(bufferIdx.isValid())
-    Client::bufferModel()->standardSelectionModel()->setCurrentIndex(bufferIdx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-  
-}