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

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index e977c6f7..32a59dff 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
@@ -240,6 +254,8 @@ void MainWin::setupTopicWidget() {
   VerticalDock *dock = new VerticalDock(tr("Topic"), this);
   dock->setObjectName("TopicDock");
   TopicWidget *topicwidget = new TopicWidget(dock);
+  connect(topicwidget, SIGNAL(topicChanged(const QString &)), this, SLOT(changeTopic(const QString &)));
+
   dock->setWidget(topicwidget);
 
   Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
@@ -252,9 +268,8 @@ void MainWin::setupTopicWidget() {
 void MainWin::setupSystray() {
   systray = new QSystemTrayIcon(this);
   systray->setIcon(QIcon(":/icons/quassel-icon.png"));
-
-  QString toolTip("left click to minimize the quassel client to tray");
-  systray->setToolTip(toolTip);
+//  systray->setToolTip("left click to minimize the quassel client to tray");
+//  systray->setToolTip(toolTip);
 
   systrayMenu = new QMenu(this);
   systrayMenu->addAction(ui.actionAboutQuassel);
@@ -266,8 +281,8 @@ void MainWin::setupSystray() {
 
   systray->setContextMenu(systrayMenu);
 
-  QtUiSettings s;
-  if(s.value("UseSystemTrayIcon").toBool()) {
+  UiSettings s;
+  if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) {
     systray->show();
   }
   
@@ -281,14 +296,23 @@ void MainWin::setupSystray() {
 void MainWin::changeEvent(QEvent *event) {
   if(event->type() == QEvent::WindowStateChange) {
     if(windowState() & Qt::WindowMinimized) {
-      QtUiSettings s;
+      UiSettings s;
       if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) {
         toggleVisibility();
+        event->ignore();
       }
     }
   }
 }
 
+// FIXME this should be made prettier...
+void MainWin::changeTopic(const QString &topic) {
+  BufferId id = ui.bufferWidget->currentBuffer();
+  if(!id.isValid()) return;
+  Buffer *buffer = Client::buffer(id);
+  if(buffer) Client::userInput(buffer->bufferInfo(), QString("/topic %1").arg(topic));
+}
+
 void MainWin::connectedToCore() {
   foreach(BufferInfo id, Client::allBufferInfos()) {
     emit requestBacklog(id, 1000, -1);
@@ -344,7 +368,7 @@ void MainWin::showAboutDlg() {
 }
 
 void MainWin::closeEvent(QCloseEvent *event) {
-  QtUiSettings s;
+  UiSettings s;
   if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
     toggleVisibility();
     event->ignore();
@@ -360,19 +384,27 @@ 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();
+    setFocus(Qt::ActiveWindowFocusReason);
+    // activateWindow();
   } else {
-   hide();
+    if(systray->isSystemTrayAvailable ()) {
+      clearFocus();
+      hide();
+      if(!systray->isVisible()) {
+        systray->show();
+      }
+    } else {
+      lower();
+    }
   }
 }
 
@@ -410,13 +442,13 @@ void MainWin::clientNetworkUpdated() {
       a->setText(net->networkName());
       if(net->connectionState() == Network::Initialized) {
         a->setIcon(QIcon(":/16x16/actions/network-connect"));
-        a->setEnabled(true);
+        //a->setEnabled(true);
       } else if(net->connectionState() == Network::Disconnected) {
         a->setIcon(QIcon(":/16x16/actions/network-disconnect"));
-        a->setEnabled(true);
+        //a->setEnabled(true);
       } else {
         a->setIcon(QIcon(":/16x16/actions/gear"));
-        a->setEnabled(false);
+        //a->setEnabled(false);
       }
       return;
     }
@@ -445,60 +477,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);
-  
-}