[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: a46789ca0b36cf4f41bb922ee82d35c4de1b4174
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:20:42 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via a46789ca0b36cf4f41bb922ee82d35c4de1b4174 (commit)
from b5157ce5a1114d85e85505de0acff3d81086fd85 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
{pyhoca/wxgui => _for_later_use_}/images.py | 0
debian/changelog | 34 +++
debian/pyhoca-gui.install | 3 +-
debian/rules | 2 +-
desktop/pyhoca-gui.desktop | 6 +-
icons/PyHoca/128x128/x2go-logo-ubuntu.png | Bin 0 -> 11139 bytes
icons/PyHoca/128x128/x2go-logo-white-bg.png | Bin 14098 -> 3714 bytes
icons/PyHoca/16x16/x2go-logo-ubuntu.png | Bin 0 -> 1118 bytes
icons/PyHoca/16x16/x2go-logo-white-bg.png | Bin 845 -> 547 bytes
icons/PyHoca/22x22/x2go-logo-ubuntu.png | Bin 0 -> 1486 bytes
icons/PyHoca/22x22/x2go-logo-white-bg.png | Bin 1155 -> 653 bytes
icons/PyHoca/32x32/x2go-logo-ubuntu.png | Bin 0 -> 2545 bytes
icons/PyHoca/32x32/x2go-logo-white-bg.png | Bin 2071 -> 985 bytes
icons/PyHoca/48x48/x2go-logo-ubuntu.png | Bin 0 -> 4205 bytes
icons/PyHoca/64x64/x2go-logo-ubuntu.png | Bin 0 -> 5704 bytes
icons/PyHoca/64x64/x2go-logo-white-bg.png | Bin 5467 -> 1872 bytes
icons/PyHoca/scalable/x2go-logo-ubuntu.svg | 358 +++++++++++++++++++++++++++
pyhoca-gui | 5 +-
pyhoca/wxgui/__init__.py | 2 +-
pyhoca/wxgui/frontend.py | 6 +-
pyhoca/wxgui/logon.py | 3 +-
pyhoca/wxgui/notify.py | 1 -
pyhoca/wxgui/taskbar.py | 26 +-
23 files changed, 418 insertions(+), 28 deletions(-)
rename {pyhoca/wxgui => _for_later_use_}/images.py (100%)
create mode 100644 icons/PyHoca/128x128/x2go-logo-ubuntu.png
create mode 100644 icons/PyHoca/16x16/x2go-logo-ubuntu.png
create mode 100644 icons/PyHoca/22x22/x2go-logo-ubuntu.png
create mode 100644 icons/PyHoca/32x32/x2go-logo-ubuntu.png
create mode 100644 icons/PyHoca/48x48/x2go-logo-ubuntu.png
create mode 100644 icons/PyHoca/64x64/x2go-logo-ubuntu.png
create mode 100644 icons/PyHoca/scalable/x2go-logo-ubuntu.svg
The diff of changes is:
diff --git a/pyhoca/wxgui/images.py b/_for_later_use_/images.py
similarity index 100%
rename from pyhoca/wxgui/images.py
rename to _for_later_use_/images.py
diff --git a/debian/changelog b/debian/changelog
index df43898..c4c2636 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+pyhoca-gui (0.0.8-0~nwt1) lucid maverick testing unstable; urgency=low
+
+ * reverting back to pixmaps based desktop icon, but now as .svg...
+
+ -- Mike Gabriel <m.gabriel at das-netzwerkteam.de> Fri, 10 Dec 2010 12:12:00 +0100
+
+pyhoca-gui (0.0.7-0~nwt1) lucid maverick testing unstable; urgency=low
+
+ * still fiddling around with desktop icon...
+ using hicolor folder in /usr/share/icons now
+
+ -- Mike Gabriel <m.gabriel at das-netzwerkteam.de> Fri, 10 Dec 2010 12:10:00 +0100
+
+pyhoca-gui (0.0.6-0~nwt1) lucid maverick testing unstable; urgency=low
+
+ * replacing desktop icon .xpm by .png image
+
+ -- Mike Gabriel <m.gabriel at das-netzwerkteam.de> Fri, 10 Dec 2010 11:52:00 +0100
+
+pyhoca-gui (0.0.5-0~nwt1) lucid maverick testing unstable; urgency=low
+
+ * fixing pixmap desktop icon
+
+ -- Mike Gabriel <m.gabriel at das-netzwerkteam.de> Fri, 10 Dec 2010 11:50:00 +0100
+
+pyhoca-gui (0.0.4-0~nwt1) lucid maverick testing unstable; urgency=low
+
+ * changed handling of icons
+ * added pixmap for PyHocaGUI app menu item
+ * changed systray icon
+ * removed images.py
+
+ -- Mike Gabriel <m.gabriel at das-netzwerkteam.de> Fri, 10 Dec 2010 11:25:00 +0100
+
pyhoca-gui (0.0.3-0~nwt1) lucid maverick testing unstable; urgency=low
* really disabled options and profilemanager menu (bugfix)
diff --git a/debian/pyhoca-gui.install b/debian/pyhoca-gui.install
index cd65fa7..dbc956e 100644
--- a/debian/pyhoca-gui.install
+++ b/debian/pyhoca-gui.install
@@ -1,3 +1,4 @@
pyhoca-gui /usr/bin/
icons/* /usr/share/icons/
-desktop/* /usr/share/applications/
\ No newline at end of file
+desktop/* /usr/share/applications/
+pixmaps/* /usr/share/pixmaps/
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index ecc9871..f699eca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,6 @@ binary-indep:
dh ${@}
clean:
- rm -Rfv debian/pyhoca-cli debian/pyhoca-cli.*.debhelper debian/pyhoca-cli.substvars
+ rm -Rfv debian/pyhoca-gui debian/pyhoca-gui.*.debhelper debian/pyhoca-gui.substvars
rm -Rfv debian/tmp debian/patches
dh ${@}
diff --git a/desktop/pyhoca-gui.desktop b/desktop/pyhoca-gui.desktop
index 89d0c52..0fcee16 100644
--- a/desktop/pyhoca-gui.desktop
+++ b/desktop/pyhoca-gui.desktop
@@ -3,11 +3,11 @@ Name=PyHoca-GUI
GenericName=PyHoca-GUI
Comment=Python X2go Client Applet
Exec=pyhoca-gui
-Icon=x2go-logo-white-bg.png
-X-Window-Icon=x2go
+Icon=pyhoca_x2go-logo-ubuntu
+X-Window-Icon=pyhoca_x2go-logo-ubuntu
X-HildonDesk-ShowInToolbar=true
X-Osso-Type=application/x-executable
Terminal=false
Type=Application
Encoding=UTF-8
-Categories=GNOME;Network
\ No newline at end of file
+Categories=GNOME;KDE;Network
diff --git a/icons/PyHoca/128x128/x2go-logo-ubuntu.png b/icons/PyHoca/128x128/x2go-logo-ubuntu.png
new file mode 100644
index 0000000..7ff0fb7
Binary files /dev/null and b/icons/PyHoca/128x128/x2go-logo-ubuntu.png differ
diff --git a/icons/PyHoca/128x128/x2go-logo-white-bg.png b/icons/PyHoca/128x128/x2go-logo-white-bg.png
index 35c2b28..1542435 100644
Binary files a/icons/PyHoca/128x128/x2go-logo-white-bg.png and b/icons/PyHoca/128x128/x2go-logo-white-bg.png differ
diff --git a/icons/PyHoca/16x16/x2go-logo-ubuntu.png b/icons/PyHoca/16x16/x2go-logo-ubuntu.png
new file mode 100644
index 0000000..63b9ee4
Binary files /dev/null and b/icons/PyHoca/16x16/x2go-logo-ubuntu.png differ
diff --git a/icons/PyHoca/16x16/x2go-logo-white-bg.png b/icons/PyHoca/16x16/x2go-logo-white-bg.png
index 53f100c..5a2df75 100644
Binary files a/icons/PyHoca/16x16/x2go-logo-white-bg.png and b/icons/PyHoca/16x16/x2go-logo-white-bg.png differ
diff --git a/icons/PyHoca/22x22/x2go-logo-ubuntu.png b/icons/PyHoca/22x22/x2go-logo-ubuntu.png
new file mode 100644
index 0000000..fb1ad70
Binary files /dev/null and b/icons/PyHoca/22x22/x2go-logo-ubuntu.png differ
diff --git a/icons/PyHoca/22x22/x2go-logo-white-bg.png b/icons/PyHoca/22x22/x2go-logo-white-bg.png
index 15e1542..7cd46ec 100644
Binary files a/icons/PyHoca/22x22/x2go-logo-white-bg.png and b/icons/PyHoca/22x22/x2go-logo-white-bg.png differ
diff --git a/icons/PyHoca/32x32/x2go-logo-ubuntu.png b/icons/PyHoca/32x32/x2go-logo-ubuntu.png
new file mode 100644
index 0000000..5b7c8e5
Binary files /dev/null and b/icons/PyHoca/32x32/x2go-logo-ubuntu.png differ
diff --git a/icons/PyHoca/32x32/x2go-logo-white-bg.png b/icons/PyHoca/32x32/x2go-logo-white-bg.png
index 67aad3e..6a35c8b 100644
Binary files a/icons/PyHoca/32x32/x2go-logo-white-bg.png and b/icons/PyHoca/32x32/x2go-logo-white-bg.png differ
diff --git a/icons/PyHoca/48x48/x2go-logo-ubuntu.png b/icons/PyHoca/48x48/x2go-logo-ubuntu.png
new file mode 100644
index 0000000..b547c98
Binary files /dev/null and b/icons/PyHoca/48x48/x2go-logo-ubuntu.png differ
diff --git a/icons/PyHoca/64x64/x2go-logo-ubuntu.png b/icons/PyHoca/64x64/x2go-logo-ubuntu.png
new file mode 100644
index 0000000..67fc789
Binary files /dev/null and b/icons/PyHoca/64x64/x2go-logo-ubuntu.png differ
diff --git a/icons/PyHoca/64x64/x2go-logo-white-bg.png b/icons/PyHoca/64x64/x2go-logo-white-bg.png
index 457e0c4..05dcbf0 100644
Binary files a/icons/PyHoca/64x64/x2go-logo-white-bg.png and b/icons/PyHoca/64x64/x2go-logo-white-bg.png differ
diff --git a/icons/PyHoca/scalable/x2go-logo-ubuntu.svg b/icons/PyHoca/scalable/x2go-logo-ubuntu.svg
new file mode 100644
index 0000000..04c15f4
--- /dev/null
+++ b/icons/PyHoca/scalable/x2go-logo-ubuntu.svg
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ width="128"
+ height="128"
+ sodipodi:docname="x2go-logo-ubuntu.svg"
+ sodipodi:docbase="/Users/h1/Documents/Projekte/x2go/x2go"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ version="1.0"
+ inkscape:export-filename="/home/h1/Desktop/x2go-logo.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <metadata
+ id="metadata87">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs85">
+ <linearGradient
+ id="linearGradient3453">
+ <stop
+ style="stop-color:#2b0000;stop-opacity:1;"
+ offset="0"
+ id="stop3455" />
+ <stop
+ id="stop3461"
+ offset="0.5"
+ style="stop-color:#950000;stop-opacity:1;" />
+ <stop
+ style="stop-color:#ffe400;stop-opacity:1;"
+ offset="1"
+ id="stop3457" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 300 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="800 : 300 : 1"
+ inkscape:persp3d-origin="400 : 200 : 1"
+ id="perspective2637" />
+ <linearGradient
+ id="linearGradient4665">
+ <stop
+ style="stop-color:#162d50;stop-opacity:1;"
+ offset="0"
+ id="stop4667" />
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="1"
+ id="stop4669" />
+ </linearGradient>
+ <filter
+ inkscape:collect="always"
+ x="-0.20268817"
+ width="1.4053763"
+ y="-0.4560484"
+ height="1.9120969"
+ id="filter3580">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="15.201613"
+ id="feGaussianBlur3582" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ id="filter4659">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.82806857"
+ id="feGaussianBlur4661" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4665"
+ id="linearGradient4671"
+ x1="400"
+ y1="100"
+ x2="400"
+ y2="0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="scale(1,1.1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3453"
+ id="linearGradient3459"
+ x1="0"
+ y1="3"
+ x2="0"
+ y2="128"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-height="816"
+ inkscape:window-width="1503"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10000"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="true"
+ inkscape:object-nodes="true"
+ inkscape:grid-points="true"
+ inkscape:guide-points="true"
+ width="800px"
+ height="600px"
+ inkscape:zoom="4.625"
+ inkscape:cx="37.664865"
+ inkscape:cy="66.782471"
+ inkscape:window-x="0"
+ inkscape:window-y="22"
+ inkscape:current-layer="svg2"
+ units="mm"
+ showguides="true"
+ inkscape:guide-bbox="true">
+ <sodipodi:guide
+ orientation="vertical"
+ position="100"
+ id="guide2393" />
+ <sodipodi:guide
+ orientation="vertical"
+ position="700"
+ id="guide2395" />
+ <inkscape:grid
+ id="GridFromPre046Settings"
+ type="xygrid"
+ originx="0px"
+ originy="0px"
+ spacingx="1px"
+ spacingy="1px"
+ color="#0000ff"
+ empcolor="#0000ff"
+ opacity="0.2"
+ empopacity="0.4"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ dotted="true" />
+ </sodipodi:namedview>
+ <rect
+ style="fill:url(#linearGradient3459);fill-opacity:1;opacity:0.5"
+ id="rect2681"
+ width="128"
+ height="128"
+ x="0"
+ y="-7.1054274e-15"
+ ry="10.162162" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.11693546;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1;filter:url(#filter3580)"
+ id="path2397"
+ sodipodi:cx="410"
+ sodipodi:cy="150"
+ sodipodi:rx="90"
+ sodipodi:ry="40"
+ d="M 500,150 A 90,40 0 1 1 320,150 A 90,40 0 1 1 500,150 z"
+ transform="matrix(0.888889,0,0,0.75,-224.4445,38.25)" />
+ <g
+ style="fill:#ffffff"
+ id="g4"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 90,977.626 L 103.32,951.85 C 104.256,949.33 104.688,947.53 104.688,946.594 C 104.688,945.082 104.184,943.93 103.248,943.282 C 102.24,942.562 100.512,942.202 98.064,942.202 L 98.064,939.826 L 120.168,939.826 L 120.168,942.202 C 117.144,942.202 114.984,942.85 113.472,944.146 C 111.96,945.442 109.872,948.898 106.992,954.514 L 92.376,982.954 L 110.808,1024.498 C 112.68,1028.386 114.336,1031.122 115.776,1032.634 C 117.216,1034.074 118.944,1034.866 120.888,1034.866 L 120.888,1037.17 L 94.536,1037.17 L 94.536,1034.866 C 96.912,1034.866 98.568,1034.578 99.576,1033.93 C 100.584,1033.354 101.088,1032.346 101.088,1031.05 C 101.088,1029.826 100.368,1027.666 99.072,1024.498 L 86.112,995.482 L 71.28,1024.498 C 69.912,1026.946 69.192,1028.962 69.192,1030.474 C 69.192,1033.426 71.352,1034.866 75.672,1034.866 L 75.672,1037.17 L 55.728,1037.17 L 55.728,1034.866 C 57.672,1034.866 59.4,1034.218 60.84,1032.994 C 62.28,1031.77 63.792,1029.682 65.232,1026.586 L 83.736,990.01 L 67.248,9
52.498 C
65.52,948.466 63.936,945.802 62.424,944.362 C 60.84,942.922 58.608,942.202 55.728,942.202 L 55.728,939.826 L 84.024,939.826 L 84.024,942.202 C 79.632,942.202 77.4,943.714 77.4,946.738 C 77.4,948.25 77.832,949.978 78.696,951.85 L 90,977.626 z"
+ id="path6" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g8"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,940.474 L 50.976,939.25 L 50.976,941.698 L 6.984,940.474 z"
+ id="path10" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g12"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,946.45 L 50.976,945.298 L 50.976,946.954 L 56.16,947.026 L 56.52,947.026 L 56.808,947.026 L 57.096,947.098 L 57.384,947.098 L 57.672,947.17 L 57.888,947.242 L 58.104,947.314 L 58.32,947.386 L 58.464,947.458 L 58.608,947.53 L 58.752,947.602 L 58.896,947.674 L 58.968,947.746 L 59.112,947.818 L 59.112,947.89 L 59.184,947.89 L 6.984,946.45 z"
+ id="path14" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g16"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,952.498 L 61.272,950.986 L 61.488,951.346 L 61.776,951.922 L 62.064,952.498 L 62.352,953.146 L 62.64,953.794 L 62.784,954.01 L 6.984,952.498 z"
+ id="path18" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g20"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,958.474 L 63.936,956.89 L 65.376,960.058 L 6.984,958.474 z"
+ id="path22" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g24"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,964.45 L 66.528,962.866 L 67.968,966.106 L 6.984,964.45 z"
+ id="path26" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g28"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,970.498 L 69.12,968.77 L 70.632,972.226 L 6.984,970.498 z"
+ id="path30" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g32"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,976.474 L 71.712,974.674 L 73.296,978.274 L 6.984,976.474 z"
+ id="path34" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g36"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,982.45 L 74.304,980.65 L 75.96,984.322 L 6.984,982.45 z"
+ id="path38" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g40"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,988.426 L 76.896,986.554 L 78.408,989.866 L 78.192,990.37 L 6.984,988.426 z"
+ id="path42" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g44"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,994.402 L 77.112,992.458 L 75.168,996.274 L 6.984,994.402 z"
+ id="path46" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g48"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,1000.378 L 74.016,998.578 L 72.216,1002.178 L 6.984,1000.378 z"
+ id="path50" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g52"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,1006.354 L 70.92,1004.626 L 69.192,1008.082 L 6.984,1006.354 z"
+ id="path54" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g56"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,1012.402 L 67.896,1010.746 L 66.168,1013.986 L 6.984,1012.402 z"
+ id="path58" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g60"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,1036.378 L 50.976,1035.154 L 50.976,1037.602 L 6.984,1036.378 z"
+ id="path62" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g64"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,1030.402 L 58.104,1028.962 L 58.032,1029.106 L 57.888,1029.178 L 57.744,1029.322 L 57.6,1029.394 L 57.528,1029.538 L 57.384,1029.61 L 57.312,1029.682 L 57.168,1029.682 L 57.024,1029.754 L 56.952,1029.826 L 56.808,1029.898 L 56.736,1029.898 L 56.592,1029.97 L 56.448,1029.97 L 56.376,1029.97 L 56.232,1030.042 L 56.088,1030.042 L 55.944,1030.042 L 50.976,1030.114 L 50.976,1031.554 L 6.984,1030.402 z"
+ id="path66" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g68"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,1024.354 L 61.776,1022.914 L 60.984,1024.498 L 60.696,1025.002 L 60.48,1025.506 L 60.264,1025.866 L 6.984,1024.354 z"
+ id="path70" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g72"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 6.984,1018.378 L 64.8,1016.794 L 63.288,1019.89 L 6.984,1018.378 z"
+ id="path74" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g76"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 63.936,924.49 L 118.872,924.49 C 123.84,924.49 127.872,928.522 127.872,933.49 L 127.872,1043.362 C 127.872,1048.33 123.84,1052.362 118.872,1052.362 L 63.936,1052.362 L 63.936,1050.418 L 117.864,1050.418 C 122.256,1050.418 125.856,1046.818 125.856,1042.426 L 125.856,934.498 C 125.856,930.106 122.256,926.506 117.864,926.506 L 63.936,926.506 L 63.936,924.49 z"
+ id="path78" />
+ </g>
+ <g
+ style="fill:#ffffff"
+ id="g80"
+ transform="matrix(1.001001,0,0,1.001001,0,-925.41541)">
+ <path
+ style="fill:#ffffff"
+ d="M 9,924.49 L 63.936,924.49 L 63.936,926.506 L 9.936,926.506 C 5.544,926.506 1.944,930.106 1.944,934.498 L 1.944,1042.426 C 1.944,1046.818 5.544,1050.418 9.936,1050.418 L 63.936,1050.418 L 63.936,1052.362 L 9,1052.362 C 4.032,1052.362 0,1048.33 0,1043.362 L 0,933.49 C 0,928.522 4.032,924.49 9,924.49 z"
+ id="path82" />
+ </g>
+</svg>
diff --git a/pyhoca-gui b/pyhoca-gui
index cad029f..6d47364 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -50,7 +50,8 @@ from pyhoca.wxgui import PyHocaGUI
# version information
PROG_NAME = os.path.basename(sys.argv[0])
PROG_PID = os.getpid()
-VERSION="0.0.1"
+from pyhoca.wxgui import __VERSION__ as _version
+VERSION=_version
VERSION_TEXT="""
%s[%s] - an X2go GUI client written in Python
----------------------------------------------------------------------
@@ -62,7 +63,7 @@ VERSION: %s
""" % (PROG_NAME, PROG_PID, VERSION)
__author__ = "Dick J. Kniep, Mike Gabriel"
-__version__ = "0.0.1"
+__version__ = _version
# debug options...
debug_options = [
diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py
index 576689c..6660f64 100644
--- a/pyhoca/wxgui/__init__.py
+++ b/pyhoca/wxgui/__init__.py
@@ -18,6 +18,6 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-__VERSION__ = '0.0.1'
+__VERSION__ = '0.0.4'
from frontend import *
\ No newline at end of file
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index d19ad01..9dced30 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -47,13 +47,9 @@ import threading
# PyHoca-GUI modules
import logon
import taskbar
-#import chooser
-#import menus_chooser
import menus_taskbar
import profilemanager
-import images
import notify
-#import messages
try:
from agw import knobctrl as KC
@@ -115,7 +111,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
STILL UNDOCUMENTED
"""
- gevent.sleep(.02)
+ gevent.sleep(.04)
evt.RequestMore()
return True
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index dd7c366..d81a926 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -44,8 +44,7 @@ import copy
import threading
# PyHoca-GUI modules
-import images
-#from messages import Message
+# ... NONE ...
try:
from agw import knobctrl as KC
diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py
index aa299bf..0b6ecac 100644
--- a/pyhoca/wxgui/notify.py
+++ b/pyhoca/wxgui/notify.py
@@ -20,7 +20,6 @@
import os
import wx, time, webbrowser
-import images
from x2go import X2GOCLIENT_OS
from x2go import log
if X2GOCLIENT_OS in ('Linux', 'Mac'):
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index 11f48b6..925d021 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -39,18 +39,19 @@ import wx.lib.mixins.listctrl as listmix
if x2go.X2GOCLIENT_OS == 'Windows':
import win32gui
-import time
+import os
import sys
-import platform
-import types
import copy
-import threading
# PyHoca-GUI modules
import menus_taskbar
import profilemanager
-import images
-#from messages import Message
+
+if os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1':
+ _icons_location = '/%s/icons' % os.path.abspath(os.path.curdir)
+else:
+ _icons_location = '/usr/share/icons'
+
try:
from agw import knobctrl as KC
@@ -84,11 +85,11 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
self.tooltip = ""
def SetIconConnecting(self, profile_name):
- self.icon = self.MakeIcon(images.getx2goclientImage())
+ self.icon = self.MakeIcon(icon_name='x2go-logo-ubuntu')
self.SetIcon(self.icon, "PyHoca-GUI (Python X2goClient)\nCurrently connecting you to remote X2go server ,,%s\'\'" % profile_name)
def SetIconIdle(self):
- self.icon = self.MakeIcon(images.getx2goclientImage())
+ self.icon = self.MakeIcon(icon_name='x2go-logo-ubuntu')
self.SetIcon(self.icon, "PyHoca-GUI (Python X2goClient)\nClient for connecting you to a remote X2go server")
def CreateSessionManagerPopupMenu(self, evt):
@@ -112,16 +113,17 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
self.menu_optionsmanager = menus_taskbar.PyHocaGUI_Menu_TaskbarOptionsManager(self._PyHocaGUI, caller=self)
return self.menu_optionsmanager
- def MakeIcon(self, img):
+ def MakeIcon(self, icon_name):
"""\
The various platforms have different requirements for the
icon size...
"""
if "wxMSW" in wx.PlatformInfo:
- img = img.Scale(16, 16)
+ img = wx.Image('%s/PyHoca/16x16/%s.png' % (_icons_location, icon_name))
elif "wxGTK" in wx.PlatformInfo:
- img = img.Scale(22, 22)
- # wxMac can be any size upto 128x128, so leave the source img alone....
+ img = wx.Image('%s/PyHoca/22x22/%s.png' % (_icons_location, icon_name))
+ elif "wxMAC" in wx.PlatformInfo:
+ img = wx.Image('%s/PyHoca/128x128/%s.png' % (_icons_location, icon_name))
icon = wx.IconFromBitmap(img.ConvertToBitmap() )
return icon
hooks/post-receive
--
pyhoca-gui.git (Python X2Go Client (wxPython GUI))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).
More information about the x2go-commits
mailing list