From f5d66ae6fd7f498fc32dcfd08de067924590c2cb Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@synergy-project.org>
Date: Sat, 28 Jul 2012 21:07:33 +0000
Subject: [PATCH] added logo, license info, and website url to about screen.

---
 src/gui/res/AboutDialogBase.ui | 122 ++++++++++++++++++++-------------
 src/gui/res/Synergy.qrc        |   1 +
 src/gui/res/image/about.png    | Bin 0 -> 4941 bytes
 3 files changed, 75 insertions(+), 48 deletions(-)
 create mode 100644 src/gui/res/image/about.png

diff --git a/src/gui/res/AboutDialogBase.ui b/src/gui/res/AboutDialogBase.ui
index 875e1bba..a7829abc 100644
--- a/src/gui/res/AboutDialogBase.ui
+++ b/src/gui/res/AboutDialogBase.ui
@@ -13,7 +13,7 @@
     <x>0</x>
     <y>0</y>
     <width>450</width>
-    <height>200</height>
+    <height>270</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -25,13 +25,13 @@
   <property name="minimumSize">
    <size>
     <width>450</width>
-    <height>200</height>
+    <height>270</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>502</width>
-    <height>200</height>
+    <width>450</width>
+    <height>270</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -41,26 +41,7 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout">
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <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&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>
-     </property>
-     <property name="openExternalLinks">
-      <bool>true</bool>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2">
+   <item row="2" column="1" colspan="2">
     <widget class="QLabel" name="label_3">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -70,35 +51,65 @@ p, li { white-space: pre-wrap; }
      </property>
      <property name="text">
       <string>&lt;p&gt;
-Keyboard and mouse sharing sharing application.&lt;br /&gt;&lt;br /&gt;
+Keyboard and mouse sharing application. Cross platform and open source.&lt;br /&gt;&lt;br /&gt;
 Copyright © 2001-2012 Chris Schoeneman, Nick Bolton, Volker Lanz, Sorin Sbarnea.&lt;br /&gt;&lt;br /&gt;
+Synergy is released under the GNU General Public License (GPLv2).&lt;br /&gt;&lt;br /&gt;
 Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.&lt;br /&gt;
-The Synergy GUI is based on QSynergy by Volker Lanz.
+The Synergy GUI is based on QSynergy by Volker Lanz.&lt;br /&gt;&lt;br /&gt;
+Visit our website for help and info: &lt;a href=&quot;http://synergy-foss.org&quot;&gt;synergy-foss.org&lt;/a&gt;
 &lt;/p&gt;</string>
      </property>
+     <property name="margin">
+      <number>1</number>
+     </property>
     </widget>
    </item>
-   <item row="8" column="0">
+   <item row="3" column="1" colspan="2">
     <spacer>
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Preferred</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>131</width>
-       <height>20</height>
+       <width>20</width>
+       <height>100</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="8" column="1">
-    <widget class="QPushButton" name="buttonOk">
+   <item row="0" column="1">
+    <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>&amp;Ok</string>
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="Synergy.qrc">:/res/image/about.png</pixmap>
+     </property>
+     <property name="margin">
+      <number>0</number>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
+   <item row="1" column="1" colspan="2">
+    <spacer name="spacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>5</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="1" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label">
@@ -111,6 +122,9 @@ The Synergy GUI is based on QSynergy by Volker Lanz.
        <property name="text">
         <string>Version:</string>
        </property>
+       <property name="margin">
+        <number>1</number>
+       </property>
       </widget>
      </item>
      <item>
@@ -124,26 +138,38 @@ The Synergy GUI is based on QSynergy by Volker Lanz.
        <property name="text">
         <string>Unknown</string>
        </property>
+       <property name="margin">
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="buttonOk">
+       <property name="text">
+        <string>&amp;Ok</string>
+       </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="2" column="1">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>78</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="Synergy.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonOk</sender>
diff --git a/src/gui/res/Synergy.qrc b/src/gui/res/Synergy.qrc
index ef0a5c75..36bcb63c 100644
--- a/src/gui/res/Synergy.qrc
+++ b/src/gui/res/Synergy.qrc
@@ -6,5 +6,6 @@
         <file>icons/64x64/user-trash.png</file>
         <file>icons/16x16/warning.png</file>
         <file>icons/256x256/synergy.ico</file>
+        <file>image/about.png</file>
     </qresource>
 </RCC>
diff --git a/src/gui/res/image/about.png b/src/gui/res/image/about.png
new file mode 100644
index 0000000000000000000000000000000000000000..4630bd32a5d36f7588a3d8b4bbf9b8706e80adec
GIT binary patch
literal 4941
zcmV-T6SC}yP)<h;3K|Lk000e1NJLTq0052v001Ni1^@s6UwQ(70000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU^?@2^KRCwC#TzPODReJyWoavscXEcW-
zOEZ!zOR_9mGRTLpvB$@P4F=0B1{N^bgjABPt*ppDNmaHAk*Z{?l5FrU)Mm5PE@GE#
zHdziCSOccO@_|`{!7?^JBwLatTh=w2`|O_Xyq0=Udv<0tlC2F8J=Iq;)5q&K@BQBQ
z{eJI#Bg|khLVAgW0<h!pzk}5q?t|c1ADlb$DU?+&2cv<5lgHnK1<q=$u5rD^%-Jl%
zgIz^yRxCDgMv=XA^?az~<HJ5uufLiU1%G68#4Doul7a*j%RqEw6pG5q;lLaFq5F6z
z(CC;XNsz7d_w>Vj`Dzw2pNlXI1A$LKEE=|zRV`mxT3WKH$Yxk=w;2~zSFEy<xCk-9
z2O8D@t5>a;e4)V5==kUbJ{CWg;A0<%zTk0?w4wR#{(l4<NfIFx@UVr>>PM|s?vdJ>
zs@qIDAT{VtgcrbZ0Gh-A$5_x(g<$35Sj>_v3OUM(h89%1`$q<!y4=_O0gj8mmIUDy
z*#XUW`!^goqL>7o-n@GA&X#8?Dr+}ejDSmM*!=-?4xJZdU?DS55&}>Zx&zn16ApqF
zp-E3tpd~cmw3aYhjp6Qd1D7_DrLYr|q#vO0bRMMn&i{r12Ln-(c}W6rf_O|{vF1md
zQD;r?09Qr<g(QHu3>X3#x|>2)&Z3G40S*QNaAN2x(D691s1g&Z$3fFz*D_$|?ApF0
z_U%3)SkGuQe}SUk2a+htad3VVzK*~V<-wZ@Oc0MnL93y`Y+dj@eM#d#$Kn_>I0g_#
zz!6Yb(jbtqdgNtv$k3}^15ixkKoKS=Aq$}k0Vxy=!ALL&g9u3HM!i7C;$SC9up$8Y
zqf(`F>z)6lW!S&`<lTd>13FGp<orl{%?joyELM?V986{_G_Gsjv*v-PpC9o68%Y50
z(j-{SW&o23pwNOqgB(R<WDu#Yp+wa0Nr(ww(gRU^%)l~ni<u1S4bT^i!1(AWh~wiB
zAM*enjer@2Fg}@tI;U-P?9icI{TF)P^^JQc2zYwwxzIB|LSI#nW3f6WeGLjN1cAf1
zwm-RU;q80=_0k})$WZ`JPJ+dZz+yvIiq!k~#WVcDV;}VRN3VRrFk}zIXvYYWNFeg7
zCBs2SoaYyEwt^*1jkmZ4oF(`<l9&Jn@A1Hh-wy;Y!13-YHuvU@KS$o}j+4hey+9De
z{AhfwLRB*PrFx<$#$2*=+rRXVX)P$)0FA<s4uvK?@-~IY+gOq0KK4JqyXd)k{=o9(
zOW(hxdDjJ-%{I=m`WQiyq96!lI26_n4GvmQp7^Bp^EcnQqqx$wsi1L1=_lwJ0R$Kj
z1mFW9h)3gaqHow)<8=N|I{fiY3CCxww%l&F`ePZg-O6j3>UbZr4rJ}feDgzolYpZ)
znI{NwA|8e<JOAdd!gT3Mp9g`40>pKYA>i1Nr_uSZhzIxo@;zs<<=4Af{`z>S(>aXp
zi^8P9`jRN=^?KY<=onqvP~Y2ospsTd?XUe|;N5qhSh;rX%3~G|f+$=O@dQXo0Y=9I
z;BXb*UALz3J7<rdd|AUXGJ<FN9XMorkv*Q}{CeeF3PAJaW&kIG<g-kWO`N5~Uj3~<
z?-`dB63CntC>p?syp1kACLMpL?aei->VC5A-W{JKzyuUEE@o2k$Pze?3kw%j_I|hJ
zDetSl{qNxuhmSs0-?VbwM+^(ea0D<pGzm%Q_XX+2W#vyYonO43h$q6Byf8E~(8yq@
zS3dg{&(f!SZjc=lGSmD}-(=wQbe};=DgnE``;R*#xWy?)6B3P`Jg%~tsU%!D`uefP
zhRWx*-Fx3>=$;5NURlD)xeSCXPEnNifkz%b#=qExeSY=}uH03z?3~v-0UUzBAP@>e
z%vH3qsIvTy&klb0I>l(gAMoef{@p6jyrg{2cHMlKx`_oZEvp5mvs_zLwf3$+6v-+{
zSz1A+)1oQd``M6z3j7Rtno|mB5_y0|U1aYQy#G57ePk7|UlawsejOrCqWl2)ae@dV
zkvO9(Dc<6$E+-c)T?{Y(>OUteADW}`G`n+L*M_Wfez<R<$9eqWX6PUERRLRAjU3OH
z>v1wNbeIUk-ACSf_`XetX<8Fi!qaR@oMG9Z`}Pe7UViV5&GzDwd;I7LI7~jzABuvR
zVH%rOHQB9Z>)`f#w&z=KgNgwEUllbO@0&qeI92<7vj8@yJhwAP-*C$N&YSIVaV;f5
zQE7FpKo;0}e!|gAtQ^ZcCp^~UH!;FnOX`++6i*}0@;NdN`NfNC2RNL5TN@4vviuei
z5te0o1Su?D!z^TUdRJkAV<z>c2B|(xN#z2Xq}bkRuI*H=>r49{vb8F8$^5Dp*+Ip6
zm1EpAZIG|=s_r|f3~Wn|{!2Z#O!1&z<-XRmYg?7NPO9qnD)(@zy4<QTo;tQWkN%dg
zYsar%8H6OxmP?pUgB1CMsF4-AyqN1B?(QmCP<RT36nU57Mm8tqhb0*u8!5KgKb5@W
z{WNknQgZTvGCAjQ!W2rxOCNmjp_$a%p7y>W4=`L--ZxL<MN-^pZ;ruVuY}1{X)3N`
z8qlm)h1k@+GJ$_K4?wr&P>}Mur&VI$va0^a)A~!@Z~i>`L_X(A-Gkrm-h>pD*->Dk
z!D^6@iBO;u!EOWydiuJI2IGhV8u13bn?%vHq-WSZDjMxCx7wh{Y=M%30w}Rqz;3nz
zS70fQgu|)p^V!7OtLm6~)ePjOxd)U^XvjgP)q{~<Qn7T0D&&->wWT?W0yHTDwIR#B
z-&c8qOzm2)0Ahz?DUi0P0Ch^KvrJY0J{4fq#is()_8gwOSq1hseA%*FC>=9usCITj
zjq^BEmwp6Q&JWS+Ifw_(4r3S|ogo>{s<Qln0K9eJK)BH82(GAXfEAU?pb@>Uu4;hg
z6?LH3nz*DS%1g*I(d2HWQ&Qz=#ieEgkb2g&Oaq*ka&Uv@w7UAzz~asTSd;2pN7}t^
z)y&TpGGwqnqYQ4lVjZdwmGUy~v=EzW+o@?LQ#P-|sg6%fBwR=Wg_D<XApZkI>L(zO
z&x1gqSK>LK*e>GD_kM!~gF(n<@kA7oQUa1<a$*lER|$keaOQj$78NuQ6)g}JIEW-o
z5JB&G$pi$c!3a{`<bauMnfsJ4wMP|(ObUQHGYnv#3TVw)fauEMZBjG3BMS$(oJQQ!
z2jrzJgjPNCvw0kU22KNMYgMf|z}}i8grCX*+GbV#6CfjLn!!XN8V$uhgFwOuaYT@1
z07yX-ILfRg|MdOWh!>uJMZ9hk5|eq*1Z{!8|F?T#$3vTdkJLfWH62tqilCUKAmsO6
z@1_u!`G>vFLB--)7U!&%t|31J15w1K2*9)=;DiJVaXg}9SYnoZs!g%oN(Z?VJE(xF
zE$!OvN@t{dj@_!6+mQ#i$^;%)25w_g@u$`t+zK+>uO8rB%M#PIt#g|GdsZbh`ZDy%
zq117b)v~})Rxh5UB?_0Ygfz)z1Cb!uoP|pb2F4JNC&tyliG&hhG%>Jjr335>7~pwf
zB6nDe81=`Ohv3L-zk&TP{Tv92mUDWhBphPj<<&Js3%Bj5zU+x2RV6|a!+|C#ASGVp
z^sEo@pc_rlX;V6{RpASAc@eJPa%fk8;mQD<=4rgmYzmh~p4ZQ^o{l^{@N_CP7jQr|
z`BGqBpWY{=(PR*{guP!9xCqOR>k=q-iE^@5lm|y4U)kiYXgc%h;O}vKYCLN<7emd`
zVpy}a7z|b|x;6>4f)5hML95lkstudr!l{!Gjf5vtCJ?aXzv8O8rZ{D^^6^p7pqmJq
z1lFJhT_P}6V9<?_@;=9u5}R#FN!v~ZG$}Xj&Y(b=(`J@w4uF#$=Dv!n*ghqUKAr}g
z>qzmJPJq=>U^Y5?q-cSML4&3tF(A=E%Yz+=591rZUAiY46(A8umJlEw6QFik5mYa;
z!`N^b_(U>e5?}d}x(TpEf&qvkZW9XnfubpW^}0JBy*3^O0+$e{A%N7-U}R}v<H0LM
zHv1KlqC~iPdC6_6*xiufT#66vPV1z7bGWFuR{`*JHW$U6M}MU&&X!CQiIn+@!(K9Q
zwaamybDEtA%@E=*I3m0x1d%i@stn)t(4XDf+<Vd29tcFBX`K_2hzG?Gm>6UB7DPi~
zu$7d;+Pm(B!QO5V5;1Ttxn)<xP`V~KfV_<cg(ocu8Uq6sA_=;9=(MA#XjqZ`bCHp3
z%HXySDQ>t~2?N{b$lG+J4PM(Ec#CXmFB6B#)y`B1->tOMm1#Xomc7Y^m9B9yQgQ^3
z777N20-Xl&4g#N$Hs07(=GLw34^3uWmApWxH)%3v>;3VnjRZI;hasb!B?iS6mAAPz
z-rw3Y<OPzFJq?9an+8lq9T-C+KAVm{YIivNGxRnsdCahS6|u`U!?vf9;`TWTQK^9~
z%aaey2AC~5>TS)_Bc|Hfl1_@%z!8ilUCdcrcl27f?OcK00R{~qBT(2PAsUN8km{}3
z^iaVs40@&_9+_DbiG_ktSn67__}(X8JU_<U<!uI9OMynO0gZ`;5(WoqsP9B|Rn-ZN
zmf>f((D<zKg<3L%qK33t(w+r4e%1QVTymRMmFH{E5H>gkyt4_BovMkkUbVfT_B0(i
z)LJIR=*lG&aAlwpO}DMS<iEDywdlAjZsQDKW^pi~P@<zK@cVthn|jvXxu@VYq^6qr
zn3#vdks#*x;`XwNC(5=w_R85Yu__vmfd+Xr#>j$((?Oxx2;6ADk0apKy88MnFqy6~
z(-mr$0-%#HwdW!!pVcWBd#8!(Fvq}YSK5(USw5%?cn3`FUA+ji&mC$}O#*e|nryww
zGk=^%J?eEXQ#vVD14k|i<aPWj8aKXu;sZkmOD+Pdk%j^t0US$#5ve4P#|x5Wpx(T6
z<X6kwhTlp_X(OW0T4c)K<WBcQ6q6*Q&Sctt=l6c_X4JLf-!BFvr|h{{ofcRG7_C_c
zoW%$WAqIhSpZ$K#+O<bD8m*kNG1J}mXH*MrnTmYwDagHfrv}tqlH!zVdqy?D^=a}v
z)n1sT*Kx!3dta%#{mOG&^Q^0Fx`~wfU5Y%*V@*wsm%6(y{_?~9hn*XnD;E>QMW6@_
zXcC2!C<Za4pu&X5K<a`I>Z^?RFodZq8mB*{@JO#H@riIk)C5AY>cUl9ZVgHF!f^qk
z`4~U(Yfpw_fI&o<GBSuK8DI$thok%Vf7DP@_448+O9o-)c|Ixk-wIQy4P~lXlW(d*
z*$li*K5I<wJlpJssnmx~rOll;@Z1!58dR1FQK__weAOD4Wn%piaO5Ho1RlEYzHJ}A
z@WSv<kG%cG-)`8ps6<2d02Ag>$RdzDM{-<{y$cICMzb+UG$i<u1|W5SNjwaMFc^-~
zh!i7vja&~-ir_=?o}zKk>KP#QS}-EeR1*Lr@BHqIVx#V-cW%8)4k_Uql;C|g;3?*s
z6z3we9dlH7XBH4P<hdBwq9XJeuTyU(PNaI8IHTvW$9BEx>95#(;1yFJL)1Z`g#)_*
zgA$~u9C``#8Xr<#Q7B;bP;6R=j@LuEr5x%?Y*1co1_Q@JR6{~QR!&wun2IdG*o;tG
zWQ95@2K}$TblQwdKYH+yN8i_IH2zt7o10O}U}{IX4Zhih%Lfo?N;GSV2bSUAjL2Z3
zM~262ZEY`a3B*o6dB+aTt)=C|L?m(r;_@OOVj@w22VRgs!cgd;*8(o>gcF_uI2}aC
zkz*y1Dx(o_a0(G@trjX68i?+*{MmQjI8syL`q{&~9y_Gh>;1DN#FO99eZ%Wy?TQrl
zD<Jwh=Oyn|yiBH_0hKAoQ-Ii$WumB)|1alSHo&s{e;OG)WGEEj_U+q$%O5^||Ng2v
ze#>nehy`ZrC?v&kWHAtuJcx4A7rp`U;V0l&kb_ga2y%8GO%lK&v!jZ%g9Fm#Bk%VF
z1~0$8dDG@s?%2BZbBdxuF!g^6;7<sgy-EkURr2&Hm_C8(t6n-(B>NCdWg<4f^?PHP
zlKMMfDzzikCp&V5ZY;+?Ho_DRq&;`8t9akOx0)^woY~@91S@MB$OXlv37XYKfTjgt
z=-UAkAArvzI=B$wflS1K3i=^&tv@<=`eeWV%D~aOB})!$-FEkhva)h{bvTt#cthc7
zmcZ#q>&PGHv5@$6D6Oiss7%GLOpZ*-Dt#RGOc%Oy0Vh=m#n@Awr;86CIkvc`r)#;0
z`D<BYvczP<ID^5V#qm-+9K%Jg&mT#I0-ks%*srCjvo$p}o$J=S&sHv4G%71M$o_k*
zKNWCxt6Xq9e6xQ2z-3vPPOTT^lc&>`kI={mIO^~vdm(yk)T8U|?Ju}`^;&^ve4Gmg
zy?Qa3AZUsd40?UgX0v%qU1eiVr_*QRxUd428}=~s<*QTvSAYQkmSi5mNaD5k00000
LNkvXXu0mjfO~zre

literal 0
HcmV?d00001