x2go-commits March 2012

x2go-commits@lists.x2go.org

1 participants
192 discussions

pyhoca-gui.git - master (branch) updated: 0.1.0.10-86-gd08ff66
by git-admin＠x2go.org 04 Mar '12

04 Mar '12

The branch, master has been updated via d08ff66f500246e48ef1201398044ad4e6793acc (commit) from 3f88b64993181aebba65e070a4b070964c5e86eb (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 d08ff66f500246e48ef1201398044ad4e6793acc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Mar 4 22:23:02 2012 +0100 use wx.Size for button sizes ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/profilemanager.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index c4ec8c7..0eabada 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -177,7 +177,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location) self.IconPath = path_to_icon self.IconButtonLabel = wx.StaticText(self.tab_Profile, -1, _(u"Window Icon")+':') - self.IconButton = wx.BitmapButton(self.tab_Profile, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=(134,134), style=wx.BU_AUTODRAW) + self.IconButton = wx.BitmapButton(self.tab_Profile, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=wx.Size(134,134), style=wx.BU_AUTODRAW) ### ### widgets for the SESSION tab @@ -206,13 +206,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=64000) self.SSHKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"RSA/DSA private key")+':') self.SSHKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) - self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=(20,20), ) + self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(20,20), ) self.UseSSHProxy = wx.CheckBox(self.tab_Connection, -1, _(u"Server behind SSH proxy")) self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+':') self.SSHProxyUser = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) self.SSHProxyKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"Key file")+':') self.SSHProxyKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) - self.SSHProxyKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=(20,20), ) + self.SSHProxyKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(20,20), ) self.SSHProxyHostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host[:Port]")+':') self.SSHProxyHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, _(u"SSH Proxy Tunnel")+':') @@ -267,7 +267,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.UseLocalFolderSharing = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Use local folder sharing")) self.SharedFolderPathLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Path")+':') self.SharedFolderPath = wx.TextCtrl(self.tab_SharedFilesAndFolders, -1, "", style=wx.TE_PROCESS_ENTER) - self.SharedFolderPathBrowseButton = wx.BitmapButton(self.tab_SharedFilesAndFolders, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=(20,20), ) + self.SharedFolderPathBrowseButton = wx.BitmapButton(self.tab_SharedFilesAndFolders, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(20,20), ) self.AddSharedFolderPathButton = wx.Button(self.tab_SharedFilesAndFolders, -1, _(u"Add")) self.SharedFoldersList = CheckListCtrl(self.tab_SharedFilesAndFolders) self.SharedFoldersList.InsertColumn(0, _("Local Path"), wx.LIST_FORMAT_LEFT) 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-85-g3f88b64
by git-admin＠x2go.org 04 Mar '12

04 Mar '12

The branch, master has been updated via 3f88b64993181aebba65e070a4b070964c5e86eb (commit) from d57763f98dca9da4de9bd97d68c9cf2029c6ba63 (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 3f88b64993181aebba65e070a4b070964c5e86eb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Mar 4 22:19:56 2012 +0100 set fixed button sizes ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/profilemanager.py | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index c80f9f1..c4ec8c7 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -356,7 +356,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.CustomSessionWindowTitleLabel.SetMinSize((160, 16)) self.CustomSessionWindowTitle.SetMinSize((320, _textfield_height)) self.IconButtonLabel.SetMinSize((168, 16)) - self.IconButton.SetSize(self.IconButton.GetBestSize()) self.SessionTypeLabel.SetMinSize((120, 16)) self.SessionType.SetMinSize((320, _textfield_height)) @@ -380,13 +379,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHPort.SetMinSize((65, _textfield_height)) self.SSHKeyFileLabel.SetMinSize((-1, 16)) self.SSHKeyFile.SetMinSize((152, _textfield_height)) - self.SSHKeyFileBrowseButton.SetSize(self.SSHKeyFileBrowseButton.GetBestSize()) self.SSHProxyUserLabel.SetMinSize((140, 16)) self.SSHProxyUser.SetMinSize((180, _textfield_height)) self.SSHProxyHostLabel.SetMinSize((140, 16)) self.SSHProxyHost.SetMinSize((180, _textfield_height)) self.SSHProxyKeyFile.SetMinSize((120, _textfield_height)) - self.SSHProxyKeyFileBrowseButton.SetSize(self.SSHProxyKeyFileBrowseButton.GetBestSize()) self.SSHProxyTunnelLabel.SetMinSize((140, 16)) self.SSHProxyTunnelFromPort.SetMinSize((60, _textfield_height)) self.SSHProxyTunnelToPort.SetMinSize((60, _textfield_height)) @@ -422,7 +419,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SoundPort.SetMinSize((-1, _textfield_height)) self.ClientSidePrinting.SetMinSize((-1, _textfield_height)) self.SharedFolderPath.SetMinSize((220, _textfield_height)) - self.SharedFolderPathBrowseButton.SetSize(self.SharedFolderPathBrowseButton.GetBestSize()) self.SharedFoldersList.SetMinSize((-1, 180)) self.ClientEncoding.SetMinSize((140, _textfield_height)) 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-84-gd57763f
by git-admin＠x2go.org 04 Mar '12

04 Mar '12

The branch, master has been updated via d57763f98dca9da4de9bd97d68c9cf2029c6ba63 (commit) from ed82afa94e74ef9f329d3cc8c9b2f5b254590fca (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 d57763f98dca9da4de9bd97d68c9cf2029c6ba63 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Mar 4 22:14:13 2012 +0100 giving some border space to bitmap buttons ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/profilemanager.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 75d51b6..c80f9f1 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -177,7 +177,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location) self.IconPath = path_to_icon self.IconButtonLabel = wx.StaticText(self.tab_Profile, -1, _(u"Window Icon")+':') - self.IconButton = wx.BitmapButton(self.tab_Profile, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=(132,132), style=wx.BU_AUTODRAW) + self.IconButton = wx.BitmapButton(self.tab_Profile, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=(134,134), style=wx.BU_AUTODRAW) ### ### widgets for the SESSION tab @@ -206,13 +206,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=64000) self.SSHKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"RSA/DSA private key")+':') self.SSHKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) - self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY)) + self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=(20,20), ) self.UseSSHProxy = wx.CheckBox(self.tab_Connection, -1, _(u"Server behind SSH proxy")) self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+':') self.SSHProxyUser = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) self.SSHProxyKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"Key file")+':') self.SSHProxyKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) - self.SSHProxyKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY)) + self.SSHProxyKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=(20,20), ) self.SSHProxyHostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host[:Port]")+':') self.SSHProxyHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, _(u"SSH Proxy Tunnel")+':') @@ -267,7 +267,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.UseLocalFolderSharing = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Use local folder sharing")) self.SharedFolderPathLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Path")+':') self.SharedFolderPath = wx.TextCtrl(self.tab_SharedFilesAndFolders, -1, "", style=wx.TE_PROCESS_ENTER) - self.SharedFolderPathBrowseButton = wx.BitmapButton(self.tab_SharedFilesAndFolders, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY)) + self.SharedFolderPathBrowseButton = wx.BitmapButton(self.tab_SharedFilesAndFolders, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=(20,20), ) self.AddSharedFolderPathButton = wx.Button(self.tab_SharedFilesAndFolders, -1, _(u"Add")) self.SharedFoldersList = CheckListCtrl(self.tab_SharedFilesAndFolders) self.SharedFoldersList.InsertColumn(0, _("Local Path"), wx.LIST_FORMAT_LEFT) 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-83-ged82afa
by git-admin＠x2go.org 04 Mar '12

04 Mar '12

The branch, master has been updated via ed82afa94e74ef9f329d3cc8c9b2f5b254590fca (commit) via 0c9b5c894ba5a6df70ff7d1544a29d51d6c8528c (commit) from f09fd3f3a752d4b7015c645202b3bd907a092b7d (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 ed82afa94e74ef9f329d3cc8c9b2f5b254590fca Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Mar 4 22:10:09 2012 +0100 providing border for session profile icon commit 0c9b5c894ba5a6df70ff7d1544a29d51d6c8528c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Mar 4 22:07:45 2012 +0100 Use wx.BU_AUTODRAW for session profile icon. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/profilemanager.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e5b2a95..ff7c9d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Update i18n files: en, de. - Only allow session window manipulations for sessions that are associated to the running PyHoca-GUI client. + - Use wx.BU_AUTODRAW for session profile icon. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index ed24594..75d51b6 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -177,7 +177,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location) self.IconPath = path_to_icon self.IconButtonLabel = wx.StaticText(self.tab_Profile, -1, _(u"Window Icon")+':') - self.IconButton = wx.BitmapButton(self.tab_Profile, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=(128,128)) + self.IconButton = wx.BitmapButton(self.tab_Profile, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=(132,132), style=wx.BU_AUTODRAW) ### ### widgets for the SESSION tab 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)).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-121-g8cfeead
by git-admin＠x2go.org 04 Mar '12

04 Mar '12

The branch, master has been updated via 8cfeeadf4e47660f6f4123915c91a326eade3256 (commit) via f6eae3f1599dd39cd7fe4628b1d28e0f8d288def (commit) from ed6cc9d89628e50501bda74af5926acd2f97f4d5 (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 8cfeeadf4e47660f6f4123915c91a326eade3256 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Mar 4 21:58:47 2012 +0100 complete background printing feature commit f6eae3f1599dd39cd7fe4628b1d28e0f8d288def Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Mar 4 21:57:49 2012 +0100 Run MIME box actions in background (gevent.spawn). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/mimeboxactions.py | 22 ++++++++++++++++++---- x2go/printactions.py | 5 +++-- 3 files changed, 22 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4468f70..a9e01f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Fix faking of WindowsError exception object in printactions.py and mimeboxactions.py. - Run print actions in background (gevent.spawn). + - Run MIME box actions in background (gevent.spawn). * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py index 2e247c1..319369f 100644 --- a/x2go/mimeboxactions.py +++ b/x2go/mimeboxactions.py @@ -29,6 +29,7 @@ __NAME__ = 'x2gomimeboxactions-pylib' import os import copy import time +import gevent from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS if _X2GOCLIENT_OS in ("Windows"): @@ -93,7 +94,7 @@ class X2goMIMEboxAction(object): """ return self.__description__ - def do_process(self, mimebox_file, mimebox_dir, ): + def _do_process(self, mimebox_file, mimebox_dir, ): """\ Perform the defined MIME box action (doing nothing in L{X2goMIMEboxAction} parent class). @@ -105,6 +106,19 @@ class X2goMIMEboxAction(object): """ pass + def do_process(self, mimebox_file, mimebox_dir, ): + """\ + Wrapper (using C{gevent.spawn()}) method for the actual processing of MIME + box actions. + + @param mimebox_file: file name as placed in to the X2Go MIME box directory + @type mimebox_file: C{str} + @param mimebox_dir: location of the X2Go sessions's MIME box directory + @type mimebox_dir: C{str} + + """ + gevent.spawn(self._do_process, mimebox_file, mimebox_dir, ) + class X2goMIMEboxActionOPEN(X2goMIMEboxAction): """\ @@ -129,7 +143,7 @@ class X2goMIMEboxActionOPEN(X2goMIMEboxAction): self.client_instance = client_instance X2goMIMEboxAction.__init__(self, logger=logger, loglevel=loglevel) - def do_process(self, mimebox_file, mimebox_dir, ): + def _do_process(self, mimebox_file, mimebox_dir, ): """\ Open an incoming MIME box file in the system's default application. @@ -184,7 +198,7 @@ class X2goMIMEboxActionOPENWITH(X2goMIMEboxAction): self.client_instance = client_instance X2goMIMEboxAction.__init__(self, logger=logger, loglevel=loglevel) - def do_process(self, mimebox_file, mimebox_dir, ): + def _do_process(self, mimebox_file, mimebox_dir, ): """\ Open an incoming MIME box file in the system's default application. @@ -242,7 +256,7 @@ class X2goMIMEboxActionSAVEAS(X2goMIMEboxAction): raise x2go_exceptions.X2goMIMEboxActionException('the SAVEAS MIME box action needs to know the X2goClient instance (client=<instance>)') X2goMIMEboxAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel) - def do_process(self, mimebox_file, mimebox_dir): + def _do_process(self, mimebox_file, mimebox_dir): """\ Call an L{X2goClient} hook method (C{HOOK_open_mimebox_saveas_dialog}) that can handle the MIME box's SAVEAS action. diff --git a/x2go/printactions.py b/x2go/printactions.py index 8227284..6dcf0cb 100644 --- a/x2go/printactions.py +++ b/x2go/printactions.py @@ -33,6 +33,7 @@ import os import shutil import copy import time +import gevent from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS if _X2GOCLIENT_OS in ("Windows"): @@ -490,7 +491,7 @@ class X2goPrintActionDIALOG(X2goPrintAction): raise x2go_exceptions.X2goPrintActionException('the DIALOG print action needs to know the X2goClient instance (client=<instance>)') X2goPrintAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel) - def do_print(self, pdf_file, job_title, spool_dir): + def _do_print(self, pdf_file, job_title, spool_dir): """\ Execute an external command that has been defined on construction of this L{X2goPrintActionPRINTCMD} instance. @@ -506,5 +507,5 @@ class X2goPrintActionDIALOG(X2goPrintAction): self.logger('Session %s (%s) is calling X2goClient class hook method <client_instance>.HOOK_open_print_dialog' % (self.session_name, self.profile_name), loglevel=log.loglevel_NOTICE) _new_print_action = self.client_instance.HOOK_open_print_dialog(profile_name=self.profile_name, session_name=self.session_name) if type(_new_print_action) != type(self): - _new_print_action.do_print(pdf_file, job_title, spool_dir) + _new_print_action._do_print(pdf_file, job_title, spool_dir) hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-81-gf09fd3f
by git-admin＠x2go.org 04 Mar '12

04 Mar '12

The branch, master has been updated via f09fd3f3a752d4b7015c645202b3bd907a092b7d (commit) from 4655b0b4c90d061d39b229bee7fcb4db93a7cfd5 (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 f09fd3f3a752d4b7015c645202b3bd907a092b7d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Mar 4 21:34:57 2012 +0100 return objects, not session names... ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/menus_taskbar.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index b947e66..bb1b4d6 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -192,7 +192,7 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu): self.Append(text=_(u"Terminate Session"), id=ID_TERMINATESESSION) - if _s.get_session_cmd() in x2go.defaults.X2GO_DESKTOPSESSIONS and status == 'R' and _s in self._PyHocaGUI.client_associated_sessions_of_profile_name(profile_name, return_session_names=True): + if _s.get_session_cmd() in x2go.defaults.X2GO_DESKTOPSESSIONS and status == 'R' and _s in self._PyHocaGUI.client_associated_sessions_of_profile_name(profile_name, return_objects=True): self.AppendSeparator() self.Append(text=_("Rename Session Window"), id=ID_RENAMESESSION) 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-80-g4655b0b
by git-admin＠x2go.org 04 Mar '12

04 Mar '12

The branch, master has been updated via 4655b0b4c90d061d39b229bee7fcb4db93a7cfd5 (commit) from 614c2ab2a202a5a7ce45c3116e4c8a9456f36fd4 (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 4655b0b4c90d061d39b229bee7fcb4db93a7cfd5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Mar 4 21:33:27 2012 +0100 Only allow session window manipulations for sessions that are associated to the running PyHoca-GUI client. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/menus_taskbar.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c1cd4f7..e5b2a95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Hook methods that notify about non-availabilities around printing, MIME box, local folder sharing. - Update i18n files: en, de. + - Only allow session window manipulations for sessions that are associated + to the running PyHoca-GUI client. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index b582a98..b947e66 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -192,7 +192,7 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu): self.Append(text=_(u"Terminate Session"), id=ID_TERMINATESESSION) - if _s.get_session_cmd() in x2go.defaults.X2GO_DESKTOPSESSIONS and status == 'R': + if _s.get_session_cmd() in x2go.defaults.X2GO_DESKTOPSESSIONS and status == 'R' and _s in self._PyHocaGUI.client_associated_sessions_of_profile_name(profile_name, return_session_names=True): self.AppendSeparator() self.Append(text=_("Rename Session Window"), id=ID_RENAMESESSION) 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)).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-119-ged6cc9d
by git-admin＠x2go.org 04 Mar '12

04 Mar '12

The branch, master has been updated via ed6cc9d89628e50501bda74af5926acd2f97f4d5 (commit) from f374c3b6f09dc326fa5205bb1c0de09804dd621d (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 ed6cc9d89628e50501bda74af5926acd2f97f4d5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Mar 4 21:20:21 2012 +0100 Run print actions in background (gevent.spawn). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/printactions.py | 27 +++++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4d55322..4468f70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Draw all Xlib code into utils.py - Fix faking of WindowsError exception object in printactions.py and mimeboxactions.py. + - Run print actions in background (gevent.spawn). * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/printactions.py b/x2go/printactions.py index d7af7a5..8227284 100644 --- a/x2go/printactions.py +++ b/x2go/printactions.py @@ -101,8 +101,8 @@ class X2goPrintAction(object): """ return self.__description__ - def do_print(self, pdf_file, job_title, spool_dir, ): - """\ + def _do_print(self, pdf_file, job_title, spool_dir, ): + """ Perform the defined print action (doing nothing in L{X2goPrintAction} parent class). @param pdf_file: PDF file name as placed in to the X2Go spool directory @@ -115,6 +115,21 @@ class X2goPrintAction(object): """ pass + def do_print(self, pdf_file, job_title, spool_dir, ): + """\ + Wrap around the actual print action (C{self._do_print}) with + gevent.spawn(). + + @param pdf_file: PDF file name as placed in to the X2Go spool directory + @type pdf_file: C{str} + @param job_title: human readable print job title + @type job_title: C{str} + @param spool_dir: location of the X2Go client's spool directory + @type spool_dir: C{str} + + """ + gevent.spawn(self._do_print, pdf_file, job_title, spool_dir) + def _humanreadable_filename(self, pdf_file, job_title, target_path): """\ Extract a human readable filename for the X2Go print job file. @@ -168,7 +183,7 @@ class X2goPrintActionPDFVIEW(X2goPrintAction): self.pdfview_cmd = pdfview_cmd X2goPrintAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel) - def do_print(self, pdf_file, job_title, spool_dir, ): + def _do_print(self, pdf_file, job_title, spool_dir, ): """\ Open an incoming X2Go print job (PDF file) in an external PDF viewer application. @@ -250,7 +265,7 @@ class X2goPrintActionPDFSAVE(X2goPrintAction): if not os.path.exists(self.save_to_folder): os.makedirs(self.save_to_folder, mode=0755) - def do_print(self, pdf_file, job_title, spool_dir): + def _do_print(self, pdf_file, job_title, spool_dir): """\ Save an incoming X2Go print job (PDF file) to a local folder. @@ -291,7 +306,7 @@ class X2goPrintActionPRINT(X2goPrintAction): self.printer = printer X2goPrintAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel) - def do_print(self, pdf_file, job_title, spool_dir, ): + def _do_print(self, pdf_file, job_title, spool_dir, ): """\ Actually really print an incoming X2Go print job (PDF file) to a local printer device. @@ -419,7 +434,7 @@ class X2goPrintActionPRINTCMD(X2goPrintAction): self.print_cmd = print_cmd X2goPrintAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel) - def do_print(self, pdf_file, job_title, spool_dir): + def _do_print(self, pdf_file, job_title, spool_dir): """\ Execute an external command that has been defined on construction of this L{X2goPrintActionPRINTCMD} instance. hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-118-gf374c3b
by git-admin＠x2go.org 04 Mar '12

04 Mar '12

The branch, master has been updated via f374c3b6f09dc326fa5205bb1c0de09804dd621d (commit) from 57027a93cd98ec52fac9e2d5272dffcae1382b40 (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 f374c3b6f09dc326fa5205bb1c0de09804dd621d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Mar 4 20:15:20 2012 +0100 Draw all Xlib code into utils.py ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- x2go/backends/terminal/_stdout.py | 5 +---- x2go/utils.py | 13 +++++++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ab10767..4d55322 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,7 +31,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low get never used. - Rename control session method is_folder_sharing_available to is_sshfs_available. - - Make x2go module importable on Win32 platforms again. + - Draw all Xlib code into utils.py - Fix faking of WindowsError exception object in printactions.py and mimeboxactions.py. * Depend on python-xlib. diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index a8c27ce..1d59497 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -46,7 +46,6 @@ import x2go.x2go_exceptions as x2go_exceptions # we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables) from x2go.defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS -from x2go.defaults import X_DISPLAY as _X_DISPLAY from x2go.defaults import LOCAL_HOME as _LOCAL_HOME from x2go.defaults import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER from x2go.defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR @@ -829,9 +828,7 @@ class X2goTerminalSessionSTDOUT(object): timeout -= 1 if self.session_window is not None: - self.session_window.set_wm_name(str(self.session_title)) - self.session_window.set_wm_icon_name(str(self.session_title)) - _X_DISPLAY.sync() + utils.set_session_window_title(self.session_window) break gevent.sleep(1) diff --git a/x2go/utils.py b/x2go/utils.py index 1ad5fd0..1a3361c 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -491,6 +491,19 @@ def find_session_window(session_name): return None +def set_session_window_title(session_window): + """\ + Set title of session window. + + @param session_window: session window instance + @type session_name: C{obj} + + """ + if _X2GOCLIENT_OS != 'Windows': + self.session_window.set_wm_name(str(self.session_title)) + self.session_window.set_wm_icon_name(str(self.session_title)) + _X_DISPLAY.sync() + def raise_session_window(session_window): """\ Raise session window. hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-117-g57027a9
by git-admin＠x2go.org 04 Mar '12

04 Mar '12

The branch, master has been updated via 57027a93cd98ec52fac9e2d5272dffcae1382b40 (commit) from ca2f9e2dc54d5d41c1c569b812cd724e8511139f (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 57027a93cd98ec52fac9e2d5272dffcae1382b40 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Mar 4 20:11:00 2012 +0100 Fix faking of WindowsError exception object in printactions.py and mimeboxactions.py. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/mimeboxactions.py | 2 +- x2go/printactions.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ef8021a..ab10767 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Rename control session method is_folder_sharing_available to is_sshfs_available. - Make x2go module importable on Win32 platforms again. + - Fix faking of WindowsError exception object in printactions.py and + mimeboxactions.py. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py index 4dec16d..2e247c1 100644 --- a/x2go/mimeboxactions.py +++ b/x2go/mimeboxactions.py @@ -34,9 +34,9 @@ from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS if _X2GOCLIENT_OS in ("Windows"): import subprocess import win32api - import x2go_exceptions.WindowsError as WindowsError else: import gevent_subprocess as subprocess + import x2go_exceptions.WindowsError as WindowsError # Python X2Go modules import log diff --git a/x2go/printactions.py b/x2go/printactions.py index f62e804..d7af7a5 100644 --- a/x2go/printactions.py +++ b/x2go/printactions.py @@ -39,9 +39,9 @@ if _X2GOCLIENT_OS in ("Windows"): import subprocess import win32api import win32print - import x2go_exceptions.WindowsError as WindowsError else: import gevent_subprocess as subprocess + import x2go_exceptions.WindowsError as WindowsError # Python X2Go modules import log hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits March 2012