From 70fa59a9b55b08e729d90cfb30d72378db2f6cf0 Mon Sep 17 00:00:00 2001
From: ccremers <ccremers@4f7d145f-a0d4-0310-ae10-d96cc04433c1>
Date: Wed, 9 Aug 2006 10:07:57 +0000
Subject: [PATCH] - Improved.

---
 gui/Gui/Mainwindow.py              |   9 ++++-----
 gui/Images/characterize-button.png | Bin 4026 -> 1572 bytes
 gui/Images/characterize-button.svg |  23 ++++++-----------------
 gui/Images/verify-button.png       | Bin 3975 -> 1590 bytes
 gui/Images/verify-button.svg       |  24 ++++++------------------
 5 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/gui/Gui/Mainwindow.py b/gui/Gui/Mainwindow.py
index 4b73c87..550b7ed 100644
--- a/gui/Gui/Mainwindow.py
+++ b/gui/Gui/Mainwindow.py
@@ -115,20 +115,19 @@ class MainWindow(wx.Frame):
         #print "Default toolbar tool size: %s\n" % tb.GetToolBitmapSize()
 
         def getBmp(name):
-            bmp = wx.Bitmap(os.path.join("Images","%s.png" % name),wx.BITMAP_TYPE_PNG)
+            bmp = wx.Image(os.path.join("Images","%s.png" % name),wx.BITMAP_TYPE_PNG).ConvertToBitmap()
             if not bmp.Ok():
-                tsize = (32,32)
-                bmp = wx.EmptyBitmap(tsize)
+                bmp = wx.EmptyBitmap(32,32)
             return bmp
 
         bmpverify = getBmp("verify-button")
         bmpcharacterize = getBmp("characterize-button")
 
         # add the actual tools
-        tb.AddSimpleTool(ID_VERIFY, bmpverify,shortHelpString="Verify")
+        tb.AddSimpleTool(ID_VERIFY, bmpverify,shortHelpString="Verify claims in protocol")
         self.Bind(wx.EVT_TOOL, self.OnVerify, id=ID_VERIFY)
         tb.AddSimpleTool(ID_STATESPACE,
-                bmpcharacterize,shortHelpString="Statespace")
+                bmpcharacterize,shortHelpString="Generate statespace for all roles")
         self.Bind(wx.EVT_TOOL, self.OnStatespace, id=ID_STATESPACE)
 
         # tb.AddSeparator()
diff --git a/gui/Images/characterize-button.png b/gui/Images/characterize-button.png
index 88ac27fe525ac20e0df9f534beb3b7836179444f..a01871c236438b59465c0c1d029a24e816a226fd 100644
GIT binary patch
delta 1537
zcmV+c2LAcFAEXQ+iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPqe+9Nl
zL_t(oh3%JJY#h}U$A9O}tnK}D?Tuq+iLo6!AQUS!aR@d|8z@w$LJc3KB?6*W6@951
zLHp85P|*)jstC2JD#!zfszOj`L)wP&p*|#lN==i9#3@k{6Dv+_#~&Np@!Hv4duQhK
zVP@^!WFyfuQeSeUqcd~v+57*`f1SDib5~TA%QX>E09BRCox@x<`W3RP1g;XeO5p!a
zKq?85h}e<F=xfHZQU*cHVjcmE2!g1y;Pe;~Le+M!2?j+3D|jw3r~%HO%e_1?G4pIC
z0(PZjbu#*7=e7-Z-S*HO)lK0fA!B?OL&#W5_r?$s3)`5UDiQ2p%$BA4f1EqYH^2N;
zn~3aE)$xnKRJF{3re&X9G4`$A@9B6ht)AzV`G0F;**<;y@Kd_7b=e2S6)*L&6%Y}L
zT$9+f@rPe*+}zMZ*2(d2XBZK|l)eH45s;E-F1q(?WA+MKukGN@EnRDOzx2T)!1I@U
z1)*ro)~4>38&@_rlL|L6e>gjYWqd$O3`QuA2$uL@Mg&Xz@1rztiBMa$ibtRLYV5;z
zkN;Ri{-CNe7kz{x5{`EyPi%hfzUD79uBW~_fh7jp2(}piTBIZ=Sf-dO)&wyaU#d6E
zJ83>Xa!4Qj#?HONLsMVU0C;f)s+UK8cip#dO4Zsi&gP~#apV|oe|CY!)&}aA*D=vQ
z!u(vGkXW>>X(k?zGH~!Dt2^6BB*NGt4D=16u1n{-)to*y#M<?%IeM_4o4Rkn7Q^*7
zw92Mi*KGXjpAOy&>|P`wRnpba-Fipenno*=pJRR@%lpr~L9{-~*x?cG{muQn|I2+u
z;x)uR6Gao<xbqG>e;@fRTOa=lo9<rEo6qf~@4e%sS{q0_zJ;GW_B=1V{R6gd`vreH
zvV$sP5i-J$p57WibYS4uBJ!51=8cHh;ilS`uK#X#9j@ZI4h7diRayD@HX_Lg`MG&i
zmD-iHG;}11HAd<0JxSMHYdO~Y365Lfz1I)$ogH6i`!f&Vf4B~rb6Ix1xDNo=b#UAQ
zuIr!*PyFnGRO*_#SHV}ph#jq}7285R4cr5Tk6-?XszeRR_9Up{F1Qr(4(cf<_YY#(
zhW`D7xQ<6*-k~ZS!gD=5R}sJt*#Q9$&-HKv->`ADiNzx~i%5-8)lBwG=9Tfi19|ln
zbv@KoK<WPee`X5j7Z~k313;ucLZUIwY<iaT;3Um!Qq(SwGtxiCbzLp|dFMX%zJ37D
z^@t|I+<E^7fB;+<iM+7$o!s<f=0#P_+W>B6{^{X2j@`3tZK^}7Z7_yZPb*@C8z0`l
z?D#BgpIb$CVvdpN9N|bcn;zOodshn~+hXoqj{COXf6hPt(#P1Tvp6@mbL*CMWTvxh
zdGHp_P0a-gDr6?-_~Y+;2h!=;9gEvgL@W#sF7Ii1w*8*YcqrIjwirTIAgv<UfxOyA
z$|Tno@$=Tw^<v)m+t9BSe)ZGcQ+<a9zXt46RkZ^-c17gfnG@-M&Get`i6tXa+|vb9
zzQ-4Jf5G^qiuzy&1eY{m=^<?6*B$=nCkv-fr*{KKiaJm#L^Z&s#H#vNTW;$}TEXO&
z@rA~^Kya44NKP)OEy;^en0MIo+J`4cN2VSI4yvkKCPb>57m+jBiR_-K<1^c0sao3-
z#S+Dc38Iul<4Z4!C6q~TS;Qyy(ch0|Mn|Tee*}h#;1~4*;EXeue`R`b_V#ewE!Sc!
zFoODx9u@p14~uzA1P$DX;02&wK*AGYbm){bHa@clI1QxB8er*xL_`eG1*SXJ-ud(D
zx+Y7C*g;1G!Gfi3=>HCbsGkeErhus5oTi6QjExWWKL#9C)l-)w5Rg~_tOG2rtYv`x
zSE`yTO;$P+P6owS+9oapuSh^u7l4T?41OLMt~5~bObCnuO+e^VO#W&9UQep(Y^8xq
nor(pB{g0rfR#4UXN(27^pAD6Hn~plB00000NkvXXu0mjf#LV<x

delta 4011
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
RI{*Lx07*qoM6N<$0fHvd%wYfk

diff --git a/gui/Images/characterize-button.svg b/gui/Images/characterize-button.svg
index 46db627..1f23b5c 100644
--- a/gui/Images/characterize-button.svg
+++ b/gui/Images/characterize-button.svg
@@ -14,11 +14,11 @@
    id="svg1307"
    sodipodi:version="0.32"
    inkscape:version="0.43"
-   sodipodi:docbase="/home/cas/svn/scyther/gui/images"
+   sodipodi:docbase="/home/cas/svn/scyther/gui/Images"
    sodipodi:docname="characterize-button.svg"
-   inkscape:export-filename="/home/cas/svn/scyther/gui/images/characterize-button.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-filename="/home/cas/svn/scyther/gui/Images/characterize-button.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
   <defs
      id="defs1309">
     <linearGradient
@@ -105,8 +105,8 @@
      inkscape:pageshadow="2"
      inkscape:zoom="12.296875"
      inkscape:cx="32"
-     inkscape:cy="53.817265"
-     inkscape:current-layer="layer6"
+     inkscape:cy="25.734125"
+     inkscape:current-layer="layer3"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
@@ -219,17 +219,6 @@
      id="layer3"
      inkscape:label="text"
      style="display:inline">
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;opacity:0.35353537;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Monospace"
-       x="31.191406"
-       y="42.815918"
-       id="text4893"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan4895"
-         x="31.191406"
-         y="42.815918">REACH</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Monospace"
diff --git a/gui/Images/verify-button.png b/gui/Images/verify-button.png
index 3b590a36584aa55f020967206c55d7f81d427556..5f79b5b9654ebfcd6f0b7f16f7b13c00b7bc6e45 100644
GIT binary patch
delta 1555
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
FV1gCK@=pK&

delta 3959
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
RfwKSr002ovPDHLkV1f@pyx{-<

diff --git a/gui/Images/verify-button.svg b/gui/Images/verify-button.svg
index 116b6a8..58c01a6 100644
--- a/gui/Images/verify-button.svg
+++ b/gui/Images/verify-button.svg
@@ -14,11 +14,11 @@
    id="svg1307"
    sodipodi:version="0.32"
    inkscape:version="0.43"
-   sodipodi:docbase="/home/cas/svn/scyther/gui/images"
+   sodipodi:docbase="/home/cas/svn/scyther/gui/Images"
    sodipodi:docname="verify-button.svg"
-   inkscape:export-filename="/home/cas/svn/scyther/gui/images/verify-button.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-filename="/home/cas/svn/scyther/gui/Images/verify-button.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
   <defs
      id="defs1309">
     <linearGradient
@@ -104,7 +104,7 @@
      inkscape:zoom="12.296875"
      inkscape:cx="32"
      inkscape:cy="41.18515"
-     inkscape:current-layer="layer7"
+     inkscape:current-layer="layer3"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
@@ -218,19 +218,7 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="text"
-     style="display:inline"
-     sodipodi:insensitive="true">
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;opacity:0.35353537;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Monospace"
-       x="31.191406"
-       y="38.815918"
-       id="text4893"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan4895"
-         x="31.191406"
-         y="38.815918">CLAIM</tspan></text>
+     style="display:inline">
     <text
        xml:space="preserve"
        style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Monospace"