pyhoca-gui.git - master (branch) updated: 0.1.0.10-114-g3b77e6c - x2go-commits

17 Mar 2012

The branch, master has been updated
       via  3b77e6c1a28fd9c752ca092fe56fa422743427b9 (commit)
       via  1a606d865abb0ff73115914547fd927987a31ed0 (commit)
       via  d2b5aed4c583497efcf5bec696beeaee745a1ea9 (commit)
      from  03894b689b5b367e29ab4c284e60f82e6faef818 (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 3b77e6c1a28fd9c752ca092fe56fa422743427b9
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Mar 17 17:35:52 2012 +0100

    remove redundant variable assignment

commit 1a606d865abb0ff73115914547fd927987a31ed0
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Mar 17 17:35:35 2012 +0100

    Show the detected GUI language in GUI output.

commit d2b5aed4c583497efcf5bec696beeaee745a1ea9
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Mar 17 17:34:32 2012 +0100

    Fix disabling of published applications tick box in profile manager.

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

Summary of changes:
 debian/changelog               |    2 ++
 pyhoca/wxgui/frontend.py       |   16 ++++++++--------
 pyhoca/wxgui/menus_taskbar.py  |    3 ---
 pyhoca/wxgui/profilemanager.py |    8 ++++++++
 4 files changed, 18 insertions(+), 11 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 4a44d55..79526b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,6 +67,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       Boolean command line option).
     - Move rendering of menu tree partially into Python X2Go.
     - Update of en/de i18n files.
+    - Fix disabling of published applications tick box in profile manager.
+    - Show the detected GUI language in GUI output.
   * Depend on Python X2Go 0.1.2.0.
   * Install GNOME icons via dh_links.
   * Install X2Go icons with explicit install paths.
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 1fc6cb1..7597e5f 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -85,14 +85,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
         self.args = args
 
-        if x2go.defaults.X2GOCLIENT_OS == 'Windows':
-            if self.args.lang is not None:
-                self.lang = self.args.lang
-            else:
-                self.lang = 'en'
-        else:
-            self.lang = locale.getdefaultlocale()[0]
-
         if logger is None:
             self._pyhoca_logger = x2go.X2goLogger(tag=self.appname)
         else:
@@ -104,6 +96,14 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         else:
             self._pyhoca_liblogger = copy.deepcopy(liblogger)
 
+        if x2go.defaults.X2GOCLIENT_OS == 'Windows':
+            if self.args.lang is not None:
+                self.lang = self.args.lang
+            else:
+                self.lang = 'en'
+        else:
+            self.lang = locale.getdefaultlocale()[0]
+        self._pyhoca_logger('%s\'s user interface language is: %s.' % (self.appname, self.lang), loglevel=x2go.loglevel_DEBUG)
 
         _x2goclient_kwargs = {
             'use_listsessions_cache': True,
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 906b9df..79b5b33 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -339,9 +339,6 @@ def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=N
     STILL UNDOCUMENTED
 
     """
-
-    _lang = _PyHocaGUI.lang
-
     _lang = _PyHocaGUI.lang
     _pub_app_session = _PyHocaGUI.get_session_of_session_name(session_name, return_object=True)
     menu_map = _pub_app_session.get_published_applications(lang=_lang)
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index cd1c2af..9c9fcd3 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -846,6 +846,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.Application.Enable(True)
             self.Application.SetValue(self.applicationChoices[_command])
             self.Command.SetValue('')
+            self.UsePublishedApplications.SetValue(False)
+            self.UsePublishedApplications.Enable(False)
         elif not _command and _published:
             self.SessionType.SetValue(self.sessionChoices['PUBLISHEDAPPLICATIONS'])
             self.UsePublishedApplications.Enable(False)
@@ -853,18 +855,24 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self._last_pubapp_value = True
         else:
             self.SessionType.SetValue(self.sessionChoices['CUSTOM'])
+            self.UsePublishedApplications.SetValue(False)
+            self.UsePublishedApplications.Enable(False)
             self.Command.Enable(True)
             self.Command.SetValue(_command)
 
         if _command == 'XDMCP':
             self.XDMCPServerLabel.Enable(True)
             self.XDMCPServer.Enable(True)
+            self.UsePublishedApplications.SetValue(False)
+            self.UsePublishedApplications.Enable(False)
 
         if _command in ('RDP', 'DirectRDP'):
             self.RDPServerLabel.Enable(True)
             self.RDPServer.Enable(True)
             self.RDPOptionsLabel.Enable(True)
             self.RDPOptions.Enable(True)
+            self.UsePublishedApplications.SetValue(False)
+            self.UsePublishedApplications.Enable(False)
         else:
             self.RDPServerLabel.Enable(False)
             self.RDPServer.Enable(False)


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

    