The branch, master has been updated via 2d38a466d20ee82908b4cafacac59aaac4735a48 (commit) from 6aca218cff665f8f148172d12b1c54d2e9099291 (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 2d38a466d20ee82908b4cafacac59aaac4735a48 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Mar 4 23:34:53 2012 +0100 Fix icon and button sizes in profile manager. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- pyhoca/wxgui/profilemanager.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ff7c9d2..52ca0f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,7 +48,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Update i18n files: en, de. - Only allow session window manipulations for sessions that are associated to the running PyHoca-GUI client. - - Use wx.BU_AUTODRAW for session profile icon. + - Fix icon and button sizes in profile manager. * 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 4ffa73e..f3be15a 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -177,7 +177,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location) self.IconPath = path_to_icon self.IconButtonLabel = wx.StaticText(self.tab_Profile, -1, _(u"Window Icon")+':') - self.IconButton = wx.BitmapButton(self.tab_Profile, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=wx.Size(134,134), style=wx.BU_AUTODRAW) + self.IconButton = wx.BitmapButton(self.tab_Profile, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=wx.Size(136,136), ) ### ### widgets for the SESSION tab @@ -206,13 +206,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(20,20), ) + 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.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(20,20), ) + 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.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 +267,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(20,20), ) + 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.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) @@ -347,7 +347,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): else: self.SetTitle(_(u"PyHoca-GUI Profile Manager - %s") % self.profile_config['name']) self.SetFont(wx.Font(9, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - _textfield_height = self.SSHKeyFileBrowseButton.GetBestSize().GetHeight() + _textfield_height = 30 self.ProfileNameLabel.SetMinSize((160, 16)) self.ProfileName.SetMinSize((320, _textfield_height)) @@ -543,7 +543,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_3_2_1_1 = wx.BoxSizer(wx.VERTICAL) sizer_3_2_1_1.Add(self.LinkSpeed) sizer_3_2_1_2 = wx.GridSizer(1,5,0,0) - sizer_3_2_1_2.SetMinSize((454/5*6 - 30, -1)) + sizer_3_2_1_2.SetMinSize((454/5*6 - 30, 36)) sizer_3_2_1_2.Add(self.ModemLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) sizer_3_2_1_2.Add(self.ISDNLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) sizer_3_2_1_2.Add(self.ADSLLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) @@ -647,7 +647,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_5_1_1_2 = wx.BoxSizer(wx.HORIZONTAL) sizer_5_1_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) sizer_5_1_1_2_1.Add(self.SharedFolderPathLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_5_1_1_2_1.Add(self.SharedFolderPath, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT|wx.RIGHT, border=5) + sizer_5_1_1_2_1.Add(self.SharedFolderPath, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=5) sizer_5_1_1_2_1.Add(self.SharedFolderPathBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL) sizer_5_1_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) sizer_5_1_1_2_3 = wx.BoxSizer(wx.HORIZONTAL) 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)).