[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 3318924e56c0f2cf9f12f48c61e0e8e4016884aa
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:20:33 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 3318924e56c0f2cf9f12f48c61e0e8e4016884aa (commit)
from e90dfa515174ef9c9256843034ca57e784cafbd5 (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:
x2goLogon.py | 140 ----------------------------------------------------------
1 file changed, 140 deletions(-)
The diff of changes is:
diff --git a/x2goLogon.py b/x2goLogon.py
index fae9961..a0e65fc 100644
--- a/x2goLogon.py
+++ b/x2goLogon.py
@@ -421,146 +421,6 @@ class X2GoChooseSessionScrn(wx.Frame):
self.list.SetItemImage(self.currentItem, self.idx2)
-class X2GoSessionDefScrn(wx.Frame):
- SESSIONNOTEBOOK = wx.NewId()
- TypeList = ['GNOME','LXDE','Connect to Windows terminal server','Custom desktop','Server security','Single application']
- CommandList = ['Internet Browser','Email client','OpenOffice','Terminal']
- ConnectList = ['Modem','ISDN','ADSL','WAN','LAN']
- CommpressionList = ['nopack','64k','256k','2m','256-rdp','32k-rdp','64k-rdp','16m-rdp','16m-rdp-compressed','64k-tight','2m-tight','4k-jpeg','16m-jpeg','64k-png-jpeg','16m-png-jpeg','64k-png','16m-png','16m-rgb','16m-rle']
- def __init__(self, parent, directCall=False):
-
- parent.logger('Session definition screen started', x2go.loglevel_INFO, )
- if directCall:
- wx.Frame.__init__(self, parent=None, id=-1)
- else:
- wx.Frame.__init__(self, parent=parent, id=-1)
- self.pnl = sc.SizedDialog(self, -1)
- if self.current_profile and self.current_profile.connected:
- self.StatusText = self.current_profile.StatusText
- self.Environment = self.current_profile.Environment
- else:
- self.StatusText = 'Not Connected'
- self.Environment = ''
- self.sb = LogonStatusBar(self)
- self.SetStatusBar(self.sb)
-
- self.Main_MenuBar = wx.MenuBar()
- self.SetMenuBar(self.Main_MenuBar)
-
- if self.current_profile and self.current_profile.showConfigScreen is False:
- self.passwordScrn(self.pnl)
- else:
- self.defineSessionScrn(self.pnl)
-
- def defineSessionScrn(self, pnl, session):
- self.SessionDefinition = wx.Notebook(id = SESSIONNOTEBOOK, name = 'SessionNoteBook', parent = pnl, pos = wx.Point(0, 0), style = 0)
- self.SessionDefinition.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnPageChanged, id=SESSIONNOTEBOOK)
- self.HostPanel = wx.Panel(self.SessionDefinition, -1)
- self.SessionDefinition.AddPage(self.HostPanel, 'Host')
- self.ConnectionPanel = wx.Panel(self.SessionDefinition, -1)
- self.SessionDefinition.AddPage(self.ConnectionPanel, 'Connection')
- self.SessionPanel = wx.Panel(self.SessionDefinition, -1)
- self.SessionDefinition.AddPage(self.SessionPanel, 'Session')
- self.SharedFilesPanel = wx.Panel(self.SessionDefinition, -1)
- self.SessionDefinition.AddPage(self.SharedFilesPanel, 'Shared Files')
-
- self.bldHostPanel(self.HostPanel)
- self.bldConnPanel(self.ConnectionPanel)
- self.bldSessionPanel(self.SessionPanel)
- self.bldSharedFilesPanel(self.SharedFilesPanel)
-
- def bldHostPanel(self, pnl):
- self.hostgbs = wx.GridBagSizer(6, 4)
- self.hostgbs.Add((0,0), (1,1))
- self.hostgbs.Add( wx.StaticText(pnl, -1, 'Session Name'),
- (1,0), flag=wx.ALIGN_LEFT | wx.ALL)
- self.ctl_sessionName = wx.TextCtrl(pnl, -1)
- self.ctl_sessionName.SetValue(self.current_profile.username)
- self.hostgbs.Add(self.ctl_sessionName, (3,0))
-
- self.hostgbs.Add( wx.StaticText(pnl, -1, 'Server address'),
- (1,1), flag=wx.ALIGN_LEFT | wx.ALL)
- self.ctl_serverName = wx.TextCtrl(pnl, -1)
- self.ctl_serverName.SetValue(self.current_profile.servername)
- self.hostgbs.Add(self.ctl_serverName, (3,1))
-
- self.hostgbs.Add( wx.StaticText(pnl, -1, 'Server port'),
- (1,2), flag=wx.ALIGN_LEFT | wx.ALL)
- self.ctl_remote_ssh_port = wx.TextCtrl(pnl, -1)
- self.ctl_remote_ssh_port.SetValue(self.current_profile.remote_ssh_port)
- self.hostgbs.Add(self.ctl_remote_ssh_port, (3,2))
-
- self.hostgbs.Add( wx.StaticText(pnl, -1, 'Login'),
- (1,3), flag=wx.ALIGN_LEFT | wx.ALL)
- self.ctl_username = wx.TextCtrl(pnl, -1)
- self.ctl_username.SetValue(self.current_profile.username)
- self.hostgbs.Add(self.ctl_username, (3,3))
-
- self.hostgbs.Add( wx.StaticText(pnl, -1, 'Use RSA/DSA key for connection'),
- (1,4), flag=wx.ALIGN_LEFT | wx.ALL)
- self.ctl_username = wx.TextCtrl(pnl, -1)
- self.ctl_username.SetValue(self.current_profile.username)
- self.hostgbs.Add(self.ctl_username, (3,4))
-
- self.hostgbs.Add( wx.StaticText(pnl, -1, 'Session type'),
- (1,5), flag=wx.ALIGN_LEFT | wx.ALL)
- self.cb = wx.ComboBox(self, 500, "KDE", (90, 50), (160, -1), self.TypeList, wx.CB_DROPDOWN|wx.CB_READONLY)
- self.hostgbs.Add(self.cb, (3,5))
-
- self.hostgbs.Add( wx.StaticText(pnl, -1, 'Command'),
- (1,6), flag=wx.ALIGN_LEFT | wx.ALL)
- self.cmdcb = wx.ComboBox(self, 500, "Path to executable", (90, 50), (160, -1), self.CommandList, wx.CB_DROPDOWN)
- self.Bind(wx.EVT_TEXT_ENTER, self.onCommandEntered, self.cmdcb)
- self.hostgbs.Add(self.cmdcb, (3,6))
-
-
- def bldConnectionPanel(self, pnl):
- lefttopsizer_staticbox = wx.StaticBox(self.panel, -1, "Connection Speed")
- mainsizer = wx.BoxSizer(wx.VERTICAL)
- panelsizer = wx.BoxSizer(wx.HORIZONTAL)
- rightsizer = wx.FlexGridSizer(6, 2, 10, 10)
- leftsizer = wx.BoxSizer(wx.VERTICAL)
- lefttopsizer = wx.StaticBoxSizer(lefttopsizer_staticbox, wx.VERTICAL)
-
- self.knob1 = KC.KnobCtrl(pnl, -1, size=(100, 100))
- self.knob1.SetTags(range(0, 4, 1))
- self.knob1.SetAngularRange(-45, 225)
- knobValue = self.__findConnection(self.current_profile.link)
- self.knob1.SetValue(knobValue)
- self.knobtracker1 = wx.StaticText(self.panel, -1, self.ConnectList[knobValue])
- lefttopsizer.Add(self.knob1, 1, wx.ALL|wx.EXPAND, 5)
- lefttopsizer.Add(self.knobtracker1, 0, wx.ALL)
- leftbottomsizer_staticbox = wx.StaticBox(self.panel, -1, "Compression")
-
- self.conngbs = wx.GridBagSizer(6, 4)
- self.conngbs.Add((0,0), (1,1))
- self.conngbs.Add( wx.StaticText(pnl, -1, 'Method'),
- (1,0), flag=wx.ALIGN_LEFT | wx.ALL)
- self.cbComp = wx.ComboBox(self, 500, "16m-jpeg-9", (90, 50), (160, -1), self.CommpressionList, wx.CB_DROPDOWN|wx.CB_READONLY)
- self.conngbs.Add(self.cbComp, (3,4))
-
- def bldSessionPanel(self, pnl):
- self.sessgbs = wx.GridBagSizer(6, 4)
- lefttopsizer_staticbox = wx.StaticBox(self.panel, -1, "Display")
-
- def bldSharedFilesPanel(self, pnl):
- pass
-
-
- def __findConnection(self, value):
- for idx, c in enumerate(self.ConnectList):
- if c.lower() == value.lower(): break
- return idx
-
- def onCommandEntered(self, evt):
- pass
-
- def getSession(self):
- pass
-
- def OnUpdateProfile(self, evt):
- pass
-
class X2GoLogonTaskBarIcon(wx.TaskBarIcon):
def __init__(self, parent=None):
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