Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: X2Go dev team <git-admin-P0WSJaAXTow <at> public.gmane.org>
Subject: pyhoca-gui.git - master (branch) updated: 0.2.0.4-35-gce4e09c
Newsgroups: gmane.linux.terminal-server.x2go.scm
Date: Tuesday 9th October 2012 12:06:41 UTC (over 4 years ago)
The branch, master has been updated
       via  ce4e09cc437f0ff15e4ed53b7a96e100576462bc (commit)
       via  306c697d496bf9bf797eeb17ef15a29cf18c191f (commit)
      from  e27f1f2427b04822c4d8576e03cc926820f40343 (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 ce4e09cc437f0ff15e4ed53b7a96e100576462bc
Author: Mike Gabriel

Date:   Tue Oct 9 14:06:34 2012 +0200

    bump version towards 0.2.1.0

commit 306c697d496bf9bf797eeb17ef15a29cf18c191f
Author: Mike Gabriel

Date:   Tue Oct 9 14:05:56 2012 +0200

    Fix naming mismatch ,,autologin'' vs. ,,autoconnect''.

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

Summary of changes:
 debian/changelog               |    7 ++++---
 debian/control                 |    2 +-
 po/PyHoca-GUI.pot              |    2 +-
 pyhoca/wxgui/profilemanager.py |   10 +++++-----
 4 files changed, 11 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 04d3978..a62501b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low
+pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
 
   [ Mike Gabriel ]
-  * New upstream version (0.2.0.5):
+  * New upstream version (0.2.1.0):
     - Session profile file option ,,export'': stay empty if no exports are
       definded.
     - Make sure RDP (X2Go-proxy) sessions stored by PyHoca-GUI get
recognized
@@ -27,6 +27,7 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low
     - Rebuild of i18n files, update of en.po and de.po.
     - Disable ,,usesshproxy'' for DirectRDP sessions.
     - Make ,,maxdim'' option configurable through session profile manager.
+    - Fix naming mismatch ,,autologin'' vs. ,,autoconnect''.
   * /debian/control:
     + Maintainer change in package: X2Go Developers
       .
@@ -38,7 +39,7 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low
     + Allow package build on systems with missing dh_python2.
 
   [ Oleksandr Shneyder ]
-  * New upstream version (0.2.0.5):
+  * New upstream version (0.2.1.0):
     - Add Russian translation.
 
  -- Oleksandr Shneyder
 
Wed, 05 Sep 2012 10:52:38 +0200
diff --git a/debian/control b/debian/control
index fcfdd9a..9b8a7f7 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Architecture: all
 Depends: 
  ${misc:Depends},
  python,
- python-x2go (>=0.2.0.11-0~),
+ python-x2go (>=0.2.1.0-0~),
  python-argparse,
  python-notify,
  python-setproctitle,
diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot
index 6e7a826..2ce9712 100644
--- a/po/PyHoca-GUI.pot
+++ b/po/PyHoca-GUI.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-29 20:56+0200\n"
+"POT-Creation-Date: 2012-09-29 20:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
diff --git a/pyhoca/wxgui/profilemanager.py
b/pyhoca/wxgui/profilemanager.py
index 3e61ad5..1888bee 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -219,7 +219,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         ### widgets for the SESSION tab
         ###
         self.AutoStartSession = wx.CheckBox(self.tab_Session, -1,
_(u"Start session automatically after login"))
-        self.AutoLoginSessionProfile = wx.CheckBox(self.tab_Session, -1,
_(u"Login automatically after %s has started") % self._PyHocaGUI.appname)
+        self.AutoConnectSessionProfile = wx.CheckBox(self.tab_Session, -1,
_(u"Login automatically after %s has started") % self._PyHocaGUI.appname)
         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")+": ")
@@ -421,7 +421,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.IconButtonLabel.SetMinSize((168, 16))
 
         self.AutoStartSession.SetMinSize((-1, self._textfield_height))
-        self.AutoLoginSessionProfile.SetMinSize((-1,
self._textfield_height))
+        self.AutoConnectSessionProfile.SetMinSize((-1,
self._textfield_height))
         self.SessionTypeLabel.SetMinSize((120, 16))
         self.SessionType.SetMinSize((420, self._textfield_height))
         self.SessionType.SetSelection(5)
@@ -537,7 +537,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         sizer_2 = wx.BoxSizer(wx.VERTICAL)
         sizer_2_1 = wx.StaticBoxSizer(self.staticbox_SessionType,
wx.VERTICAL)
         sizer_2_1_1 = wx.GridBagSizer(hgap=2,vgap=6)
-        sizer_2_1_1.Add(self.AutoLoginSessionProfile, pos=(0,0),
span=(1,2), flag=wx.EXPAND, )
+        sizer_2_1_1.Add(self.AutoConnectSessionProfile, pos=(0,0),
span=(1,2), flag=wx.EXPAND, )
         sizer_2_1_1.Add(self.AutoStartSession, pos=(1,0), span=(1,2),
flag=wx.EXPAND, )
         sizer_2_1_1.Add(self.SessionTypeLabel, pos=(2,0),
flag=wx.ALIGN_CENTRE_VERTICAL, )
         sizer_2_1_1.Add(self.SessionType, pos=(2,1), flag=wx.EXPAND, )
@@ -863,7 +863,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self._toggle_SSHProxy()
 
         self.AutoStartSession.SetValue(self.profile_config['autostart'])
-       
self.AutoLoginSessionProfile.SetValue(self.profile_config['autologin'])
+       
self.AutoConnectSessionProfile.SetValue(self.profile_config['autoconnect'])
 
         _command = self.profile_config['command']
         _published = self.profile_config['published']
@@ -1202,7 +1202,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         else:
             self.profile_config['sessiontitle'] =
self.CustomSessionWindowTitle.GetValue()
         self.profile_config['autostart'] =
self.AutoStartSession.GetValue()
-        self.profile_config['autologin'] =
self.AutoLoginSessionProfile.GetValue()
+        self.profile_config['autoconnect'] =
self.AutoConnectSessionProfile.GetValue()
         self.profile_config['published'] =
self.UsePublishedApplications.GetValue()
         if not self.default_icon:
             self.profile_config['icon'] = self.IconPath


hooks/post-receive
 
CD: 3ms