X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=518b2b8451c59cbc2ec6b66c806ad33d748f1262;hp=6c63404f139757b54163063ad0f11d142cd2c934;hb=6ffaa82b95c0be603b9f94688c435bdcf6129230;hpb=f9fc50a5e043668a2525a6c0903ea339d4ba05b7

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 6c63404f..518b2b84 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -32,6 +32,8 @@
 #include "settingsdlg.h"
 #include "signalproxy.h"
 #include "topicwidget.h"
+#include "inputwidget.h"
+#include "verticaldock.h"
 #include "uisettings.h"
 
 #include "selectionmodelsynchronizer.h"
@@ -39,6 +41,7 @@
 
 #include "settingspages/fontssettingspage.h"
 #include "settingspages/identitiessettingspage.h"
+#include "settingspages/networkssettingspage.h"
 
 #include "debugconsole.h"
 
@@ -69,7 +72,23 @@ void MainWin::init() {
   statusBar()->showMessage(tr("Not connected to core."));
   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);
+  
+  QMenu *systrayMenu = new QMenu();
+  systrayMenu->addAction(ui.actionAboutQuassel);
+  systrayMenu->addSeparator();
+  systrayMenu->addAction(ui.actionConnectCore);
+  systrayMenu->addAction(ui.actionDisconnectCore);
+  systrayMenu->addSeparator();
+  systrayMenu->addAction(ui.actionQuit);
+  
+  systray->setContextMenu(systrayMenu);
+  
   systray->show();
+  connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )), 
+          this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason )));
 
   //setupSettingsDlg();
 
@@ -100,36 +119,45 @@ void MainWin::init() {
     showServerList();
   }
   
+  // DOCK OPTIONS
   setDockNestingEnabled(true);
-  
-  
-  // new Topic Stuff... should be probably refactored out into a separate method
-  
+
   setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
   setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
 
   setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
   setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
 
+  // new Topic Stuff... should be probably refactored out into a separate method
+  VerticalDock *topicDock = new VerticalDock(tr("Topic"), this);
+  topicDock->setObjectName("TopicDock");
+  TopicWidget *topicwidget = new TopicWidget(topicDock);
+  topicDock->setWidget(topicwidget);
 
-  QDockWidget *dock = new QDockWidget(tr("Topic Dock"), this);
-  dock->setObjectName("TopicDock");
-  dock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
+  Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
 
-  TopicWidget *topicwidget = new TopicWidget(dock);
-  dock->setWidget(topicwidget);
+  addDockWidget(Qt::TopDockWidgetArea, topicDock);
 
-  Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
+  ui.menuViews->addAction(topicDock->toggleViewAction());
 
-  addDockWidget(Qt::TopDockWidgetArea, dock);
+  // NEW INPUT WIDGET -- damn init() needs a cleanup
+  VerticalDock *inputDock = new VerticalDock(tr("Inputline"), this);
+  inputDock->setObjectName("InputDock");
+  InputWidget *inputWidget = new InputWidget(inputDock);
+  inputDock->setWidget(inputWidget);
 
-  ui.menuViews->addAction(dock->toggleViewAction());
+  addDockWidget(Qt::BottomDockWidgetArea, inputDock);
+
+  ui.menuViews->addAction(inputDock->toggleViewAction());
 
+  inputWidget->setModel(Client::bufferModel());
+  inputWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
 
+  ui.bufferWidget->setFocusProxy(inputWidget);
+  
   // attach the BufferWidget to the PropertyMapper
-  Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, ui.bufferWidget, "currentBuffer");
-  connect(Client::networkModel(), SIGNAL(bufferAboutToBeRemoved(BufferId)),
-	  ui.bufferWidget, SLOT(removeBuffer(BufferId)));
+  ui.bufferWidget->setModel(Client::bufferModel());
+  ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
 
   // attach the NickList to the PropertyMapper
   Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");
@@ -171,16 +199,16 @@ void MainWin::setupMenus() {
 void MainWin::setupViews() {
   BufferModel *model = Client::bufferModel();
 
-  addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList<uint>());
-  addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList<uint>());
-  addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList<uint>());
-  addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList<uint>());
-  addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList<uint>());
+  addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList<NetworkId>());
+  addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList<NetworkId>());
+  addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList<NetworkId>());
+  addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList<NetworkId>());
+  addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList<NetworkId>());
 
   ui.menuViews->addSeparator();
 }
 
-void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList<uint> &nets) {
+QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList<NetworkId> &nets) {
   QDockWidget *dock = new QDockWidget(viewname, this);
   dock->setObjectName(QString("ViewDock-" + viewname)); // should be unique for mainwindow state!
   dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
@@ -197,11 +225,17 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
   ui.menuViews->addAction(dock->toggleViewAction());
 
   netViews.append(dock);
+  return dock;
 }
 
 void MainWin::setupSettingsDlg() {
+#ifdef SPUTDEV
+  connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit()));  // FIXME
+#endif
+
   settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
   settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
+  //settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
 }
 
 void MainWin::connectedToCore() {
@@ -237,14 +271,14 @@ void MainWin::showCoreConnectionDlg(bool autoConnect) {
   coreConnectDlg = new CoreConnectDlg(this, autoConnect);
   connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int)));
   coreConnectDlg->setModal(true);
-  if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect())
+  //if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect())
     coreConnectDlg->show(); // avoid flicker and show dlg only if we do remote connect, which needs a progress bar
-  if(autoConnect) coreConnectDlg->doAutoConnect();
+  //if(autoConnect) coreConnectDlg->doAutoConnect();
 }
 
 void MainWin::coreConnectionDlgFinished(int /*code*/) {
-
   coreConnectDlg->close();
+  //exit(1);
 }
 
 
@@ -267,15 +301,24 @@ void MainWin::showDebugConsole() {
 void MainWin::closeEvent(QCloseEvent *event)
 {
   //if (userReallyWantsToQuit()) {
-    ui.bufferWidget->saveState();
     UiSettings s;
     s.setValue("MainWinSize", size());
     s.setValue("MainWinPos", pos());
     s.setValue("MainWinState", saveState());
-    delete systray;
     event->accept();
   //} else {
     //event->ignore();
   //}
 }
 
+void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
+  if (activationReason == QSystemTrayIcon::Trigger) {
+    if (isHidden())
+      show();
+    else
+      hide();
+  }
+  
+  
+  
+}