[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.2.1.1-58-g36368f8

The branch, master has been updated via 36368f8fec64279369f5995b2fc4557879af9530 (commit) from a996bc1dea22a6ae478950c01a4c7b8d5071e146 (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 36368f8fec64279369f5995b2fc4557879af9530 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jan 22 06:21:08 2013 +0100 Add another tab »Media« to session profile configuration window. Makes the windows display on netbook screens again (Fixes: #13). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + pyhoca/wxgui/profilemanager.py | 262 +++++++++++++++++++++------------------- 2 files changed, 137 insertions(+), 127 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6499bfd..4c54b26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ pyhoca-gui (0.4.0.0-0~x2go1) UNRELEASED; urgency=low - Add dialog box that shows server information (components, add-ons, features, versions). - Add »Apply« to session profile manager window. + - Add another tab »Media« to session profile configuration window. + Makes the windows display on netbook screens again (Fixes: #13). * /debian/control: + Thanks to Orion's patch in bug #91 we can drop many build dependencies. + Versioned Depend: on python-x2go (>= 0.4.0.0-0~). diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 31c8d9a..02b9d3a 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -178,7 +178,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.tab_Session = wx.Panel(self.X2GoTabs, -1) self.tab_Connection = wx.Panel(self.X2GoTabs, -1) self.tab_LinkQuality = wx.Panel(self.X2GoTabs, -1) - self.tab_Settings = wx.Panel(self.X2GoTabs, -1) + self.tab_IO = wx.Panel(self.X2GoTabs, -1) + self.tab_MediaResources = wx.Panel(self.X2GoTabs, -1) self.tab_SharedResources = wx.Panel(self.X2GoTabs, -1) # boxes for all tabs @@ -189,10 +190,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.staticbox_Proxy = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Proxy")) self.staticbox_LinkSpeed = wx.StaticBox(self.tab_LinkQuality, -1, ' %s ' % _(u"Connection Link Speed")) self.staticbox_Compression = wx.StaticBox(self.tab_LinkQuality, -1, ' %s ' % _(u"Compression")) - self.staticbox_Display = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Display")) - self.staticbox_Keyboard = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Keyboard")) - self.staticbox_Sound = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Sound")) - self.staticbox_Printing = wx.StaticBox(self.tab_SharedResources, -1, ' %s ' % _(u"Printing")) + self.staticbox_Display = wx.StaticBox(self.tab_IO, -1, ' %s ' % _(u"Display")) + self.staticbox_Keyboard = wx.StaticBox(self.tab_IO, -1, ' %s ' % _(u"Keyboard")) + self.staticbox_Sound = wx.StaticBox(self.tab_MediaResources, -1, ' %s ' % _(u"Sound")) + self.staticbox_Printing = wx.StaticBox(self.tab_MediaResources, -1, ' %s ' % _(u"Printing")) self.staticbox_FolderSharing = wx.StaticBox(self.tab_SharedResources, -1, ' %s ' % _(u"Folder Exports")) self.staticbox_FileMIMEbox = wx.StaticBox(self.tab_SharedResources, -1, ' %s ' % _(u"File Import")) @@ -295,38 +296,48 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.ImageQuality = wx.SpinCtrl(self.tab_LinkQuality, -1, "9", min=0, max=9) ### - ### wigdets for the SETTINGS tab + ### wigdets for the IO 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) - self.ScreenHeightLabel = wx.StaticText(self.tab_Settings, -1, "x") - self.ScreenHeight = wx.SpinCtrl(self.tab_Settings, -1, "600", min=500, max=3000) - self.SetDisplayDPI = wx.CheckBox(self.tab_Settings, -1, _(u"Set display DPI")+": ") - self.DisplayDPI = wx.SpinCtrl(self.tab_Settings, -1, "96", min=32, max=512) - self.DontSetKeyboard = wx.RadioButton(self.tab_Settings, -1, label=_(u"Do not set (use server-side tools to configure the keyboard)"), style=wx.RB_GROUP) - self.AutoSetKeyboard = wx.RadioButton(self.tab_Settings, -1, label=_(u"Automatically detect and use client-side keyboard configuration inside the session")) - self.CustomSetKeyboard = wx.RadioButton(self.tab_Settings, -1, label=_(u"Use custom keyboard settings as provided below") + ": ") - self.KeyboardModelLabel = wx.StaticText(self.tab_Settings, -1, _(u"Keyboard model")+": ") - self.KeyboardModel = wx.TextCtrl(self.tab_Settings, -1, "") - self.KeyboardLayoutLabel = wx.StaticText(self.tab_Settings, -1, _(u"Layout")+": ") - self.KeyboardLayout = wx.TextCtrl(self.tab_Settings, -1, "") - self.KeyboardVariantLabel = wx.StaticText(self.tab_Settings, -1, _(u"Layout variant")+": ") - self.KeyboardVariant = wx.TextCtrl(self.tab_Settings, -1, "") - self.EnableSound = wx.CheckBox(self.tab_Settings, -1, _(u"Enable sound support")) - self.PulseAudio = wx.RadioButton(self.tab_Settings, -1, _(u"Pulse Audio"), style=wx.RB_GROUP) + self.DisplayTypeFullscreen = wx.RadioButton(self.tab_IO, -1, _(u"Fullscreen"), style=wx.RB_GROUP) + self.DisplayTypeMaximize = wx.RadioButton(self.tab_IO, -1, _(u"Maximized")) + self.DisplayTypeCustom = wx.RadioButton(self.tab_IO, -1, _(u"Custom Size")+": ") + self.ScreenWidthLabel = wx.StaticText(self.tab_IO, -1, '') + self.ScreenWidth = wx.SpinCtrl(self.tab_IO, -1, "800", min=400, max=3000) + self.ScreenHeightLabel = wx.StaticText(self.tab_IO, -1, "x") + self.ScreenHeight = wx.SpinCtrl(self.tab_IO, -1, "600", min=500, max=3000) + self.SetDisplayDPI = wx.CheckBox(self.tab_IO, -1, _(u"Set display DPI")+": ") + self.DisplayDPI = wx.SpinCtrl(self.tab_IO, -1, "96", min=32, max=512) + self.DontSetKeyboard = wx.RadioButton(self.tab_IO, -1, label=_(u"Do not set (use server-side tools to configure the keyboard)"), style=wx.RB_GROUP) + self.AutoSetKeyboard = wx.RadioButton(self.tab_IO, -1, label=_(u"Automatically detect and use client-side keyboard configuration inside the session")) + self.CustomSetKeyboard = wx.RadioButton(self.tab_IO, -1, label=_(u"Use custom keyboard settings as provided below") + ": ") + self.KeyboardModelLabel = wx.StaticText(self.tab_IO, -1, _(u"Keyboard model")+": ") + self.KeyboardModel = wx.TextCtrl(self.tab_IO, -1, "") + self.KeyboardLayoutLabel = wx.StaticText(self.tab_IO, -1, _(u"Layout")+": ") + self.KeyboardLayout = wx.TextCtrl(self.tab_IO, -1, "") + self.KeyboardVariantLabel = wx.StaticText(self.tab_IO, -1, _(u"Layout variant")+": ") + self.KeyboardVariant = wx.TextCtrl(self.tab_IO, -1, "") + + ### + ### wigdets for the MEDIA tab + ### + self.EnableSound = wx.CheckBox(self.tab_MediaResources, -1, _(u"Enable sound support")) + self.PulseAudio = wx.RadioButton(self.tab_MediaResources, -1, _(u"Pulse Audio"), style=wx.RB_GROUP) # Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. # However, config files can contain an Arts configuration, so we will honour this - self.Arts = wx.RadioButton(self.tab_Settings, -1, _(u"Arts (not supported)")) + self.Arts = wx.RadioButton(self.tab_MediaResources, -1, _(u"Arts (not supported)")) self.Arts.Enable(False) - self.Esd = wx.RadioButton(self.tab_Settings, -1, _(u"esd")) - self.DefaultSoundPort = wx.CheckBox(self.tab_Settings, -1, _(u"Use default sound port")) - self.SoundPortLabel = wx.StaticText(self.tab_Settings, -1, _(u"Custom sound port")+": ") - self.SoundPort = wx.SpinCtrl(self.tab_Settings, -1, "4713", min=23, max=64889) + self.Esd = wx.RadioButton(self.tab_MediaResources, -1, _(u"esd")) + self.DefaultSoundPort = wx.CheckBox(self.tab_MediaResources, -1, _(u"Use default sound port")) + self.SoundPortLabel = wx.StaticText(self.tab_MediaResources, -1, _(u"Custom sound port")+": ") + self.SoundPort = wx.SpinCtrl(self.tab_MediaResources, -1, "4713", min=23, max=64889) + + self.ClientSidePrinting = wx.CheckBox(self.tab_MediaResources, -1, _(u"Client Side printing")) + + ### + ### wigdets for the SHARING tab + ### self.UseLocalFolderSharing = wx.CheckBox(self.tab_SharedResources, -1, _(u"Use local folder sharing")) self.RestoreSharedLocalFolders = wx.CheckBox(self.tab_SharedResources, -1, _(u"Store share list at end of session")) @@ -351,8 +362,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.FileMIMEboxActionLabel = wx.StaticText(self.tab_SharedResources, -1, _(u"Action")+": ") self.FileMIMEboxAction = wx.ComboBox(self.tab_SharedResources, -1, choices=self.mimeboxactionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) - self.ClientSidePrinting = wx.CheckBox(self.tab_SharedResources, -1, _(u"Client Side printing")) - if self.action == 'ADD': self.OKButton = wx.Button(self, -1, _(u"Add")) self.DefaultButton = wx.Button(self, -1, _(u'Defaults')) @@ -614,7 +623,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7) sizer_3.Add(sizer_3_1, flag=wx.EXPAND|wx.ALL, border=5) - sizer_3.Add(sizer_3_2, flag=wx.EXPAND|wx.ALL, border=5) + sizer_3.Add(sizer_3_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) self.tab_Connection.SetSizerAndFit(sizer_3) self.tab_Connection.Layout() @@ -646,14 +655,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_4_2_1_2.Add(self.ImageQuality) sizer_4_2_1.Add(sizer_4_2_1_1, flag=wx.EXPAND) sizer_4_2_1.Add(sizer_4_2_1_2, flag=wx.EXPAND) - sizer_4_2.Add(sizer_4_2_1, proportion=1, flag=wx.EXPAND|wx.ALL, border=7) + sizer_4_2.Add(sizer_4_2_1, flag=wx.EXPAND|wx.ALL, border=7) sizer_4.Add(sizer_4_1, flag=wx.EXPAND|wx.ALL, border=5) - sizer_4.Add(sizer_4_2, flag=wx.EXPAND|wx.ALL, border=5) + sizer_4.Add(sizer_4_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) self.tab_LinkQuality.SetSizerAndFit(sizer_4) self.tab_LinkQuality.Layout() - ## SETTINGS TAB + ## INPUT/OUTPUT TAB sizer_5 = wx.BoxSizer(wx.VERTICAL) sizer_5_1 = wx.StaticBoxSizer(self.staticbox_Display, wx.VERTICAL) sizer_5_1_1 = wx.BoxSizer(wx.VERTICAL) @@ -702,100 +711,102 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_5_2_1.Add(sizer_5_2_1_2) sizer_5_2.Add(sizer_5_2_1, flag=wx.EXPAND|wx.ALL, border=7) - sizer_5_3 = wx.StaticBoxSizer(self.staticbox_Sound, wx.VERTICAL) - sizer_5_3_1 = wx.GridBagSizer(vgap=4, hgap=2) - sizer_5_3_1.Add(self.EnableSound, pos=(0,0), span=(1,2), border=16, ) - sizer_5_3_1.Add(self.PulseAudio, pos=(1,0), flag=wx.RIGHT, border=16, ) - sizer_5_3_1.Add(self.Arts, pos=(2,0), flag=wx.RIGHT, border=16, ) - sizer_5_3_1.Add(self.Esd, pos=(3,0), flag=wx.RIGHT, border=16, ) - sizer_5_3_1.Add(self.DefaultSoundPort, pos=(1,1), ) - sizer_5_3_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_3_1_1.Add(self.SoundPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_5_3_1_1.Add((8, -1)) - sizer_5_3_1_1.Add(self.SoundPort, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_5_3_1.Add(sizer_5_3_1_1, pos=(2,1), ) - sizer_5_3.Add(sizer_5_3_1, flag=wx.EXPAND|wx.ALL, border=7) - - sizer_5_4 = wx.StaticBoxSizer(self.staticbox_Printing, wx.VERTICAL) - sizer_5_4.Add(self.ClientSidePrinting, flag=wx.EXPAND|wx.ALL, border=7) - sizer_5.Add(sizer_5_1, flag=wx.EXPAND|wx.ALL, border=5) - sizer_5.Add(sizer_5_2, flag=wx.EXPAND|wx.ALL, border=5) - sizer_5.Add(sizer_5_3, flag=wx.EXPAND|wx.ALL, border=5) - sizer_5.Add(sizer_5_4, flag=wx.EXPAND|wx.ALL, border=5) - self.tab_Settings.SetSizerAndFit(sizer_5) - self.tab_Settings.Layout() + sizer_5.Add(sizer_5_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) + self.tab_IO.SetSizerAndFit(sizer_5) + self.tab_IO.Layout() - # RESOURCE SHARING TAB + # MEDIA TAB sizer_6 = wx.BoxSizer(wx.VERTICAL) - sizer_6_1 = wx.StaticBoxSizer(self.staticbox_FolderSharing, wx.VERTICAL) - sizer_6_1_1 = wx.BoxSizer(wx.VERTICAL) - sizer_6_1_1_1 = wx.GridBagSizer(vgap=1, hgap=3) - sizer_6_1_1_1.Add(self.UseLocalFolderSharing, pos=(0,0)) - sizer_6_1_1_1.Add((32,-1), pos=(0,1)) - sizer_6_1_1_1.Add(self.RestoreSharedLocalFolders, pos=(0,2), flag=wx.ALIGN_RIGHT|wx.EXPAND) - sizer_6_1_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_6_1_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_6_1_1_2_1.Add(self.SharedFolderPathLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_6_1_1_2_1.Add(self.SharedFolderPath, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=5) - sizer_6_1_1_2_1.Add(self.SharedFolderPathBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) - sizer_6_1_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_6_1_1_2_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_6_1_1_2_3.Add(self.AddSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_6_1_1_2_3.Add(self.DeleteSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) - sizer_6_1_1_2.Add(sizer_6_1_1_2_1, flag=wx.EXPAND|wx.ALIGN_LEFT) - sizer_6_1_1_2.Add(sizer_6_1_1_2_2, proportion=1, flag=wx.EXPAND|wx.ALIGN_LEFT) - sizer_6_1_1_2.Add(sizer_6_1_1_2_3, flag=wx.EXPAND|wx.ALIGN_RIGHT) - sizer_6_1_1_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_6_1_1_3.Add(self.SharedFoldersList, proportion=1, flag=wx.EXPAND) - sizer_6_1_1.Add(sizer_6_1_1_1, flag=wx.EXPAND|wx.BOTTOM, border=12) - sizer_6_1_1.Add(sizer_6_1_1_2, flag=wx.EXPAND) - sizer_6_1_1.Add(sizer_6_1_1_3, flag=wx.EXPAND|wx.TOP|wx.BOTTOM, border=5) - sizer_6_1_2 = wx.BoxSizer(wx.VERTICAL) - sizer_6_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_6_1_2_1.Add(self.UseEncodingConverter, flag=wx.BOTTOM, border=5) - sizer_6_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_6_1_2_2.Add(self.ClientEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_6_1_2_2.Add((8,0)) - sizer_6_1_2_2.Add(self.ClientEncoding) - sizer_6_1_2_2.Add((16,0)) - sizer_6_1_2_2.Add(self.ServerEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_6_1_2_2.Add((8,0)) - sizer_6_1_2_2.Add(self.ServerEncoding) - sizer_6_1_2.Add(sizer_6_1_2_1, flag=wx.EXPAND) - sizer_6_1_2.Add(sizer_6_1_2_2, flag=wx.EXPAND) + sizer_6_1 = wx.StaticBoxSizer(self.staticbox_Sound, wx.VERTICAL) + sizer_6_1_1 = wx.GridBagSizer(vgap=4, hgap=2) + sizer_6_1_1.Add(self.EnableSound, pos=(0,0), span=(1,2), border=16, ) + sizer_6_1_1.Add(self.PulseAudio, pos=(1,0), flag=wx.RIGHT, border=16, ) + sizer_6_1_1.Add(self.Arts, pos=(2,0), flag=wx.RIGHT, border=16, ) + sizer_6_1_1.Add(self.Esd, pos=(3,0), flag=wx.RIGHT, border=16, ) + sizer_6_1_1.Add(self.DefaultSoundPort, pos=(1,1), ) + sizer_6_1_1_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_6_1_1_1.Add(self.SoundPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_6_1_1_1.Add((8, -1)) + sizer_6_1_1_1.Add(self.SoundPort, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_6_1_1.Add(sizer_6_1_1_1, pos=(2,1), ) sizer_6_1.Add(sizer_6_1_1, flag=wx.EXPAND|wx.ALL, border=7) - sizer_6_1.Add(sizer_6_1_2, flag=wx.EXPAND|wx.ALL, border=7) - - sizer_6_2 = wx.StaticBoxSizer(self.staticbox_FileMIMEbox, wx.VERTICAL) - sizer_6_2_1 = wx.BoxSizer(wx.VERTICAL) - sizer_6_2_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_6_2_1_1.Add(self.UseFileMIMEbox, flag=wx.BOTTOM, border=5) - sizer_6_2_1_2 = wx.GridBagSizer(vgap=2, hgap=3) - sizer_6_2_1_2.Add(self.FileMIMEboxActionLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_6_2_1_2.Add(self.FileMIMEboxAction, pos=(0,2)) - sizer_6_2_1_2.Add((8,0), pos=(0,1)) - sizer_6_2_1_2.Add((8,0), pos=(1,1)) - sizer_6_2_1_2.Add(self.FileMIMEboxExtensionsLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_6_2_1_2.Add(self.FileMIMEboxExtensions, pos=(1,2)) - sizer_6_2_1.Add(sizer_6_2_1_1, flag=wx.EXPAND) - sizer_6_2_1.Add(sizer_6_2_1_2, flag=wx.EXPAND) - sizer_6_2.Add(sizer_6_2_1, flag=wx.EXPAND|wx.ALL, border=7) - - sizer_6_3 = wx.StaticBoxSizer(self.staticbox_Printing, wx.VERTICAL) - sizer_6_3.Add(self.ClientSidePrinting, flag=wx.EXPAND|wx.ALL, border=7) + + sizer_6_2 = wx.StaticBoxSizer(self.staticbox_Printing, wx.VERTICAL) + sizer_6_2.Add(self.ClientSidePrinting, flag=wx.EXPAND|wx.ALL, border=7) sizer_6.Add(sizer_6_1, flag=wx.EXPAND|wx.ALL, border=5) - sizer_6.Add(sizer_6_2, flag=wx.EXPAND|wx.ALL, border=5) - sizer_6.Add(sizer_6_3, flag=wx.EXPAND|wx.ALL, border=5) - self.tab_SharedResources.SetSizerAndFit(sizer_6) + sizer_6.Add(sizer_6_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) + self.tab_MediaResources.SetSizerAndFit(sizer_6) + self.tab_MediaResources.Layout() + + # RESOURCE SHARING TAB + sizer_7 = wx.BoxSizer(wx.VERTICAL) + sizer_7_1 = wx.StaticBoxSizer(self.staticbox_FolderSharing, wx.VERTICAL) + sizer_7_1_1 = wx.BoxSizer(wx.VERTICAL) + sizer_7_1_1_1 = wx.GridBagSizer(vgap=1, hgap=3) + sizer_7_1_1_1.Add(self.UseLocalFolderSharing, pos=(0,0)) + sizer_7_1_1_1.Add((32,-1), pos=(0,1)) + sizer_7_1_1_1.Add(self.RestoreSharedLocalFolders, pos=(0,2), flag=wx.ALIGN_RIGHT|wx.EXPAND) + sizer_7_1_1_2 = wx.BoxSizer(wx.HORIZONTAL) + sizer_7_1_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_7_1_1_2_1.Add(self.SharedFolderPathLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_7_1_1_2_1.Add(self.SharedFolderPath, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=5) + sizer_7_1_1_2_1.Add(self.SharedFolderPathBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) + sizer_7_1_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) + sizer_7_1_1_2_3 = wx.BoxSizer(wx.HORIZONTAL) + sizer_7_1_1_2_3.Add(self.AddSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_7_1_1_2_3.Add(self.DeleteSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) + sizer_7_1_1_2.Add(sizer_7_1_1_2_1, flag=wx.EXPAND|wx.ALIGN_LEFT) + sizer_7_1_1_2.Add(sizer_7_1_1_2_2, proportion=1, flag=wx.EXPAND|wx.ALIGN_LEFT) + sizer_7_1_1_2.Add(sizer_7_1_1_2_3, flag=wx.EXPAND|wx.ALIGN_RIGHT) + sizer_7_1_1_3 = wx.BoxSizer(wx.HORIZONTAL) + sizer_7_1_1_3.Add(self.SharedFoldersList, proportion=1, flag=wx.EXPAND) + sizer_7_1_1.Add(sizer_7_1_1_1, flag=wx.EXPAND|wx.BOTTOM, border=12) + sizer_7_1_1.Add(sizer_7_1_1_2, flag=wx.EXPAND) + sizer_7_1_1.Add(sizer_7_1_1_3, flag=wx.EXPAND|wx.TOP|wx.BOTTOM, border=5) + sizer_7_1_2 = wx.BoxSizer(wx.VERTICAL) + sizer_7_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_7_1_2_1.Add(self.UseEncodingConverter, flag=wx.BOTTOM, border=5) + sizer_7_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) + sizer_7_1_2_2.Add(self.ClientEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_7_1_2_2.Add((8,0)) + sizer_7_1_2_2.Add(self.ClientEncoding) + sizer_7_1_2_2.Add((16,0)) + sizer_7_1_2_2.Add(self.ServerEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_7_1_2_2.Add((8,0)) + sizer_7_1_2_2.Add(self.ServerEncoding) + sizer_7_1_2.Add(sizer_7_1_2_1, flag=wx.EXPAND) + sizer_7_1_2.Add(sizer_7_1_2_2, flag=wx.EXPAND) + sizer_7_1.Add(sizer_7_1_1, flag=wx.EXPAND|wx.ALL, border=7) + sizer_7_1.Add(sizer_7_1_2, flag=wx.EXPAND|wx.ALL, border=7) + + sizer_7_2 = wx.StaticBoxSizer(self.staticbox_FileMIMEbox, wx.VERTICAL) + sizer_7_2_1 = wx.BoxSizer(wx.VERTICAL) + sizer_7_2_1_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_7_2_1_1.Add(self.UseFileMIMEbox, flag=wx.BOTTOM, border=5) + sizer_7_2_1_2 = wx.GridBagSizer(vgap=2, hgap=3) + sizer_7_2_1_2.Add(self.FileMIMEboxActionLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_7_2_1_2.Add(self.FileMIMEboxAction, pos=(0,2)) + sizer_7_2_1_2.Add((8,0), pos=(0,1)) + sizer_7_2_1_2.Add((8,0), pos=(1,1)) + sizer_7_2_1_2.Add(self.FileMIMEboxExtensionsLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_7_2_1_2.Add(self.FileMIMEboxExtensions, pos=(1,2)) + sizer_7_2_1.Add(sizer_7_2_1_1, flag=wx.EXPAND) + sizer_7_2_1.Add(sizer_7_2_1_2, flag=wx.EXPAND) + sizer_7_2.Add(sizer_7_2_1, flag=wx.EXPAND|wx.ALL, border=7) + + sizer_7.Add(sizer_7_1, flag=wx.EXPAND|wx.ALL, border=5) + sizer_7.Add(sizer_7_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) + self.tab_SharedResources.SetSizerAndFit(sizer_7) self.tab_SharedResources.Layout() self.X2GoTabs.AddPage(self.tab_Profile, _(u"Profile")) self.X2GoTabs.AddPage(self.tab_Session, _(u"Session")) self.X2GoTabs.AddPage(self.tab_Connection, _(u"Connection")) self.X2GoTabs.AddPage(self.tab_LinkQuality, _(u"Link Quality")) - self.X2GoTabs.AddPage(self.tab_Settings, _(u"Settings")) + self.X2GoTabs.AddPage(self.tab_IO, _(u"Input/Output")) + self.X2GoTabs.AddPage(self.tab_MediaResources, _(u"Media")) self.X2GoTabs.AddPage(self.tab_SharedResources, _(u"Sharing")) # the bottom area with OK, Defaults and Cancel buttons @@ -817,22 +828,19 @@ class PyHocaGUI_ProfileManager(wx.Dialog): max2_x, max2_y = self.tab_Session.GetBestSize() max3_x, max3_y = self.tab_Connection.GetBestSize() max4_x, max4_y = self.tab_LinkQuality.GetBestSize() - max5_x, max5_y = self.tab_Settings.GetBestSize() - max6_x, max6_y = self.tab_SharedResources.GetBestSize() + max5_x, max5_y = self.tab_IO.GetBestSize() + max6_x, max6_y = self.tab_MediaResources.GetBestSize() + max7_x, max7_y = self.tab_SharedResources.GetBestSize() - #self.SetSize(self.GetBestSize() + self.X2GoTabs.GetBestSize()) + self.SetSize((max(max1_x, max2_x, max3_x, max4_x, max5_x, max6_x, max7_x) * 1.05, max(max1_y, max2_y, max3_y, max4_y, max5_y, max6_y, max7_y) * 1.10 + 50)) - if X2GOCLIENT_OS == "Windows": - self.SetSize((max(max1_x, max2_x, max3_x, max4_x, max5_x) * 1.05, max(max1_y, max2_y, max3_y, max4_y, max5_y) * 1.10 + 50)) - else: - self.SetSize((max(max1_x, max2_x, max3_x, max4_x, max5_x) * 1.05, max(max1_y, max2_y, max3_y, max4_y, max5_y) + 50)) self.SetAutoLayout(True) self.Layout() self.CentreOnScreen() self.Show(True) # derive ListCtrl widths from sizer information - _sizer_width = sizer_6_1_1_3.GetSize().GetWidth() + _sizer_width = sizer_7_1_1_3.GetSize().GetWidth() self.SharedFoldersList.SetColumnWidth(0, abs(_sizer_width*.7)) self.SharedFoldersList.SetColumnWidth(1, abs(_sizer_width*.3)) 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)).