diff --git a/src/gui/res/MainWindowBase.ui b/src/gui/res/MainWindowBase.ui
index 4452c4d8..ba434b76 100644
--- a/src/gui/res/MainWindowBase.ui
+++ b/src/gui/res/MainWindowBase.ui
@@ -26,156 +26,59 @@
Synergy
-
- -
-
-
-
- 0
- 0
-
-
-
- &Client (use another computer's keyboard and mouse):
-
-
- true
-
-
- true
-
-
-
- QFormLayout::AllNonFixedFieldsGrow
+
+
-
+
+
+
+ 2
+
+
+ 0
+
+
+ 0
+
+
+ 7
-
-
-
-
- Screen name:
-
-
-
- -
-
-
- &Server IP:
-
-
- m_pLineEditHostname
-
-
-
- -
-
-
- -
-
-
-
-
-
-
-
-
-
- -
-
-
- Ready
-
-
-
- -
-
-
- Log
-
-
-
-
-
-
- 0
- 0
-
+
+
+
-
-
- Courier
-
+
+ :/res/icons/16x16/warning.png
-
- false
+
+
+ -
+
+
+ m_pLabelUpdate
-
- false
-
-
- QTextEdit::NoWrap
-
-
+
true
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 469
+ 20
+
+
+
+
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
-
-
- :/res/icons/16x16/warning.png
-
-
-
- -
-
-
-
-
-
- true
-
-
-
- -
-
-
- &Start
-
-
-
- -
-
-
- &Apply
-
-
-
- -
-
-
- &Elevate
-
-
-
- -
+
-
@@ -289,6 +192,141 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+ &Client (use another computer's keyboard and mouse):
+
+
+ true
+
+
+ true
+
+
+
+ QFormLayout::AllNonFixedFieldsGrow
+
+
-
+
+
+ Screen name:
+
+
+
+ -
+
+
+ &Server IP:
+
+
+ m_pLineEditHostname
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Log
+
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ Courier
+
+
+
+ false
+
+
+ false
+
+
+ QTextEdit::NoWrap
+
+
+ true
+
+
+
+
+
+
+ -
+
+
+ QLayout::SetDefaultConstraint
+
+
-
+
+
+ Ready
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ &Elevate
+
+
+
+ -
+
+
+ &Apply
+
+
+
+ -
+
+
+ &Start
+
+
+
+
+
@@ -400,22 +438,6 @@
-
- m_pButtonToggleStart
- clicked()
- m_pActionStartSynergy
- trigger()
-
-
- 361
- 404
-
-
- -1
- -1
-
-
-
m_pRadioExternalConfig
toggled(bool)
@@ -464,5 +486,21 @@
+
+ m_pButtonToggleStart
+ clicked()
+ m_pActionStartSynergy
+ trigger()
+
+
+ 361
+ 404
+
+
+ -1
+ -1
+
+
+
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index f70fad3d..7aec42b4 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -79,8 +79,7 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
loadSettings();
initConnections();
- m_pUpdateIcon->hide();
- m_pUpdateLabel->hide();
+ m_pWidgetUpdate->hide();
m_VersionChecker.setApp(appPath(appConfig.synergycName()));
m_pLabelScreenName->setText(getScreenName());
m_pLabelIpAddresses->setText(getIPAddresses());
@@ -320,10 +319,11 @@ void MainWindow::logError()
void MainWindow::updateFound(const QString &version)
{
- m_pUpdateIcon->show();
- m_pUpdateLabel->show();
- m_pUpdateLabel->setText(
- tr("Version %1 is now available, visit website.
")
+ m_pWidgetUpdate->show();
+ m_pLabelUpdate->setText(
+ tr("Your version of Synergy is out of date. "
+ "Version %1 is now available to "
+ "download.
")
.arg(version).arg("http://synergy-foss.org"));
}
diff --git a/src/gui/src/VersionChecker.cpp b/src/gui/src/VersionChecker.cpp
index 7bf36ae8..cd811d3f 100644
--- a/src/gui/src/VersionChecker.cpp
+++ b/src/gui/src/VersionChecker.cpp
@@ -1,6 +1,6 @@
/*
* synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2012 Bolton Software Ltd.
* Copyright (C) 2012 Nick Bolton
*
* This package is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
#include
#define VERSION_REGEX "(\\d+\\.\\d+\\.\\d+)"
-#define VERSION_URL "http://synergy-plus.googlecode.com/svn/web/version.txt"
+#define VERSION_URL "http://synergy-foss.org/version/"
VersionChecker::VersionChecker()
{