From f3e1e81967adb1dce554413ee7e2ecb69fe5558a Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Wed, 2 Jun 2010 19:53:45 +0000 Subject: [PATCH] Fixed issue 483 --- gui/res/AboutDialogBase.ui | 393 +++++---- gui/res/ActionDialogBase.ui | 1161 ++++++++++++++------------- gui/res/HotkeyDialogBase.ui | 162 ++-- gui/res/MainWindowBase.ui | 655 +++++++-------- gui/res/ScreenSettingsDialogBase.ui | 1085 ++++++++++++------------- gui/res/SettingsDialogBase.ui | 505 ++++++------ gui/src/MainWindow.cpp | 12 +- 7 files changed, 1997 insertions(+), 1976 deletions(-) diff --git a/gui/res/AboutDialogBase.ui b/gui/res/AboutDialogBase.ui index 5c70ae37..5126c21d 100644 --- a/gui/res/AboutDialogBase.ui +++ b/gui/res/AboutDialogBase.ui @@ -1,197 +1,196 @@ - - AboutDialogBase - - - Qt::ApplicationModal - - - - 0 - 0 - 368 - 350 - - - - - 368 - 350 - - - - About QSynergy - - - true - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<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;"><span style=" font-size:x-large;">QSynergy</span></p></body></html> - - - true - - - true - - - Qt::LinksAccessibleByMouse|Qt::NoTextInteraction|Qt::TextSelectableByMouse - - - - - - - Version 0.9.0 - -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. - - - true - - - - - - - Qt::Horizontal - - - - - - - - - - 1 - 0 - - - - Synergy Version: - - - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 1 - 0 - - - - Hostname: - - - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 1 - 0 - - - - IP-Address: - - - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - Qt::Vertical - - - - 20 - 78 - - - - - - - - Qt::Horizontal - - - - 131 - 20 - - - - - - - - &Ok - - - - - - - - - buttonOk - clicked() - AboutDialogBase - accept() - - - 315 - 374 - - - 301 - 3 - - - - - + + + AboutDialogBase + + + Qt::ApplicationModal + + + + 0 + 0 + 374 + 212 + + + + + 0 + 0 + + + + About Synergy+ + + + true + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<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;"><span style=" font-size:x-large;">Synergy+</span></p></body></html> + + + true + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + The Synergy+ GUI is based on QSynergy by Volker Lanz + +Copyright © 2010 The Synergy+ Project +Copyright © 2008 Volker Lanz (vl@fidra.de) +Copyright © 2002 Chris Schoeneman + + + true + + + + + + + Qt::Horizontal + + + + + + + + + + 1 + 0 + + + + Version: + + + + + + + - + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 1 + 0 + + + + Hostname: + + + + + + + - + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 1 + 0 + + + + IP-Address: + + + + + + + - + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + Qt::Vertical + + + + 20 + 78 + + + + + + + + Qt::Horizontal + + + + 131 + 20 + + + + + + + + &Ok + + + + + + + + + buttonOk + clicked() + AboutDialogBase + accept() + + + 315 + 374 + + + 301 + 3 + + + + + diff --git a/gui/res/ActionDialogBase.ui b/gui/res/ActionDialogBase.ui index f2c2e121..0bf3deb6 100644 --- a/gui/res/ActionDialogBase.ui +++ b/gui/res/ActionDialogBase.ui @@ -1,580 +1,581 @@ - - ActionDialogBase - - - - 0 - 0 - 372 - 484 - - - - Configure action - - - - - - Choose the action to perform - - - - - - Press a hotkey - - - true - - - - - - - Release a hotkey - - - - - - - Press and release a hotkey - - - - - - - - 1 - 0 - - - - - 256 - 0 - - - - dfgsfgsdfgsdfgsd - - - - - - - only on these screens - - - true - - - true - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 128 - 64 - - - - QAbstractItemView::ExtendedSelection - - - - - - - - - - Qt::Horizontal - - - - - - - - - Switch to screen - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - - - - - - - - - Switch in direction - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - - left - - - - - right - - - - - up - - - - - down - - - - - - - - - - - - Lock cursor to screen - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - - toggle - - - - - on - - - - - off - - - - - - - - - - - - - This action is performed when - - - - - - the hotkey is pressed - - - true - - - - - - - the hotkey is released - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok - - - - - - - - KeySequenceWidget - QLineEdit -
KeySequenceWidget.h
- - - - - - buttonBox - accepted() - ActionDialogBase - accept() - - - 245 - 474 - - - 157 - 274 - - - - - buttonBox - rejected() - ActionDialogBase - reject() - - - 313 - 474 - - - 286 - 274 - - - - - m_pGroupType - toggled(bool) - m_pKeySequenceWidgetHotkey - setDisabled(bool) - - - 104 - 194 - - - 110 - 132 - - - - - m_pRadioSwitchInDirection - toggled(bool) - m_pKeySequenceWidgetHotkey - setDisabled(bool) - - - 118 - 322 - - - 81 - 129 - - - - - m_pRadioLockCursorToScreen - toggled(bool) - m_pKeySequenceWidgetHotkey - setDisabled(bool) - - - 101 - 353 - - - 68 - 126 - - - - - m_pRadioPress - toggled(bool) - m_pKeySequenceWidgetHotkey - setEnabled(bool) - - - 48 - 48 - - - 45 - 129 - - - - - m_pRadioRelease - toggled(bool) - m_pKeySequenceWidgetHotkey - setEnabled(bool) - - - 135 - 70 - - - 148 - 125 - - - - - m_pRadioPressAndRelease - toggled(bool) - m_pKeySequenceWidgetHotkey - setEnabled(bool) - - - 194 - 100 - - - 201 - 125 - - - - - m_pRadioSwitchToScreen - toggled(bool) - m_pComboSwitchToScreen - setEnabled(bool) - - - 148 - 291 - - - 350 - 290 - - - - - m_pRadioSwitchInDirection - toggled(bool) - m_pComboSwitchInDirection - setEnabled(bool) - - - 158 - 322 - - - 350 - 321 - - - - - m_pRadioLockCursorToScreen - toggled(bool) - m_pComboLockCursorToScreen - setEnabled(bool) - - - 180 - 353 - - - 350 - 352 - - - - - m_pRadioPress - toggled(bool) - m_pGroupBoxScreens - setEnabled(bool) - - - 25 - 47 - - - 33 - 155 - - - - - m_pRadioSwitchToScreen - toggled(bool) - m_pGroupBoxScreens - setDisabled(bool) - - - 48 - 278 - - - 98 - 153 - - - - - m_pRadioRelease - toggled(bool) - m_pGroupBoxScreens - setEnabled(bool) - - - 264 - 67 - - - 241 - 158 - - - - - m_pRadioPressAndRelease - toggled(bool) - m_pGroupBoxScreens - setEnabled(bool) - - - 286 - 98 - - - 290 - 156 - - - - - m_pRadioSwitchInDirection - toggled(bool) - m_pGroupBoxScreens - setDisabled(bool) - - - 38 - 313 - - - 64 - 195 - - - - - m_pRadioLockCursorToScreen - toggled(bool) - m_pGroupBoxScreens - setDisabled(bool) - - - 48 - 339 - - - 79 - 234 - - - - - m_pRadioSwitchToScreen - toggled(bool) - m_pKeySequenceWidgetHotkey - setDisabled(bool) - - - 84 - 280 - - - 185 - 123 - - - - - + + + ActionDialogBase + + + + 0 + 0 + 372 + 484 + + + + Configure Action + + + + + + Choose the action to perform + + + + + + Press a hotkey + + + true + + + + + + + Release a hotkey + + + + + + + Press and release a hotkey + + + + + + + + 1 + 0 + + + + + 256 + 0 + + + + dfgsfgsdfgsdfgsd + + + + + + + only on these screens + + + true + + + true + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 128 + 64 + + + + QAbstractItemView::ExtendedSelection + + + + + + + + + + Qt::Horizontal + + + + + + + + + Switch to screen + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + + + + + + + + + Switch in direction + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + + left + + + + + right + + + + + up + + + + + down + + + + + + + + + + + + Lock cursor to screen + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + + toggle + + + + + on + + + + + off + + + + + + + + + + + + + This action is performed when + + + + + + the hotkey is pressed + + + true + + + + + + + the hotkey is released + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + KeySequenceWidget + QLineEdit +
KeySequenceWidget.h
+ + + + + + buttonBox + accepted() + ActionDialogBase + accept() + + + 245 + 474 + + + 157 + 274 + + + + + buttonBox + rejected() + ActionDialogBase + reject() + + + 313 + 474 + + + 286 + 274 + + + + + m_pGroupType + toggled(bool) + m_pKeySequenceWidgetHotkey + setDisabled(bool) + + + 104 + 194 + + + 110 + 132 + + + + + m_pRadioSwitchInDirection + toggled(bool) + m_pKeySequenceWidgetHotkey + setDisabled(bool) + + + 118 + 322 + + + 81 + 129 + + + + + m_pRadioLockCursorToScreen + toggled(bool) + m_pKeySequenceWidgetHotkey + setDisabled(bool) + + + 101 + 353 + + + 68 + 126 + + + + + m_pRadioPress + toggled(bool) + m_pKeySequenceWidgetHotkey + setEnabled(bool) + + + 48 + 48 + + + 45 + 129 + + + + + m_pRadioRelease + toggled(bool) + m_pKeySequenceWidgetHotkey + setEnabled(bool) + + + 135 + 70 + + + 148 + 125 + + + + + m_pRadioPressAndRelease + toggled(bool) + m_pKeySequenceWidgetHotkey + setEnabled(bool) + + + 194 + 100 + + + 201 + 125 + + + + + m_pRadioSwitchToScreen + toggled(bool) + m_pComboSwitchToScreen + setEnabled(bool) + + + 148 + 291 + + + 350 + 290 + + + + + m_pRadioSwitchInDirection + toggled(bool) + m_pComboSwitchInDirection + setEnabled(bool) + + + 158 + 322 + + + 350 + 321 + + + + + m_pRadioLockCursorToScreen + toggled(bool) + m_pComboLockCursorToScreen + setEnabled(bool) + + + 180 + 353 + + + 350 + 352 + + + + + m_pRadioPress + toggled(bool) + m_pGroupBoxScreens + setEnabled(bool) + + + 25 + 47 + + + 33 + 155 + + + + + m_pRadioSwitchToScreen + toggled(bool) + m_pGroupBoxScreens + setDisabled(bool) + + + 48 + 278 + + + 98 + 153 + + + + + m_pRadioRelease + toggled(bool) + m_pGroupBoxScreens + setEnabled(bool) + + + 264 + 67 + + + 241 + 158 + + + + + m_pRadioPressAndRelease + toggled(bool) + m_pGroupBoxScreens + setEnabled(bool) + + + 286 + 98 + + + 290 + 156 + + + + + m_pRadioSwitchInDirection + toggled(bool) + m_pGroupBoxScreens + setDisabled(bool) + + + 38 + 313 + + + 64 + 195 + + + + + m_pRadioLockCursorToScreen + toggled(bool) + m_pGroupBoxScreens + setDisabled(bool) + + + 48 + 339 + + + 79 + 234 + + + + + m_pRadioSwitchToScreen + toggled(bool) + m_pKeySequenceWidgetHotkey + setDisabled(bool) + + + 84 + 280 + + + 185 + 123 + + + + + diff --git a/gui/res/HotkeyDialogBase.ui b/gui/res/HotkeyDialogBase.ui index 1b9a63ee..cccccf22 100644 --- a/gui/res/HotkeyDialogBase.ui +++ b/gui/res/HotkeyDialogBase.ui @@ -1,81 +1,81 @@ - - HotkeyDialogBase - - - - 0 - 0 - 344 - 106 - - - - Hotkey - - - - - - Enter the specification for the hotkey: - - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok - - - - - - - - KeySequenceWidget - QPushButton -
KeySequenceWidget.h
- - - - - - buttonBox - accepted() - HotkeyDialogBase - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - HotkeyDialogBase - reject() - - - 316 - 260 - - - 286 - 274 - - - - - + + + HotkeyDialogBase + + + + 0 + 0 + 344 + 86 + + + + Hotkey + + + + + + Enter the specification for the hotkey: + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + KeySequenceWidget + QLineEdit +
KeySequenceWidget.h
+ + + + + + buttonBox + accepted() + HotkeyDialogBase + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + HotkeyDialogBase + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/gui/res/MainWindowBase.ui b/gui/res/MainWindowBase.ui index 6eb5a8c5..06167190 100644 --- a/gui/res/MainWindowBase.ui +++ b/gui/res/MainWindowBase.ui @@ -1,318 +1,337 @@ - - MainWindowBase - - - - 0 - 0 - 397 - 306 - - - - QSynergy - - - - - - - Control &this computer from another one (be a client) - - - true - - - - - - &Name of the server: - - - m_pLineEditHostname - - - - - - - - - - - - - Use this computer to control &others (be a server) - - - true - - - true - - - - - - Start synergy with an &existing configuration - - - - - - - - - &Configuration file: - - - m_pLineEditConfigFile - - - - - - - false - - - - - - - false - - - &Browse... - - - - - - - - - &Interactively configure synergy - - - true - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - &Configure Server... - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - &Start - - - - - - - - &About QSynergy... - - - - - &Quit - - - Quit QSynergy. - - - Ctrl+Q - - - - - &Start Synergy - - - Run synergy program. - - - Ctrl+S - - - - - false - - - S&top Synergy - - - Stop Synergy program. - - - Ctrl+T - - - - - S&how Status - - - Ctrl+H - - - - - &Minimize - - - - - &Restore - - - - - Save configuration &as... - - - Save the interactively generated server configuration to a file. - - - Ctrl+Alt+S - - - - - Settings - - - Edit settings for QSynergy and synergy itself - - - - - Log output - - - Open a window with synergy's output - - - - - - - m_pButtonStart - clicked() - m_pActionStartSynergy - trigger() - - - 361 - 404 - - - -1 - -1 - - - - - m_pRadioInternalConfig - toggled(bool) - m_pButtonConfigureServer - setEnabled(bool) - - - 204 - 244 - - - 212 - 274 - - - - - m_pRadioExternalConfig - toggled(bool) - m_pLineEditConfigFile - setEnabled(bool) - - - 156 - 179 - - - 169 - 209 - - - - - m_pRadioExternalConfig - toggled(bool) - m_pButtonBrowseConfigFile - setEnabled(bool) - - - 353 - 182 - - - 356 - 211 - - - - - + + + MainWindowBase + + + + 0 + 0 + 397 + 247 + + + + + 0 + 0 + + + + Synergy+ + + + + + + + &Start + + + + + + + + 0 + 0 + + + + &Server (share this computer's mouse and keyboard): + + + true + + + true + + + + + + Use existing configuration: + + + + + + + + + &Configuration file: + + + m_pLineEditConfigFile + + + + + + + false + + + + + + + false + + + &Browse... + + + + + + + + + Configure interactively: + + + true + + + + + + + + + &Configure Server... + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + &Client (use another computer's keyboard and mouse): + + + true + + + + + + &Name of the server: + + + m_pLineEditHostname + + + + + + + + + + + + + + &About QSynergy... + + + + + &Quit + + + Quit QSynergy. + + + Ctrl+Q + + + + + &Start Synergy + + + Run synergy program. + + + Ctrl+S + + + + + false + + + S&top Synergy + + + Stop Synergy program. + + + Ctrl+T + + + + + S&how Status + + + Ctrl+H + + + + + &Minimize + + + + + &Restore + + + + + Save configuration &as... + + + Save the interactively generated server configuration to a file. + + + Ctrl+Alt+S + + + + + Settings + + + Edit settings for QSynergy and synergy itself + + + + + Log output + + + Open a window with synergy's output + + + + + + + m_pButtonToggleStart + clicked() + m_pActionStartSynergy + trigger() + + + 361 + 404 + + + -1 + -1 + + + + + m_pRadioExternalConfig + toggled(bool) + m_pLineEditConfigFile + setEnabled(bool) + + + 156 + 179 + + + 169 + 209 + + + + + m_pRadioExternalConfig + toggled(bool) + m_pButtonBrowseConfigFile + setEnabled(bool) + + + 353 + 182 + + + 356 + 211 + + + + + m_pRadioInternalConfig + toggled(bool) + m_pButtonConfigureServer + setEnabled(bool) + + + 204 + 244 + + + 212 + 274 + + + + + diff --git a/gui/res/ScreenSettingsDialogBase.ui b/gui/res/ScreenSettingsDialogBase.ui index 35de6a13..95c48685 100644 --- a/gui/res/ScreenSettingsDialogBase.ui +++ b/gui/res/ScreenSettingsDialogBase.ui @@ -1,542 +1,543 @@ - - ScreenSettingsDialogBase - - - - 0 - 0 - 434 - 484 - - - - Screen settings - - - - - - - - Screen &name: - - - m_pLineEditName - - - - - - - - - - - - - - true - - - A&liases - - - false - - - - - - - - - false - - - &Add - - - - - - - QAbstractItemView::ExtendedSelection - - - - - - - false - - - &Remove - - - - - - - Qt::Vertical - - - - 20 - 126 - - - - - - - - - - - &Modifier keys - - - false - - - - - - &Shift: - - - m_pComboBoxShift - - - - - - - - Shift - - - - - Ctrl - - - - - Alt - - - - - Meta - - - - - Super - - - - - None - - - - - - - - &Ctrl: - - - m_pComboBoxCtrl - - - - - - - 1 - - - - Shift - - - - - Ctrl - - - - - Alt - - - - - Meta - - - - - Super - - - - - None - - - - - - - - Al&t: - - - m_pComboBoxAlt - - - - - - - 2 - - - - Shift - - - - - Ctrl - - - - - Alt - - - - - Meta - - - - - Super - - - - - None - - - - - - - - M&eta: - - - m_pComboBoxMeta - - - - - - - 3 - - - - Shift - - - - - Ctrl - - - - - Alt - - - - - Meta - - - - - Super - - - - - None - - - - - - - - S&uper: - - - m_pComboBoxSuper - - - - - - - 4 - - - - Shift - - - - - Ctrl - - - - - Alt - - - - - Meta - - - - - Super - - - - - None - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - - &Dead corners - - - false - - - - - - Top-left - - - - - - - Top-right - - - - - - - Bottom-left - - - - - - - Bottom-right - - - - - - - - - Corner Si&ze: - - - m_pSpinBoxSwitchCornerSize - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - &Fixes - - - false - - - - - - Fix CAPS LOCK key - - - - - - - Fix NUM LOCK key - - - - - - - Fix SCROLL LOCK key - - - - - - - Fix XTest for Xinerama - - - false - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok - - - - - - - - - m_pButtonBox - accepted() - ScreenSettingsDialogBase - accept() - - - 222 - 502 - - - 157 - 274 - - - - - m_pButtonBox - rejected() - ScreenSettingsDialogBase - reject() - - - 290 - 508 - - - 286 - 274 - - - - - + + + ScreenSettingsDialogBase + + + + 0 + 0 + 434 + 437 + + + + Screen Settings + + + + + + + + Screen &name: + + + m_pLineEditName + + + + + + + + + + + + + + true + + + A&liases + + + false + + + + + + + + + false + + + &Add + + + + + + + QAbstractItemView::ExtendedSelection + + + + + + + false + + + &Remove + + + + + + + Qt::Vertical + + + + 20 + 126 + + + + + + + + + + + &Modifier keys + + + false + + + + + + &Shift: + + + m_pComboBoxShift + + + + + + + + Shift + + + + + Ctrl + + + + + Alt + + + + + Meta + + + + + Super + + + + + None + + + + + + + + &Ctrl: + + + m_pComboBoxCtrl + + + + + + + 1 + + + + Shift + + + + + Ctrl + + + + + Alt + + + + + Meta + + + + + Super + + + + + None + + + + + + + + Al&t: + + + m_pComboBoxAlt + + + + + + + 2 + + + + Shift + + + + + Ctrl + + + + + Alt + + + + + Meta + + + + + Super + + + + + None + + + + + + + + M&eta: + + + m_pComboBoxMeta + + + + + + + 3 + + + + Shift + + + + + Ctrl + + + + + Alt + + + + + Meta + + + + + Super + + + + + None + + + + + + + + S&uper: + + + m_pComboBoxSuper + + + + + + + 4 + + + + Shift + + + + + Ctrl + + + + + Alt + + + + + Meta + + + + + Super + + + + + None + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + + &Dead corners + + + false + + + + + + Top-left + + + + + + + Top-right + + + + + + + Bottom-left + + + + + + + Bottom-right + + + + + + + + + Corner Si&ze: + + + m_pSpinBoxSwitchCornerSize + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + &Fixes + + + false + + + + + + Fix CAPS LOCK key + + + + + + + Fix NUM LOCK key + + + + + + + Fix SCROLL LOCK key + + + + + + + Fix XTest for Xinerama + + + false + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + m_pButtonBox + accepted() + ScreenSettingsDialogBase + accept() + + + 222 + 502 + + + 157 + 274 + + + + + m_pButtonBox + rejected() + ScreenSettingsDialogBase + reject() + + + 290 + 508 + + + 286 + 274 + + + + + diff --git a/gui/res/SettingsDialogBase.ui b/gui/res/SettingsDialogBase.ui index fc56a921..1bbc1727 100644 --- a/gui/res/SettingsDialogBase.ui +++ b/gui/res/SettingsDialogBase.ui @@ -1,252 +1,253 @@ - - SettingsDialogBase - - - - 0 - 0 - 372 - 390 - - - - Settings - - - - - - &Programs - - - - - - This is the synergy client program, usually called synergyc or synergyc.exe. - - - &Client: - - - m_pLineEditSynergyc - - - - - - - - - - &Browse... - - - - - - - - - - This is the synergy server program, usually called synergys or synergys.exe. - - - S&erver: - - - m_pLineEditSynergys - - - - - - - - - - Bro&wse... - - - - - - - - - - &Advanced - - - - - - Sc&reen name: - - - m_pLineEditScreenName - - - - - - - true - - - - - - - P&ort: - - - m_pSpinBoxPort - - - - - - - true - - - 65535 - - - 24800 - - - - - - - &Interface: - - - m_pLineEditInterface - - - - - - - true - - - - - - - - - - &Start - - - - - - A&utomatically start synergy when QSynergy starts - - - - - - - - - - &Logging level: - - - m_pComboLogLevel - - - - - - - - Error - - - - - Warning - - - - - Note - - - - - Info - - - - - Debug - - - - - Debug1 - - - - - Debug2 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - SettingsDialogBase - accept() - - - 257 - 380 - - - 157 - 274 - - - - - buttonBox - rejected() - SettingsDialogBase - reject() - - - 325 - 380 - - - 286 - 274 - - - - - + + + SettingsDialogBase + + + + 0 + 0 + 372 + 325 + + + + Settings + + + + + + &Programs + + + + + + This is the synergy client program, usually called synergyc or synergyc.exe. + + + &Client: + + + m_pLineEditSynergyc + + + + + + + + + + &Browse... + + + + + + + + + + This is the synergy server program, usually called synergys or synergys.exe. + + + S&erver: + + + m_pLineEditSynergys + + + + + + + + + + Bro&wse... + + + + + + + + + + &Advanced + + + + + + Sc&reen name: + + + m_pLineEditScreenName + + + + + + + true + + + + + + + P&ort: + + + m_pSpinBoxPort + + + + + + + true + + + 65535 + + + 24800 + + + + + + + &Interface: + + + m_pLineEditInterface + + + + + + + true + + + + + + + + + + &Start + + + + + + A&utomatically start synergy when QSynergy starts + + + + + + + + + + &Logging level: + + + m_pComboLogLevel + + + + + + + + Error + + + + + Warning + + + + + Note + + + + + Info + + + + + Debug + + + + + Debug1 + + + + + Debug2 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + SettingsDialogBase + accept() + + + 257 + 380 + + + 157 + 274 + + + + + buttonBox + rejected() + SettingsDialogBase + reject() + + + 325 + 380 + + + 286 + 274 + + + + + diff --git a/gui/src/MainWindow.cpp b/gui/src/MainWindow.cpp index c676cfc0..cf75d1fe 100644 --- a/gui/src/MainWindow.cpp +++ b/gui/src/MainWindow.cpp @@ -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);