# include <KMenuBar>
# include <KShortcutsDialog>
# include <KStatusBar>
+# include <KToolBar>
#endif
#ifdef Q_WS_X11
#include "settingspages/bufferviewsettingspage.h"
#include "settingspages/chatmonitorsettingspage.h"
#include "settingspages/colorsettingspage.h"
+#include "settingspages/connectionsettingspage.h"
#include "settingspages/generalsettingspage.h"
#include "settingspages/highlightsettingspage.h"
#include "settingspages/identitiessettingspage.h"
updateIcon();
installEventFilter(new JumpKeyHandler(this));
-
- QtUiApplication* app = qobject_cast<QtUiApplication*> qApp;
- connect(app, SIGNAL(aboutToQuit()), SLOT(aboutToQuit()));
}
void MainWin::init() {
- connect(QApplication::instance(), SIGNAL(aboutToQuit()), SLOT(saveLayout()));
connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), SLOT(clientNetworkCreated(NetworkId)));
connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), SLOT(clientNetworkRemoved(NetworkId)));
connect(Client::messageModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
setDisconnectedState(); // Disable menus and stuff
+#ifdef HAVE_KDE
+ setAutoSaveSettings();
+#endif
+
// restore mainwin state
QtUiSettings s;
restoreStateFromSettings(s);
}
-void MainWin::aboutToQuit() {
+void MainWin::quit() {
QtUiSettings s;
saveStateToSettings(s);
+ saveLayout();
+ QApplication::quit();
}
void MainWin::saveStateToSettings(UiSettings &s) {
s.setValue("MainWinGeometry", saveGeometry());
s.setValue("MainWinMinimized", isMinimized());
s.setValue("MainWinMaximized", isMaximized());
- s.setValue("MainWinHidden", _isHidden);
+ s.setValue("MainWinHidden", !isVisible());
+
+#ifdef HAVE_KDE
+ saveAutoSaveSettings();
+#endif
}
void MainWin::restoreStateFromSettings(UiSettings &s) {
_normalPos = s.value("MainWinPos", pos()).toPoint();
bool maximized = s.value("MainWinMaximized", false).toBool();
+#ifndef HAVE_KDE
restoreGeometry(s.value("MainWinGeometry").toByteArray());
if(maximized) {
restoreState(s.value("MainWinState").toByteArray());
- _isHidden = false;
+#else
+ move(_normalPos);
+#endif
+
if(s.value("MainWinHidden").toBool())
hideToTray();
else if(s.value("MainWinMinimized").toBool())
coll->addAction("ConfigureNetworks", new Action(SmallIcon("configure"), tr("Configure &Networks..."), coll,
this, SLOT(on_actionConfigureNetworks_triggered())));
coll->addAction("Quit", new Action(SmallIcon("application-exit"), tr("&Quit"), coll,
- qApp, SLOT(quit()), tr("Ctrl+Q")));
+ this, SLOT(quit()), tr("Ctrl+Q")));
// View
coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Buffer Views..."), coll,
#ifdef Q_WS_MAC
setUnifiedTitleAndToolBarOnMac(true);
#endif
- _mainToolBar = addToolBar(tr("Main Toolbar"));
+
+#ifdef HAVE_KDE
+ _mainToolBar = new KToolBar("MainToolBar", this, Qt::TopToolBarArea, false, true, true);
+#else
+ _mainToolBar = new QToolBar(this);
_mainToolBar->setObjectName("MainToolBar");
+#endif
+ _mainToolBar->setWindowTitle(tr("Main Toolbar"));
+ addToolBar(_mainToolBar);
QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar);
_toolbarMenu->addAction(_mainToolBar->toggleViewAction());
-
- //_nickToolBar = addToolBar("User");
- //_nickToolBar->setObjectName("NickToolBar");
- //QtUi::toolBarActionProvider()->addActions(_nickToolBar, ToolBarActionProvider::NickToolBar);
-
-#ifdef HAVE_KDE
- _mainToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
- //_nickToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-#endif
}
void MainWin::connectedToCore() {
//Category: Misc
dlg->registerSettingsPage(new GeneralSettingsPage(dlg));
+ dlg->registerSettingsPage(new ConnectionSettingsPage(dlg));
dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg));
dlg->registerSettingsPage(new NetworksSettingsPage(dlg));
dlg->registerSettingsPage(new AliasesSettingsPage(dlg));
event->ignore();
} else {
event->accept();
- QApplication::quit();
+ quit();
}
}
}
hide();
systemTray()->setIconVisible();
- _isHidden = true;
}
void MainWin::toggleMinimizedToTray() {
show();
raise();
activateWindow();
- _isHidden = false;
}
void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) {