#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"
}
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::toggleVisibility() {
- if(isHidden()) {
+ if(isHidden() || !isActiveWindow()) {
show();
- if(isMinimized()) {
- if(isMaximized()) {
+ if(isMinimized())
+ if (isMaximized())
showMaximized();
- } else {
+ else
showNormal();
- }
- }
+
raise();
activateWindow();
} else {
- hide();
+ if(systray->isSystemTrayAvailable ()) {
+ hide();
+ if(!systray->isVisible()) {
+ systray->show();
+ }
+ } else {
+ lower();
+ }
}
}