From 476903c47bbe04cf122fb1e7936cdb1d134c6792 Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@synergy-project.org>
Date: Wed, 2 Jun 2010 20:19:23 +0000
Subject: [PATCH] Fixed issue 487

---
 gui/res/MainWindowBase.ui | 41 +++++++++++++++++++++++----------------
 gui/src/MainWindow.cpp    | 15 ++++++--------
 gui/src/MainWindow.h      |  2 +-
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/gui/res/MainWindowBase.ui b/gui/res/MainWindowBase.ui
index a0827529..ac52f236 100644
--- a/gui/res/MainWindowBase.ui
+++ b/gui/res/MainWindowBase.ui
@@ -33,14 +33,14 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout">
-    <item row="4" column="1">
+    <item row="6" column="3">
      <widget class="QPushButton" name="m_pButtonToggleStart">
       <property name="text">
        <string>&amp;Start</string>
       </property>
      </widget>
     </item>
-    <item row="1" column="0" colspan="2">
+    <item row="1" column="0" colspan="4">
      <widget class="QGroupBox" name="m_pGroupServer">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -133,20 +133,7 @@
       </layout>
      </widget>
     </item>
-    <item row="4" column="0">
-     <spacer>
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>40</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item row="3" column="0" colspan="2">
+    <item row="3" column="0" colspan="4">
      <spacer name="verticalSpacer">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
@@ -159,7 +146,7 @@
       </property>
      </spacer>
     </item>
-    <item row="2" column="0" colspan="2">
+    <item row="2" column="0" colspan="4">
      <widget class="QGroupBox" name="m_pGroupClient">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -190,6 +177,26 @@
       </layout>
      </widget>
     </item>
+    <item row="6" column="1">
+     <widget class="QLabel" name="m_pStatusLabel">
+      <property name="text">
+       <string>Ready</string>
+      </property>
+     </widget>
+    </item>
+    <item row="6" column="2">
+     <spacer>
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
    </layout>
   </widget>
   <action name="m_pActionAbout">
diff --git a/gui/src/MainWindow.cpp b/gui/src/MainWindow.cpp
index cf75d1fe..14f8d786 100644
--- a/gui/src/MainWindow.cpp
+++ b/gui/src/MainWindow.cpp
@@ -44,7 +44,6 @@ MainWindow::MainWindow(QWidget* parent) :
 	m_ServerConfig(&m_Settings, 5, 3),
 	m_pTempConfigFile(NULL),
 	m_pLogDialog(new LogDialog(this, synergyProcess())),
-	m_pLabelStatusBar(NULL),
 	m_pTrayIcon(NULL),
 	m_pTrayIconMenu(NULL)
 {
@@ -52,7 +51,6 @@ MainWindow::MainWindow(QWidget* parent) :
 
 	createTrayIcon();
 	createMenuBar();
-	createStatusBar();
 	loadSettings();
 	initConnections();
 
@@ -66,6 +64,11 @@ MainWindow::~MainWindow()
 	saveSettings();
 }
 
+void MainWindow::setStatus(const QString &status)
+{
+	m_pStatusLabel->setText(status);
+}
+
 void MainWindow::createTrayIcon()
 {
 #if !defined(Q_OS_MAC)
@@ -123,12 +126,6 @@ void MainWindow::createMenuBar()
 	setMenuBar(menubar);
 }
 
-void MainWindow::createStatusBar()
-{
-	m_pLabelStatusBar = new QLabel(tr("Synergy is not running."));
-	statusBar()->addPermanentWidget(m_pLabelStatusBar);
-}
-
 void MainWindow::loadSettings()
 {
 	// gui
@@ -383,7 +380,7 @@ void MainWindow::setSynergyState(qSynergyState state)
 	m_pGroupServer->setEnabled(state == synergyDisconnected);
 	m_pActionStartSynergy->setEnabled(state == synergyDisconnected);
 	m_pActionStopSynergy->setEnabled(state == synergyConnected);
-	m_pLabelStatusBar->setText(state == synergyConnected ? QString(tr("Synergy %1 is running.")).arg(synergyType() == synergyServer ? tr("server") : tr("client")) : tr("Synergy is not running."));
+	setStatus(state == synergyConnected ? QString(tr("Synergy %1 is running.")).arg(synergyType() == synergyServer ? tr("server") : tr("client")) : tr("Synergy is not running."));
 	setIcon(state);
 	m_SynergyState = state;
 }
diff --git a/gui/src/MainWindow.h b/gui/src/MainWindow.h
index 23b4edcb..52ab49b5 100644
--- a/gui/src/MainWindow.h
+++ b/gui/src/MainWindow.h
@@ -86,6 +86,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
 		bool checkForApp(int which, QString& app);
 		bool clientArgs(QStringList& args, QString& app);
 		bool serverArgs(QStringList& args, QString& app);
+		void setStatus(const QString& status);
 
 	private:
 		QSettings m_Settings;
@@ -96,7 +97,6 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
 		QTemporaryFile* m_pTempConfigFile;
 		LogDialog* m_pLogDialog;
 
-		QLabel* m_pLabelStatusBar;
 		QSystemTrayIcon* m_pTrayIcon;
 		QMenu* m_pTrayIconMenu;
 };