[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 3c1a3a4698d7e3eb1f8260289628808c6b8b65aa

[X2Go dev team]

The branch, twofactorauth has been updated
       via  3c1a3a4698d7e3eb1f8260289628808c6b8b65aa (commit)
      from  00eb8532ef893c3d853a4a0f787e108de2a4957c (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:
 debian/changelog          |   14 ++++++++++++++
 debian/control            |    4 ++--
 debian/pyhoca-gui.dirs    |    1 -
 debian/pyhoca-gui.install |    2 +-
 img/pyhoca-about-logo.png |  Bin 53243 -> 57520 bytes
 img/pyhoca-about-logo.xcf |  Bin 0 -> 207672 bytes
 img/pyhoca-splash.png     |  Bin 53243 -> 49098 bytes
 pyhoca/wxgui/__init__.py  |    2 +-
 pyhoca/wxgui/about.py     |    2 +-
 pyhoca/wxgui/basepath.py  |    2 +-
 pyhoca/wxgui/frontend.py  |    3 ++-
 11 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 img/pyhoca-about-logo.xcf

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3859be4..6740939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+pyhoca-gui (0.0.13-0~nwt3) lucid maverick testing unstable; urgency=low
+
+  * fixing image path
+
+ -- Mike Gabriel <m.gabriel at das-netzwerkteam.de>  Tue, 14 Dec 2010 16:21:00 +0100
+
+pyhoca-gui (0.0.13-0~nwt1) lucid maverick testing unstable; urgency=low
+
+  * added splash screen
+  * added ,,About...'' window
+  * added new artwork from Heinz-M. Graesing
+
+ -- Mike Gabriel <m.gabriel at das-netzwerkteam.de>  Tue, 14 Dec 2010 16:15:00 +0100
+
 pyhoca-gui (0.0.12-0~nwt1) lucid maverick testing unstable; urgency=low
 
   * added MS remote desktop (RDP) support
diff --git a/debian/control b/debian/control
index ca5e781..5b240ac 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,11 @@ Maintainer: Mike Gabriel <m.gabriel at das-netzwerkteam.de>
 Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
 Standards-Version: 3.9.0
 Homepage: http://das-netzwerkteam.de/site/?q=node/71
-XS-Python-Version: all
+XS-Python-Version: >= 2.6
 
 Package: pyhoca-gui
 Architecture: all
-Depends: ${misc:Depends}, python, python-x2go (>=0.0.23-0~nwt1), python-argparse, python-notify, 
+Depends: ${misc:Depends}, python, python-x2go (>=0.0.24-0~nwt1), python-argparse, python-notify, 
     wx-common(>=2.8.10.0), python-wxtools (>=2.8.10.0)
 Description: An graphical X2go client written in (wx)Python
  A graphical X2go client implementation written in (wx)Python.
diff --git a/debian/pyhoca-gui.dirs b/debian/pyhoca-gui.dirs
index 24d9948..22ccb76 100644
--- a/debian/pyhoca-gui.dirs
+++ b/debian/pyhoca-gui.dirs
@@ -1,2 +1 @@
-usr/share/pyhoca
 usr/share/pyhoca/img
diff --git a/debian/pyhoca-gui.install b/debian/pyhoca-gui.install
index f76cebc..0fd727b 100644
--- a/debian/pyhoca-gui.install
+++ b/debian/pyhoca-gui.install
@@ -2,4 +2,4 @@ pyhoca-gui /usr/bin/
 icons/* /usr/share/icons/
 desktop/* /usr/share/applications/
 pixmaps/* /usr/share/pixmaps/
-img/* /usr/share/pyhoca/img/
\ No newline at end of file
+img/*.png /usr/share/pyhoca/img/
\ No newline at end of file
diff --git a/img/pyhoca-about-logo.png b/img/pyhoca-about-logo.png
index 43b8dad..929b2a5 100644
Binary files a/img/pyhoca-about-logo.png and b/img/pyhoca-about-logo.png differ
diff --git a/img/pyhoca-about-logo.xcf b/img/pyhoca-about-logo.xcf
new file mode 100644
index 0000000..90e95d1
Binary files /dev/null and b/img/pyhoca-about-logo.xcf differ
diff --git a/img/pyhoca-splash.png b/img/pyhoca-splash.png
index 43b8dad..5f4f46e 100644
Binary files a/img/pyhoca-splash.png and b/img/pyhoca-splash.png differ
diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py
index bc7509a..4d629f2 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.12'
+__VERSION__ = '0.0.13'
 
 from frontend import *
\ No newline at end of file
diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py
index b5d85ca..c7c29ab 100644
--- a/pyhoca/wxgui/about.py
+++ b/pyhoca/wxgui/about.py
@@ -51,7 +51,7 @@ class PyHocaGUI_AboutFrame(wx.Frame):
         self._PyHocaGUI = _PyHocaGUI
         self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger
 
-        wx.Frame.__init__(self, None, -1, 'About PyHoca-GUI...', size=(400,300))
+        wx.Frame.__init__(self, None, -1, 'About PyHoca-GUI...', size=(400,298))
         self.Bind(wx.EVT_CLOSE, self.OnClose)
 
         _logo_bitmap = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap(os.path.join(basepath.images_basepath, 'pyhoca-about-logo.png')), (0, 0))
diff --git a/pyhoca/wxgui/basepath.py b/pyhoca/wxgui/basepath.py
index 98088ea..b3cf1cf 100644
--- a/pyhoca/wxgui/basepath.py
+++ b/pyhoca/wxgui/basepath.py
@@ -32,7 +32,7 @@ else:
         _images_location = os.path.join(_base_location, 'img')
     else:
         _icons_location = '/usr/share/icons'
-        _images_location = '/usr/share/pyhoca-gui/img'
+        _images_location = '/usr/share/pyhoca/img'
 
 icons_basepath = _icons_location
 images_basepath = _images_location
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 221e35e..790ba70 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -464,7 +464,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         STILL UNDOCUMENTED
 
         """
-        self._pyhoca_logger('The ,,About...\'\' window is not implemented yet', loglevel=x2go.log.loglevel_WARN, )
+        self._pyhoca_logger('Showing the ,,About...\'\' window', loglevel=x2go.log.loglevel_WARN, )
+        self.about.Show(True)
 
     def OnOptions(self, evt):
         """\


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)).