The branch, twofactorauth has been updated via 44cb5652045e663ee451b6e9502129cf22e60e5f (commit) from 0a828a95ecb575bddbfede95bdafc81609fd9784 (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/wxgui/printingprefs.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py index 80c3db0..46c56b7 100644 --- a/pyhoca/wxgui/printingprefs.py +++ b/pyhoca/wxgui/printingprefs.py @@ -69,7 +69,7 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog): if self.mode != 'edit': self._availablePrintActions['DIALOG'] = _(u'<Select a print action here>') - self._availablePrinters = {} + self._availablePrinters = {} if _X2GOCLIENT_OS != "Windows": # initialize CUPS config API and retrieve a list of local print queues cups.setUser(_CURRENT_LOCAL_USER) @@ -81,12 +81,12 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog): else: # initialize win32print API and retrieve a list of local print queues win32_printers = win32print.EnumPrinters(win32print.PRINTER_ENUM_LOCAL) - for p in win32_printers: + for p in win32_printers: if p[3]: self._availablePrinters.update({p[2]: '%s (%s)' % (p[2], p[3]), }) - else: + else: self._availablePrinters.update({p[2]: '%s' % p[2], }) - self._defaultPrinter = win32print.GetDefaultPrinter() + self._defaultPrinter = win32print.GetDefaultPrinter() self.client_printing = self._PyHocaGUI.client_printing @@ -148,10 +148,10 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog): _textfield_height = self.PdfViewCmdBrowseButton.GetBestSize().GetHeight()-2 self.PrintActionLabel.SetMinSize((-1, 16)) self.PrintAction.SetMinSize((-1, _textfield_height+4)) - self.PdfViewCmdBrowseButton.SetMinSize(self.PdfViewCmdBrowseButton.GetBestSize()) - self.PdfSaveToFolderBrowseButton.SetMinSize(self.PdfSaveToFolderBrowseButton.GetBestSize()) + self.PdfViewCmdBrowseButton.SetMinSize(self.PdfViewCmdBrowseButton.GetBestSize()) + self.PdfSaveToFolderBrowseButton.SetMinSize(self.PdfSaveToFolderBrowseButton.GetBestSize()) self.OKButton.SetMinSize((-1, 30)) - self.ApplyButton.SetMinSize((-1, 30)) + self.ApplyButton.SetMinSize((-1, 30)) self.CancelButton.SetMinSize((-1, 30)) def __do_layout(self): @@ -310,11 +310,11 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog): # This returns a Python list of files that were selected. _save_to_folder = dlg.GetPath() if _X2GOCLIENT_OS != 'Windows': - if _save_to_folder.startswith(_LOCAL_HOME): + if _save_to_folder.startswith(_LOCAL_HOME): _save_to_folder = re.sub('^%s\/' % _LOCAL_HOME, '', _save_to_folder) - else: - if os.path.normpath(_save_to_folder).lower().startswith(os.path.normpath(_LOCAL_HOME).lower()): - _save_to_folder = re.sub('^%s\\\\' % os.path.normpath(_LOCAL_HOME).replace('\\', '\\\\'), '', _save_to_folder, flags=re.IGNORECASE) + else: + if os.path.normpath(_save_to_folder).lower().startswith(os.path.normpath(_LOCAL_HOME).lower()): + _save_to_folder = re.sub('^%s\\\\' % os.path.normpath(_LOCAL_HOME).replace('\\', '\\\\'), '', _save_to_folder, flags=re.IGNORECASE) self.PdfSaveToFolder.SetValue(_save_to_folder) def __validate(self): 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)).