#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"
#ifdef SPUTDEV
//showSettingsDlg();
//showAboutDlg();
+ showNetworkDlg();
+ exit(1);
#endif
}
}
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
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()) {
+ 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();
+ }
}
}
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;
}