X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=2c20680cab913727009e6b24f95ce9138fdc82a8;hp=3d4c12d976219a28e4d49bba23493ed73921c828;hb=d1c517f3be0e4457f363f74a474a8a47bdd4a5cf;hpb=fa6d3f8fad021a2a6f6d6228987c85997532e683

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 3d4c12d9..2c20680c 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -66,7 +66,7 @@ void MainWin::init() {
   connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientNetworkCreated(NetworkId)));
   connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), this, SLOT(clientNetworkRemoved(NetworkId)));
   ui.bufferWidget->init();
-
+  
   show();
 
   statusBar()->showMessage(tr("Not connected to core."));
@@ -245,7 +245,7 @@ void MainWin::setupSystray() {
   QString toolTip("left click to minimize the quassel client to tray");
   systray->setToolTip(toolTip);
 
-  QMenu *systrayMenu = new QMenu(this);
+  systrayMenu = new QMenu(this);
   systrayMenu->addAction(ui.actionAboutQuassel);
   systrayMenu->addSeparator();
   systrayMenu->addAction(ui.actionConnectCore);
@@ -256,8 +256,10 @@ void MainWin::setupSystray() {
   systray->setContextMenu(systrayMenu);
 
   systray->show();
+  #ifndef Q_WS_MAC
   connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )),
           this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason )));
+  #endif
 }
 
 void MainWin::connectedToCore() {
@@ -324,10 +326,20 @@ void MainWin::closeEvent(QCloseEvent *event)
 
 void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
   if (activationReason == QSystemTrayIcon::Trigger) {
-    if (isHidden())
+    if(isHidden()) {
       show();
-    else
+      if(isMinimized()) {
+        if(isMaximized()) {
+          showMaximized();
+        } else {
+          showNormal();
+        }
+      }
+      raise();
+      activateWindow();
+    } else {
       hide();
+    }
   }
 }
 
@@ -409,28 +421,51 @@ void MainWin::keyPressEvent(QKeyEvent *event) {
   int jumpModifier = Qt::AltModifier;
 #endif
 
-  if(Qt::Key_0 <= event->key() && event->key() <= Qt::Key_9) {
-    if(event->modifiers() ==  bindModifier) {
-      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();
-
-      _keyboardJump[event->key()] = bufferIdx;
-      statusBar()->showMessage(tr("Bound Buffer %1::%2 to Key %3").arg(net->networkName()).arg(bufferName).arg(event->key() - Qt::Key_0), 10000);
-      event->accept();
-    }
-    
-    else if(event->modifiers() == jumpModifier && _keyboardJump.contains(event->key())) {
-      Client::bufferModel()->standardSelectionModel()->setCurrentIndex(_keyboardJump[event->key()], QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-      event->accept();
-    }
-    
-    else {
-      event->ignore();
-    }
+  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);
+  
+}