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

Fixed issue 483

This commit is contained in:
Nick Bolton 2010-06-02 19:53:45 +00:00
parent 5c8a85c750
commit f3e1e81967
7 changed files with 1997 additions and 1976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

393
gui/res/AboutDialogBase.ui
View File

@ -1,197 +1,196 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<class>AboutDialogBase</class> <ui version="4.0">
<widget class="QDialog" name="AboutDialogBase" > <class>AboutDialogBase</class>
<property name="windowModality" > <widget class="QDialog" name="AboutDialogBase">
<enum>Qt::ApplicationModal</enum> <property name="windowModality">
</property> <enum>Qt::ApplicationModal</enum>
<property name="geometry" > </property>
<rect> <property name="geometry">
<x>0</x> <rect>
<y>0</y> <x>0</x>
<width>368</width> <y>0</y>
<height>350</height> <width>374</width>
</rect> <height>212</height>
</property> </rect>
<property name="minimumSize" > </property>
<size> <property name="minimumSize">
<width>368</width> <size>
<height>350</height> <width>0</width>
</size> <height>0</height>
</property> </size>
<property name="windowTitle" > </property>
<string>About QSynergy</string> <property name="windowTitle">
</property> <string>About Synergy+</string>
<property name="modal" > </property>
<bool>true</bool> <property name="modal">
</property> <bool>true</bool>
<layout class="QGridLayout" > </property>
<item row="0" column="0" colspan="2" > <layout class="QGridLayout">
<widget class="QLabel" name="label_2" > <item row="0" column="0" colspan="2">
<property name="text" > <widget class="QLabel" name="label_2">
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css"> <property name="text">
p, li { white-space: pre-wrap; } <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> p, li { white-space: pre-wrap; }
&lt;p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;">&lt;span style=" font-size:x-large;">QSynergy&lt;/span>&lt;/p>&lt;/body>&lt;/html></string> &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
</property> &lt;p style=&quot; margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;&quot;&gt;&lt;span style=&quot; font-size:x-large;&quot;&gt;Synergy+&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<property name="wordWrap" > </property>
<bool>true</bool> <property name="wordWrap">
</property> <bool>true</bool>
<property name="openExternalLinks" > </property>
<bool>true</bool> <property name="openExternalLinks">
</property> <bool>true</bool>
<property name="textInteractionFlags" > </property>
<set>Qt::LinksAccessibleByMouse|Qt::NoTextInteraction|Qt::TextSelectableByMouse</set> <property name="textInteractionFlags">
</property> <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</widget> </property>
</item> </widget>
<item row="1" column="0" colspan="2" > </item>
<widget class="QLabel" name="label_3" > <item row="1" column="0" rowspan="2" colspan="2">
<property name="text" > <widget class="QLabel" name="label_3">
<string>Version 0.9.0 <property name="text">
<string>The Synergy+ GUI is based on QSynergy by Volker Lanz
Copyright 2008 Volker Lanz (vl@fidra.de)
Copyright © 2010 The Synergy+ Project
QSynergy is open source and released under the GNU Public License (GPL) Version 2. Copyright © 2008 Volker Lanz (vl@fidra.de)
Copyright © 2002 Chris Schoeneman</string>
Synergy and the synergy icon: Copyright (C) 2002 Chris Schoeneman.</string> </property>
</property> <property name="wordWrap">
<property name="wordWrap" > <bool>true</bool>
<bool>true</bool> </property>
</property> </widget>
</widget> </item>
</item> <item row="3" column="0" colspan="2">
<item row="3" column="0" colspan="2" > <widget class="Line" name="line">
<widget class="Line" name="line" > <property name="orientation">
<property name="orientation" > <enum>Qt::Horizontal</enum>
<enum>Qt::Horizontal</enum> </property>
</property> </widget>
</widget> </item>
</item> <item row="5" column="0" colspan="2">
<item row="5" column="0" colspan="2" > <layout class="QGridLayout">
<layout class="QGridLayout" > <item row="0" column="0">
<item row="0" column="0" > <widget class="QLabel" name="label">
<widget class="QLabel" name="label" > <property name="sizePolicy">
<property name="sizePolicy" > <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" > <horstretch>1</horstretch>
<horstretch>1</horstretch> <verstretch>0</verstretch>
<verstretch>0</verstretch> </sizepolicy>
</sizepolicy> </property>
</property> <property name="text">
<property name="text" > <string>Version:</string>
<string>Synergy Version:</string> </property>
</property> </widget>
</widget> </item>
</item> <item row="0" column="1">
<item row="0" column="1" > <widget class="QLabel" name="m_pLabelSynergyVersion">
<widget class="QLabel" name="m_pLabelSynergyVersion" > <property name="text">
<property name="text" > <string>-</string>
<string>-</string> </property>
</property> <property name="alignment">
<property name="alignment" > <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property>
</property> </widget>
</widget> </item>
</item> <item row="1" column="0">
<item row="1" column="0" > <widget class="QLabel" name="label_6">
<widget class="QLabel" name="label_6" > <property name="sizePolicy">
<property name="sizePolicy" > <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" > <horstretch>1</horstretch>
<horstretch>1</horstretch> <verstretch>0</verstretch>
<verstretch>0</verstretch> </sizepolicy>
</sizepolicy> </property>
</property> <property name="text">
<property name="text" > <string>Hostname:</string>
<string>Hostname:</string> </property>
</property> </widget>
</widget> </item>
</item> <item row="1" column="1">
<item row="1" column="1" > <widget class="QLabel" name="m_pLabelHostname">
<widget class="QLabel" name="m_pLabelHostname" > <property name="text">
<property name="text" > <string>-</string>
<string>-</string> </property>
</property> <property name="alignment">
<property name="alignment" > <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property>
</property> </widget>
</widget> </item>
</item> <item row="2" column="0">
<item row="2" column="0" > <widget class="QLabel" name="label_8">
<widget class="QLabel" name="label_8" > <property name="sizePolicy">
<property name="sizePolicy" > <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" > <horstretch>1</horstretch>
<horstretch>1</horstretch> <verstretch>0</verstretch>
<verstretch>0</verstretch> </sizepolicy>
</sizepolicy> </property>
</property> <property name="text">
<property name="text" > <string>IP-Address:</string>
<string>IP-Address:</string> </property>
</property> </widget>
</widget> </item>
</item> <item row="2" column="1">
<item row="2" column="1" > <widget class="QLabel" name="m_pLabelIPAddress">
<widget class="QLabel" name="m_pLabelIPAddress" > <property name="text">
<property name="text" > <string>-</string>
<string>-</string> </property>
</property> <property name="alignment">
<property name="alignment" > <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property>
</property> </widget>
</widget> </item>
</item> </layout>
</layout> </item>
</item> <item row="6" column="1">
<item row="6" column="1" > <spacer>
<spacer> <property name="orientation">
<property name="orientation" > <enum>Qt::Vertical</enum>
<enum>Qt::Vertical</enum> </property>
</property> <property name="sizeHint" stdset="0">
<property name="sizeHint" > <size>
<size> <width>20</width>
<width>20</width> <height>78</height>
<height>78</height> </size>
</size> </property>
</property> </spacer>
</spacer> </item>
</item> <item row="7" column="0">
<item row="7" column="0" > <spacer>
<spacer> <property name="orientation">
<property name="orientation" > <enum>Qt::Horizontal</enum>
<enum>Qt::Horizontal</enum> </property>
</property> <property name="sizeHint" stdset="0">
<property name="sizeHint" > <size>
<size> <width>131</width>
<width>131</width> <height>20</height>
<height>20</height> </size>
</size> </property>
</property> </spacer>
</spacer> </item>
</item> <item row="7" column="1">
<item row="7" column="1" > <widget class="QPushButton" name="buttonOk">
<widget class="QPushButton" name="buttonOk" > <property name="text">
<property name="text" > <string>&amp;Ok</string>
<string>&amp;Ok</string> </property>
</property> </widget>
</widget> </item>
</item> </layout>
</layout> </widget>
</widget> <resources/>
<resources/> <connections>
<connections> <connection>
<connection> <sender>buttonOk</sender>
<sender>buttonOk</sender> <signal>clicked()</signal>
<signal>clicked()</signal> <receiver>AboutDialogBase</receiver>
<receiver>AboutDialogBase</receiver> <slot>accept()</slot>
<slot>accept()</slot> <hints>
<hints> <hint type="sourcelabel">
<hint type="sourcelabel" > <x>315</x>
<x>315</x> <y>374</y>
<y>374</y> </hint>
</hint> <hint type="destinationlabel">
<hint type="destinationlabel" > <x>301</x>
<x>301</x> <y>3</y>
<y>3</y> </hint>
</hint> </hints>
</hints> </connection>
</connection> </connections>
</connections> </ui>
</ui>

1161
gui/res/ActionDialogBase.ui
View File

File diff suppressed because it is too large Load Diff

162
gui/res/HotkeyDialogBase.ui
View File

@ -1,81 +1,81 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<class>HotkeyDialogBase</class> <ui version="4.0">
<widget class="QDialog" name="HotkeyDialogBase" > <class>HotkeyDialogBase</class>
<property name="geometry" > <widget class="QDialog" name="HotkeyDialogBase">
<rect> <property name="geometry">
<x>0</x> <rect>
<y>0</y> <x>0</x>
<width>344</width> <y>0</y>
<height>106</height> <width>344</width>
</rect> <height>86</height>
</property> </rect>
<property name="windowTitle" > </property>
<string>Hotkey</string> <property name="windowTitle">
</property> <string>Hotkey</string>
<layout class="QVBoxLayout" > </property>
<item> <layout class="QVBoxLayout">
<widget class="QLabel" name="label" > <item>
<property name="text" > <widget class="QLabel" name="label">
<string>Enter the specification for the hotkey:</string> <property name="text">
</property> <string>Enter the specification for the hotkey:</string>
</widget> </property>
</item> </widget>
<item> </item>
<widget class="KeySequenceWidget" name="m_pKeySequenceWidgetHotkey" > <item>
</widget> <widget class="KeySequenceWidget" name="m_pKeySequenceWidgetHotkey"/>
</item> </item>
<item> <item>
<widget class="QDialogButtonBox" name="buttonBox" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="standardButtons" > <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>KeySequenceWidget</class> <class>KeySequenceWidget</class>
<extends>QPushButton</extends> <extends>QLineEdit</extends>
<header>KeySequenceWidget.h</header> <header>KeySequenceWidget.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>accepted()</signal> <signal>accepted()</signal>
<receiver>HotkeyDialogBase</receiver> <receiver>HotkeyDialogBase</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>248</x> <x>248</x>
<y>254</y> <y>254</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>157</x> <x>157</x>
<y>274</y> <y>274</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
<receiver>HotkeyDialogBase</receiver> <receiver>HotkeyDialogBase</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>316</x> <x>316</x>
<y>260</y> <y>260</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>286</x> <x>286</x>
<y>274</y> <y>274</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
</connections> </connections>
</ui> </ui>

655
gui/res/MainWindowBase.ui
View File

@ -1,318 +1,337 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<class>MainWindowBase</class> <ui version="4.0">
<widget class="QMainWindow" name="MainWindowBase" > <class>MainWindowBase</class>
<property name="geometry" > <widget class="QMainWindow" name="MainWindowBase">
<rect> <property name="geometry">
<x>0</x> <rect>
<y>0</y> <x>0</x>
<width>397</width> <y>0</y>
<height>306</height> <width>397</width>
</rect> <height>247</height>
</property> </rect>
<property name="windowTitle" > </property>
<string>QSynergy</string> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<widget class="QWidget" name="centralwidget" > <horstretch>0</horstretch>
<layout class="QGridLayout" > <verstretch>0</verstretch>
<item row="0" column="0" colspan="2" > </sizepolicy>
<widget class="QGroupBox" name="m_pGroupClient" > </property>
<property name="title" > <property name="windowTitle">
<string>Control &amp;this computer from another one (be a client)</string> <string>Synergy+</string>
</property> </property>
<property name="checkable" > <widget class="QWidget" name="centralwidget">
<bool>true</bool> <layout class="QGridLayout">
</property> <item row="4" column="1">
<layout class="QGridLayout" > <widget class="QPushButton" name="m_pButtonToggleStart">
<item row="0" column="0" > <property name="text">
<widget class="QLabel" name="m_pLabel_2" > <string>&amp;Start</string>
<property name="text" > </property>
<string>&amp;Name of the server:</string> </widget>
</property> </item>
<property name="buddy" > <item row="1" column="0" colspan="2">
<cstring>m_pLineEditHostname</cstring> <widget class="QGroupBox" name="m_pGroupServer">
</property> <property name="sizePolicy">
</widget> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
</item> <horstretch>0</horstretch>
<item row="0" column="1" > <verstretch>0</verstretch>
<widget class="QLineEdit" name="m_pLineEditHostname" /> </sizepolicy>
</item> </property>
</layout> <property name="title">
</widget> <string>&amp;Server (share this computer's mouse and keyboard):</string>
</item> </property>
<item row="1" column="0" colspan="2" > <property name="checkable">
<widget class="QGroupBox" name="m_pGroupServer" > <bool>true</bool>
<property name="title" > </property>
<string>Use this computer to control &amp;others (be a server)</string> <property name="checked">
</property> <bool>true</bool>
<property name="checkable" > </property>
<bool>true</bool> <layout class="QVBoxLayout">
</property> <item>
<property name="checked" > <widget class="QRadioButton" name="m_pRadioExternalConfig">
<bool>true</bool> <property name="text">
</property> <string>Use existing configuration:</string>
<layout class="QVBoxLayout" > </property>
<item> </widget>
<widget class="QRadioButton" name="m_pRadioExternalConfig" > </item>
<property name="text" > <item>
<string>Start synergy with an &amp;existing configuration</string> <layout class="QHBoxLayout">
</property> <item>
</widget> <widget class="QLabel" name="m_pLabelConfigurationFile">
</item> <property name="text">
<item> <string>&amp;Configuration file:</string>
<layout class="QHBoxLayout" > </property>
<item> <property name="buddy">
<widget class="QLabel" name="m_pLabel_4" > <cstring>m_pLineEditConfigFile</cstring>
<property name="text" > </property>
<string>&amp;Configuration file:</string> </widget>
</property> </item>
<property name="buddy" > <item>
<cstring>m_pLineEditConfigFile</cstring> <widget class="QLineEdit" name="m_pLineEditConfigFile">
</property> <property name="enabled">
</widget> <bool>false</bool>
</item> </property>
<item> </widget>
<widget class="QLineEdit" name="m_pLineEditConfigFile" > </item>
<property name="enabled" > <item>
<bool>false</bool> <widget class="QPushButton" name="m_pButtonBrowseConfigFile">
</property> <property name="enabled">
</widget> <bool>false</bool>
</item> </property>
<item> <property name="text">
<widget class="QPushButton" name="m_pButtonBrowseConfigFile" > <string>&amp;Browse...</string>
<property name="enabled" > </property>
<bool>false</bool> </widget>
</property> </item>
<property name="text" > </layout>
<string>&amp;Browse...</string> </item>
</property> <item>
</widget> <widget class="QRadioButton" name="m_pRadioInternalConfig">
</item> <property name="text">
</layout> <string>Configure interactively:</string>
</item> </property>
<item> <property name="checked">
<widget class="QRadioButton" name="m_pRadioInternalConfig" > <bool>true</bool>
<property name="text" > </property>
<string>&amp;Interactively configure synergy</string> </widget>
</property> </item>
<property name="checked" > <item>
<bool>true</bool> <layout class="QHBoxLayout">
</property> <item>
</widget> <widget class="QPushButton" name="m_pButtonConfigureServer">
</item> <property name="text">
<item> <string>&amp;Configure Server...</string>
<layout class="QHBoxLayout" > </property>
<item> </widget>
<spacer> </item>
<property name="orientation" > <item>
<enum>Qt::Horizontal</enum> <spacer>
</property> <property name="orientation">
<property name="sizeHint" > <enum>Qt::Horizontal</enum>
<size> </property>
<width>40</width> <property name="sizeHint" stdset="0">
<height>20</height> <size>
</size> <width>40</width>
</property> <height>20</height>
</spacer> </size>
</item> </property>
<item> </spacer>
<widget class="QPushButton" name="m_pButtonConfigureServer" > </item>
<property name="text" > </layout>
<string>&amp;Configure Server...</string> </item>
</property> </layout>
</widget> </widget>
</item> </item>
<item> <item row="4" column="0">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout> <item row="3" column="0" colspan="2">
</item> <spacer name="verticalSpacer">
</layout> <property name="orientation">
</widget> <enum>Qt::Vertical</enum>
</item> </property>
<item row="3" column="0" > <property name="sizeHint" stdset="0">
<spacer> <size>
<property name="orientation" > <width>0</width>
<enum>Qt::Horizontal</enum> <height>0</height>
</property> </size>
<property name="sizeHint" > </property>
<size> </spacer>
<width>40</width> </item>
<height>20</height> <item row="2" column="0" colspan="2">
</size> <widget class="QGroupBox" name="m_pGroupClient">
</property> <property name="sizePolicy">
</spacer> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
</item> <horstretch>0</horstretch>
<item row="3" column="1" > <verstretch>0</verstretch>
<widget class="QPushButton" name="m_pButtonStart" > </sizepolicy>
<property name="text" > </property>
<string>&amp;Start</string> <property name="title">
</property> <string>&amp;Client (use another computer's keyboard and mouse):</string>
</widget> </property>
</item> <property name="checkable">
</layout> <bool>true</bool>
</widget> </property>
<action name="m_pActionAbout" > <layout class="QGridLayout">
<property name="text" > <item row="0" column="0">
<string>&amp;About QSynergy...</string> <widget class="QLabel" name="m_pLabelServerName">
</property> <property name="text">
</action> <string>&amp;Name of the server:</string>
<action name="m_pActionQuit" > </property>
<property name="text" > <property name="buddy">
<string>&amp;Quit</string> <cstring>m_pLineEditHostname</cstring>
</property> </property>
<property name="statusTip" > </widget>
<string>Quit QSynergy.</string> </item>
</property> <item row="0" column="1">
<property name="shortcut" > <widget class="QLineEdit" name="m_pLineEditHostname"/>
<string>Ctrl+Q</string> </item>
</property> </layout>
</action> </widget>
<action name="m_pActionStartSynergy" > </item>
<property name="text" > </layout>
<string>&amp;Start Synergy</string> </widget>
</property> <action name="m_pActionAbout">
<property name="statusTip" > <property name="text">
<string>Run synergy program.</string> <string>&amp;About QSynergy...</string>
</property> </property>
<property name="shortcut" > </action>
<string>Ctrl+S</string> <action name="m_pActionQuit">
</property> <property name="text">
</action> <string>&amp;Quit</string>
<action name="m_pActionStopSynergy" > </property>
<property name="enabled" > <property name="statusTip">
<bool>false</bool> <string>Quit QSynergy.</string>
</property> </property>
<property name="text" > <property name="shortcut">
<string>S&amp;top Synergy</string> <string>Ctrl+Q</string>
</property> </property>
<property name="statusTip" > </action>
<string>Stop Synergy program.</string> <action name="m_pActionStartSynergy">
</property> <property name="text">
<property name="shortcut" > <string>&amp;Start Synergy</string>
<string>Ctrl+T</string> </property>
</property> <property name="statusTip">
</action> <string>Run synergy program.</string>
<action name="actionShowStatus" > </property>
<property name="text" > <property name="shortcut">
<string>S&amp;how Status</string> <string>Ctrl+S</string>
</property> </property>
<property name="shortcut" > </action>
<string>Ctrl+H</string> <action name="m_pActionStopSynergy">
</property> <property name="enabled">
</action> <bool>false</bool>
<action name="m_pActionMinimize" > </property>
<property name="text" > <property name="text">
<string>&amp;Minimize</string> <string>S&amp;top Synergy</string>
</property> </property>
</action> <property name="statusTip">
<action name="m_pActionRestore" > <string>Stop Synergy program.</string>
<property name="text" > </property>
<string>&amp;Restore</string> <property name="shortcut">
</property> <string>Ctrl+T</string>
</action> </property>
<action name="m_pActionSave" > </action>
<property name="text" > <action name="actionShowStatus">
<string>Save configuration &amp;as...</string> <property name="text">
</property> <string>S&amp;how Status</string>
<property name="statusTip" > </property>
<string>Save the interactively generated server configuration to a file.</string> <property name="shortcut">
</property> <string>Ctrl+H</string>
<property name="shortcut" > </property>
<string>Ctrl+Alt+S</string> </action>
</property> <action name="m_pActionMinimize">
</action> <property name="text">
<action name="m_pActionSettings" > <string>&amp;Minimize</string>
<property name="text" > </property>
<string>Settings</string> </action>
</property> <action name="m_pActionRestore">
<property name="statusTip" > <property name="text">
<string>Edit settings for QSynergy and synergy itself</string> <string>&amp;Restore</string>
</property> </property>
</action> </action>
<action name="m_pActionLogOutput" > <action name="m_pActionSave">
<property name="text" > <property name="text">
<string>Log output</string> <string>Save configuration &amp;as...</string>
</property> </property>
<property name="statusTip" > <property name="statusTip">
<string>Open a window with synergy's output</string> <string>Save the interactively generated server configuration to a file.</string>
</property> </property>
</action> <property name="shortcut">
</widget> <string>Ctrl+Alt+S</string>
<resources/> </property>
<connections> </action>
<connection> <action name="m_pActionSettings">
<sender>m_pButtonStart</sender> <property name="text">
<signal>clicked()</signal> <string>Settings</string>
<receiver>m_pActionStartSynergy</receiver> </property>
<slot>trigger()</slot> <property name="statusTip">
<hints> <string>Edit settings for QSynergy and synergy itself</string>
<hint type="sourcelabel" > </property>
<x>361</x> </action>
<y>404</y> <action name="m_pActionLogOutput">
</hint> <property name="text">
<hint type="destinationlabel" > <string>Log output</string>
<x>-1</x> </property>
<y>-1</y> <property name="statusTip">
</hint> <string>Open a window with synergy's output</string>
</hints> </property>
</connection> </action>
<connection> </widget>
<sender>m_pRadioInternalConfig</sender> <resources/>
<signal>toggled(bool)</signal> <connections>
<receiver>m_pButtonConfigureServer</receiver> <connection>
<slot>setEnabled(bool)</slot> <sender>m_pButtonToggleStart</sender>
<hints> <signal>clicked()</signal>
<hint type="sourcelabel" > <receiver>m_pActionStartSynergy</receiver>
<x>204</x> <slot>trigger()</slot>
<y>244</y> <hints>
</hint> <hint type="sourcelabel">
<hint type="destinationlabel" > <x>361</x>
<x>212</x> <y>404</y>
<y>274</y> </hint>
</hint> <hint type="destinationlabel">
</hints> <x>-1</x>
</connection> <y>-1</y>
<connection> </hint>
<sender>m_pRadioExternalConfig</sender> </hints>
<signal>toggled(bool)</signal> </connection>
<receiver>m_pLineEditConfigFile</receiver> <connection>
<slot>setEnabled(bool)</slot> <sender>m_pRadioExternalConfig</sender>
<hints> <signal>toggled(bool)</signal>
<hint type="sourcelabel" > <receiver>m_pLineEditConfigFile</receiver>
<x>156</x> <slot>setEnabled(bool)</slot>
<y>179</y> <hints>
</hint> <hint type="sourcelabel">
<hint type="destinationlabel" > <x>156</x>
<x>169</x> <y>179</y>
<y>209</y> </hint>
</hint> <hint type="destinationlabel">
</hints> <x>169</x>
</connection> <y>209</y>
<connection> </hint>
<sender>m_pRadioExternalConfig</sender> </hints>
<signal>toggled(bool)</signal> </connection>
<receiver>m_pButtonBrowseConfigFile</receiver> <connection>
<slot>setEnabled(bool)</slot> <sender>m_pRadioExternalConfig</sender>
<hints> <signal>toggled(bool)</signal>
<hint type="sourcelabel" > <receiver>m_pButtonBrowseConfigFile</receiver>
<x>353</x> <slot>setEnabled(bool)</slot>
<y>182</y> <hints>
</hint> <hint type="sourcelabel">
<hint type="destinationlabel" > <x>353</x>
<x>356</x> <y>182</y>
<y>211</y> </hint>
</hint> <hint type="destinationlabel">
</hints> <x>356</x>
</connection> <y>211</y>
</connections> </hint>
</ui> </hints>
</connection>
<connection>
<sender>m_pRadioInternalConfig</sender>
<signal>toggled(bool)</signal>
<receiver>m_pButtonConfigureServer</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>204</x>
<y>244</y>
</hint>
<hint type="destinationlabel">
<x>212</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

1085
gui/res/ScreenSettingsDialogBase.ui
View File

File diff suppressed because it is too large Load Diff

505
gui/res/SettingsDialogBase.ui
View File

@ -1,252 +1,253 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<class>SettingsDialogBase</class> <ui version="4.0">
<widget class="QDialog" name="SettingsDialogBase" > <class>SettingsDialogBase</class>
<property name="geometry" > <widget class="QDialog" name="SettingsDialogBase">
<rect> <property name="geometry">
<x>0</x> <rect>
<y>0</y> <x>0</x>
<width>372</width> <y>0</y>
<height>390</height> <width>372</width>
</rect> <height>325</height>
</property> </rect>
<property name="windowTitle" > </property>
<string>Settings</string> <property name="windowTitle">
</property> <string>Settings</string>
<layout class="QGridLayout" > </property>
<item row="0" column="0" colspan="2" > <layout class="QGridLayout">
<widget class="QGroupBox" name="m_pGroupBox_2" > <item row="0" column="0" colspan="2">
<property name="title" > <widget class="QGroupBox" name="m_pGroupBox_2">
<string>&amp;Programs</string> <property name="title">
</property> <string>&amp;Programs</string>
<layout class="QGridLayout" > </property>
<item row="0" column="0" > <layout class="QGridLayout">
<widget class="QLabel" name="m_pLabel_17" > <item row="0" column="0">
<property name="whatsThis" > <widget class="QLabel" name="m_pLabel_17">
<string>This is the synergy client program, usually called synergyc or synergyc.exe.</string> <property name="whatsThis">
</property> <string>This is the synergy client program, usually called synergyc or synergyc.exe.</string>
<property name="text" > </property>
<string>&amp;Client:</string> <property name="text">
</property> <string>&amp;Client:</string>
<property name="buddy" > </property>
<cstring>m_pLineEditSynergyc</cstring> <property name="buddy">
</property> <cstring>m_pLineEditSynergyc</cstring>
</widget> </property>
</item> </widget>
<item row="0" column="1" > </item>
<widget class="QLineEdit" name="m_pLineEditSynergyc" /> <item row="0" column="1">
</item> <widget class="QLineEdit" name="m_pLineEditSynergyc"/>
<item row="0" column="2" > </item>
<widget class="QPushButton" name="m_pButtonBrowseSynergyc" > <item row="0" column="2">
<property name="text" > <widget class="QPushButton" name="m_pButtonBrowseSynergyc">
<string>&amp;Browse...</string> <property name="text">
</property> <string>&amp;Browse...</string>
</widget> </property>
</item> </widget>
<item row="1" column="0" > </item>
<widget class="QLabel" name="m_pLabel_18" > <item row="1" column="0">
<property name="toolTip" > <widget class="QLabel" name="m_pLabel_18">
<string/> <property name="toolTip">
</property> <string/>
<property name="whatsThis" > </property>
<string>This is the synergy server program, usually called synergys or synergys.exe.</string> <property name="whatsThis">
</property> <string>This is the synergy server program, usually called synergys or synergys.exe.</string>
<property name="text" > </property>
<string>S&amp;erver:</string> <property name="text">
</property> <string>S&amp;erver:</string>
<property name="buddy" > </property>
<cstring>m_pLineEditSynergys</cstring> <property name="buddy">
</property> <cstring>m_pLineEditSynergys</cstring>
</widget> </property>
</item> </widget>
<item row="1" column="1" > </item>
<widget class="QLineEdit" name="m_pLineEditSynergys" /> <item row="1" column="1">
</item> <widget class="QLineEdit" name="m_pLineEditSynergys"/>
<item row="1" column="2" > </item>
<widget class="QPushButton" name="m_pButtonBrowseSynergys" > <item row="1" column="2">
<property name="text" > <widget class="QPushButton" name="m_pButtonBrowseSynergys">
<string>Bro&amp;wse...</string> <property name="text">
</property> <string>Bro&amp;wse...</string>
</widget> </property>
</item> </widget>
</layout> </item>
</widget> </layout>
</item> </widget>
<item row="1" column="0" colspan="2" > </item>
<widget class="QGroupBox" name="m_pGroupBox_3" > <item row="1" column="0" colspan="2">
<property name="title" > <widget class="QGroupBox" name="m_pGroupBox_3">
<string>&amp;Advanced</string> <property name="title">
</property> <string>&amp;Advanced</string>
<layout class="QGridLayout" > </property>
<item row="0" column="0" > <layout class="QGridLayout">
<widget class="QLabel" name="m_pLabel_19" > <item row="0" column="0">
<property name="text" > <widget class="QLabel" name="m_pLabel_19">
<string>Sc&amp;reen name:</string> <property name="text">
</property> <string>Sc&amp;reen name:</string>
<property name="buddy" > </property>
<cstring>m_pLineEditScreenName</cstring> <property name="buddy">
</property> <cstring>m_pLineEditScreenName</cstring>
</widget> </property>
</item> </widget>
<item row="0" column="1" > </item>
<widget class="QLineEdit" name="m_pLineEditScreenName" > <item row="0" column="1">
<property name="enabled" > <widget class="QLineEdit" name="m_pLineEditScreenName">
<bool>true</bool> <property name="enabled">
</property> <bool>true</bool>
</widget> </property>
</item> </widget>
<item row="1" column="0" > </item>
<widget class="QLabel" name="m_pLabel_20" > <item row="1" column="0">
<property name="text" > <widget class="QLabel" name="m_pLabel_20">
<string>P&amp;ort:</string> <property name="text">
</property> <string>P&amp;ort:</string>
<property name="buddy" > </property>
<cstring>m_pSpinBoxPort</cstring> <property name="buddy">
</property> <cstring>m_pSpinBoxPort</cstring>
</widget> </property>
</item> </widget>
<item row="1" column="1" > </item>
<widget class="QSpinBox" name="m_pSpinBoxPort" > <item row="1" column="1">
<property name="enabled" > <widget class="QSpinBox" name="m_pSpinBoxPort">
<bool>true</bool> <property name="enabled">
</property> <bool>true</bool>
<property name="maximum" > </property>
<number>65535</number> <property name="maximum">
</property> <number>65535</number>
<property name="value" > </property>
<number>24800</number> <property name="value">
</property> <number>24800</number>
</widget> </property>
</item> </widget>
<item row="2" column="0" > </item>
<widget class="QLabel" name="m_pLabel_21" > <item row="2" column="0">
<property name="text" > <widget class="QLabel" name="m_pLabel_21">
<string>&amp;Interface:</string> <property name="text">
</property> <string>&amp;Interface:</string>
<property name="buddy" > </property>
<cstring>m_pLineEditInterface</cstring> <property name="buddy">
</property> <cstring>m_pLineEditInterface</cstring>
</widget> </property>
</item> </widget>
<item row="2" column="1" > </item>
<widget class="QLineEdit" name="m_pLineEditInterface" > <item row="2" column="1">
<property name="enabled" > <widget class="QLineEdit" name="m_pLineEditInterface">
<bool>true</bool> <property name="enabled">
</property> <bool>true</bool>
</widget> </property>
</item> </widget>
</layout> </item>
</widget> </layout>
</item> </widget>
<item row="2" column="0" colspan="2" > </item>
<widget class="QGroupBox" name="m_pGroupRunOptions" > <item row="2" column="0" colspan="2">
<property name="title" > <widget class="QGroupBox" name="m_pGroupRunOptions">
<string>&amp;Start</string> <property name="title">
</property> <string>&amp;Start</string>
<layout class="QVBoxLayout" > </property>
<item> <layout class="QVBoxLayout">
<widget class="QCheckBox" name="m_pCheckBoxAutoConnect" > <item>
<property name="text" > <widget class="QCheckBox" name="m_pCheckBoxAutoConnect">
<string>A&amp;utomatically start synergy when QSynergy starts</string> <property name="text">
</property> <string>A&amp;utomatically start synergy when QSynergy starts</string>
</widget> </property>
</item> </widget>
</layout> </item>
</widget> </layout>
</item> </widget>
<item row="3" column="0" > </item>
<widget class="QLabel" name="m_pLabel_3" > <item row="3" column="0">
<property name="text" > <widget class="QLabel" name="m_pLabel_3">
<string>&amp;Logging level:</string> <property name="text">
</property> <string>&amp;Logging level:</string>
<property name="buddy" > </property>
<cstring>m_pComboLogLevel</cstring> <property name="buddy">
</property> <cstring>m_pComboLogLevel</cstring>
</widget> </property>
</item> </widget>
<item row="3" column="1" > </item>
<widget class="QComboBox" name="m_pComboLogLevel" > <item row="3" column="1">
<item> <widget class="QComboBox" name="m_pComboLogLevel">
<property name="text" > <item>
<string>Error</string> <property name="text">
</property> <string>Error</string>
</item> </property>
<item> </item>
<property name="text" > <item>
<string>Warning</string> <property name="text">
</property> <string>Warning</string>
</item> </property>
<item> </item>
<property name="text" > <item>
<string>Note</string> <property name="text">
</property> <string>Note</string>
</item> </property>
<item> </item>
<property name="text" > <item>
<string>Info</string> <property name="text">
</property> <string>Info</string>
</item> </property>
<item> </item>
<property name="text" > <item>
<string>Debug</string> <property name="text">
</property> <string>Debug</string>
</item> </property>
<item> </item>
<property name="text" > <item>
<string>Debug1</string> <property name="text">
</property> <string>Debug1</string>
</item> </property>
<item> </item>
<property name="text" > <item>
<string>Debug2</string> <property name="text">
</property> <string>Debug2</string>
</item> </property>
</widget> </item>
</item> </widget>
<item row="4" column="0" colspan="2" > </item>
<widget class="QDialogButtonBox" name="buttonBox" > <item row="4" column="0" colspan="2">
<property name="orientation" > <widget class="QDialogButtonBox" name="buttonBox">
<enum>Qt::Horizontal</enum> <property name="orientation">
</property> <enum>Qt::Horizontal</enum>
<property name="standardButtons" > </property>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set> <property name="standardButtons">
</property> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</widget> </property>
</item> </widget>
</layout> </item>
</widget> </layout>
<resources/> </widget>
<connections> <resources/>
<connection> <connections>
<sender>buttonBox</sender> <connection>
<signal>accepted()</signal> <sender>buttonBox</sender>
<receiver>SettingsDialogBase</receiver> <signal>accepted()</signal>
<slot>accept()</slot> <receiver>SettingsDialogBase</receiver>
<hints> <slot>accept()</slot>
<hint type="sourcelabel" > <hints>
<x>257</x> <hint type="sourcelabel">
<y>380</y> <x>257</x>
</hint> <y>380</y>
<hint type="destinationlabel" > </hint>
<x>157</x> <hint type="destinationlabel">
<y>274</y> <x>157</x>
</hint> <y>274</y>
</hints> </hint>
</connection> </hints>
<connection> </connection>
<sender>buttonBox</sender> <connection>
<signal>rejected()</signal> <sender>buttonBox</sender>
<receiver>SettingsDialogBase</receiver> <signal>rejected()</signal>
<slot>reject()</slot> <receiver>SettingsDialogBase</receiver>
<hints> <slot>reject()</slot>
<hint type="sourcelabel" > <hints>
<x>325</x> <hint type="sourcelabel">
<y>380</y> <x>325</x>
</hint> <y>380</y>
<hint type="destinationlabel" > </hint>
<x>286</x> <hint type="destinationlabel">
<y>274</y> <x>286</x>
</hint> <y>274</y>
</hints> </hint>
</connection> </hints>
</connections> </connection>
</ui> </connections>
</ui>

12
gui/src/MainWindow.cpp
View File

@ -368,15 +368,15 @@ void MainWindow::setSynergyState(qSynergyState state)
if (state == synergyConnected) if (state == synergyConnected)
{ {
disconnect (m_pButtonStart, SIGNAL(clicked()), m_pActionStartSynergy, SLOT(trigger())); disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartSynergy, SLOT(trigger()));
connect (m_pButtonStart, SIGNAL(clicked()), m_pActionStopSynergy, SLOT(trigger())); connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopSynergy, SLOT(trigger()));
m_pButtonStart->setText(tr("&Stop")); m_pButtonToggleStart->setText(tr("&Stop"));
} }
else else
{ {
disconnect (m_pButtonStart, SIGNAL(clicked()), m_pActionStopSynergy, SLOT(trigger())); disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopSynergy, SLOT(trigger()));
connect (m_pButtonStart, SIGNAL(clicked()), m_pActionStartSynergy, SLOT(trigger())); connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartSynergy, SLOT(trigger()));
m_pButtonStart->setText(tr("&Start")); m_pButtonToggleStart->setText(tr("&Start"));
} }
m_pGroupClient->setEnabled(state == synergyDisconnected); m_pGroupClient->setEnabled(state == synergyDisconnected);