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);
QtUiSettings s;
if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) {
toggleVisibility();
+ event->ignore();
}
}
}
}
void MainWin::toggleVisibility() {
- if(isHidden() || !isActiveWindow()) {
+ if(isHidden() /*|| !isActiveWindow()*/) {
show();
if(isMinimized())
if (isMaximized())
showNormal();
raise();
- activateWindow();
+ setFocus(Qt::ActiveWindowFocusReason);
+ // activateWindow();
} else {
if(systray->isSystemTrayAvailable ()) {
+ clearFocus();
hide();
if(!systray->isVisible()) {
systray->show();
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;
}