[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.2.0.4-27-g51a1034
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:56:21 CEST 2013
The branch, twofactorauth has been updated
via 51a10345649908d5972d4cffcbd33e7c2d37c9d8 (commit)
from 30830ba27f3e93883e1a2f3769ddd9607f352b3c (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:
debian/changelog | 1 +
pyhoca/wxgui/profilemanager.py | 54 ++++++++++++++++++++++++++++------------
2 files changed, 39 insertions(+), 16 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7cb05e3..5528727 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low
profile options ,,sshproxysameuser'' and ,,sshproxysamepass''.
- Rebuild of i18n files, update of en.po and de.po.
- Disable ,,usesshproxy'' for DirectRDP sessions.
+ - Make ,,maxdim'' option configurable through session profile manager.
* /debian/control:
+ Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
+ Add Oleksandr Shneyder to Uploaders.
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index adec2f2..38e10fa 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -284,6 +284,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
### wigdets for the SETTINGS tab
###
self.DisplayTypeFullscreen = wx.RadioButton(self.tab_Settings, -1, _(u"Fullscreen"), style=wx.RB_GROUP)
+ self.DisplayTypeMaximize = wx.RadioButton(self.tab_Settings, -1, _(u"Maximized"))
self.DisplayTypeCustom = wx.RadioButton(self.tab_Settings, -1, _(u"Custom Size")+": ")
self.ScreenWidthLabel = wx.StaticText(self.tab_Settings, -1, '')
self.ScreenWidth = wx.SpinCtrl(self.tab_Settings, -1, "800", min=400, max=3000)
@@ -365,6 +366,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.Bind(wx.EVT_TEXT, self.OnUpdateSSHProxyTunnelFromPort, self.SSHProxyTunnelFromPort)
self.Bind(wx.EVT_COMBOBOX, self.OnCompressionSelected, self.Compression)
self.Bind(wx.EVT_RADIOBUTTON, self.OnSetDisplayFullscreen, self.DisplayTypeFullscreen)
+ self.Bind(wx.EVT_RADIOBUTTON, self.OnSetDisplayMaximize, self.DisplayTypeMaximize)
self.Bind(wx.EVT_RADIOBUTTON, self.OnSetDisplayCustom, self.DisplayTypeCustom)
self.Bind(wx.EVT_CHECKBOX, self.OnSetDisplayDPI, self.SetDisplayDPI)
self.Bind(wx.EVT_RADIOBUTTON, self.OnSetKeyboard, self.DontSetKeyboard)
@@ -471,6 +473,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.ImageQualityLabel.SetMinSize((120, 16))
self.ImageQuality.SetMinSize((180, self._textfield_height))
self.DisplayTypeFullscreen.SetMinSize((-1, self._textfield_height))
+ self.DisplayTypeMaximize.SetMinSize((-1, self._textfield_height))
self.ScreenWidth.SetMinSize((60, self._textfield_height))
self.ScreenHeight.SetMinSize((60, self._textfield_height))
self.SetDisplayDPI.SetMinSize((-1, self._textfield_height))
@@ -643,6 +646,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_4_1_1_1 = wx.BoxSizer(wx.HORIZONTAL)
sizer_4_1_1_1.Add(self.DisplayTypeFullscreen, flag=wx.ALIGN_CENTRE_VERTICAL)
sizer_4_1_1_1.Add((16, 0))
+ sizer_4_1_1_1.Add(self.DisplayTypeMaximize, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_4_1_1_1.Add((16, 0))
sizer_4_1_1_1.Add(self.DisplayTypeCustom, flag=wx.ALIGN_CENTRE_VERTICAL)
sizer_4_1_1_1.Add(self.ScreenWidthLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
sizer_4_1_1_1.Add((8,0))
@@ -929,8 +934,24 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.UsePublishedApplications.Enable(False)
self.RootlessSession.Enable(False)
+ if 0 < self.profile_config['speed'] <= 5:
+ _link_speed = self.profile_config['speed']
+ else:
+ _link_speed = self.profileManagerDefaults['speed']
+ self.LinkSpeed.SetValue(_link_speed)
+ if '%s-%%' % self.profile_config['pack'] in self._compressions and self.profile_config['quality'] and (self.profile_config['quality'] in range(1,10)):
+ self.Compression.SetValue('%s-%%' % self.profile_config['pack'])
+ self.ImageQuality.SetValue(self.profile_config['quality'])
+ self.ImageQuality.Enable(True)
+ else:
+ self.Compression.SetValue(self.profile_config['pack'])
+ self.ImageQuality.SetValue(9)
+ self.ImageQuality.Enable(False)
+
if _command == 'RDP':
if self.profile_config['directrdp']:
+ self.UseSSHProxy.SetValue(False)
+ self.ToggleSSHProxy()
self.enable_DirectRDP()
self.SSHPort.SetValue(self.profile_config['rdpport'])
self.RDPOptions.SetValue(self.profile_config['directrdpsettings'])
@@ -961,22 +982,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.XDMCPServer.SetValue(self.profile_config['xdmcpserver'])
- if 0 < self.profile_config['speed'] <= 5:
- _link_speed = self.profile_config['speed']
- else:
- _link_speed = self.profileManagerDefaults['speed']
- self.LinkSpeed.SetValue(_link_speed)
- if '%s-%%' % self.profile_config['pack'] in self._compressions and self.profile_config['quality'] and (self.profile_config['quality'] in range(1,10)):
- self.Compression.SetValue('%s-%%' % self.profile_config['pack'])
- self.ImageQuality.SetValue(self.profile_config['quality'])
- self.ImageQuality.Enable(True)
- else:
- self.Compression.SetValue(self.profile_config['pack'])
- self.ImageQuality.SetValue(9)
- self.ImageQuality.Enable(False)
-
- self.DisplayTypeFullscreen.SetValue(self.profile_config['fullscreen'])
- self.DisplayTypeCustom.SetValue(not self.profile_config['fullscreen'])
+ self.DisplayTypeFullscreen.SetValue(self.profile_config['fullscreen'] and not self.profile_config['maxdim'])
+ self.DisplayTypeMaximize.SetValue(self.profile_config['maxdim'])
+ self.DisplayTypeCustom.SetValue(not (self.profile_config['fullscreen'] or self.profile_config['maxdim']))
self.ScreenWidth.SetValue(self.profile_config['width'])
self.ScreenHeight.SetValue(self.profile_config['height'])
if self.profile_config['fullscreen']:
@@ -1229,6 +1237,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
else:
self.profile_config['quality'] = 0
self.profile_config['fullscreen'] = self.DisplayTypeFullscreen.GetValue()
+ self.profile_config['maxdim'] = self.DisplayTypeMaximize.GetValue()
self.profile_config['width'] = self.ScreenWidth.GetValue()
self.profile_config['height'] = self.ScreenHeight.GetValue()
@@ -1819,6 +1828,19 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.ScreenHeightLabel.Enable(False)
self.ScreenHeight.Enable(False)
+ def OnSetDisplayMaximize(self, event):
+ """\
+ Gets called whenever the maximize-display radion button gets checked.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
+ self.ScreenWidthLabel.Enable(False)
+ self.ScreenWidth.Enable(False)
+ self.ScreenHeightLabel.Enable(False)
+ self.ScreenHeight.Enable(False)
+
def OnSetDisplayCustom(self, event):
"""\
Gets called whenever the custom-size-display radion button gets checked.
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