merged 1.4 r902:903 into trunk

cmake/CMakeLists_cpack.txt

@@ -28,16 +28,20 @@ install(TARGETS
 
 if (UNIX)
 	if (APPLE)
-		# TODO: how the hell do we distribute mac apps?
+		# no cpack support for apple
-		#install(
-		#	MACOSX_BUNDLE
-		#	bin/QSynergy.app
-		#	DESTINATION bin)
 	else()
-		install(
+		install(FILES bin/qsynergy
-			FILES
+			DESTINATION bin
-			bin/qsynergy
+			PERMISSIONS
-			DESTINATION bin)
+			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})

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

gui/res/AboutDialogBase.ui

@@ -5,18 +5,25 @@
   <property name="windowModality">
    <enum>Qt::ApplicationModal</enum>
   </property>
-  <property name="geometry">
+  <property name="enabled">
-   <rect>
+   <bool>true</bool>
-    <x>0</x>
+  </property>
-    <y>0</y>
+  <property name="sizePolicy">
-    <width>374</width>
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <height>212</height>
+    <horstretch>0</horstretch>
-   </rect>
+    <verstretch>0</verstretch>
+   </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
-    <width>0</width>
+    <width>400</width>
-    <height>0</height>
+    <height>250</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>400</width>
+    <height>250</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -45,19 +52,6 @@ p, li { white-space: pre-wrap; }
      </property>
     </widget>
    </item>
-   <item row="1" column="0" rowspan="2" colspan="2">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>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</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item row="3" column="0" colspan="2">
     <widget class="Line" name="line">
      <property name="orientation">
@@ -171,6 +165,19 @@ Copyright © 2010 Chris Schoeneman, Nick Bolton, Sorin Sbarnea</string>
      </property>
     </widget>
    </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>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</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

gui/res/MainWindowBase.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>445</width>
-    <height>260</height>
+    <height>300</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -18,14 +18,14 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>400</width>
+    <width>445</width>
-    <height>260</height>
+    <height>300</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>400</width>
+    <width>445</width>
-    <height>260</height>
+    <height>400</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -188,7 +188,7 @@
   </widget>
   <action name="m_pActionAbout">
    <property name="text">
-	<string>&amp;About Synergy...</string>
+    <string>&amp;About Synergy...</string>
    </property>
   </action>
   <action name="m_pActionQuit">
@@ -196,7 +196,7 @@
     <string>&amp;Quit</string>
    </property>
    <property name="statusTip">
-	<string>Quit</string>
+    <string>Quit</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Q</string>
@@ -204,10 +204,10 @@
   </action>
   <action name="m_pActionStartSynergy">
    <property name="text">
-	<string>&amp;Start</string>
+    <string>&amp;Start</string>
    </property>
    <property name="statusTip">
-	<string>Run</string>
+    <string>Run</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+S</string>
@@ -218,10 +218,10 @@
     <bool>false</bool>
    </property>
    <property name="text">
-	<string>S&amp;top</string>
+    <string>S&amp;top</string>
    </property>
    <property name="statusTip">
-	<string>Stop</string>
+    <string>Stop</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+T</string>
@@ -261,7 +261,7 @@
     <string>Settings</string>
    </property>
    <property name="statusTip">
-	<string>Edit settings</string>
+    <string>Edit settings</string>
    </property>
   </action>
   <action name="m_pActionLogOutput">
@@ -269,7 +269,7 @@
     <string>Log output</string>
    </property>
    <property name="statusTip">
-	<string>Open a window with output</string>
+    <string>Open a window with output</string>
    </property>
   </action>
   <action name="m_pActionServices">