[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: cc21b02553f196a6ec456f172cfab7219d4e4424
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:20:59 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via cc21b02553f196a6ec456f172cfab7219d4e4424 (commit)
from 3d303c19df65cfd73ec6e21169456b0bbaddf661 (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-gui | 6 +++---
pyhoca/wxgui/profilemanager.py | 16 ++++++----------
2 files changed, 9 insertions(+), 13 deletions(-)
The diff of changes is:
diff --git a/pyhoca-gui b/pyhoca-gui
index 6fd9030..1b76567 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -80,7 +80,7 @@ if _X2GOCLIENT_OS == 'Windows':
from pyhoca.wxgui import basepath
os.environ.update({'NXPROXY_BINARY': basepath.nxproxy_binary, })
-__author__ = "Dick J. Kniep, Mike Gabriel"
+__author__ = "Mike Gabriel, Dick Kniep"
__version__ = _version
# version information
@@ -88,8 +88,8 @@ VERSION=_version
VERSION_TEXT="""
%s[%s] - an X2go GUI client written in Python
----------------------------------------------------------------------
-developed by Dick Kniep <dick.kniep at lindix.nl>
- and Mike Gabriel <m.gabriel at das-netzwerkteam.de>
+developed by Mike Gabriel <m.gabriel at das-netzwerkteam.de>
+sponsored by Dick Kniep <dick.kniep at lindix.nl> (2010-2011)
VERSION: %s
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 2909acc..e9d9cf9 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -725,15 +725,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.XDMCPServer.SetValue(self.profile_config['xdmcpserver'])
- try:
- _link_speed = self.linkChoices[self.profile_config['link']]
- except KeyError:
- _link_speed = self.profileManagerDefaults['link']
-
- for e in self.linkChoices.items():
- if e[1] == _link_speed:
- self.LinkSpeed.SetValue(e[0])
- break
+ if 0 < self.profile_config['speed'] <= 5:
+ _link_speed = self.profile_config['speed']
+ else:
+ _link_speed = self.profileManagerDefaults['speed']
+ self.LinkSpeed.SetValue(_link_speed)
self.Compression.SetValue(self.profile_config['pack'])
self.ImageQuality.SetValue(self.profile_config['quality'])
@@ -901,7 +897,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.profile_config['xdmcpserver'] = self.XDMCPServer.GetValue()
_link_idx = self.LinkSpeed.GetValue()
- self.profile_config['link'] = self.linkChoices[_link_idx]
+ self.profile_config['speed'] = _link_idx
self.profile_config['pack'] = self.Compression.GetValue()
self.profile_config['quality'] = self.ImageQuality.GetValue()
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