[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.6-22-ge921529

[X2go dev team]

The branch, master has been updated
       via  e9215294febee3f224594860eed0f2196d7e2007 (commit)
       via  f23eebb111e36c056297ae66e16a64b9534ef6a7 (commit)
      from  d1f91922ee400ba9d6e58330ea697e781ce646ef (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 e9215294febee3f224594860eed0f2196d7e2007
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 16 22:29:00 2011 +0200

    Help output fixes.

commit f23eebb111e36c056297ae66e16a64b9534ef6a7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 28 16:12:55 2011 +0200

    Fix for usekbd session profile option, it was misinterpreted before...

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog               |    1 +
 pyhoca-gui                     |    8 ++++----
 pyhoca/wxgui/profilemanager.py |    6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2e1a82c..53823d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ pyhoca-gui (0.1.0.7-0~x2go1) UNRELEASED; urgency=low
       raisure), requires Python X2go >= 0.1.1.5.
     - Provide complete list of compression methods, profile manager GUI
       improved.
+    - Fix for usekbd session profile option, it was misinterpreted before...
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 06 Jul 2011 22:17:10 +0200
 
diff --git a/pyhoca-gui b/pyhoca-gui
index 3723004..2052b38 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -174,11 +174,11 @@ x2go_gui_options = [
                    {'args':['--auto-connect'], 'default': False, 'action': 'store_true', 'help': 'connect sessions via SSH pubkey authentication if possible', },
                    {'args':['--show-profile-metatypes'], 'default': False, 'action': 'store_true', 'help': 'show descriptive meta information on session profiles in menus (NOTE: this makes menus appear a bit more sluggish, use it mostly for debugging)', },
                    {'args':['--restricted-trayicon'], 'default': False, 'action': 'store_true', 'help': 'restricts session manager\'s main icon functionality to information window and application exit', },
-                   {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication', },
+                   {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication if no session is currently running/suspended', },
                    {'args':['--exit-on-disconnect'], 'default': False, 'action': 'store_true', 'help': 'exit the session manager after a server connection has died', },
-                   {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': ' on connect auto-resume the newest suspended session', },
-                   {'args':['--resume-oldest-on-connect'], 'default': False, 'action': 'store_true', 'help': ' on connect auto-resume the oldest suspended session', },
-                   {'args':['--resume-all-on-connect'], 'default': False, 'action': 'store_true', 'help': 'auto-resume all suspended session on connect', },
+                   {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': 'on connect auto-resume the newest suspended session', },
+                   {'args':['--resume-oldest-on-connect'], 'default': False, 'action': 'store_true', 'help': 'on connect auto-resume the oldest suspended session', },
+                   {'args':['--resume-all-on-connect'], 'default': False, 'action': 'store_true', 'help': 'auto-resume all suspended sessions on connect', },
                    {'args':['--disconnect-on-suspend'], 'default': False, 'action': 'store_true', 'help': 'disconnect a server if a session has been suspended', },
                    {'args':['--disconnect-on-terminate'], 'default': False, 'action': 'store_true', 'help': 'disconnect a server if a session has been terminated', },
                    {'args':['--disable-splash'], 'default': False, 'action': 'store_true', 'help': 'disable the applications splash screen', },
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index d3f0254..43812bb 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -825,10 +825,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.DisplayDPI.Enable(True)
 
         # TODO Fill in the actual DPI
-        self.CurrentKeyBoard.SetValue(self.profile_config['usekbd'])
+        self.CurrentKeyBoard.SetValue(not self.profile_config['usekbd'])
         self.KeyboardLayout.SetValue(self.profile_config['layout'])
         self.KeyboardModel.SetValue(self.profile_config['type'])
-        if self.profile_config['usekbd']:
+        if self.CurrentKeyBoard.GetValue():
             self.KeyboardLayoutLabel.Enable(False)
             self.KeyboardModelLabel.Enable(False)
             self.KeyboardLayout.Enable(False)
@@ -984,7 +984,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.profile_config['setdpi'] = self.SetDisplayDPI.GetValue()
         self.profile_config['dpi'] = self.DisplayDPI.GetValue()
 
-        self.profile_config['usekbd'] = self.CurrentKeyBoard.GetValue()
+        self.profile_config['usekbd'] = not self.CurrentKeyBoard.GetValue()
         self.profile_config['layout'] = self.KeyboardLayout.GetValue()
         self.profile_config['type'] = self.KeyboardModel.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)).