merged 1.4 r902:903 into trunk
This commit is contained in:
parent
2da69a8759
commit
462248a2de
|
@ -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})
|
||||
|
|
|
@ -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
|
|
@ -5,18 +5,25 @@
|
|||
<property name="windowModality">
|
||||
<enum>Qt::ApplicationModal</enum>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>374</width>
|
||||
<height>212</height>
|
||||
</rect>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
<width>400</width>
|
||||
<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/>
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>260</height>
|
||||
<width>445</width>
|
||||
<height>300</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
|
@ -18,14 +18,14 @@
|
|||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>400</width>
|
||||
<height>260</height>
|
||||
<width>445</width>
|
||||
<height>300</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>400</width>
|
||||
<height>260</height>
|
||||
<width>445</width>
|
||||
<height>400</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
Loading…
Reference in New Issue