[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.10-89-g445fb0d

The branch, master has been updated via 445fb0d907a942e2550fb11acea53d6d1e1df93f (commit) from 2d38a466d20ee82908b4cafacac59aaac4735a48 (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 ----------------------------------------------------------------- commit 445fb0d907a942e2550fb11acea53d6d1e1df93f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Mar 4 23:46:59 2012 +0100 Use different textfield sizes for wxMSWin and wxGTK. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/profilemanager.py | 97 +++++++++++++++++++++------------------- 2 files changed, 52 insertions(+), 46 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 52ca0f6..e2d147e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Only allow session window manipulations for sessions that are associated to the running PyHoca-GUI client. - Fix icon and button sizes in profile manager. + - Use different textfield sizes for wxMSWin and wxGTK. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index f3be15a..dbfbd10 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -113,6 +113,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.session_profiles = self._PyHocaGUI.session_profiles self.action = action + if X2GOCLIENT_OS == 'Windows': + self._textfield_height = 24 + else: + self._textfield_height = 30 + if profile_id is not None: self.profile_id = profile_id elif profile_name is not None and self.action in ('EDIT', 'EDIT_CONNECTED', 'COPY'): @@ -206,13 +211,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=64000) self.SSHKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"RSA/DSA private key")+':') self.SSHKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) - self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(30,30), ) + self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) self.UseSSHProxy = wx.CheckBox(self.tab_Connection, -1, _(u"Server behind SSH proxy")) self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+':') self.SSHProxyUser = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) self.SSHProxyKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"Key file")+':') self.SSHProxyKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) - self.SSHProxyKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(30,30), ) + self.SSHProxyKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) self.SSHProxyHostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host[:Port]")+':') self.SSHProxyHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, _(u"SSH Proxy Tunnel")+':') @@ -267,7 +272,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.UseLocalFolderSharing = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Use local folder sharing")) self.SharedFolderPathLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Path")+':') self.SharedFolderPath = wx.TextCtrl(self.tab_SharedFilesAndFolders, -1, "", style=wx.TE_PROCESS_ENTER) - self.SharedFolderPathBrowseButton = wx.BitmapButton(self.tab_SharedFilesAndFolders, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(30,30), ) + self.SharedFolderPathBrowseButton = wx.BitmapButton(self.tab_SharedFilesAndFolders, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) self.AddSharedFolderPathButton = wx.Button(self.tab_SharedFilesAndFolders, -1, _(u"Add")) self.SharedFoldersList = CheckListCtrl(self.tab_SharedFilesAndFolders) self.SharedFoldersList.InsertColumn(0, _("Local Path"), wx.LIST_FORMAT_LEFT) @@ -350,82 +355,82 @@ class PyHocaGUI_ProfileManager(wx.Dialog): _textfield_height = 30 self.ProfileNameLabel.SetMinSize((160, 16)) - self.ProfileName.SetMinSize((320, _textfield_height)) - self.SetSessionWindowTitle.SetMinSize((-1, _textfield_height)) - self.UseDefaultSessionWindowTitle.SetMinSize((-1, _textfield_height)) + self.ProfileName.SetMinSize((320, self._textfield_height)) + self.SetSessionWindowTitle.SetMinSize((-1, self._textfield_height)) + self.UseDefaultSessionWindowTitle.SetMinSize((-1, self._textfield_height)) self.CustomSessionWindowTitleLabel.SetMinSize((160, 16)) - self.CustomSessionWindowTitle.SetMinSize((320, _textfield_height)) + self.CustomSessionWindowTitle.SetMinSize((320, self._textfield_height)) self.IconButtonLabel.SetMinSize((168, 16)) self.SessionTypeLabel.SetMinSize((120, 16)) - self.SessionType.SetMinSize((320, _textfield_height)) + self.SessionType.SetMinSize((320, self._textfield_height)) self.SessionType.SetSelection(5) self.ApplicationLabel.SetMinSize((120, 16)) - self.Application.SetMinSize((-1, _textfield_height)) + self.Application.SetMinSize((-1, self._textfield_height)) self.Application.SetSelection(0) - self.Command.SetMinSize((-1, _textfield_height)) + self.Command.SetMinSize((-1, self._textfield_height)) self.XDMCPServerLabel.SetMinSize((120, 16)) - self.XDMCPServer.SetMinSize((-1, _textfield_height)) + self.XDMCPServer.SetMinSize((-1, self._textfield_height)) self.RDPServerLabel.SetMinSize((180, 16)) - self.RDPServer.SetMinSize((-1, _textfield_height)) + self.RDPServer.SetMinSize((-1, self._textfield_height)) self.RDPOptionsLabel.SetMinSize((180, 16)) - self.RDPOptions.SetMinSize((-1, _textfield_height)) + self.RDPOptions.SetMinSize((-1, self._textfield_height)) self.UserNameLabel.SetMinSize((110, 16)) - self.UserName.SetMinSize((220, _textfield_height)) + self.UserName.SetMinSize((220, self._textfield_height)) self.HostLabel.SetMinSize((110, 16)) - self.Host.SetMinSize((220, _textfield_height)) + self.Host.SetMinSize((220, self._textfield_height)) self.SSHPortLabel.SetMinSize((110, 16)) - self.SSHPort.SetMinSize((65, _textfield_height)) + self.SSHPort.SetMinSize((65, self._textfield_height)) self.SSHKeyFileLabel.SetMinSize((-1, 16)) - self.SSHKeyFile.SetMinSize((152, _textfield_height)) + self.SSHKeyFile.SetMinSize((152, self._textfield_height)) self.SSHProxyUserLabel.SetMinSize((140, 16)) - self.SSHProxyUser.SetMinSize((180, _textfield_height)) + self.SSHProxyUser.SetMinSize((180, self._textfield_height)) self.SSHProxyHostLabel.SetMinSize((140, 16)) - self.SSHProxyHost.SetMinSize((180, _textfield_height)) - self.SSHProxyKeyFile.SetMinSize((120, _textfield_height)) + self.SSHProxyHost.SetMinSize((180, self._textfield_height)) + self.SSHProxyKeyFile.SetMinSize((120, self._textfield_height)) self.SSHProxyTunnelLabel.SetMinSize((140, 16)) - self.SSHProxyTunnelFromPort.SetMinSize((60, _textfield_height)) - self.SSHProxyTunnelToPort.SetMinSize((60, _textfield_height)) - self.SSHProxyTunnelFromHost.SetMinSize((120, _textfield_height)) - self.SSHProxyTunnelToHost.SetMinSize((120, _textfield_height)) + self.SSHProxyTunnelFromPort.SetMinSize((60, self._textfield_height)) + self.SSHProxyTunnelToPort.SetMinSize((60, self._textfield_height)) + self.SSHProxyTunnelFromHost.SetMinSize((120, self._textfield_height)) + self.SSHProxyTunnelToHost.SetMinSize((120, self._textfield_height)) if X2GOCLIENT_OS == 'Windows': - self.LinkSpeed.SetMinSize((425, _textfield_height)) + self.LinkSpeed.SetMinSize((425, self._textfield_height)) else: - self.LinkSpeed.SetMinSize((440, _textfield_height)) + self.LinkSpeed.SetMinSize((440, self._textfield_height)) self.ModemLabel.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) self.ISDNLabel.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) self.ADSLLabel.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) self.WANLabel.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) self.LANLabel.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) self.CompressionLabel.SetMinSize((120, 16)) - self.Compression.SetMinSize((180, _textfield_height)) + self.Compression.SetMinSize((180, self._textfield_height)) self.Compression.SetSelection(0) self.ImageQualityLabel.SetMinSize((120, 16)) - self.ImageQuality.SetMinSize((180, _textfield_height)) - self.DisplayTypeFullscreen.SetMinSize((-1, _textfield_height)) - self.ScreenWidth.SetMinSize((60, _textfield_height)) - self.ScreenHeight.SetMinSize((60, _textfield_height)) - self.SetDisplayDPI.SetMinSize((-1, _textfield_height)) - self.DisplayDPI.SetMinSize((60, _textfield_height)) + self.ImageQuality.SetMinSize((180, self._textfield_height)) + self.DisplayTypeFullscreen.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)) + self.DisplayDPI.SetMinSize((60, self._textfield_height)) self.KeyboardLayoutLabel.SetMinSize((-1, 16)) - self.KeyboardLayout.SetMinSize((-1, _textfield_height)) + self.KeyboardLayout.SetMinSize((-1, self._textfield_height)) self.KeyboardModelLabel.SetMinSize((-1, 16)) - self.KeyboardModel.SetMinSize((-1, _textfield_height)) - self.PulseAudio.SetMinSize((-1, _textfield_height)) - self.Arts.SetMinSize((-1, _textfield_height)) - self.Esd.SetMinSize((-1, _textfield_height)) - self.DefaultSoundPort.SetMinSize((-1, _textfield_height)) - self.SoundPort.SetMinSize((-1, _textfield_height)) - self.ClientSidePrinting.SetMinSize((-1, _textfield_height)) - self.SharedFolderPath.SetMinSize((220, _textfield_height)) + self.KeyboardModel.SetMinSize((-1, self._textfield_height)) + self.PulseAudio.SetMinSize((-1, self._textfield_height)) + self.Arts.SetMinSize((-1, self._textfield_height)) + self.Esd.SetMinSize((-1, self._textfield_height)) + self.DefaultSoundPort.SetMinSize((-1, self._textfield_height)) + self.SoundPort.SetMinSize((-1, self._textfield_height)) + self.ClientSidePrinting.SetMinSize((-1, self._textfield_height)) + self.SharedFolderPath.SetMinSize((220, self._textfield_height)) self.SharedFoldersList.SetMinSize((-1, 180)) - self.ClientEncoding.SetMinSize((140, _textfield_height)) - self.ServerEncoding.SetMinSize((140, _textfield_height)) + self.ClientEncoding.SetMinSize((140, self._textfield_height)) + self.ServerEncoding.SetMinSize((140, self._textfield_height)) - self.FileMIMEboxExtensions.SetMinSize((140, _textfield_height)) - self.FileMIMEboxAction.SetMinSize((180, _textfield_height)) + self.FileMIMEboxExtensions.SetMinSize((140, self._textfield_height)) + self.FileMIMEboxAction.SetMinSize((180, self._textfield_height)) self.OKButton.SetMinSize((-1, 30)) self.CancelButton.SetMinSize((-1, 30)) 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)).