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

43
gui/res/AboutDialogBase.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>AboutDialogBase</class>
<widget class="QDialog" name="AboutDialogBase">
@ -8,18 +9,18 @@
<rect>
<x>0</x>
<y>0</y>
<width>368</width>
<height>350</height>
<width>374</width>
<height>212</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>368</width>
<height>350</height>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="windowTitle">
<string>About QSynergy</string>
<string>About Synergy+</string>
</property>
<property name="modal">
<bool>true</bool>
@ -28,10 +29,10 @@
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<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; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
&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;
&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 name="wordWrap">
<bool>true</bool>
@ -40,20 +41,18 @@ p, li { white-space: pre-wrap; }
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::NoTextInteraction|Qt::TextSelectableByMouse</set>
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<item row="1" column="0" rowspan="2" colspan="2">
<widget class="QLabel" name="label_3">
<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)
QSynergy is open source and released under the GNU Public License (GPL) Version 2.
Synergy and the synergy icon: Copyright (C) 2002 Chris Schoeneman.</string>
Copyright © 2010 The Synergy+ Project
Copyright © 2008 Volker Lanz (vl@fidra.de)
Copyright © 2002 Chris Schoeneman</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@ -72,13 +71,13 @@ Synergy and the synergy icon: Copyright (C) 2002 Chris Schoeneman.</string>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Synergy Version:</string>
<string>Version:</string>
</property>
</widget>
</item>
@ -95,7 +94,7 @@ Synergy and the synergy icon: Copyright (C) 2002 Chris Schoeneman.</string>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -118,7 +117,7 @@ Synergy and the synergy icon: Copyright (C) 2002 Chris Schoeneman.</string>
<item row="2" column="0">
<widget class="QLabel" name="label_8">
<property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -145,7 +144,7 @@ Synergy and the synergy icon: Copyright (C) 2002 Chris Schoeneman.</string>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>78</height>
@ -158,7 +157,7 @@ Synergy and the synergy icon: Copyright (C) 2002 Chris Schoeneman.</string>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>131</width>
<height>20</height>

15
gui/res/ActionDialogBase.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ActionDialogBase</class>
<widget class="QDialog" name="ActionDialogBase">
@ -10,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Configure action</string>
<string>Configure Action</string>
</property>
<layout class="QVBoxLayout">
<item>
@ -46,7 +47,7 @@
<item>
<widget class="KeySequenceWidget" name="m_pKeySequenceWidgetHotkey">
<property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -79,7 +80,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@ -124,7 +125,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@ -155,7 +156,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@ -206,7 +207,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@ -273,7 +274,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>

10
gui/res/HotkeyDialogBase.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>HotkeyDialogBase</class>
<widget class="QDialog" name="HotkeyDialogBase">
@ -6,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>344</width>
<height>106</height>
<height>86</height>
</rect>
</property>
<property name="windowTitle">
@ -21,8 +22,7 @@
</widget>
</item>
<item>
<widget class="KeySequenceWidget" name="m_pKeySequenceWidgetHotkey" >
</widget>
<widget class="KeySequenceWidget" name="m_pKeySequenceWidgetHotkey"/>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
@ -30,7 +30,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@ -39,7 +39,7 @@
<customwidgets>
<customwidget>
<class>KeySequenceWidget</class>
<extends>QPushButton</extends>
<extends>QLineEdit</extends>
<header>KeySequenceWidget.h</header>
</customwidget>
</customwidgets>

147
gui/res/MainWindowBase.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MainWindowBase</class>
<widget class="QMainWindow" name="MainWindowBase">
@ -6,43 +7,37 @@
<x>0</x>
<y>0</y>
<width>397</width>
<height>306</height>
<height>247</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>QSynergy</string>
<string>Synergy+</string>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout">
<item row="0" column="0" colspan="2" >
<widget class="QGroupBox" name="m_pGroupClient" >
<property name="title" >
<string>Control &amp;this computer from another one (be a client)</string>
</property>
<property name="checkable" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="m_pLabel_2" >
<item row="4" column="1">
<widget class="QPushButton" name="m_pButtonToggleStart">
<property name="text">
<string>&amp;Name of the server:</string>
<string>&amp;Start</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>
</item>
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="m_pGroupServer">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Use this computer to control &amp;others (be a server)</string>
<string>&amp;Server (share this computer's mouse and keyboard):</string>
</property>
<property name="checkable">
<bool>true</bool>
@ -54,14 +49,14 @@
<item>
<widget class="QRadioButton" name="m_pRadioExternalConfig">
<property name="text">
<string>Start synergy with an &amp;existing configuration</string>
<string>Use existing configuration:</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="m_pLabel_4" >
<widget class="QLabel" name="m_pLabelConfigurationFile">
<property name="text">
<string>&amp;Configuration file:</string>
</property>
@ -92,7 +87,7 @@
<item>
<widget class="QRadioButton" name="m_pRadioInternalConfig">
<property name="text">
<string>&amp;Interactively configure synergy</string>
<string>Configure interactively:</string>
</property>
<property name="checked">
<bool>true</bool>
@ -101,19 +96,6 @@
</item>
<item>
<layout class="QHBoxLayout">
<item>
<spacer>
<property name="orientation" >
<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">
@ -126,7 +108,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@ -139,12 +121,12 @@
</layout>
</widget>
</item>
<item row="3" column="0" >
<item row="4" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@ -152,11 +134,48 @@
</property>
</spacer>
</item>
<item row="3" column="1" >
<widget class="QPushButton" name="m_pButtonStart" >
<property name="text" >
<string>&amp;Start</string>
<item row="3" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</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>
</item>
</layout>
@ -251,7 +270,7 @@
<resources/>
<connections>
<connection>
<sender>m_pButtonStart</sender>
<sender>m_pButtonToggleStart</sender>
<signal>clicked()</signal>
<receiver>m_pActionStartSynergy</receiver>
<slot>trigger()</slot>
@ -266,22 +285,6 @@
</hint>
</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>
<connection>
<sender>m_pRadioExternalConfig</sender>
<signal>toggled(bool)</signal>
@ -314,5 +317,21 @@
</hint>
</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>

19
gui/res/ScreenSettingsDialogBase.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ScreenSettingsDialogBase</class>
<widget class="QDialog" name="ScreenSettingsDialogBase">
@ -6,11 +7,11 @@
<x>0</x>
<y>0</y>
<width>434</width>
<height>484</height>
<height>437</height>
</rect>
</property>
<property name="windowTitle">
<string>Screen settings</string>
<string>Screen Settings</string>
</property>
<layout class="QVBoxLayout">
<item>
@ -57,7 +58,7 @@
</property>
</widget>
</item>
<item rowspan="2" row="1" column="0" >
<item row="1" column="0" rowspan="2">
<widget class="QListWidget" name="m_pListAliases">
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
@ -79,7 +80,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>126</height>
@ -336,7 +337,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@ -405,7 +406,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@ -466,7 +467,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@ -484,7 +485,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@ -498,7 +499,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>

5
gui/res/SettingsDialogBase.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SettingsDialogBase</class>
<widget class="QDialog" name="SettingsDialogBase">
@ -6,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>372</width>
<height>390</height>
<height>325</height>
</rect>
</property>
<property name="windowTitle">
@ -208,7 +209,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>

12
gui/src/MainWindow.cpp
View File

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