projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added colorsettingspage
[quassel.git]
/
src
/
qtui
/
mainwin.cpp
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
81dc224
..
1b73804
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-43,10
+43,12
@@
#include "selectionmodelsynchronizer.h"
#include "mappedselectionmodel.h"
#include "selectionmodelsynchronizer.h"
#include "mappedselectionmodel.h"
+#include "settingspages/colorsettingspage.h"
#include "settingspages/fontssettingspage.h"
#include "settingspages/fontssettingspage.h"
+#include "settingspages/generalsettingspage.h"
#include "settingspages/identitiessettingspage.h"
#include "settingspages/networkssettingspage.h"
#include "settingspages/identitiessettingspage.h"
#include "settingspages/networkssettingspage.h"
-#include "settingspages/generalsettingspage.h"
+
#include "debugconsole.h"
#include "debugconsole.h"
@@
-174,12
+176,16
@@
QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel
}
void MainWin::setupSettingsDlg() {
}
void MainWin::setupSettingsDlg() {
-
+ //Category: Appearance
+ settingsDlg->registerSettingsPage(new ColorSettingsPage(settingsDlg));
settingsDlg->registerSettingsPage(new FontsSettingsPage(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 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
#ifdef SPUTDEV
connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit())); // FIXME
#endif
@@
-368,19
+374,25
@@
void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas
}
void MainWin::toggleVisibility() {
}
void MainWin::toggleVisibility() {
- if(isHidden()) {
+ if(isHidden()
|| !isActiveWindow()
) {
show();
show();
- if(isMinimized())
{
- if
(isMaximized()) {
+ if(isMinimized())
+ if
(isMaximized())
showMaximized();
showMaximized();
- } else {
+ else
showNormal();
showNormal();
- }
- }
+
raise();
activateWindow();
} else {
raise();
activateWindow();
} else {
- hide();
+ if(systray->isSystemTrayAvailable ()) {
+ hide();
+ if(!systray->isVisible()) {
+ systray->show();
+ }
+ } else {
+ lower();
+ }
}
}
}
}