The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated via 5eb2f6105a2d56261ecf3b99c09093960d638cb8 (commit) from 3548f33e206a87a7569735ed7bebdd4615aa4ee1 (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: debian/changelog | 2 ++ pyhoca/wxgui/profilemanager.py | 44 ++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 24 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0dd7dde..a15dd3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Enforce startup of rootless session if launching a single application. - Provide empty translation file sv.po. - Provide empty translation file nb_NO.po. + - Fix profile manager GUI layout, make default keyboard layout i18n + capable. * 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 a183876..ed24594 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -130,6 +130,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog): else: # if self.action == 'ADD' ... self.profile_config = self.session_profiles.default_profile_config() + # allow localization of the default keyboard settings + self.profile_config['layout'] = _(u'us') + self.profile_config['type'] = _(u'pc105/us') self.profile_name = self.profile_config['name'] = '%s' %_('new session profile') # we create a backup dict of our profile_config immediately (for being able to reset erroneously made changes) @@ -408,10 +411,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.ScreenHeight.SetMinSize((60, _textfield_height)) self.SetDisplayDPI.SetMinSize((-1, _textfield_height)) self.DisplayDPI.SetMinSize((60, _textfield_height)) - self.KeyboardLayoutLabel.SetMinSize((120, 16)) - self.KeyboardLayout.SetMinSize((120, _textfield_height)) - self.KeyboardModelLabel.SetMinSize((120, 16)) - self.KeyboardModel.SetMinSize((120, _textfield_height)) + self.KeyboardLayoutLabel.SetMinSize((-1, 16)) + self.KeyboardLayout.SetMinSize((-1, _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)) @@ -443,20 +446,15 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_1_1.Add(sizer_1_1_1, flag=wx.EXPAND|wx.ALL, border=7) sizer_1_2 = wx.StaticBoxSizer(self.staticbox_Window, wx.VERTICAL) - sizer_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_1_2_1.Add(self.SetSessionWindowTitle) - sizer_1_2_1.Add((32,0)) - sizer_1_2_1.Add(self.UseDefaultSessionWindowTitle) - sizer_1_2_2 = wx.FlexGridSizer(1, 2, 7, 9) - sizer_1_2_2.Add(self.CustomSessionWindowTitleLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_1_2_2.Add(self.CustomSessionWindowTitle) - sizer_1_2_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_1_2_3.Add(self.IconButtonLabel, flag=wx.TOP) - sizer_1_2_3.Add(self.IconButton) + sizer_1_2_1 = wx.GridBagSizer(hgap=2,vgap=4) + sizer_1_2_1.Add(self.SetSessionWindowTitle, pos=(0,0), span=(1,2)) + sizer_1_2_1.Add(self.UseDefaultSessionWindowTitle, pos=(1,0), span=(1,2)) + sizer_1_2_1.Add(self.CustomSessionWindowTitleLabel, pos=(2,0), ) + sizer_1_2_1.Add(self.CustomSessionWindowTitle, pos=(2,1), ) + sizer_1_2_1.Add(self.IconButtonLabel, flag=wx.TOP, pos=(3,0), ) + sizer_1_2_1.Add(self.IconButton, pos=(3,1), ) sizer_1_2.Add(sizer_1_2_1, flag=wx.EXPAND|wx.ALL, border=7) - sizer_1_2.Add(sizer_1_2_2, flag=wx.EXPAND|wx.ALL, border=7) - sizer_1_2.Add(sizer_1_2_3, flag=wx.EXPAND|wx.ALL, border=7) sizer_1.Add(sizer_1_1, flag=wx.EXPAND|wx.ALL, border=5) sizer_1.Add(sizer_1_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) @@ -609,15 +607,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_4_2_1_1.Add((0, 32)) sizer_4_2_1_2 = wx.BoxSizer(wx.HORIZONTAL) sizer_4_2_1_2.Add((32,0)) - sizer_4_2_1_2_1 = wx.BoxSizer(wx.VERTICAL) - sizer_4_2_1_2_1.Add(self.KeyboardLayoutLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_2_1_2_1.Add(self.KeyboardLayout, flag=wx.EXPAND) - sizer_4_2_1_2_2 = wx.BoxSizer(wx.VERTICAL) - sizer_4_2_1_2_2.Add(self.KeyboardModelLabel) - sizer_4_2_1_2_2.Add(self.KeyboardModel, flag=wx.EXPAND) + sizer_4_2_1_2_1 = wx.GridBagSizer(hgap=2, vgap=2) + sizer_4_2_1_2_1.Add(self.KeyboardLayoutLabel, flag=wx.ALIGN_CENTRE_VERTICAL, pos=(0,0), ) + sizer_4_2_1_2_1.Add(self.KeyboardLayout, flag=wx.EXPAND, pos=(1,0), ) + sizer_4_2_1_2_1.Add((32,0), pos=(0,1), span=(2,1)) + sizer_4_2_1_2_1.Add(self.KeyboardModelLabel, pos=(0,2),) + sizer_4_2_1_2_1.Add(self.KeyboardModel, flag=wx.EXPAND, pos=(1,2),) sizer_4_2_1_2.Add(sizer_4_2_1_2_1) - sizer_4_2_1_2.Add((32,0)) - sizer_4_2_1_2.Add(sizer_4_2_1_2_2) sizer_4_2_1.Add(sizer_4_2_1_1) sizer_4_2_1.Add(sizer_4_2_1_2) sizer_4_2.Add(sizer_4_2_1, flag=wx.EXPAND|wx.ALL, border=7) 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)).