The branch, twofactorauth has been updated via 67dd94f2e9a5ebb8abca86d0da86656f6911e20b (commit) from f905cc552072465b02c8f2299f7cc3bbeadabde3 (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/profilemanager.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) The diff of changes is: diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index bd1a17f..eac7b58 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -54,6 +54,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): 'GNOME': 'GNOME Desktop (GNOME)', 'KDE': 'K Desktop Environment (KDE)', 'LXDE': 'Lightweight X Desktop (LXDE)', + 'XDMCP': 'XDMCP Query', 'EMBEDDED_MENU': 'Embedded Application Menu', 'RDP': 'Windows Terminal Server (RDP-proxy)', 'DirectRDP': 'Windows Terminal Server (RDP-direct)', @@ -140,6 +141,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.RDPServer = wx.TextCtrl(self.tab_Session, -1, "", size=wx.Size(160,20)) self.RDPOptionsLabel = wx.StaticText(self.tab_Session, -1, "RDP options:") self.RDPOptions = wx.TextCtrl(self.tab_Session, -1, "", size=wx.Size(160,20)) + self.XDMCPServerLabel = wx.StaticText(self.tab_Session, -1, "XDMCP server:") + self.XDMCPServer = wx.TextCtrl(self.tab_Session, -1, "", size=wx.Size(160,20)) ### ### widgets for the CONNECTION tab @@ -264,9 +267,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Application.SetMinSize((230, _textfield_height)) self.Application.SetSelection(0) self.Command.SetMinSize((230, _textfield_height)) + self.XDMCPServerLabel.SetMinSize((120, 16)) + self.XDMCPServer.SetMinSize((160, _textfield_height)) self.RDPSettingsLabel.SetMinSize((120, 16)) self.RDPServerLabel.SetMinSize((120, 16)) self.RDPServer.SetMinSize((160, _textfield_height)) + self.RDPServerLabel.SetMinSize((120, 16)) + self.RDPServer.SetMinSize((160, _textfield_height)) self.RDPOptionsLabel.SetMinSize((120, 16)) self.RDPOptions.SetMinSize((160, _textfield_height)) self.HostLabel.SetMinSize((120, 16)) @@ -345,6 +352,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_1_2_1.Add(self.Application, 0, 0, 0) sizer_1_2_1.Add(self.CommandLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0) sizer_1_2_1.Add(self.Command, 0, 0, 0) + sizer_1_2_1.Add(self.XDMCPServerLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0) + sizer_1_2_1.Add(self.XDMCPServer, 0, 0, 0) sizer_1_2_2 = wx.FlexGridSizer(1, 3, 2, 9) sizer_1_2_2.Add((0,23)) sizer_1_2_2.Add(self.RDPServerLabel, 0, wx.ALIGN_BOTTOM, 0) @@ -619,6 +628,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Application.Enable(False) self.CommandLabel.Enable(False) self.Command.Enable(False) + self.XDMCPServerLabel.Enable(False) + self.XDMCPServer.Enable(False) if _command in self.sessionChoices.keys(): self.SessionType.SetValue(self.sessionChoices[_command]) @@ -635,6 +646,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Command.Enable(True) self.Command.SetValue(_command) + if _command == 'XDMCP': + self.XDMCPServerLabel.Enable(True) + self.XDMCPServer.Enable(True) + if _command in ('RDP', 'DirectRDP'): self.RDPSettingsLabel.Enable(True) self.RDPServerLabel.Enable(True) @@ -656,6 +671,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.RDPServer.SetValue(self.profile_config['rdpserver']) self.RDPOptions.SetValue(self.profile_config['rdpoptions']) + self.XDMCPServer.SetValue(self.profile_config['xdmcpserver']) + try: _link_speed = self.linkChoices[self.profile_config['link']] except KeyError: @@ -815,6 +832,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['command'] = _command self.profile_config['rdpserver'] = self.RDPServer.GetValue() self.profile_config['rdpoptions'] = self.RDPOptions.GetValue() + self.profile_config['xdmcpserver'] = self.XDMCPServer.GetValue() _link_idx = self.LinkSpeed.GetValue() self.profile_config['link'] = self.linkChoices[_link_idx] @@ -939,6 +957,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.CommandLabel.Enable(False) self.Command.Enable(False) + if _session_type == 'XDMCP': + self.XDMCPServerLabel.Enable(True) + self.XDMCPServer.Enable(True) + else: + self.XDMCPServerLabel.Enable(False) + self.XDMCPServer.Enable(False) + if _session_type in ('RDP', 'DirectRDP', ): self.RDPSettingsLabel.Enable(True) self.RDPServerLabel.Enable(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)).