[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.2.1.1-38-g8204792
X2Go dev team
git-admin at x2go.org
Mon Jan 14 01:38:47 CET 2013
The branch, master has been updated
via 82047923404f6b180002ec9dfa009c1022e17856 (commit)
via d2ac0cf2f987699d35a4b4f37566f9d4804a95c2 (commit)
from 9d9e83cfdd5e0e5af32444f29ef851812dca21bd (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 82047923404f6b180002ec9dfa009c1022e17856
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Jan 14 01:40:17 2013 +0100
Give control of auto-starting and auto-resuming fully into the hands of the session profiles. No extra cmdline options needed anymore to activate auto-starting/-resuming of sessions.
commit d2ac0cf2f987699d35a4b4f37566f9d4804a95c2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Jan 14 01:39:04 2013 +0100
fix some i18n statements
-----------------------------------------------------------------------
Summary of changes:
build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 550 -> 550 bytes
build/mo/da/LC_MESSAGES/PyHoca-GUI.mo | Bin 23366 -> 23267 bytes
build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 26549 -> 26597 bytes
build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 24823 -> 24869 bytes
build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 24857 -> 24746 bytes
build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo | Bin 546 -> 546 bytes
build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 23771 -> 23670 bytes
build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 23448 -> 23353 bytes
build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo | Bin 28394 -> 28270 bytes
build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 23213 -> 23115 bytes
debian/changelog | 3 +++
man/man1/pyhoca-gui.1 | 7 +++++--
po/PyHoca-GUI.pot | 4 ++--
po/bg.po | 4 ++--
po/da.po | 6 +++---
po/de.po | 6 +++---
po/en.po | 6 +++---
po/es.po | 6 +++---
po/fr.po | 4 ++--
po/nb_NO.po | 6 +++---
po/nl.po | 6 +++---
po/ru.po | 6 +++---
po/sv.po | 6 +++---
pyhoca-gui | 4 ++--
pyhoca/wxgui/frontend.py | 12 ++++++------
pyhoca/wxgui/profilemanager.py | 2 +-
26 files changed, 47 insertions(+), 41 deletions(-)
The diff of changes is:
diff --git a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo
index 86f85c8..fcec64e 100644
Binary files a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo
index 7a9e44f..612cad6 100644
Binary files a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo
index 538c9d5..cef4572 100644
Binary files a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo
index 61682df..bbe235f 100644
Binary files a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo
index 114d9f0..9a40aad 100644
Binary files a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo
index 169cde9..bb650cd 100644
Binary files a/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo
index 1ef5a26..f616200 100644
Binary files a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo
index aeffa30..e9126d3 100644
Binary files a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo
index 85116a5..b8a2bfa 100644
Binary files a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo
index 8058add..1b036c1 100644
Binary files a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/debian/changelog b/debian/changelog
index e5df2ed..8398714 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,9 @@ pyhoca-gui (0.4.0.0-0~x2go1) UNRELEASED; urgency=low
manager.
- Show ,,Start RDP sessions'' in menu if RDP (X2Go-proxied) has been
selected as command.
+ - Give control of auto-starting and auto-resuming fully into the hands
+ of the session profiles. No extra cmdline options needed anymore to
+ activate auto-starting/-resuming of sessions.
* /debian/control:
+ Thanks to Orion's patch in bug #91 we can drop many build dependencies.
+ Versioned Depend: on python-x2go (>= 0.4.0.0-0~).
diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1
index 8f07e83..0d59829 100644
--- a/man/man1/pyhoca-gui.1
+++ b/man/man1/pyhoca-gui.1
@@ -101,13 +101,16 @@ Automatically add host key fingerprint to .ssh/known_hosts in case of "authentic
Handle this option with care: Using it lessens the security/integrity of your SSH client setup.
.TP
\*(T<\fB\-\-start-on-connect\fR\*(T>
-Start a session directly after authentication (only if no suspended sessions are available).
+DEPRECATED: Start a session directly after authentication (only if no suspended sessions are available). This switch is now fully controlled from within
+the session profiles. This option itself remains here for compatibility with older versions of \fBPyHoca-GUI\fR.
.TP
\*(T<\fB\-\-exit-on-disconnect\fR\*(T>
Exit \fBpyhoca-gui\fR cleanly once a session has been disconnected.
.TP
\*(T<\fB\-\-resume-on-connect, \-\-resume-newest-on-connect\fR\*(T>
-After authentication directly auto-resume the newest available running/suspended session.
+DEPRECATED: After authentication directly auto-resume the newest available running/suspended session. This switch is now fully controlled from within
+the session profiles, resuming the newest session is the hard-coded default. However, you can influence the resuming behaviour with the next two command line options. This option itself remains here
+for compatibility with older versions of \fBPyHoca-GUI\fR.
.TP
\*(T<\fB\-\-resume-oldest-on-connect\fR\*(T>
After authentication directly auto-resume the oldest available running/suspended session.
diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot
index c9c6e9d..5a36aa9 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: 2013-01-14 00:53+0100\n"
+"POT-Creation-Date: 2013-01-14 01:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -328,7 +328,7 @@ msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:231
#, python-format
-msgid "Login automatically after %s has started"
+msgid "Login automatically after %s has started (needs --auto-connect)"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:232
diff --git a/po/bg.po b/po/bg.po
index fff2fc7..76f08dc 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:53+0100\n"
+"POT-Creation-Date: 2013-01-14 01:38+0100\n"
"PO-Revision-Date: 2011-09-17 02:17+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
@@ -332,7 +332,7 @@ msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:231
#, python-format
-msgid "Login automatically after %s has started"
+msgid "Login automatically after %s has started (needs --auto-connect)"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:232
diff --git a/po/da.po b/po/da.po
index c02dec0..b82bf56 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI 0.2.0.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:53+0100\n"
+"POT-Creation-Date: 2013-01-14 01:38+0100\n"
"PO-Revision-Date: 2012-12-07 13:16+0100\n"
"Last-Translator: Christoffer Krakou <christoffer at fleten.net>\n"
"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
@@ -337,8 +337,8 @@ msgid "Start session automatically after login"
msgstr "Start session automatisk efter login"
#: ../pyhoca/wxgui/profilemanager.py:231
-#, python-format
-msgid "Login automatically after %s has started"
+#, fuzzy, python-format
+msgid "Login automatically after %s has started (needs --auto-connect)"
msgstr "Log ind automatisk efter at %s er startet"
#: ../pyhoca/wxgui/profilemanager.py:232
diff --git a/po/de.po b/po/de.po
index 4ef35da..588cea1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:53+0100\n"
+"POT-Creation-Date: 2013-01-14 01:38+0100\n"
"PO-Revision-Date: 2013-01-13 23:41+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
@@ -340,8 +340,8 @@ msgstr "Sitzung nach Anmeldung automatisch starten"
#: ../pyhoca/wxgui/profilemanager.py:231
#, python-format
-msgid "Login automatically after %s has started"
-msgstr "Automatisch anmelden nach %s Programmstart"
+msgid "Login automatically after %s has started (needs --auto-connect)"
+msgstr "Automatisch anmelden nach %s Programmstart (nur mit --auto-connect)"
#: ../pyhoca/wxgui/profilemanager.py:232
msgid "Type"
diff --git a/po/en.po b/po/en.po
index b3c1f7e..408a1bd 100644
--- a/po/en.po
+++ b/po/en.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:53+0100\n"
+"POT-Creation-Date: 2013-01-14 01:38+0100\n"
"PO-Revision-Date: 2013-01-13 23:44+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
@@ -340,8 +340,8 @@ msgstr "Start session automatically after login"
#: ../pyhoca/wxgui/profilemanager.py:231
#, python-format
-msgid "Login automatically after %s has started"
-msgstr "Login automatically after %s has started"
+msgid "Login automatically after %s has started (needs --auto-connect)"
+msgstr "Login automatically after %s has started (needs --auto-connect)"
#: ../pyhoca/wxgui/profilemanager.py:232
msgid "Type"
diff --git a/po/es.po b/po/es.po
index f83220f..f67f2fa 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:53+0100\n"
+"POT-Creation-Date: 2013-01-14 01:38+0100\n"
"PO-Revision-Date: 2012-11-26 14:23+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
@@ -346,8 +346,8 @@ msgid "Start session automatically after login"
msgstr "Iniciar sesión automáticamente tras el login"
#: ../pyhoca/wxgui/profilemanager.py:231
-#, python-format
-msgid "Login automatically after %s has started"
+#, fuzzy, python-format
+msgid "Login automatically after %s has started (needs --auto-connect)"
msgstr "El inicio de sesión automático ha comenzado tras %s"
#: ../pyhoca/wxgui/profilemanager.py:232
diff --git a/po/fr.po b/po/fr.po
index 17dc158..30b6351 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:53+0100\n"
+"POT-Creation-Date: 2013-01-14 01:38+0100\n"
"PO-Revision-Date: 2011-09-17 02:17+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
@@ -332,7 +332,7 @@ msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:231
#, python-format
-msgid "Login automatically after %s has started"
+msgid "Login automatically after %s has started (needs --auto-connect)"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:232
diff --git a/po/nb_NO.po b/po/nb_NO.po
index cba620b..7fdfd48 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:53+0100\n"
+"POT-Creation-Date: 2013-01-14 01:38+0100\n"
"PO-Revision-Date: 2012-11-26 14:24+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
@@ -340,8 +340,8 @@ msgid "Start session automatically after login"
msgstr "Start sesjonen automatisk etter innlogging"
#: ../pyhoca/wxgui/profilemanager.py:231
-#, python-format
-msgid "Login automatically after %s has started"
+#, fuzzy, python-format
+msgid "Login automatically after %s has started (needs --auto-connect)"
msgstr "Logg inn automatisk etter at %s har startet"
#: ../pyhoca/wxgui/profilemanager.py:232
diff --git a/po/nl.po b/po/nl.po
index 221d5e9..3edf198 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:53+0100\n"
+"POT-Creation-Date: 2013-01-14 01:38+0100\n"
"PO-Revision-Date: 2012-11-26 14:23+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
@@ -338,8 +338,8 @@ msgid "Start session automatically after login"
msgstr "Start sessie automatisch na login"
#: ../pyhoca/wxgui/profilemanager.py:231
-#, python-format
-msgid "Login automatically after %s has started"
+#, fuzzy, python-format
+msgid "Login automatically after %s has started (needs --auto-connect)"
msgstr "Login automatisch nadat %s is gestart"
#: ../pyhoca/wxgui/profilemanager.py:232
diff --git a/po/ru.po b/po/ru.po
index eefe3b4..ea6be6d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:53+0100\n"
+"POT-Creation-Date: 2013-01-14 01:38+0100\n"
"PO-Revision-Date: 2012-11-19 13:51+0100\n"
"Last-Translator: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
@@ -342,8 +342,8 @@ msgid "Start session automatically after login"
msgstr "Запускать сессию автоматически после входа"
#: ../pyhoca/wxgui/profilemanager.py:231
-#, python-format
-msgid "Login automatically after %s has started"
+#, fuzzy, python-format
+msgid "Login automatically after %s has started (needs --auto-connect)"
msgstr "Автоматический вход после запуска %s"
#: ../pyhoca/wxgui/profilemanager.py:232
diff --git a/po/sv.po b/po/sv.po
index 97908fb..271d397 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:53+0100\n"
+"POT-Creation-Date: 2013-01-14 01:38+0100\n"
"PO-Revision-Date: 2012-11-26 14:24+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
@@ -339,8 +339,8 @@ msgid "Start session automatically after login"
msgstr "Starta session automatiskt efter inloggning"
#: ../pyhoca/wxgui/profilemanager.py:231
-#, python-format
-msgid "Login automatically after %s has started"
+#, fuzzy, python-format
+msgid "Login automatically after %s has started (needs --auto-connect)"
msgstr "Logga in automatiskt när %s har startat"
#: ../pyhoca/wxgui/profilemanager.py:232
diff --git a/pyhoca-gui b/pyhoca-gui
index 9c54b38..0555dd6 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -207,9 +207,9 @@ x2go_gui_options = [
{'args':['--tray-icon-connecting'], 'default': None, 'metavar': '<your-logo-while-connecting>', 'help': 'define an alternative system tray icon file while connecting to a server (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', },
{'args':['--restricted-trayicon'], 'default': False, 'action': 'store_true', 'help': 'restricts session manager\'s main icon functionality to information window and application exit; on left-click only a minimal session menu is shown', },
{'args':['--add-to-known-hosts'], 'default': False, 'action': 'store_true', 'help': 'automatically add SSH host keys to the known_hosts files of the client-side user', },
- {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication if no session is currently running/suspended', },
+ {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'This is now the hard-coded default. 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-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': 'This is now the hard-coded default. 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', },
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index f2d0cf1..42382f2 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -277,8 +277,8 @@ class PyHocaGUI(wx.App, x2go.X2GoClient):
# cmd line options
self.add_to_known_hosts = self.args.add_to_known_hosts
self.auto_connect = self.args.auto_connect
- self.start_on_connect = self.args.start_on_connect
- self.resume_newest_on_connect = self.args.resume_newest_on_connect
+ self.start_on_connect = True
+ self.resume_newest_on_connect = True
self.resume_oldest_on_connect = self.args.resume_oldest_on_connect
self.resume_all_on_connect = self.args.resume_all_on_connect
self.exit_on_disconnect = self.args.exit_on_disconnect
@@ -404,12 +404,12 @@ class PyHocaGUI(wx.App, x2go.X2GoClient):
"""
if not self.get_session(session_uuid).published_applications:
- if self.resume_newest_on_connect:
- self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect, **kwargs)
- elif self.resume_oldest_on_connect:
+ if self.resume_oldest_on_connect:
self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect, **kwargs)
- elif self.resume_all_on_connect:
+ if self.resume_all_on_connect:
self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect, **kwargs)
+ elif self.resume_newest_on_connect:
+ self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect, **kwargs)
def _exit_handler(self, *args):
"""\
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 7f926b9..b0c07ec 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -228,7 +228,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.AutoConnectSessionProfile = 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 (needs --auto-connect)") % 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")+": ")
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