added context menu to systray

[quassel.git] / src / qtui / mainwin.cpp

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 56f7d7e..817a762 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -70,7 +70,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();
 
@@ -173,9 +189,9 @@ void MainWin::setupViews() {
 
   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>())->hide();
-  addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList<NetworkId>())->hide();
-  addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList<NetworkId>())->hide();
+  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();
 }
@@ -207,7 +223,7 @@ void MainWin::setupSettingsDlg() {
 
   settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
   settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
-  settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
+  //settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
 }
 
 void MainWin::connectedToCore() {
@@ -277,10 +293,20 @@ void MainWin::closeEvent(QCloseEvent *event)
     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();
+  }
+  
+  
+  
+}
\ No newline at end of file