#include "settingspages/chatviewsettingspage.h"
#include "settingspages/connectionsettingspage.h"
#include "settingspages/coreaccountsettingspage.h"
-#include "settingspages/generalsettingspage.h"
+#include "settingspages/coreconnectionsettingspage.h"
#include "settingspages/highlightsettingspage.h"
#include "settingspages/identitiessettingspage.h"
#include "settingspages/ignorelistsettingspage.h"
#ifndef HAVE_KDE
QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this));
+# ifndef QT_NO_SYSTEMTRAYICON
QtUi::registerNotificationBackend(new SystrayNotificationBackend(this));
+# endif
# ifdef HAVE_PHONON
QtUi::registerNotificationBackend(new PhononNotificationBackend(this));
# endif
move(_normalPos);
#endif
- if(s.value("MainWinHidden").toBool())
+#ifndef QT_NO_SYSTEMTRAYICON
+ if(s.value("MainWinHidden").toBool()) {
hideToTray();
- else if(s.value("MainWinMinimized").toBool())
+ return;
+ }
+#endif
+ if(s.value("MainWinMinimized").toBool())
showMinimized();
else if(maximized)
showMaximized();
}
void MainWin::setupSystray() {
+#ifndef QT_NO_SYSTEMTRAYICON
_systemTray = new SystemTray(this);
+#endif
}
void MainWin::setupToolBars() {
_coreConnectionStatusWidget->setVisible(!Client::internalCore());
updateIcon();
+#ifndef QT_NO_SYSTEMTRAYICON
systemTray()->setState(SystemTray::Active);
+#endif
if(Client::networkIds().isEmpty()) {
IrcConnectionWizard *wizard = new IrcConnectionWizard(this, Qt::Sheet);
if(_msgProcessorStatusWidget)
_msgProcessorStatusWidget->setProgress(0, 0);
updateIcon();
+#ifndef QT_NO_SYSTEMTRAYICON
systemTray()->setState(SystemTray::Inactive);
+#endif
}
void MainWin::userAuthenticationRequired(CoreAccount *account, bool *valid, const QString &errorMessage) {
//Category: Interface
dlg->registerSettingsPage(new AppearanceSettingsPage(dlg));
dlg->registerSettingsPage(new ChatViewSettingsPage(dlg));
+ dlg->registerSettingsPage(new ChatMonitorSettingsPage(dlg));
dlg->registerSettingsPage(new ItemViewSettingsPage(dlg));
+ dlg->registerSettingsPage(new BufferViewSettingsPage(dlg));
dlg->registerSettingsPage(new InputWidgetSettingsPage(dlg));
dlg->registerSettingsPage(new TopicWidgetSettingsPage(dlg));
dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
- dlg->registerSettingsPage(new BufferViewSettingsPage(dlg));
- dlg->registerSettingsPage(new ChatMonitorSettingsPage(dlg));
- //Category: Misc
- dlg->registerSettingsPage(new GeneralSettingsPage(dlg));
+ //Category: IRC
dlg->registerSettingsPage(new ConnectionSettingsPage(dlg));
dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg));
dlg->registerSettingsPage(new NetworksSettingsPage(dlg));
dlg->registerSettingsPage(new AliasesSettingsPage(dlg));
dlg->registerSettingsPage(new IgnoreListSettingsPage(dlg));
+ // Category: Remote Cores
if(Quassel::runMode() != Quassel::Monolithic) {
dlg->registerSettingsPage(new CoreAccountSettingsPage(dlg));
+ dlg->registerSettingsPage(new CoreConnectionSettingsPage(dlg));
}
dlg->show();
}
void MainWin::closeEvent(QCloseEvent *event) {
+#ifndef QT_NO_SYSTEMTRAYICON
QtUiSettings s;
QtUiApplication* app = qobject_cast<QtUiApplication*> qApp;
Q_ASSERT(app);
event->accept();
quit();
}
+#else
+ event->accept();
+ quit();
+#endif
}
void MainWin::changeEvent(QEvent *event) {
QMainWindow::changeEvent(event);
}
+#ifndef QT_NO_SYSTEMTRAYICON
+
void MainWin::hideToTray() {
if(!systemTray()->isSystemTrayAvailable()) {
qWarning() << Q_FUNC_INFO << "was called with no SystemTray available!";
#endif
}
+#endif /* QT_NO_SYSTEMTRAYICON */
+
void MainWin::forceActivated() {
#ifdef HAVE_KDE
show();