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

View File

@ -1,151 +1,150 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>AboutDialogBase</class> <class>AboutDialogBase</class>
<widget class="QDialog" name="AboutDialogBase" > <widget class="QDialog" name="AboutDialogBase">
<property name="windowModality" > <property name="windowModality">
<enum>Qt::ApplicationModal</enum> <enum>Qt::ApplicationModal</enum>
</property> </property>
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>368</width> <width>374</width>
<height>350</height> <height>212</height>
</rect> </rect>
</property> </property>
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>368</width> <width>0</width>
<height>350</height> <height>0</height>
</size> </size>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>About QSynergy</string> <string>About Synergy+</string>
</property> </property>
<property name="modal" > <property name="modal">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<item row="0" column="0" colspan="2" > <item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2">
<property name="text" > <property name="text">
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css"> <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;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> &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;
&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;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> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="openExternalLinks" > <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="textInteractionFlags" > <property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::NoTextInteraction|Qt::TextSelectableByMouse</set> <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2" > <item row="1" column="0" rowspan="2" colspan="2">
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3">
<property name="text" > <property name="text">
<string>Version 0.9.0 <string>The Synergy+ GUI is based on QSynergy by Volker Lanz
Copyright 2008 Volker Lanz (vl@fidra.de) Copyright © 2010 The Synergy+ Project
Copyright © 2008 Volker Lanz (vl@fidra.de)
QSynergy is open source and released under the GNU Public License (GPL) Version 2. 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 vsizetype="Preferred" hsizetype="Preferred" > <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch> <horstretch>1</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string>Synergy Version:</string> <string>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 vsizetype="Preferred" hsizetype="Preferred" > <sizepolicy hsizetype="Preferred" vsizetype="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 vsizetype="Preferred" hsizetype="Preferred" > <sizepolicy hsizetype="Preferred" vsizetype="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" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>78</height> <height>78</height>
@ -153,12 +152,12 @@ Synergy and the synergy icon: Copyright (C) 2002 Chris Schoeneman.</string>
</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" > <property name="sizeHint" stdset="0">
<size> <size>
<width>131</width> <width>131</width>
<height>20</height> <height>20</height>
@ -166,9 +165,9 @@ Synergy and the synergy icon: Copyright (C) 2002 Chris Schoeneman.</string>
</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>
@ -183,11 +182,11 @@ Synergy and the synergy icon: Copyright (C) 2002 Chris Schoeneman.</string>
<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>

View File

@ -1,7 +1,8 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ActionDialogBase</class> <class>ActionDialogBase</class>
<widget class="QDialog" name="ActionDialogBase" > <widget class="QDialog" name="ActionDialogBase">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@ -9,77 +10,77 @@
<height>484</height> <height>484</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>Configure action</string> <string>Configure Action</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<widget class="QGroupBox" name="m_pGroupType" > <widget class="QGroupBox" name="m_pGroupType">
<property name="title" > <property name="title">
<string>Choose the action to perform</string> <string>Choose the action to perform</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<widget class="QRadioButton" name="m_pRadioPress" > <widget class="QRadioButton" name="m_pRadioPress">
<property name="text" > <property name="text">
<string>Press a hotkey</string> <string>Press a hotkey</string>
</property> </property>
<property name="checked" > <property name="checked">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="m_pRadioRelease" > <widget class="QRadioButton" name="m_pRadioRelease">
<property name="text" > <property name="text">
<string>Release a hotkey</string> <string>Release a hotkey</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="m_pRadioPressAndRelease" > <widget class="QRadioButton" name="m_pRadioPressAndRelease">
<property name="text" > <property name="text">
<string>Press and release a hotkey</string> <string>Press and release a hotkey</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="KeySequenceWidget" name="m_pKeySequenceWidgetHotkey" > <widget class="KeySequenceWidget" name="m_pKeySequenceWidgetHotkey">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>1</horstretch> <horstretch>1</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>256</width> <width>256</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="text" > <property name="text">
<string>dfgsfgsdfgsdfgsd</string> <string>dfgsfgsdfgsdfgsd</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="m_pGroupBoxScreens" > <widget class="QGroupBox" name="m_pGroupBoxScreens">
<property name="title" > <property name="title">
<string>only on these screens</string> <string>only on these screens</string>
</property> </property>
<property name="flat" > <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="checkable" > <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<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>
@ -88,14 +89,14 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QListWidget" name="m_pListScreens" > <widget class="QListWidget" name="m_pListScreens">
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>128</width> <width>128</width>
<height>64</height> <height>64</height>
</size> </size>
</property> </property>
<property name="selectionMode" > <property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum> <enum>QAbstractItemView::ExtendedSelection</enum>
</property> </property>
</widget> </widget>
@ -104,27 +105,27 @@
</widget> </widget>
</item> </item>
<item> <item>
<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> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QRadioButton" name="m_pRadioSwitchToScreen" > <widget class="QRadioButton" name="m_pRadioSwitchToScreen">
<property name="text" > <property name="text">
<string>Switch to screen</string> <string>Switch to screen</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<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>
@ -133,8 +134,8 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QComboBox" name="m_pComboSwitchToScreen" > <widget class="QComboBox" name="m_pComboSwitchToScreen">
<property name="enabled" > <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
@ -142,20 +143,20 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QRadioButton" name="m_pRadioSwitchInDirection" > <widget class="QRadioButton" name="m_pRadioSwitchInDirection">
<property name="text" > <property name="text">
<string>Switch in direction</string> <string>Switch in direction</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<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>
@ -164,27 +165,27 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QComboBox" name="m_pComboSwitchInDirection" > <widget class="QComboBox" name="m_pComboSwitchInDirection">
<property name="enabled" > <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<item> <item>
<property name="text" > <property name="text">
<string>left</string> <string>left</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>right</string> <string>right</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>up</string> <string>up</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>down</string> <string>down</string>
</property> </property>
</item> </item>
@ -193,20 +194,20 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QRadioButton" name="m_pRadioLockCursorToScreen" > <widget class="QRadioButton" name="m_pRadioLockCursorToScreen">
<property name="text" > <property name="text">
<string>Lock cursor to screen</string> <string>Lock cursor to screen</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<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>
@ -215,22 +216,22 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QComboBox" name="m_pComboLockCursorToScreen" > <widget class="QComboBox" name="m_pComboLockCursorToScreen">
<property name="enabled" > <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<item> <item>
<property name="text" > <property name="text">
<string>toggle</string> <string>toggle</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>on</string> <string>on</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>off</string> <string>off</string>
</property> </property>
</item> </item>
@ -242,24 +243,24 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_2" > <widget class="QGroupBox" name="groupBox_2">
<property name="title" > <property name="title">
<string>This action is performed when</string> <string>This action is performed when</string>
</property> </property>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QRadioButton" name="m_pRadioHotkeyPressed" > <widget class="QRadioButton" name="m_pRadioHotkeyPressed">
<property name="text" > <property name="text">
<string>the hotkey is pressed</string> <string>the hotkey is pressed</string>
</property> </property>
<property name="checked" > <property name="checked">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="m_pRadioHotkeyReleased" > <widget class="QRadioButton" name="m_pRadioHotkeyReleased">
<property name="text" > <property name="text">
<string>the hotkey is released</string> <string>the hotkey is released</string>
</property> </property>
</widget> </widget>
@ -268,12 +269,12 @@
</widget> </widget>
</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>
@ -294,11 +295,11 @@
<receiver>ActionDialogBase</receiver> <receiver>ActionDialogBase</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>245</x> <x>245</x>
<y>474</y> <y>474</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>157</x> <x>157</x>
<y>274</y> <y>274</y>
</hint> </hint>
@ -310,11 +311,11 @@
<receiver>ActionDialogBase</receiver> <receiver>ActionDialogBase</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>313</x> <x>313</x>
<y>474</y> <y>474</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>286</x> <x>286</x>
<y>274</y> <y>274</y>
</hint> </hint>
@ -326,11 +327,11 @@
<receiver>m_pKeySequenceWidgetHotkey</receiver> <receiver>m_pKeySequenceWidgetHotkey</receiver>
<slot>setDisabled(bool)</slot> <slot>setDisabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>104</x> <x>104</x>
<y>194</y> <y>194</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>110</x> <x>110</x>
<y>132</y> <y>132</y>
</hint> </hint>
@ -342,11 +343,11 @@
<receiver>m_pKeySequenceWidgetHotkey</receiver> <receiver>m_pKeySequenceWidgetHotkey</receiver>
<slot>setDisabled(bool)</slot> <slot>setDisabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>118</x> <x>118</x>
<y>322</y> <y>322</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>81</x> <x>81</x>
<y>129</y> <y>129</y>
</hint> </hint>
@ -358,11 +359,11 @@
<receiver>m_pKeySequenceWidgetHotkey</receiver> <receiver>m_pKeySequenceWidgetHotkey</receiver>
<slot>setDisabled(bool)</slot> <slot>setDisabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>101</x> <x>101</x>
<y>353</y> <y>353</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>68</x> <x>68</x>
<y>126</y> <y>126</y>
</hint> </hint>
@ -374,11 +375,11 @@
<receiver>m_pKeySequenceWidgetHotkey</receiver> <receiver>m_pKeySequenceWidgetHotkey</receiver>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>48</x> <x>48</x>
<y>48</y> <y>48</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>45</x> <x>45</x>
<y>129</y> <y>129</y>
</hint> </hint>
@ -390,11 +391,11 @@
<receiver>m_pKeySequenceWidgetHotkey</receiver> <receiver>m_pKeySequenceWidgetHotkey</receiver>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>135</x> <x>135</x>
<y>70</y> <y>70</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>148</x> <x>148</x>
<y>125</y> <y>125</y>
</hint> </hint>
@ -406,11 +407,11 @@
<receiver>m_pKeySequenceWidgetHotkey</receiver> <receiver>m_pKeySequenceWidgetHotkey</receiver>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>194</x> <x>194</x>
<y>100</y> <y>100</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>201</x> <x>201</x>
<y>125</y> <y>125</y>
</hint> </hint>
@ -422,11 +423,11 @@
<receiver>m_pComboSwitchToScreen</receiver> <receiver>m_pComboSwitchToScreen</receiver>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>148</x> <x>148</x>
<y>291</y> <y>291</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>350</x> <x>350</x>
<y>290</y> <y>290</y>
</hint> </hint>
@ -438,11 +439,11 @@
<receiver>m_pComboSwitchInDirection</receiver> <receiver>m_pComboSwitchInDirection</receiver>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>158</x> <x>158</x>
<y>322</y> <y>322</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>350</x> <x>350</x>
<y>321</y> <y>321</y>
</hint> </hint>
@ -454,11 +455,11 @@
<receiver>m_pComboLockCursorToScreen</receiver> <receiver>m_pComboLockCursorToScreen</receiver>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>180</x> <x>180</x>
<y>353</y> <y>353</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>350</x> <x>350</x>
<y>352</y> <y>352</y>
</hint> </hint>
@ -470,11 +471,11 @@
<receiver>m_pGroupBoxScreens</receiver> <receiver>m_pGroupBoxScreens</receiver>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>25</x> <x>25</x>
<y>47</y> <y>47</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>33</x> <x>33</x>
<y>155</y> <y>155</y>
</hint> </hint>
@ -486,11 +487,11 @@
<receiver>m_pGroupBoxScreens</receiver> <receiver>m_pGroupBoxScreens</receiver>
<slot>setDisabled(bool)</slot> <slot>setDisabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>48</x> <x>48</x>
<y>278</y> <y>278</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>98</x> <x>98</x>
<y>153</y> <y>153</y>
</hint> </hint>
@ -502,11 +503,11 @@
<receiver>m_pGroupBoxScreens</receiver> <receiver>m_pGroupBoxScreens</receiver>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>264</x> <x>264</x>
<y>67</y> <y>67</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>241</x> <x>241</x>
<y>158</y> <y>158</y>
</hint> </hint>
@ -518,11 +519,11 @@
<receiver>m_pGroupBoxScreens</receiver> <receiver>m_pGroupBoxScreens</receiver>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>286</x> <x>286</x>
<y>98</y> <y>98</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>290</x> <x>290</x>
<y>156</y> <y>156</y>
</hint> </hint>
@ -534,11 +535,11 @@
<receiver>m_pGroupBoxScreens</receiver> <receiver>m_pGroupBoxScreens</receiver>
<slot>setDisabled(bool)</slot> <slot>setDisabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>38</x> <x>38</x>
<y>313</y> <y>313</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>64</x> <x>64</x>
<y>195</y> <y>195</y>
</hint> </hint>
@ -550,11 +551,11 @@
<receiver>m_pGroupBoxScreens</receiver> <receiver>m_pGroupBoxScreens</receiver>
<slot>setDisabled(bool)</slot> <slot>setDisabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>48</x> <x>48</x>
<y>339</y> <y>339</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>79</x> <x>79</x>
<y>234</y> <y>234</y>
</hint> </hint>
@ -566,11 +567,11 @@
<receiver>m_pKeySequenceWidgetHotkey</receiver> <receiver>m_pKeySequenceWidgetHotkey</receiver>
<slot>setDisabled(bool)</slot> <slot>setDisabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>84</x> <x>84</x>
<y>280</y> <y>280</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>185</x> <x>185</x>
<y>123</y> <y>123</y>
</hint> </hint>

View File

@ -1,36 +1,36 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>HotkeyDialogBase</class> <class>HotkeyDialogBase</class>
<widget class="QDialog" name="HotkeyDialogBase" > <widget class="QDialog" name="HotkeyDialogBase">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>344</width> <width>344</width>
<height>106</height> <height>86</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>Hotkey</string> <string>Hotkey</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<widget class="QLabel" name="label" > <widget class="QLabel" name="label">
<property name="text" > <property name="text">
<string>Enter the specification for the hotkey:</string> <string>Enter the specification for the hotkey:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="KeySequenceWidget" name="m_pKeySequenceWidgetHotkey" > <widget class="KeySequenceWidget" name="m_pKeySequenceWidgetHotkey"/>
</widget>
</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>
@ -39,7 +39,7 @@
<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>
@ -51,11 +51,11 @@
<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>
@ -67,11 +67,11 @@
<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>

View File

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

View File

@ -1,85 +1,86 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ScreenSettingsDialogBase</class> <class>ScreenSettingsDialogBase</class>
<widget class="QDialog" name="ScreenSettingsDialogBase" > <widget class="QDialog" name="ScreenSettingsDialogBase">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>434</width> <width>434</width>
<height>484</height> <height>437</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>Screen settings</string> <string>Screen Settings</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QLabel" name="label_7" > <widget class="QLabel" name="label_7">
<property name="text" > <property name="text">
<string>Screen &amp;name:</string> <string>Screen &amp;name:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>m_pLineEditName</cstring> <cstring>m_pLineEditName</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="m_pLineEditName" /> <widget class="QLineEdit" name="m_pLineEditName"/>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QGroupBox" name="m_pGroupAliases" > <widget class="QGroupBox" name="m_pGroupAliases">
<property name="enabled" > <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="title" > <property name="title">
<string>A&amp;liases</string> <string>A&amp;liases</string>
</property> </property>
<property name="checked" > <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLineEdit" name="m_pLineEditAlias" /> <widget class="QLineEdit" name="m_pLineEditAlias"/>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QPushButton" name="m_pButtonAddAlias" > <widget class="QPushButton" name="m_pButtonAddAlias">
<property name="enabled" > <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text" > <property name="text">
<string>&amp;Add</string> <string>&amp;Add</string>
</property> </property>
</widget> </widget>
</item> </item>
<item rowspan="2" row="1" column="0" > <item row="1" column="0" rowspan="2">
<widget class="QListWidget" name="m_pListAliases" > <widget class="QListWidget" name="m_pListAliases">
<property name="selectionMode" > <property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum> <enum>QAbstractItemView::ExtendedSelection</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1">
<widget class="QPushButton" name="m_pButtonRemoveAlias" > <widget class="QPushButton" name="m_pButtonRemoveAlias">
<property name="enabled" > <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text" > <property name="text">
<string>&amp;Remove</string> <string>&amp;Remove</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="2" column="1">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>126</height> <height>126</height>
@ -91,252 +92,252 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="m_pGroupModifiers" > <widget class="QGroupBox" name="m_pGroupModifiers">
<property name="title" > <property name="title">
<string>&amp;Modifier keys</string> <string>&amp;Modifier keys</string>
</property> </property>
<property name="checked" > <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2">
<property name="text" > <property name="text">
<string>&amp;Shift:</string> <string>&amp;Shift:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>m_pComboBoxShift</cstring> <cstring>m_pComboBoxShift</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QComboBox" name="m_pComboBoxShift" > <widget class="QComboBox" name="m_pComboBoxShift">
<item> <item>
<property name="text" > <property name="text">
<string>Shift</string> <string>Shift</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Ctrl</string> <string>Ctrl</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Alt</string> <string>Alt</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Meta</string> <string>Meta</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Super</string> <string>Super</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>None</string> <string>None</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3">
<property name="text" > <property name="text">
<string>&amp;Ctrl:</string> <string>&amp;Ctrl:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>m_pComboBoxCtrl</cstring> <cstring>m_pComboBoxCtrl</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1">
<widget class="QComboBox" name="m_pComboBoxCtrl" > <widget class="QComboBox" name="m_pComboBoxCtrl">
<property name="currentIndex" > <property name="currentIndex">
<number>1</number> <number>1</number>
</property> </property>
<item> <item>
<property name="text" > <property name="text">
<string>Shift</string> <string>Shift</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Ctrl</string> <string>Ctrl</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Alt</string> <string>Alt</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Meta</string> <string>Meta</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Super</string> <string>Super</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>None</string> <string>None</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0">
<widget class="QLabel" name="label_4" > <widget class="QLabel" name="label_4">
<property name="text" > <property name="text">
<string>Al&amp;t:</string> <string>Al&amp;t:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>m_pComboBoxAlt</cstring> <cstring>m_pComboBoxAlt</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="2" column="1">
<widget class="QComboBox" name="m_pComboBoxAlt" > <widget class="QComboBox" name="m_pComboBoxAlt">
<property name="currentIndex" > <property name="currentIndex">
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
<property name="text" > <property name="text">
<string>Shift</string> <string>Shift</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Ctrl</string> <string>Ctrl</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Alt</string> <string>Alt</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Meta</string> <string>Meta</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Super</string> <string>Super</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>None</string> <string>None</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="3" column="0">
<widget class="QLabel" name="label_5" > <widget class="QLabel" name="label_5">
<property name="text" > <property name="text">
<string>M&amp;eta:</string> <string>M&amp;eta:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>m_pComboBoxMeta</cstring> <cstring>m_pComboBoxMeta</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" > <item row="3" column="1">
<widget class="QComboBox" name="m_pComboBoxMeta" > <widget class="QComboBox" name="m_pComboBoxMeta">
<property name="currentIndex" > <property name="currentIndex">
<number>3</number> <number>3</number>
</property> </property>
<item> <item>
<property name="text" > <property name="text">
<string>Shift</string> <string>Shift</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Ctrl</string> <string>Ctrl</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Alt</string> <string>Alt</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Meta</string> <string>Meta</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Super</string> <string>Super</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>None</string> <string>None</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
<item row="4" column="0" > <item row="4" column="0">
<widget class="QLabel" name="label_6" > <widget class="QLabel" name="label_6">
<property name="text" > <property name="text">
<string>S&amp;uper:</string> <string>S&amp;uper:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>m_pComboBoxSuper</cstring> <cstring>m_pComboBoxSuper</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1" > <item row="4" column="1">
<widget class="QComboBox" name="m_pComboBoxSuper" > <widget class="QComboBox" name="m_pComboBoxSuper">
<property name="currentIndex" > <property name="currentIndex">
<number>4</number> <number>4</number>
</property> </property>
<item> <item>
<property name="text" > <property name="text">
<string>Shift</string> <string>Shift</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Ctrl</string> <string>Ctrl</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Alt</string> <string>Alt</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Meta</string> <string>Meta</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Super</string> <string>Super</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>None</string> <string>None</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
<item row="5" column="0" > <item row="5" column="0">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -350,62 +351,62 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QGroupBox" name="m_pGroupSwitchCorners" > <widget class="QGroupBox" name="m_pGroupSwitchCorners">
<property name="title" > <property name="title">
<string>&amp;Dead corners</string> <string>&amp;Dead corners</string>
</property> </property>
<property name="checked" > <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<item row="0" column="0" > <item row="0" column="0">
<widget class="QCheckBox" name="m_pCheckBoxCornerTopLeft" > <widget class="QCheckBox" name="m_pCheckBoxCornerTopLeft">
<property name="text" > <property name="text">
<string>Top-left</string> <string>Top-left</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QCheckBox" name="m_pCheckBoxCornerTopRight" > <widget class="QCheckBox" name="m_pCheckBoxCornerTopRight">
<property name="text" > <property name="text">
<string>Top-right</string> <string>Top-right</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QCheckBox" name="m_pCheckBoxCornerBottomLeft" > <widget class="QCheckBox" name="m_pCheckBoxCornerBottomLeft">
<property name="text" > <property name="text">
<string>Bottom-left</string> <string>Bottom-left</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1">
<widget class="QCheckBox" name="m_pCheckBoxCornerBottomRight" > <widget class="QCheckBox" name="m_pCheckBoxCornerBottomRight">
<property name="text" > <property name="text">
<string>Bottom-right</string> <string>Bottom-right</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2" > <item row="2" column="0" colspan="2">
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QLabel" name="label" > <widget class="QLabel" name="label">
<property name="text" > <property name="text">
<string>Corner Si&amp;ze:</string> <string>Corner Si&amp;ze:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>m_pSpinBoxSwitchCornerSize</cstring> <cstring>m_pSpinBoxSwitchCornerSize</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<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>
@ -414,7 +415,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QSpinBox" name="m_pSpinBoxSwitchCornerSize" /> <widget class="QSpinBox" name="m_pSpinBoxSwitchCornerSize"/>
</item> </item>
</layout> </layout>
</item> </item>
@ -422,51 +423,51 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="m_pGroupFixes" > <widget class="QGroupBox" name="m_pGroupFixes">
<property name="title" > <property name="title">
<string>&amp;Fixes</string> <string>&amp;Fixes</string>
</property> </property>
<property name="checked" > <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<item row="0" column="0" > <item row="0" column="0">
<widget class="QCheckBox" name="m_pCheckBoxCapsLock" > <widget class="QCheckBox" name="m_pCheckBoxCapsLock">
<property name="text" > <property name="text">
<string>Fix CAPS LOCK key</string> <string>Fix CAPS LOCK key</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QCheckBox" name="m_pCheckBoxNumLock" > <widget class="QCheckBox" name="m_pCheckBoxNumLock">
<property name="text" > <property name="text">
<string>Fix NUM LOCK key</string> <string>Fix NUM LOCK key</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0">
<widget class="QCheckBox" name="m_pCheckBoxScrollLock" > <widget class="QCheckBox" name="m_pCheckBoxScrollLock">
<property name="text" > <property name="text">
<string>Fix SCROLL LOCK key</string> <string>Fix SCROLL LOCK key</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="3" column="0">
<widget class="QCheckBox" name="m_pCheckBoxXTest" > <widget class="QCheckBox" name="m_pCheckBoxXTest">
<property name="text" > <property name="text">
<string>Fix XTest for Xinerama</string> <string>Fix XTest for Xinerama</string>
</property> </property>
<property name="checked" > <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" > <item row="4" column="0">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -481,10 +482,10 @@
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -493,12 +494,12 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QDialogButtonBox" name="m_pButtonBox" > <widget class="QDialogButtonBox" name="m_pButtonBox">
<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>
@ -512,11 +513,11 @@
<receiver>ScreenSettingsDialogBase</receiver> <receiver>ScreenSettingsDialogBase</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>222</x> <x>222</x>
<y>502</y> <y>502</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>157</x> <x>157</x>
<y>274</y> <y>274</y>
</hint> </hint>
@ -528,11 +529,11 @@
<receiver>ScreenSettingsDialogBase</receiver> <receiver>ScreenSettingsDialogBase</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>290</x> <x>290</x>
<y>508</y> <y>508</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>286</x> <x>286</x>
<y>274</y> <y>274</y>
</hint> </hint>

View File

@ -1,69 +1,70 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SettingsDialogBase</class> <class>SettingsDialogBase</class>
<widget class="QDialog" name="SettingsDialogBase" > <widget class="QDialog" name="SettingsDialogBase">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>372</width> <width>372</width>
<height>390</height> <height>325</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>Settings</string> <string>Settings</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<item row="0" column="0" colspan="2" > <item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="m_pGroupBox_2" > <widget class="QGroupBox" name="m_pGroupBox_2">
<property name="title" > <property name="title">
<string>&amp;Programs</string> <string>&amp;Programs</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="m_pLabel_17" > <widget class="QLabel" name="m_pLabel_17">
<property name="whatsThis" > <property name="whatsThis">
<string>This is the synergy client program, usually called synergyc or synergyc.exe.</string> <string>This is the synergy client program, usually called synergyc or synergyc.exe.</string>
</property> </property>
<property name="text" > <property name="text">
<string>&amp;Client:</string> <string>&amp;Client:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>m_pLineEditSynergyc</cstring> <cstring>m_pLineEditSynergyc</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QLineEdit" name="m_pLineEditSynergyc" /> <widget class="QLineEdit" name="m_pLineEditSynergyc"/>
</item> </item>
<item row="0" column="2" > <item row="0" column="2">
<widget class="QPushButton" name="m_pButtonBrowseSynergyc" > <widget class="QPushButton" name="m_pButtonBrowseSynergyc">
<property name="text" > <property name="text">
<string>&amp;Browse...</string> <string>&amp;Browse...</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QLabel" name="m_pLabel_18" > <widget class="QLabel" name="m_pLabel_18">
<property name="toolTip" > <property name="toolTip">
<string/> <string/>
</property> </property>
<property name="whatsThis" > <property name="whatsThis">
<string>This is the synergy server program, usually called synergys or synergys.exe.</string> <string>This is the synergy server program, usually called synergys or synergys.exe.</string>
</property> </property>
<property name="text" > <property name="text">
<string>S&amp;erver:</string> <string>S&amp;erver:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>m_pLineEditSynergys</cstring> <cstring>m_pLineEditSynergys</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1">
<widget class="QLineEdit" name="m_pLineEditSynergys" /> <widget class="QLineEdit" name="m_pLineEditSynergys"/>
</item> </item>
<item row="1" column="2" > <item row="1" column="2">
<widget class="QPushButton" name="m_pButtonBrowseSynergys" > <widget class="QPushButton" name="m_pButtonBrowseSynergys">
<property name="text" > <property name="text">
<string>Bro&amp;wse...</string> <string>Bro&amp;wse...</string>
</property> </property>
</widget> </widget>
@ -71,65 +72,65 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2" > <item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="m_pGroupBox_3" > <widget class="QGroupBox" name="m_pGroupBox_3">
<property name="title" > <property name="title">
<string>&amp;Advanced</string> <string>&amp;Advanced</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="m_pLabel_19" > <widget class="QLabel" name="m_pLabel_19">
<property name="text" > <property name="text">
<string>Sc&amp;reen name:</string> <string>Sc&amp;reen name:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>m_pLineEditScreenName</cstring> <cstring>m_pLineEditScreenName</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QLineEdit" name="m_pLineEditScreenName" > <widget class="QLineEdit" name="m_pLineEditScreenName">
<property name="enabled" > <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QLabel" name="m_pLabel_20" > <widget class="QLabel" name="m_pLabel_20">
<property name="text" > <property name="text">
<string>P&amp;ort:</string> <string>P&amp;ort:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>m_pSpinBoxPort</cstring> <cstring>m_pSpinBoxPort</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1">
<widget class="QSpinBox" name="m_pSpinBoxPort" > <widget class="QSpinBox" name="m_pSpinBoxPort">
<property name="enabled" > <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="maximum" > <property name="maximum">
<number>65535</number> <number>65535</number>
</property> </property>
<property name="value" > <property name="value">
<number>24800</number> <number>24800</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0">
<widget class="QLabel" name="m_pLabel_21" > <widget class="QLabel" name="m_pLabel_21">
<property name="text" > <property name="text">
<string>&amp;Interface:</string> <string>&amp;Interface:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>m_pLineEditInterface</cstring> <cstring>m_pLineEditInterface</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="2" column="1">
<widget class="QLineEdit" name="m_pLineEditInterface" > <widget class="QLineEdit" name="m_pLineEditInterface">
<property name="enabled" > <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
@ -137,15 +138,15 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2" > <item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="m_pGroupRunOptions" > <widget class="QGroupBox" name="m_pGroupRunOptions">
<property name="title" > <property name="title">
<string>&amp;Start</string> <string>&amp;Start</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<widget class="QCheckBox" name="m_pCheckBoxAutoConnect" > <widget class="QCheckBox" name="m_pCheckBoxAutoConnect">
<property name="text" > <property name="text">
<string>A&amp;utomatically start synergy when QSynergy starts</string> <string>A&amp;utomatically start synergy when QSynergy starts</string>
</property> </property>
</widget> </widget>
@ -153,62 +154,62 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="3" column="0">
<widget class="QLabel" name="m_pLabel_3" > <widget class="QLabel" name="m_pLabel_3">
<property name="text" > <property name="text">
<string>&amp;Logging level:</string> <string>&amp;Logging level:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>m_pComboLogLevel</cstring> <cstring>m_pComboLogLevel</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" > <item row="3" column="1">
<widget class="QComboBox" name="m_pComboLogLevel" > <widget class="QComboBox" name="m_pComboLogLevel">
<item> <item>
<property name="text" > <property name="text">
<string>Error</string> <string>Error</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Warning</string> <string>Warning</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Note</string> <string>Note</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Info</string> <string>Info</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Debug</string> <string>Debug</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Debug1</string> <string>Debug1</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Debug2</string> <string>Debug2</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2" > <item row="4" column="0" colspan="2">
<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>
@ -222,11 +223,11 @@
<receiver>SettingsDialogBase</receiver> <receiver>SettingsDialogBase</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>257</x> <x>257</x>
<y>380</y> <y>380</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>157</x> <x>157</x>
<y>274</y> <y>274</y>
</hint> </hint>
@ -238,11 +239,11 @@
<receiver>SettingsDialogBase</receiver> <receiver>SettingsDialogBase</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>325</x> <x>325</x>
<y>380</y> <y>380</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>286</x> <x>286</x>
<y>274</y> <y>274</y>
</hint> </hint>

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);