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

[X2Go dev team]

The branch, twofactorauth has been updated
       via  51c9f51ab03af63dd9d5400ece25ad8b3c48a838 (commit)
      from  d1a153d8856f052d843624f8ecacd50ebfadbf77 (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               |    1 +
 pyhoca/wxgui/profilemanager.py |   16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4abf097..66ce84a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ 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.
   * Depend on Python X2Go 0.1.1.9.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 09 Nov 2011 03:13:09 +0100
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index e0425f3..9f8b06b 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -150,7 +150,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         ### widgets for the SESSION tab
         ###
         self.ProfileNameLabel = wx.StaticText(self.tab_Session, -1, _(u"Name")+":")
-        self.ProfileName = wx.TextCtrl(self.tab_Session, -1, "", size=wx.Size(200,20))
+        self.ProfileName = wx.TextCtrl(self.tab_Session, -1, "")
         _share_location = os.path.split(_icons_location)[0]
         if 'icon' in self.profile_config:
             path_to_icon = self.profile_config['icon']
@@ -161,6 +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.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)
         self.ApplicationLabel = wx.StaticText(self.tab_Session, -1, _(u"Application")+':')
@@ -327,8 +329,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.SetFont(wx.Font(9, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, ""))
         _textfield_height = self.SSHKeyFileBrowseButton.GetBestSize().GetHeight()-2
 
-        self.ProfileNameLabel.SetMinSize((120, 16))
-        self.ProfileName.SetMinSize((180, _textfield_height))
+        self.ProfileNameLabel.SetMinSize((160, 16))
+        self.ProfileName.SetMinSize((320, _textfield_height))
+        self.SessionWindowTitleLabel.SetMinSize((160, 16))
+        self.SessionWindowTitle.SetMinSize((320, _textfield_height))
         self.IconButton.SetSize(self.IconButton.GetBestSize())
         self.SessionTypeLabel.SetMinSize((120, 16))
         self.SessionType.SetMinSize((-1, _textfield_height))
@@ -413,11 +417,13 @@ 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(2, 2, 7, 9)
+        sizer_1_1_1 = wx.FlexGridSizer(3, 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.Add(sizer_1_1_1, flag=wx.EXPAND|wx.ALL, border=7)
 
         sizer_1_2 = wx.StaticBoxSizer(self.staticbox_SessionType, wx.VERTICAL)
@@ -703,6 +709,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
     def __update_fields(self):
 
         self.ProfileName.SetValue(self.profile_config['name'])
+        self.SessionWindowTitle.SetValue(self.profile_config['sessiontitle'])
         self.Host.SetValue(self.profile_config['host'])
         self.UserName.SetValue(self.profile_config['user'])
         self.SSHPort.SetValue(self.profile_config['sshport'])
@@ -989,6 +996,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
     def __update_from_screen(self):
         self.profile_config['name'] = self.ProfileName.GetValue()
+        self.profile_config['sessiontitle'] = self.SessionWindowTitle.GetValue()
         self.profile_config['icon'] = self.IconPath
         self.profile_config['user'] = self.UserName.GetValue()
         self.profile_config['key'] = self.SSHKeyFile.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)).