rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

jerry's patch: fixed version checker label was being hidden by status label, and was using old update check url.

This commit is contained in:
Nick Bolton 2013-06-05 14:47:42 +00:00
parent a986125965
commit 2182906451
3 changed files with 200 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

324
src/gui/res/MainWindowBase.ui
View File

@ -26,116 +26,24 @@
<string>Synergy</string> <string>Synergy</string>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<layout class="QGridLayout"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item row="2" column="0" colspan="12">
<widget class="QGroupBox" name="m_pGroupClient">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>&amp;Client (use another computer's keyboard and mouse):</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<layout class="QFormLayout" name="formLayout_3">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Screen name:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="m_pLabelServerName">
<property name="text">
<string>&amp;Server IP:</string>
</property>
<property name="buddy">
<cstring>m_pLineEditHostname</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="m_pLineEditHostname"/>
</item>
<item row="0" column="1">
<widget class="QLabel" name="m_pLabelScreenName">
<property name="text">
<string notr="true"/>
</property>
</widget>
</item>
</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="3" column="0" colspan="12">
<widget class="QGroupBox" name="m_pGroupLog">
<property name="title">
<string>Log</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QTextEdit" name="m_pLogOutput"> <widget class="QWidget" name="m_pWidgetUpdate" native="true">
<property name="sizePolicy"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <property name="leftMargin">
<horstretch>0</horstretch> <number>2</number>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="font"> <property name="topMargin">
<font> <number>0</number>
<family>Courier</family>
</font>
</property> </property>
<property name="autoFillBackground"> <property name="rightMargin">
<bool>false</bool> <number>0</number>
</property> </property>
<property name="undoRedoEnabled"> <property name="bottomMargin">
<bool>false</bool> <number>7</number>
</property> </property>
<property name="lineWrapMode"> <item>
<enum>QTextEdit::NoWrap</enum> <widget class="QLabel" name="m_pIconUpdate">
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="6" column="5">
<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="6" column="2">
<widget class="QLabel" name="m_pUpdateIcon">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -144,38 +52,33 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="3"> <item>
<widget class="QLabel" name="m_pUpdateLabel"> <widget class="QLabel" name="m_pLabelUpdate">
<property name="text"> <property name="text">
<string/> <string notr="true">m_pLabelUpdate</string>
</property> </property>
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="11"> <item>
<widget class="QPushButton" name="m_pButtonToggleStart"> <spacer name="m_pSpacerUpdate">
<property name="text"> <property name="orientation">
<string>&amp;Start</string> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0">
<size>
<width>469</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="6" column="10"> <item>
<widget class="QPushButton" name="m_pButtonApply">
<property name="text">
<string>&amp;Apply</string>
</property>
</widget>
</item>
<item row="6" column="9">
<widget class="QCheckBox" name="m_pElevateCheckBox">
<property name="text">
<string>&amp;Elevate</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="12">
<widget class="QGroupBox" name="m_pGroupServer"> <widget class="QGroupBox" name="m_pGroupServer">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -289,6 +192,141 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="m_pGroupClient">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>&amp;Client (use another computer's keyboard and mouse):</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<layout class="QFormLayout" name="formLayout_3">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Screen name:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="m_pLabelServerName">
<property name="text">
<string>&amp;Server IP:</string>
</property>
<property name="buddy">
<cstring>m_pLineEditHostname</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="m_pLineEditHostname"/>
</item>
<item row="0" column="1">
<widget class="QLabel" name="m_pLabelScreenName">
<property name="text">
<string notr="true"/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="m_pGroupLog">
<property name="title">
<string>Log</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTextEdit" name="m_pLogOutput">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<family>Courier</family>
</font>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="undoRedoEnabled">
<bool>false</bool>
</property>
<property name="lineWrapMode">
<enum>QTextEdit::NoWrap</enum>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<widget class="QLabel" name="m_pStatusLabel">
<property name="text">
<string>Ready</string>
</property>
</widget>
</item>
<item>
<spacer name="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>
<widget class="QCheckBox" name="m_pElevateCheckBox">
<property name="text">
<string>&amp;Elevate</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="m_pButtonApply">
<property name="text">
<string>&amp;Apply</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="m_pButtonToggleStart">
<property name="text">
<string>&amp;Start</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
<action name="m_pActionAbout"> <action name="m_pActionAbout">
@ -400,22 +438,6 @@
<include location="Synergy.qrc"/> <include location="Synergy.qrc"/>
</resources> </resources>
<connections> <connections>
<connection>
<sender>m_pButtonToggleStart</sender>
<signal>clicked()</signal>
<receiver>m_pActionStartSynergy</receiver>
<slot>trigger()</slot>
<hints>
<hint type="sourcelabel">
<x>361</x>
<y>404</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection> <connection>
<sender>m_pRadioExternalConfig</sender> <sender>m_pRadioExternalConfig</sender>
<signal>toggled(bool)</signal> <signal>toggled(bool)</signal>
@ -464,5 +486,21 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>m_pButtonToggleStart</sender>
<signal>clicked()</signal>
<receiver>m_pActionStartSynergy</receiver>
<slot>trigger()</slot>
<hints>
<hint type="sourcelabel">
<x>361</x>
<y>404</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
</connections> </connections>
</ui> </ui>

12
src/gui/src/MainWindow.cpp
View File

@ -79,8 +79,7 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
loadSettings(); loadSettings();
initConnections(); initConnections();
m_pUpdateIcon->hide(); m_pWidgetUpdate->hide();
m_pUpdateLabel->hide();
m_VersionChecker.setApp(appPath(appConfig.synergycName())); m_VersionChecker.setApp(appPath(appConfig.synergycName()));
m_pLabelScreenName->setText(getScreenName()); m_pLabelScreenName->setText(getScreenName());
m_pLabelIpAddresses->setText(getIPAddresses()); m_pLabelIpAddresses->setText(getIPAddresses());
@ -320,10 +319,11 @@ void MainWindow::logError()
void MainWindow::updateFound(const QString &version) void MainWindow::updateFound(const QString &version)
{ {
m_pUpdateIcon->show(); m_pWidgetUpdate->show();
m_pUpdateLabel->show(); m_pLabelUpdate->setText(
m_pUpdateLabel->setText( tr("<p>Your version of Synergy is out of date. "
tr("<p>Version %1 is now available, <a href=\"%2\">visit website</a>.</p>") "Version <b>%1</b> is now available to "
"<a href=\"%2\">download</a>.</p>")
.arg(version).arg("http://synergy-foss.org")); .arg(version).arg("http://synergy-foss.org"));
} }

2
src/gui/src/VersionChecker.cpp
View File

@ -25,7 +25,7 @@
#include <QLocale> #include <QLocale>
#define VERSION_REGEX "(\\d+\\.\\d+\\.\\d+)" #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() VersionChecker::VersionChecker()
{ {