[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.2.0.4-9-g46be5e3
X2Go dev team
git-admin at x2go.org
Fri Sep 14 09:03:17 CEST 2012
The branch, master has been updated
via 46be5e3b5b1f56c6c3084bccc5e36e6eb81b574b (commit)
via 794df417583d5de50cb34ebedb922fe16aa0d423 (commit)
via 7b18f2d1e27306b0cea947cfb88eedce4cb56bd2 (commit)
from 804944e3c211b676a3e08c668cba238d4e3b238a (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 -----------------------------------------------------------------
commit 46be5e3b5b1f56c6c3084bccc5e36e6eb81b574b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Sep 14 09:02:48 2012 +0200
Make session icon handling more robust, be more compatible with X2Go Client about the session icon name. Rewrite mistakes pyhoca-gui <= 0.2.0.4 did on the icon attribute in the session profile config.
commit 794df417583d5de50cb34ebedb922fe16aa0d423
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Sep 13 21:44:08 2012 +0200
Make sure RDP (X2Go-proxy) sessions stored by PyHoca-GUI get recognized as such by X2goClient.
commit 7b18f2d1e27306b0cea947cfb88eedce4cb56bd2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Sep 13 21:25:09 2012 +0200
Session profile file option ,,export'': stay empty if no exports are definded.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 8 ++++++-
po/PyHoca-GUI.pot | 38 ++++++++++++++++++------------------
pyhoca/wxgui/profilemanager.py | 41 ++++++++++++++++++++++++++-------------
3 files changed, 53 insertions(+), 34 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 666b16f..e8f019e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,13 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low
[ Mike Gabriel ]
* New upstream version (0.2.0.5):
- - Continue development...
+ - Session profile file option ,,export'': stay empty if no exports are
+ definded.
+ - Make sure RDP (X2Go-proxy) sessions stored by PyHoca-GUI get recognized
+ as such by X2goClient.
+ - Make session icon handling more robust, be more compatible with X2Go Client
+ about the session icon name. Rewrite mistakes pyhoca-gui <= 0.2.0.4 did
+ on the icon attribute in the session profile config.
* /debian/control:
+ Add Oleksandr Shneyder to Uploaders.
diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot
index 96396f3..1bf667b 100644
--- a/po/PyHoca-GUI.pot
+++ b/po/PyHoca-GUI.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-10 21:18+0200\n"
+"POT-Creation-Date: 2012-09-05 12:22+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -548,7 +548,7 @@ msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:365
#: ../pyhoca/wxgui/profilemanager.py:1078
-#: ../pyhoca/wxgui/profilemanager.py:1832
+#: ../pyhoca/wxgui/profilemanager.py:1829
msgid "automatically"
msgstr ""
@@ -603,50 +603,50 @@ msgstr ""
msgid "<xkbvariant>"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1284
+#: ../pyhoca/wxgui/profilemanager.py:1281
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1287
+#: ../pyhoca/wxgui/profilemanager.py:1284
msgid "Choose an icon for this session profile"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1509
+#: ../pyhoca/wxgui/profilemanager.py:1506
msgid "All files (*.*)|*"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1511
-#: ../pyhoca/wxgui/profilemanager.py:1533
+#: ../pyhoca/wxgui/profilemanager.py:1508
+#: ../pyhoca/wxgui/profilemanager.py:1530
msgid "Choose a public SSH key"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1784
+#: ../pyhoca/wxgui/profilemanager.py:1781
msgid "Choose a folder to share within a session"
msgstr ""
+#: ../pyhoca/wxgui/profilemanager.py:1909
#: ../pyhoca/wxgui/profilemanager.py:1912
#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
-#: ../pyhoca/wxgui/profilemanager.py:1923
-#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118
+#: ../pyhoca/wxgui/profilemanager.py:1920
+#: ../pyhoca/wxgui/profilemanager.py:1930 ../pyhoca/wxgui/menus_taskbar.py:118
msgid "Profile Manager"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1912
+#: ../pyhoca/wxgui/profilemanager.py:1909
msgid "Profile name is missing, profile unusable!!!"
msgstr ""
+#: ../pyhoca/wxgui/profilemanager.py:1912
#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
#, python-format
msgid "Profile name %s already exists!!!"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1923
+#: ../pyhoca/wxgui/profilemanager.py:1920
msgid "The SSH proxy configuration is incomplete. Try again."
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1933
+#: ../pyhoca/wxgui/profilemanager.py:1930
#, python-format
msgid ""
"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -654,21 +654,21 @@ msgid ""
"Please change the SSH proxy settings accordingly."
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1960
+#: ../pyhoca/wxgui/profilemanager.py:1957
#, python-format
msgid "%s - profile added"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1961
+#: ../pyhoca/wxgui/profilemanager.py:1958
msgid "A new session profile has been added."
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1965
+#: ../pyhoca/wxgui/profilemanager.py:1962
#, python-format
msgid "%s - modified"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1966
+#: ../pyhoca/wxgui/profilemanager.py:1963
msgid "Changes to profile have been saved."
msgstr ""
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 2ff1987..2349547 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -184,13 +184,22 @@ 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, "")
- _share_location = os.path.split(_icons_location)[0]
- if 'icon' in self.profile_config:
- path_to_icon = self.profile_config['icon']
- path_to_icon = path_to_icon.lstrip(':')
- path_to_icon = os.path.join(os.path.normpath(_share_location), os.path.normpath(path_to_icon))
- if not os.path.exists(path_to_icon) or not 'icon' in self.profile_config:
- path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location)
+ path_to_icon = os.path.normpath('%s/PyHoca/128x128/pyhoca-session.png' % _icons_location)
+ 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...
+ pass
+ elif 'icon' in self.profile_config and self.profile_config['icon'] == path_to_icon:
+ # rewrite absolute path to PyHoca icon in session profile config back to the default icon path used
+ # by X2Go Client, fixes behaviour of PyHoca-GUI <= 0.2.0.4.
+ pass
+ elif 'icon' in self.profile_config:
+ path_to_icon = self.profile_config['icon'].strip()
+ path_to_icon = os.path.normpath(path_to_icon)
+ self.default_icon = False
+ if not os.path.exists(path_to_icon):
+ path_to_icon = os.path.normpath('%s/PyHoca/128x128/pyhoca-session.png' % _icons_location)
+ self.default_icon = True
self.IconPath = path_to_icon
self.IconButtonLabel = wx.StaticText(self.tab_Profile, -1, _(u"Window Icon")+':')
self.IconButton = wx.BitmapButton(self.tab_Profile, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=wx.Size(136,136), )
@@ -1154,7 +1163,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.profile_config['autostart'] = self.AutoStartSession.GetValue()
self.profile_config['autologin'] = self.AutoLoginSessionProfile.GetValue()
self.profile_config['published'] = self.UsePublishedApplications.GetValue()
- self.profile_config['icon'] = self.IconPath
+ if not self.default_icon:
+ self.profile_config['icon'] = self.IconPath
+ else:
+ self.profile_config['icon'] = ':icons/128x128/x2gosession.png'
self.profile_config['user'] = self.UserName.GetValue()
self.profile_config['key'] = self.SSHKeyFile.GetValue()
if self.UseSSHProxy.GetValue():
@@ -1184,7 +1196,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.profile_config['rootless'] = self.RootlessSession.GetValue()
elif _session_type == 'RDP':
_command = _session_type
- self.profile_config['rootless'] = True
+ self.profile_config['rootless'] = False
elif _session_type == 'PUBLISHEDAPPLICATIONS':
_command = ""
self.profile_config['rootless'] = True
@@ -1245,7 +1257,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
_item_id = self.SharedFoldersList.GetNextItem(_item_id)
- self.profile_config['export'] = '"%s;"' % ';'.join([ f for f in _shared_folders if f ])
+ if _shared_folders:
+ self.profile_config['export'] = '"%s;"' % ';'.join([ f for f in _shared_folders if f ])
+ else:
+ self.profile_config['export'] = ''
self.profile_config['useiconv'] = self.UseEncodingConverter.GetValue()
self.profile_config['iconvfrom'] = self.ClientEncoding.GetValue()
self.profile_config['iconvto'] = self.ServerEncoding.GetValue()
@@ -1274,7 +1289,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
@type event: C{obj}
"""
- _share_location = os.path.split(_icons_location)[0]
iconsdir = _icons_location
if not os.path.exists(iconsdir):
iconsdir = os.getcwd()
@@ -1289,9 +1303,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
# This returns a Python list of files that were selected.
path_to_icon = dlg.GetPath()
self.IconButton.SetBitmapLabel(wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY))
- rel_path = path_to_icon.replace('%s/' % _share_location, ':')
- rel_path = rel_path.replace( 'icons/PyHoca/128x128/pyhoca-session.png', 'icons/128x128/x2gosession.png')
- self.IconPath = rel_path
+ self.IconPath = path_to_icon
+ default_icon = False
def OnSetSessionWindowTitle(self, event):
"""\
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