From: Marcus Eggenberger Date: Mon, 14 Apr 2008 13:36:43 +0000 (+0000) Subject: fixing layout issues X-Git-Tag: 0.2.0-beta1~51 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=ef450b6502abfcad52fec7581a3d807a5386512f fixing layout issues --- diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index a4a33b8f..1b503efa 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -131,7 +131,7 @@ void MainWin::init() { // restore mainwin state restoreState(s.value("MainWinState").toByteArray()); - disconnectedFromCore(); // Disable menus and stuff + setDisconnectedState(); // Disable menus and stuff showCoreConnectionDlg(true); // autoconnect if appropriate // attach the BufferWidget to the BufferModel and the default selection @@ -399,7 +399,10 @@ void MainWin::connectedToCore() { foreach(BufferInfo id, Client::allBufferInfos()) { Client::backlogManager()->requestBacklog(id.bufferId(), 500, -1); } + setConnectedState(); +} +void MainWin::setConnectedState() { ui.menuViews->setEnabled(true); //ui.menuCore->setEnabled(true); ui.actionConnectCore->setEnabled(false); @@ -447,7 +450,11 @@ void MainWin::disconnectedFromCore() { dock->deleteLater(); } } + restoreState(s.value("MainWinState").toByteArray()); + setDisconnectedState(); +} +void MainWin::setDisconnectedState() { ui.menuViews->setEnabled(false); //ui.menuCore->setEnabled(false); ui.actionDisconnectCore->setEnabled(false); diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 01903456..50dc496f 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -64,8 +64,10 @@ class MainWin : public QMainWindow { protected slots: void connectedToCore(); + void setConnectedState(); void securedConnection(); void disconnectedFromCore(); + void setDisconnectedState(); void systrayActivated( QSystemTrayIcon::ActivationReason ); private slots: diff --git a/version.inc b/version.inc index f2f85670..59bfcdd2 100644 --- a/version.inc +++ b/version.inc @@ -5,7 +5,7 @@ quasselVersion = "0.2.0-beta1-pre"; quasselDate = "2008-04-14"; - quasselBuild = 738; + quasselBuild = 739; //! Minimum client build number the core needs clientBuildNeeded = 731;