[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.10-8-g773ae32

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:55:23 CEST 2013


The branch, twofactorauth has been updated
       via  773ae32bf5e0ec31db6a9af706fa1db52cbc253e (commit)
      from  1445656e56e4d00aded6ff7b98b33cb728822b71 (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:
 debian/changelog               |    2 ++
 pyhoca/wxgui/profilemanager.py |   30 ++++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 031429c..fc66b54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ pyhoca-gui (0.1.0.11-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (0.1.0.11):
     - Add XFCE4 support.
     - Add support for renaming session window titles from the client-side.
+    - Add switch that enables/disablee custom/server-side session window
+      titles.
     - Update of i18n files: en, de, es.
   * Depend on Python X2Go 0.1.1.9.
 
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index a8b32d8..c844fe8 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -161,7 +161,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.IconPath = path_to_icon
         self.IconButtonLabel = wx.StaticText(self.tab_Session, -1, _(u"Icon")+':')
         self.IconButton = wx.BitmapButton(self.tab_Session, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY))
-        self.SessionWindowTitleLabel = wx.StaticText(self.tab_Session, -1, _(u"Session Window Title")+":")
+        self.SetSessionWindowTitle = wx.CheckBox(self.tab_Session, -1, _(u"Set session window title (leave below field empty for default title from server)")+':')
+        self.SessionWindowTitleLabel = wx.StaticText(self.tab_Session, -1, _(u"Session window title")+":")
         self.SessionWindowTitle = wx.TextCtrl(self.tab_Session, -1, "")
         self.SessionTypeLabel = wx.StaticText(self.tab_Session, -1, _(u"Type")+':')
         self.SessionType = wx.ComboBox(self.tab_Session, -1, choices=self.sessionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY)
@@ -283,6 +284,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         self.Bind(wx.EVT_BUTTON, self.OnIconChange, self.IconButton)
         self.Bind(wx.EVT_COMBOBOX, self.OnSessionTypeSelected, self.SessionType)
+        self.Bind(wx.EVT_CHECKBOX, self.OnSetSessionWindowTitle, self.SetSessionWindowTitle)
         self.Bind(wx.EVT_BUTTON, self.OnSSHKeyFileBrowse, self.SSHKeyFileBrowseButton)
         self.Bind(wx.EVT_BUTTON, self.OnSSHProxyKeyFileBrowse, self.SSHProxyKeyFileBrowseButton)
         self.Bind(wx.EVT_CHECKBOX, self.OnUseSSHProxy, self.UseSSHProxy)
@@ -331,6 +333,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         self.ProfileNameLabel.SetMinSize((160, 16))
         self.ProfileName.SetMinSize((320, _textfield_height))
+        self.SetSessionWindowTitle.SetMinSize((-1, _textfield_height))
         self.SessionWindowTitleLabel.SetMinSize((160, 16))
         self.SessionWindowTitle.SetMinSize((320, _textfield_height))
         self.IconButton.SetSize(self.IconButton.GetBestSize())
@@ -417,14 +420,20 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         # SESSION TAB
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_1_1 = wx.StaticBoxSizer(self.staticbox_Profile, wx.VERTICAL)
-        sizer_1_1_1 = wx.FlexGridSizer(3, 2, 7, 9)
+        sizer_1_1_1 = wx.FlexGridSizer(2, 2, 7, 9)
         sizer_1_1_1.Add(self.ProfileNameLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
         sizer_1_1_1.Add(self.ProfileName)
         sizer_1_1_1.Add(self.IconButtonLabel, flag=wx.TOP)
         sizer_1_1_1.Add(self.IconButton)
-        sizer_1_1_1.Add(self.SessionWindowTitleLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_1_1_1.Add(self.SessionWindowTitle)
+        sizer_1_1_2 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_1_1_2.Add(self.SetSessionWindowTitle)
+        sizer_1_1_3 = wx.FlexGridSizer(1, 2, 7, 9)
+        sizer_1_1_3.Add(self.SessionWindowTitleLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_1_1_3.Add(self.SessionWindowTitle)
+
         sizer_1_1.Add(sizer_1_1_1, flag=wx.EXPAND|wx.ALL, border=7)
+        sizer_1_1.Add(sizer_1_1_2, flag=wx.EXPAND|wx.ALL, border=7)
+        sizer_1_1.Add(sizer_1_1_3, flag=wx.EXPAND|wx.ALL, border=7)
 
         sizer_1_2 = wx.StaticBoxSizer(self.staticbox_SessionType, wx.VERTICAL)
         sizer_1_2_1 = wx.GridBagSizer(hgap=3,vgap=6)
@@ -710,6 +719,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         self.ProfileName.SetValue(self.profile_config['name'])
         self.SessionWindowTitle.SetValue(self.profile_config['sessiontitle'])
+        self.SetSessionWindowTitle.SetValue(self.profile_config['setsessiontitle'])
+        if not self.profile_config['setsessiontitle']:
+            self.SessionWindowTitleLabel.Enable(False)
+            self.SessionWindowTitle.Enable(False)
         self.Host.SetValue(self.profile_config['host'])
         self.UserName.SetValue(self.profile_config['user'])
         self.SSHPort.SetValue(self.profile_config['sshport'])
@@ -995,6 +1008,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
     def __update_from_screen(self):
         self.profile_config['name'] = self.ProfileName.GetValue()
+        self.profile_config['setsessiontitle'] = self.SetSessionWindowTitle.GetValue()
         self.profile_config['sessiontitle'] = self.SessionWindowTitle.GetValue()
         self.profile_config['icon'] = self.IconPath
         self.profile_config['user'] = self.UserName.GetValue()
@@ -1122,6 +1136,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             rel_path = rel_path.replace( 'icons/PyHoca/128x128/pyhoca-session.png', 'icons/128x128/x2gosession.png')
             self.IconPath = rel_path
 
+    def OnSetSessionWindowTitle(self, event):
+        if self.SetSessionWindowTitle.GetValue():
+            self.SessionWindowTitleLabel.Enable(True)
+            self.SessionWindowTitle.Enable(True)
+        else:
+            self.SessionWindowTitleLabel.Enable(False)
+            self.SessionWindowTitle.Enable(False)
+
     def enable_DirectRDP(self):
         self.HostLabel.Enable(False)
         self.Host.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)).




More information about the x2go-commits mailing list