The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated via 7a8808f258f6a417a9fe4d73b84a03e803841155 (commit) from 98924c78afc15ae5fd4a1fe449892c33e5055008 (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: pyhoca-gui.py | 10 +++++++++ x2goLogon.py | 68 ++++++++++++++++++++++++--------------------------------- 2 files changed, 38 insertions(+), 40 deletions(-) The diff of changes is: diff --git a/pyhoca-gui.py b/pyhoca-gui.py index 60fafed..7136187 100644 --- a/pyhoca-gui.py +++ b/pyhoca-gui.py @@ -45,6 +45,7 @@ import os import sys import platform import exceptions +from subprocess import Popen, PIPE class notsupportedError(exceptions.StandardError): pass @@ -154,9 +155,18 @@ def version(): sys.stderr.write ("%s\n" % VERSION_TEXT) sys.exit(0) +def check_running(logger): + if platform.system() in ('Linux', 'Mac'): + p = Popen(['ps', '-A'], stdout=PIPE) + psA_out = p.communicate() + logger('psa_out %s' % (psA_out,), x2go.loglevel_INFO ) + return psA_out[0].count(PROG_NAME) > 1 + elif platform.system() == 'Windows': + return False def main(): args, logger, liblogger = parseargs() + if check_running(logger): sys.exit(0) pgui = pyhocagui(args, logger, liblogger) pgui.MainLoop() diff --git a/x2goLogon.py b/x2goLogon.py index c1e1f89..92960bf 100644 --- a/x2goLogon.py +++ b/x2goLogon.py @@ -32,7 +32,6 @@ import time import sys import wx.lib.scrolledpanel as scrolled import wx.lib.mixins.listctrl as listmix -import SessionProfile import X2goMaintProfile from Message import Message import x2go @@ -197,7 +196,7 @@ class X2GoPasswordScrn(sc.SizedFrame): if the screen is iconized, but an error occurs, the screen is displayed and the user can enter another userid/password """ - captionText = "X2go Profile " + parent.SessionProfiles.current_profile.name + captionText = "X2go Profile " + parent.current_profile.name sc.SizedFrame.__init__(self, None, -1, captionText, style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER) self.CentreOnScreen() @@ -206,7 +205,7 @@ class X2GoPasswordScrn(sc.SizedFrame): self.settingsProfile = parent.settingsProfile self.SessionProfiles = parent.SessionProfiles - self.current_profile = parent.SessionProfiles.current_profile + self.current_profile = parent.current_profile self.printProfile = parent.printProfile self.parent = parent self.logger = parent.logger @@ -305,7 +304,8 @@ class X2GoChooseSessionScrn(wx.Frame): self.logger = parent.logger self.settingsProfile = parent.settingsProfile self.SessionProfiles = parent.SessionProfiles - self.current_profile = parent.SessionProfiles.current_profile + self.current_profile = parent.current_profile + self.registeredSessions = parent.registeredSessions self.selected_profile = None self.currentItem = None self.printProfile = parent.printProfile @@ -360,7 +360,7 @@ class X2GoChooseSessionScrn(wx.Frame): self.list.SetDimensions(0, 0, w, h) def PopulateList(self): - sessions = self.parent.SessionProfiles.listAllAvailableSessions() + sessions = self.parent.SessionProfiles.profile_names info = wx.ListItem() info.m_mask = wx.LIST_MASK_TEXT | wx.LIST_MASK_IMAGE | wx.LIST_MASK_FORMAT info.m_image = -1 @@ -529,44 +529,32 @@ def startX2Go(parent): """ parent.logger('starting a new X2go GUI session', x2go.loglevel_INFO, ) - parent.printProfile = SessionProfile.Printing(parent.logger) - parent.settingsProfile = SessionProfile.Settings(parent.logger) + parent.printProfile = x2go.printing.X2goClientPrinting(logger=parent.liblogger) + parent.settingsProfile = x2go.settings.X2goClientSettings(logger=parent.liblogger) if platform.system() == 'Windows': - parent.settingsProfile = SessionProfile.XServer(parent.logger) + #parent.settingsProfile = SessionProfile.XServer(parent.liblogger) import X2goXserver X2goXserver.startXserver(parent) - if parent.args.profile: - parent.SessionProfiles = SessionProfile.x2goProfiles(parent.logger, parent.liblogger, parent.args.profile) - else: - parent.SessionProfiles = SessionProfile.x2goProfiles(parent.logger, parent.liblogger) - noSessionsDefined = len(parent.SessionProfiles.x2goprofs) == 0 - moreSessionsDefined = len(parent.SessionProfiles.x2goprofs) > 1 - if parent.args.password and parent.SessionProfiles.current_profile: - parent.SessionProfiles.current_profile.setPassword(parent.args.password) - - #checkArgs(parent, parent.args, SessionProfiles) - parent.logger('parent.SessionProfiles %s' % parent.SessionProfiles, x2go.loglevel_INFO, ) - sessionsSuspended = parent.SessionProfiles.suspendedSessions() - if len(sessionsSuspended) and parent.settingsProfile.autoresume: - parent.logger('autoresume sessionsSuspended %s' % sessionsSuspended, x2go.loglevel_INFO, ) - ChoiceScrn = X2GoChooseSessionScrn(parent, Iconize=True) - for suspended in sessionsSuspended: - suspended.Resume(parent) - elif len(sessionsSuspended): - parent.logger('Choose SuspendedSessions %s' % sessionsSuspended, x2go.loglevel_INFO, ) - X2GoResumeSessions(parent, sessionsSuspended) - else: - if parent.args.minimized: - parent.logger('Start X2GoChooseSessionScrn minimized', x2go.loglevel_INFO, ) + parent.SessionProfiles = x2go.profiles.X2goSessionProfiles(logger=parent.liblogger) + parent.registeredSessions = x2go.registry.X2goSessionRegistry(logger=parent.liblogger) + + sessionsSuspended = parent.registeredSessions.suspended_sessions + parent.current_profile = defaultProfile = parent.SessionProfiles.has_default_profile() + if sessionsSuspended and len(sessionsSuspended) > 0: + if parent.settingsProfile.autoresume: + parent.logger('autoresume sessionsSuspended %s' % sessionsSuspended, x2go.loglevel_INFO, ) ChoiceScrn = X2GoChooseSessionScrn(parent, Iconize=True) + for suspended in sessionsSuspended: + suspended.Resume(parent) else: - if not noSessionsDefined and (not moreSessionsDefined or parent.SessionProfiles.defaultAvailable()): - parent.logger('Start X2GoChooseSessionScrn entry normally with a default or chosen profile', x2go.loglevel_INFO, ) - ChoiceScrn = X2GoChooseSessionScrn(parent, Iconize=True) - elif noSessionsDefined: - parent.logger('Start Profile Definition', x2go.loglevel_INFO, ) - defScrn = X2GoSessionDefScrn(parent, directCall=True) - else: - parent.logger('Start Profile choice', x2go.loglevel_INFO, ) - choiceScrn = X2GoChooseSessionScrn(parent) + parent.logger('Choose SuspendedSessions %s' % sessionsSuspended, x2go.loglevel_INFO, ) + X2GoResumeSessions(parent, sessionsSuspended) + elif defaultProfile: + ChoiceScrn = X2GoChooseSessionScrn(parent, Iconize=parent.args.minimized) + elif len(parent.SessionProfiles.profile_names) > 0: + parent.logger('Start Profile choice', x2go.loglevel_INFO, ) + choiceScrn = X2GoChooseSessionScrn(parent) + else: + parent.logger('Start Profile Definition', x2go.loglevel_INFO, ) + defScrn = X2GoSessionDefScrn(parent, directCall=True) 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)).