[X2Go-Commits] [pyhoca-gui] 04/04: whitespace fixes at EOL
git-admin at x2go.org
git-admin at x2go.org
Sat Apr 5 09:00:54 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository pyhoca-gui.
commit 1ade46d298c8df30fea878e65f515aae45c814c1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Apr 5 09:00:37 2014 +0200
whitespace fixes at EOL
---
pyhoca/wxgui/brokerlogon.py | 32 +++++++++---------
pyhoca/wxgui/defaults.py | 2 +-
pyhoca/wxgui/frontend.py | 4 +--
pyhoca/wxgui/listdesktops.py | 16 ++++-----
pyhoca/wxgui/logon.py | 72 ++++++++++++++++++++---------------------
pyhoca/wxgui/menus_taskbar.py | 16 ++++-----
pyhoca/wxgui/notify.py | 2 +-
pyhoca/wxgui/passphrase.py | 22 ++++++-------
pyhoca/wxgui/printingprefs.py | 4 +--
pyhoca/wxgui/serverinfo.py | 4 +--
pyhoca/wxgui/sessiontitle.py | 14 ++++----
pyhoca/wxgui/splash.py | 2 +-
12 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/pyhoca/wxgui/brokerlogon.py b/pyhoca/wxgui/brokerlogon.py
index 8ef10f9..b72c0fc 100644
--- a/pyhoca/wxgui/brokerlogon.py
+++ b/pyhoca/wxgui/brokerlogon.py
@@ -53,7 +53,7 @@ class PyHocaGUI_BrokerDialogBoxPassword(wx.Dialog):
Broker logon window for L{PyHocaGUI}.
"""
- def __init__(self, _PyHocaGUI, caller=None):
+ def __init__(self, _PyHocaGUI, caller=None):
"""\
Broker logon window (constructor)
@@ -68,14 +68,14 @@ class PyHocaGUI_BrokerDialogBoxPassword(wx.Dialog):
wx.Dialog.__init__(self, None, id=-1, title=self._PyHocaGUI.broker_name + ' ' + _(u'Logon'), style=wx.DEFAULT_FRAME_STYLE, )
self._PyHocaGUI._sub_windows.append(self)
- self.brokerLbl = wx.StaticText(self, wx.ID_ANY, _(u'Broker URL')+':', size=(-1, -1))
- self.brokerTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER, size=(240, -1))
+ self.brokerLbl = wx.StaticText(self, wx.ID_ANY, _(u'Broker URL')+':', size=(-1, -1))
+ self.brokerTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER, size=(240, -1))
- self.userLbl = wx.StaticText(self, wx.ID_ANY, _(u'Username')+':', size=(-1, -1))
- self.userTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER, size=(240, -1))
+ self.userLbl = wx.StaticText(self, wx.ID_ANY, _(u'Username')+':', size=(-1, -1))
+ self.userTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER, size=(240, -1))
- self.passwordLbl = wx.StaticText(self, wx.ID_ANY, _(u'Password')+':', size=(-1, -1))
- self.passwordTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD, size=(240, -1))
+ self.passwordLbl = wx.StaticText(self, wx.ID_ANY, _(u'Password')+':', size=(-1, -1))
+ self.passwordTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD, size=(240, -1))
self.passwordTxt.SetFocus()
if self._PyHocaGUI.session_profiles.get_broker_username():
@@ -110,20 +110,20 @@ class PyHocaGUI_BrokerDialogBoxPassword(wx.Dialog):
mainSizer = wx.BoxSizer(wx.VERTICAL)
credSizer = wx.GridBagSizer(hgap=2, vgap=3)
- credSizer.Add(self.brokerLbl, pos=(0,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
- credSizer.Add(self.brokerTxt, pos=(0,1), flag=wx.ALL, border=5)
- credSizer.Add(self.userLbl, pos=(1,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
- credSizer.Add(self.userTxt, pos=(1,1), flag=wx.ALL, border=5)
- credSizer.Add(self.passwordLbl, pos=(2,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
+ credSizer.Add(self.brokerLbl, pos=(0,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
+ credSizer.Add(self.brokerTxt, pos=(0,1), flag=wx.ALL, border=5)
+ credSizer.Add(self.userLbl, pos=(1,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
+ credSizer.Add(self.userTxt, pos=(1,1), flag=wx.ALL, border=5)
+ credSizer.Add(self.passwordLbl, pos=(2,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
credSizer.Add(self.passwordTxt, pos=(2,1), flag=wx.ALL, border=5)
- btnSizer.Add(self.loginBtn, 0, wx.ALL, 5)
- btnSizer.Add(self.cancelBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.loginBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.cancelBtn, 0, wx.ALL, 5)
- mainSizer.Add(credSizer, 0, wx.ALL, 5)
+ mainSizer.Add(credSizer, 0, wx.ALL, 5)
mainSizer.Add(btnSizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
- # Logged in variable
+ # Logged in variable
self.loggedIn = False
self.SetSizerAndFit(mainSizer)
diff --git a/pyhoca/wxgui/defaults.py b/pyhoca/wxgui/defaults.py
index c0ccb5e..d3955bb 100644
--- a/pyhoca/wxgui/defaults.py
+++ b/pyhoca/wxgui/defaults.py
@@ -21,7 +21,7 @@
from x2go import X2GOCLIENT_OS
from x2go import BACKENDS
-
+
_profiles_backend_default = BACKENDS['X2GoSessionProfiles']['default']
_settings_backend_default = BACKENDS['X2GoClientSettings']['default']
_printing_backend_default = BACKENDS['X2GoClientPrinting']['default']
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 324d7ce..d4b3887 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -118,8 +118,8 @@ class PyHocaGUI(wx.App, x2go.X2GoClient):
wxPython and gevent.
"""
- def __init__(self, args, logger, liblogger,
- appname='PyHoca-GUI',
+ def __init__(self, args, logger, liblogger,
+ appname='PyHoca-GUI',
vendorname='Open Source Software Foundation',
version=None,):
"""\
diff --git a/pyhoca/wxgui/listdesktops.py b/pyhoca/wxgui/listdesktops.py
index 8ab0885..49eb356 100644
--- a/pyhoca/wxgui/listdesktops.py
+++ b/pyhoca/wxgui/listdesktops.py
@@ -54,7 +54,7 @@ class PyHocaGUI_DialogBoxListDesktops(wx.Dialog):
Dialog box for selection from a list of sharable desktops.
"""
- def __init__(self, _PyHocaGUI, profile_name):
+ def __init__(self, _PyHocaGUI, profile_name):
"""\
Desktop list and selection dialog box (constructor).
@@ -80,7 +80,7 @@ class PyHocaGUI_DialogBoxListDesktops(wx.Dialog):
self.SetTitle(_(u'Share Desktop Session - %s') % profile_name)
- self.titleLbl = wx.StaticText(self, wx.ID_ANY, _(u'Select one of the available desktop sessions on this server')+':', size=(-1, -1))
+ self.titleLbl = wx.StaticText(self, wx.ID_ANY, _(u'Select one of the available desktop sessions on this server')+':', size=(-1, -1))
self.desktopList = wx.ListCtrl(self, size=(420,140),
style=wx.LC_REPORT|wx.BORDER_SUNKEN|wx.LC_SINGLE_SEL)
self.desktopList.InsertColumn(0, 'Display')
@@ -116,13 +116,13 @@ class PyHocaGUI_DialogBoxListDesktops(wx.Dialog):
modeSizer.Add(self.shareMode0, 0, wx.ALL, 5)
modeSizer.Add(self.shareMode1, 0, wx.ALL, 5)
- btnSizer.Add(self.okBtn, 0, wx.ALL, 5)
- btnSizer.Add(self.refreshBtn, 0, wx.ALL, 5)
- btnSizer.Add(self.cancelBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.okBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.refreshBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.cancelBtn, 0, wx.ALL, 5)
- mainSizer.Add(titleSizer, 0, wx.ALL, 5)
- mainSizer.Add(listSizer, 0, wx.ALL|wx.EXPAND, 5)
- mainSizer.Add(modeSizer, 0, wx.ALL, 5)
+ mainSizer.Add(titleSizer, 0, wx.ALL, 5)
+ mainSizer.Add(listSizer, 0, wx.ALL|wx.EXPAND, 5)
+ mainSizer.Add(modeSizer, 0, wx.ALL, 5)
mainSizer.Add(btnSizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
self.SetSizerAndFit(mainSizer)
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 17f03ef..96edbec 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -54,7 +54,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
Logon window for L{PyHocaGUI}.
"""
- def __init__(self, _PyHocaGUI, profile_name, caller=None, passphrase=None, sshproxy_passphrase=None, sshproxy_auth=False, twofactor_auth=False, sshproxy_twofactor_auth=False):
+ def __init__(self, _PyHocaGUI, profile_name, caller=None, passphrase=None, sshproxy_passphrase=None, sshproxy_auth=False, twofactor_auth=False, sshproxy_twofactor_auth=False):
"""\
Logon window (constructor)
@@ -95,22 +95,22 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
self.passphrase = passphrase
self.sshproxy_passphrase = sshproxy_passphrase
- self.userLbl = wx.StaticText(self, wx.ID_ANY, _(u'Username')+':', size=(-1, -1))
- self.userTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER, size=(120, -1))
- self.passwordLbl = wx.StaticText(self, wx.ID_ANY, _(u'Password')+':', size=(-1, -1))
- self.passwordTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD, size=(120, -1))
+ self.userLbl = wx.StaticText(self, wx.ID_ANY, _(u'Username')+':', size=(-1, -1))
+ self.userTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER, size=(120, -1))
+ self.passwordLbl = wx.StaticText(self, wx.ID_ANY, _(u'Password')+':', size=(-1, -1))
+ self.passwordTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD, size=(120, -1))
self.passwordTxt.SetFocus()
self.loginBtn = wx.Button(self, wx.ID_OK, _(u'Authenticate'), )
self.loginBtn.SetDefault()
_tab_order = []
- # widgets
+ # widgets
if self.sshproxy_auth:
- self.sshProxyUserLbl = wx.StaticText(self, wx.ID_ANY, _(u'Username')+':', size=(-1, -1))
- self.sshProxyUserTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER, size=(120, -1))
- self.sshProxyPasswordLbl = wx.StaticText(self, wx.ID_ANY, _(u'Password')+':', size=(-1, -1))
- self.sshProxyPasswordTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD, size=(120, -1))
+ self.sshProxyUserLbl = wx.StaticText(self, wx.ID_ANY, _(u'Username')+':', size=(-1, -1))
+ self.sshProxyUserTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER, size=(120, -1))
+ self.sshProxyPasswordLbl = wx.StaticText(self, wx.ID_ANY, _(u'Password')+':', size=(-1, -1))
+ self.sshProxyPasswordTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD, size=(120, -1))
self.sshProxyPasswordTxt.SetFocus()
self.sshProxyLoginBtn = wx.Button(self, wx.ID_OK, ' '+_(u'Start SSH tunnel')+' ')
self.sshProxyLoginBtn.SetDefault()
@@ -151,7 +151,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
credSizer = wx.GridBagSizer(hgap=2, vgap=2)
mainSizer = wx.BoxSizer(wx.VERTICAL)
- # sizer / layout
+ # sizer / layout
if self.sshproxy_auth:
credSizer = wx.GridBagSizer(hgap=4, vgap=2)
@@ -162,31 +162,31 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
credSizer.Add(self.sshProxyUserLbl, pos=(1,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
credSizer.Add(self.sshProxyUserTxt, pos=(1,1), flag=wx.ALL, border=5)
- credSizer.Add(self.userLbl, pos=(1,2), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
- credSizer.Add(self.userTxt, pos=(1,3), flag=wx.ALL, border=5)
+ credSizer.Add(self.userLbl, pos=(1,2), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
+ credSizer.Add(self.userTxt, pos=(1,3), flag=wx.ALL, border=5)
else:
- credSizer.Add(self.userLbl, pos=(0,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
- credSizer.Add(self.userTxt, pos=(0,1), flag=wx.ALL, border=5)
+ credSizer.Add(self.userLbl, pos=(0,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
+ credSizer.Add(self.userTxt, pos=(0,1), flag=wx.ALL, border=5)
if self.sshproxy_auth:
credSizer.Add(self.sshProxyPasswordLbl, pos=(2,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
credSizer.Add(self.sshProxyPasswordTxt, pos=(2,1), flag=wx.ALL, border=5)
- credSizer.Add(self.passwordLbl, pos=(2,2), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
+ credSizer.Add(self.passwordLbl, pos=(2,2), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
credSizer.Add(self.passwordTxt, pos=(2,3), flag=wx.ALL, border=5)
else:
- credSizer.Add(self.passwordLbl, pos=(1,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
+ credSizer.Add(self.passwordLbl, pos=(1,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
credSizer.Add(self.passwordTxt, pos=(1,1), flag=wx.ALL, border=5)
if self.sshproxy_auth:
btnSizer.Add(self.sshProxyLoginBtn, 0, wx.ALL, 5)
- btnSizer.Add(self.loginBtn, 0, wx.ALL, 5)
- btnSizer.Add(self.cancelBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.loginBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.cancelBtn, 0, wx.ALL, 5)
- mainSizer.Add(credSizer, 0, wx.ALL, 5)
+ mainSizer.Add(credSizer, 0, wx.ALL, 5)
mainSizer.Add(btnSizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
if self.current_profile_config.has_key('user'):
@@ -203,10 +203,10 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
if self.current_profile_config.has_key('sshproxysameuser') and self.current_profile_config['sshproxysameuser']:
self.sshProxyUserTxt.SetValue(self.current_profile_config['user'])
- # Logged in variable
+ # Logged in variable
self.loggedIn = False
- self.SetSizerAndFit(mainSizer)
+ self.SetSizerAndFit(mainSizer)
self.Layout()
for i in xrange(len(_tab_order) - 1):
@@ -285,7 +285,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
force_password_auth = False
sshproxy_force_password_auth = True
else:
- force_password_auth = True
+ force_password_auth = True
sshproxy_force_password_auth = True
wx.BeginBusyCursor()
@@ -309,7 +309,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
icon='auth_error')
self._PyHocaGUI.OnServerDisconnect(evt)
else:
- self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
title=_(u'%s - connect') % self.current_profile_name,
text=_(u'Authentication has been successful.'),
icon='auth_success')
@@ -356,8 +356,8 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
self.sshProxyLoginBtn.SetLabel(_(u'SSH tunnel started'))
return
else:
- self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
- title=_(u'%s - connect failure') % self.current_profile_name,
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - connect failure') % self.current_profile_name,
text=_(u'Authentication failed!'),
icon='auth_failed')
connect_failed = True
@@ -366,7 +366,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
try: wx.EndBusyCursor()
except: pass
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
- title=_(u'%s - SSH proxy') % self.current_profile_name,
+ title=_(u'%s - SSH proxy') % self.current_profile_name,
text=_(u'Authentication to the SSH proxy server failed!'),
icon='auth_failed')
@@ -386,24 +386,24 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
connect_failed = True
#except gevent.dns.DNSError, e:
- # self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
- # title=_(u'%s - DNS error') % self.current_profile_name,
+ # self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ # title=_(u'%s - DNS error') % self.current_profile_name,
# text=e.strerror + '!',
# icon='auth_error')
# connect_failed = True
except gevent.socket.error, e:
- self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
- title=_(u'%s - socket error') % self.current_profile_name,
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - socket error') % self.current_profile_name,
text=e.strerror + '!',
icon='auth_error')
connect_failed = True
except x2go.X2GoHostKeyException, e:
- self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
- title=_(u'%s - host key error') % self.current_profile_name,
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - host key error') % self.current_profile_name,
text=_(u'The remote server\'s host key is invalid or has not been accepted by the user') + '!',
- icon='auth_error',
+ icon='auth_error',
timeout=4000)
connect_failed = True
@@ -471,8 +471,8 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
connect_failed = True
except:
- self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
- title=_(u'%s - unknown error') % self.current_profile_name,
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - unknown error') % self.current_profile_name,
text=_(u'An unknown error occured during authentication!'),
icon='auth_error')
connect_failed = True
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 5a5239e..1829763 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -129,8 +129,8 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
if not self._PyHocaGUI.args.single_session_profile:
ID_PROFILEMANAGER = wx.NewId()
- _maintain_profiles_item = self.AppendMenu(id=ID_PROFILEMANAGER,
- text=_(u"Profile Manager"),
+ _maintain_profiles_item = self.AppendMenu(id=ID_PROFILEMANAGER,
+ text=_(u"Profile Manager"),
submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI,
caller=self,
filter_profiles=[],
@@ -274,7 +274,7 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
_ts.Enable(False)
if not _s.is_shadow_session():
- if self._PyHocaGUI.disconnect_on_suspend and self._PyHocaGUI.exit_on_disconnect and _s.has_terminal_session():
+ if self._PyHocaGUI.disconnect_on_suspend and self._PyHocaGUI.exit_on_disconnect and _s.has_terminal_session():
_ss = self.Append(text=_(u"Suspend Session (and disconnect/exit)"), id=ID_SUSPENDSESSION)
elif self._PyHocaGUI.disconnect_on_suspend and _s.has_terminal_session():
_ss = self.Append(text=_(u"Suspend Session (and disconnect)"), id=ID_SUSPENDSESSION)
@@ -421,8 +421,8 @@ class PyHocaGUI_Menu_LaunchSingleApplication(wx.Menu):
_available_applications = {
'WWWBROWSER': _(u'Internet Browser'),
'MAILCLIENT': _(u'Email Client'),
- 'OFFICE': _(u'Office'),
- 'TERMINAL': _(u'Terminal'),
+ 'OFFICE': _(u'Office'),
+ 'TERMINAL': _(u'Terminal'),
}
for application in self._PyHocaGUI.get_profile_config(profile_name, 'applications'):
@@ -866,7 +866,7 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
will be rendered in a tree-like fashion.
"""
- def __init__(self, _PyHocaGUI, caller=None,
+ def __init__(self, _PyHocaGUI, caller=None,
sub_profile_items=[], filter_profiles=[], disabled_profiles=[],
bind_method=None,
submenu=None,
@@ -924,7 +924,7 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
for profile_name in _profile_names:
if len(profile_name.split('/')) >= 2:
_group_name = profile_name.split('/')[0]
- if not _group_name in _profile_groups:
+ if not _group_name in _profile_groups:
_profile_groups.append(_group_name)
_profile_groups.sort()
@@ -938,7 +938,7 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
_this_id = wx.NewId()
self.AppendMenu(text=profile_group, id=_this_id,
- submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI,
+ submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI,
caller=self,
sub_profile_items=_sub_profile_items,
filter_profiles=[],
diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py
index 8d66cc5..db1ceba 100644
--- a/pyhoca/wxgui/notify.py
+++ b/pyhoca/wxgui/notify.py
@@ -434,7 +434,7 @@ class notificationmessage_NotifierPopup(object):
_notification_msg.SetFlags(icon)
_notification_msg.Show(timeout=timeout)
except:
- # if we are running wxPython 2.8, we ignore missing
+ # if we are running wxPython 2.8, we ignore missing
# wx.NotificationMessage class
pass
diff --git a/pyhoca/wxgui/passphrase.py b/pyhoca/wxgui/passphrase.py
index 5c9104f..08fea50 100644
--- a/pyhoca/wxgui/passphrase.py
+++ b/pyhoca/wxgui/passphrase.py
@@ -91,8 +91,8 @@ class PyHocaGUI_DialogBoxPassphrase(wx.Dialog):
else:
keyfilenameLbl = wx.StaticText(self, wx.ID_ANY, _(u'Unlock auto-discovered SSH private key...'))
- self.passphraseLbl = wx.StaticText(self, wx.ID_ANY, _(u'Passphrase')+':', size=(-1, -1))
- self.passphraseTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD, size=(120, -1))
+ self.passphraseLbl = wx.StaticText(self, wx.ID_ANY, _(u'Passphrase')+':', size=(-1, -1))
+ self.passphraseTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD, size=(120, -1))
self.passphraseTxt.SetFocus()
self.unlockBtn = wx.Button(self, wx.ID_OK, _(u'Unlock SSH key'), )
self.unlockBtn.SetDefault()
@@ -111,20 +111,20 @@ class PyHocaGUI_DialogBoxPassphrase(wx.Dialog):
credSizer = wx.GridBagSizer(hgap=1, vgap=1)
mainSizer = wx.BoxSizer(wx.VERTICAL)
- credSizer.Add(self.passphraseLbl, pos=(0,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
+ credSizer.Add(self.passphraseLbl, pos=(0,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
credSizer.Add(self.passphraseTxt, pos=(0,1), flag=wx.ALL, border=5)
- btnSizer.Add(self.unlockBtn, 0, wx.ALL, 5)
- btnSizer.Add(self.cancelBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.unlockBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.cancelBtn, 0, wx.ALL, 5)
mainSizer.Add(keyfilenameLbl, 0, wx.ALL|wx.ALIGN_LEFT, 5)
- mainSizer.Add(credSizer, 0, wx.ALL|wx.ALIGN_CENTER, 5)
+ mainSizer.Add(credSizer, 0, wx.ALL|wx.ALIGN_CENTER, 5)
mainSizer.Add(btnSizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
- # Logged in variable
+ # Logged in variable
self.loggedIn = False
- self.SetSizerAndFit(mainSizer)
+ self.SetSizerAndFit(mainSizer)
self.Layout()
for i in xrange(len(_tab_order) - 1):
@@ -259,7 +259,7 @@ class PyHocaGUI_DialogBoxPassphrase(wx.Dialog):
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
title=_(u'%s - host key error') % self.current_profile_name,
text=_(u'The remote server\'s host key is invalid or has not been accepted by the user') + '!',
- icon='auth_error',
+ icon='auth_error',
timeout=4000)
connect_failed = True
@@ -327,8 +327,8 @@ class PyHocaGUI_DialogBoxPassphrase(wx.Dialog):
connect_failed = True
except:
- self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
- title=_(u'%s - unknown error') % self.current_profile_name,
+ self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+ title=_(u'%s - unknown error') % self.current_profile_name,
text=_(u'An unknown error occured during authentication!'),
icon='auth_error')
connect_failed = True
diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py
index 1199ce0..67c1324 100644
--- a/pyhoca/wxgui/printingprefs.py
+++ b/pyhoca/wxgui/printingprefs.py
@@ -119,14 +119,14 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
# widgets for print action PDFVIEW
self.PdfViewCmdLabel = wx.StaticText(self, -1, _(u'PDF viewer command') + ':', )
self.PdfViewCmd = wx.TextCtrl(self, -1, '', )
- self.PdfViewCmdBrowseButton = wx.BitmapButton(self, -1,
+ self.PdfViewCmdBrowseButton = wx.BitmapButton(self, -1,
wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY)
)
# widgets for print action PDFSAVE
self.PdfSaveToFolderLabel = wx.StaticText(self, -1, _(u'Save PDFs to folder') + ':', )
self.PdfSaveToFolder = wx.TextCtrl(self, -1, '', )
- self.PdfSaveToFolderBrowseButton = wx.BitmapButton(self, -1,
+ self.PdfSaveToFolderBrowseButton = wx.BitmapButton(self, -1,
wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY)
)
diff --git a/pyhoca/wxgui/serverinfo.py b/pyhoca/wxgui/serverinfo.py
index e3b03ee..23177e6 100644
--- a/pyhoca/wxgui/serverinfo.py
+++ b/pyhoca/wxgui/serverinfo.py
@@ -54,7 +54,7 @@ class PyHocaGUI_DialogBoxServerInfo(wx.Dialog):
Simple dialog box for showing server information.
"""
- def __init__(self, _PyHocaGUI, profile_name):
+ def __init__(self, _PyHocaGUI, profile_name):
"""\
Server information dialog box (constructor).
@@ -75,7 +75,7 @@ class PyHocaGUI_DialogBoxServerInfo(wx.Dialog):
self.SetTitle(_(u'Server Information - %s') % profile_name)
- self.titleLbl = wx.StaticText(self, wx.ID_ANY, _(u'Session Profile: %s\n\nList of X2Go Server components, add-ons and their versions...') % self.current_profile_name, size=(-1, -1))
+ self.titleLbl = wx.StaticText(self, wx.ID_ANY, _(u'Session Profile: %s\n\nList of X2Go Server components, add-ons and their versions...') % self.current_profile_name, size=(-1, -1))
self.infoArea = wx.TextCtrl(self, id=-1, value="", size=(520,300), style=wx.TE_READONLY|wx.TE_MULTILINE|wx.SUNKEN_BORDER)
diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py
index 111fd46..5336ac1 100644
--- a/pyhoca/wxgui/sessiontitle.py
+++ b/pyhoca/wxgui/sessiontitle.py
@@ -54,7 +54,7 @@ class PyHocaGUI_DialogBoxSessionTitle(wx.Dialog):
Simple dialog box for selecting a session title string.
"""
- def __init__(self, _PyHocaGUI, profile_name, session_name):
+ def __init__(self, _PyHocaGUI, profile_name, session_name):
"""\
Session title renaming dialog box (constructor).
@@ -78,8 +78,8 @@ class PyHocaGUI_DialogBoxSessionTitle(wx.Dialog):
self.SetTitle(_(u'Session Title - %s') % profile_name)
- self.titleLbl = wx.StaticText(self, wx.ID_ANY, _(u'Change session title to')+':', size=(-1, -1))
- self.titleTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER, size=(120, -1))
+ self.titleLbl = wx.StaticText(self, wx.ID_ANY, _(u'Change session title to')+':', size=(-1, -1))
+ self.titleTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER, size=(120, -1))
self.okBtn = wx.Button(self, wx.ID_OK, _(u'OK'), )
self.okBtn.SetDefault()
self.cancelBtn = wx.Button(self, wx.ID_CANCEL, _(u'Cancel'), )
@@ -95,13 +95,13 @@ class PyHocaGUI_DialogBoxSessionTitle(wx.Dialog):
titleSizer.Add(self.titleLbl, 0, wx.ALL, 5)
titleSizer.Add(self.titleTxt, 0, wx.ALL, 5)
- btnSizer.Add(self.okBtn, 0, wx.ALL, 5)
- btnSizer.Add(self.cancelBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.okBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.cancelBtn, 0, wx.ALL, 5)
- mainSizer.Add(titleSizer, 0, wx.ALL, 5)
+ mainSizer.Add(titleSizer, 0, wx.ALL, 5)
mainSizer.Add(btnSizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
- self.SetSizerAndFit(mainSizer)
+ self.SetSizerAndFit(mainSizer)
self.Layout()
maxX, maxY = wx.GetDisplaySize()
diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py
index bedc60b..87e44f7 100644
--- a/pyhoca/wxgui/splash.py
+++ b/pyhoca/wxgui/splash.py
@@ -66,7 +66,7 @@ class PyHocaGUI_SplashScreen(wx.SplashScreen):
splash_wximage.Rescale(400, int(float(400)/splash_wximage.Width*splash_wximage.Height))
splash_wxbitmap = splash_wximage.ConvertToBitmap()
- wx.SplashScreen.__init__(self,
+ wx.SplashScreen.__init__(self,
splash_wxbitmap,
splashStyle=wx.SPLASH_CENTRE_ON_SCREEN|wx.SPLASH_TIMEOUT,
milliseconds=5000,
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
More information about the x2go-commits
mailing list