[X2Go-Commits] [pyhoca-gui] 05/71: adapt application name in image/icon paths

git-admin at x2go.org git-admin at x2go.org
Thu Mar 20 00:32:41 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch cvix/2.x
in repository pyhoca-gui.

commit 671e991c1600820defa586296713d064415a6b09
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Feb 7 14:05:13 2014 +0100

    adapt application name in image/icon paths
---
 pyhoca/wxgui/about.py          |    4 ++--
 pyhoca/wxgui/frontend.py       |    2 +-
 pyhoca/wxgui/profilemanager.py |    4 ++--
 pyhoca/wxgui/splash.py         |    2 +-
 pyhoca/wxgui/taskbar.py        |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py
index 5c0e6b8..4077824 100644
--- a/pyhoca/wxgui/about.py
+++ b/pyhoca/wxgui/about.py
@@ -65,7 +65,7 @@ class PyHocaGUI_AboutFrame(wx.Frame):
         self._PyHocaGUI = _PyHocaGUI
         self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger
 
-        fallback_about_image = 'pyhoca-gui_about-logo.png'
+        fallback_about_image = 'PyHoca-GUI_about-logo.png'
 
         if about_image is None:
             about_image = '{appname}_about-logo.png'.format(appname=_PyHocaGUI.appname)
@@ -120,7 +120,7 @@ class PyHocaGUI_AboutFrame(wx.Frame):
             icon_file = '%s/%s/%s/%s' % (basepath.icons_basepath, _PyHocaGUI.appname, icon_size, icon_name)
 
         if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))):
-            icon_file = os.path.normpath('%s/PyHoca/%s/%s' % (basepath.icons_basepath, icon_size, 'pyhoca-gui_winicon.png'))
+            icon_file = os.path.normpath('%s/PyHoca/%s/%s' % (basepath.icons_basepath, icon_size, 'PyHoca-GUI_winicon.png'))
 
         img = wx.Image(icon_file)
         icon = wx.IconFromBitmap(img.ConvertToBitmap())
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index f55ef8d..e460a42 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -303,7 +303,7 @@ class PyHocaGUI(wx.App, x2go.X2GoClient):
             self.about = about.PyHocaGUI_AboutFrame(self, about_image=self.args.about_image)
         self.about.Show(False)
 
-        self.about_pythonx2go = about.PyHocaGUI_AboutFrame(self, about_image='python-x2go_about-logo.png', about_what="Python X2Go")
+        self.about_pythonx2go = about.PyHocaGUI_AboutFrame(self, about_image='Python-X2Go_about-logo.png', about_what="Python X2Go")
         self.about_pythonx2go.Show(False)
 
         self.taskbar = taskbar.PyHocaGUI_TaskBarIcon(self.about)
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 170fd97..faea0cf 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -213,7 +213,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.UseDefaultSessionWindowTitle = wx.CheckBox(self.tab_Profile, -1, _(u"Use a default session window title"))
         self.CustomSessionWindowTitleLabel = wx.StaticText(self.tab_Profile, -1, _(u"Custom session window title") + ": ")
         self.CustomSessionWindowTitle = wx.TextCtrl(self.tab_Profile, -1, "")
-        path_to_icon = os.path.normpath('%s/PyHoca/128x128/pyhoca-session.png' % _icons_location)
+        path_to_icon = os.path.normpath('%s/%s/128x128/%s_sessionicon.png' % (_icons_location, self._PyHocaGUI.appname, self._PyHocaGUI.appname))
         self.default_icon = True
         if 'icon' in self.profile_config and self.profile_config['icon'] == ':icons/128x128/x2gosession.png':
             # interpret the default x2gosession.png icon entry in session profile config as the PyHoca icon...
@@ -227,7 +227,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             path_to_icon = os.path.normpath(path_to_icon)
             self.default_icon = False
         if not os.path.exists(os.path.expanduser(path_to_icon)):
-            path_to_icon = os.path.normpath('%s/PyHoca/128x128/pyhoca-session.png' % _icons_location)
+            path_to_icon = os.path.normpath('%s/PyHoca/128x128/PyHoca-GUI_sessionicon.png' % _icons_location)
             self.default_icon = True
         self.IconPath = path_to_icon
         self.IconButtonLabel = wx.StaticText(self.tab_Profile, -1, _(u"Window Icon")+": ")
diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py
index 8ef4668..bedc60b 100644
--- a/pyhoca/wxgui/splash.py
+++ b/pyhoca/wxgui/splash.py
@@ -59,7 +59,7 @@ class PyHocaGUI_SplashScreen(wx.SplashScreen):
         if splash_image is None:
             splash_image = os.path.join(basepath.images_basepath, '{appname}_splash.png'.format(appname=_PyHocaGUI.appname))
             if not os.path.exists(splash_image):
-                splash_image = os.path.join(basepath.images_basepath, 'pyhoca-gui_splash.png')
+                splash_image = os.path.join(basepath.images_basepath, 'PyHoca-GUI_splash.png')
 
         if os.path.isfile(str(splash_image)):
             splash_wximage = wx.Image(splash_image, wx.BITMAP_TYPE_PNG, )
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index b4e6244..035dd2a 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -50,7 +50,7 @@ import basepath
 
 _icons_location = basepath.icons_basepath
 
-def MakeIcon(icon_name, fallback_name='pyhoca-gui_trayicon.png', appname="pyhoca-gui"):
+def MakeIcon(icon_name, fallback_name='PyHoca-GUI_trayicon.png', appname="PyHoca-GUI"):
     """\
     The various platforms have different requirements for the
     icon size...

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git



More information about the x2go-commits mailing list