From 462248a2de338ea3298def204b09e92abc1b0805 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Sat, 5 Feb 2011 23:01:04 +0000 Subject: [PATCH] merged 1.4 r902:903 into trunk --- cmake/CMakeLists_cpack.txt | 24 +- cmake/synergy.desktop | 7 + gui/res/AboutDialogBase.ui | 397 ++++++++++----------- gui/res/MainWindowBase.ui | 696 ++++++++++++++++++------------------- 4 files changed, 571 insertions(+), 553 deletions(-) create mode 100644 cmake/synergy.desktop diff --git a/cmake/CMakeLists_cpack.txt b/cmake/CMakeLists_cpack.txt index 841fab5b..8c15aa29 100644 --- a/cmake/CMakeLists_cpack.txt +++ b/cmake/CMakeLists_cpack.txt @@ -28,16 +28,20 @@ install(TARGETS if (UNIX) if (APPLE) - # TODO: how the hell do we distribute mac apps? - #install( - # MACOSX_BUNDLE - # bin/QSynergy.app - # DESTINATION bin) + # no cpack support for apple else() - install( - FILES - bin/qsynergy - DESTINATION bin) + install(FILES bin/qsynergy + DESTINATION bin + PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) + + # install gnome menu item + install(FILES cmake/synergy.desktop + DESTINATION share/applications) + install(FILES cmd/launcher/synergy.ico + DESTINATION share/icons) endif() endif() @@ -59,7 +63,7 @@ endif(APPLE) SET(CPACK_PACKAGE_NAME "synergy") SET(CPACK_PACKAGE_VENDOR "The Synergy Project") -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Installs Synergy server and client") +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Synergy server and client") SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_REV}) diff --git a/cmake/synergy.desktop b/cmake/synergy.desktop new file mode 100644 index 00000000..563ce64c --- /dev/null +++ b/cmake/synergy.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Synergy +Comment=Share your keyboard and mouse over a network +Exec=qsynergy +Icon=/usr/share/icons/synergy.ico +Type=Application +Categories=Utility diff --git a/gui/res/AboutDialogBase.ui b/gui/res/AboutDialogBase.ui index 840d4bf6..5e6ff72f 100644 --- a/gui/res/AboutDialogBase.ui +++ b/gui/res/AboutDialogBase.ui @@ -1,195 +1,202 @@ - - - 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 © 2008 Volker Lanz (vl@fidra.de) -Copyright © 2010 Chris Schoeneman, Nick Bolton, Sorin Sbarnea - - - 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 - - - - - + + + AboutDialogBase + + + Qt::ApplicationModal + + + true + + + + 0 + 0 + + + + + 400 + 250 + + + + + 400 + 250 + + + + 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 + + + + + + + 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 + + + + + + + The Synergy GUI is based on QSynergy by Volker Lanz + +Copyright © 2008 Volker Lanz (vl@fidra.de) +Copyright © 2010 Chris Schoeneman, Nick Bolton, Sorin Sbarnea + + + true + + + + + + + + + buttonOk + clicked() + AboutDialogBase + accept() + + + 315 + 374 + + + 301 + 3 + + + + + diff --git a/gui/res/MainWindowBase.ui b/gui/res/MainWindowBase.ui index 39888297..3bfda45d 100644 --- a/gui/res/MainWindowBase.ui +++ b/gui/res/MainWindowBase.ui @@ -1,348 +1,348 @@ - - - MainWindowBase - - - - 0 - 0 - 400 - 260 - - - - - 0 - 0 - - - - - 400 - 260 - - - - - 400 - 260 - - - - 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 - - - - - - - - - - - - - - 0 - 0 - - - - &Client (use another computer's keyboard and mouse): - - - true - - - - - - &Name of the server: - - - m_pLineEditHostname - - - - - - - - - - - - - Ready - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - &About Synergy... - - - - - &Quit - - - Quit - - - Ctrl+Q - - - - - &Start - - - Run - - - Ctrl+S - - - - - false - - - S&top - - - Stop - - - 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 - - - - - Log output - - - Open a window with output - - - - - Services - - - - - - - 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 - - - - - + + + MainWindowBase + + + + 0 + 0 + 445 + 300 + + + + + 0 + 0 + + + + + 445 + 300 + + + + + 445 + 400 + + + + 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 + + + + + + + + + + + + + + 0 + 0 + + + + &Client (use another computer's keyboard and mouse): + + + true + + + + + + &Name of the server: + + + m_pLineEditHostname + + + + + + + + + + + + + Ready + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + &About Synergy... + + + + + &Quit + + + Quit + + + Ctrl+Q + + + + + &Start + + + Run + + + Ctrl+S + + + + + false + + + S&top + + + Stop + + + 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 + + + + + Log output + + + Open a window with output + + + + + Services + + + + + + + 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 + + + + +