The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated via a28d17d078fc2ab8789e9cbb4163a88ca10c0a6f (commit) from 356a9f714a5a7e16502541770776bb2b549175aa (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 | 50 +++++++++++++++++++++++++++------------- 2 files changed, 36 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f2f1b83..908b3f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -136,6 +136,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Add option --about-image. Allow changing the application's name by renaming the ,,pyhoca-gui'' script. - Allow custom commands to be desktop sessions. + - Make new session option keyboard ,,variant'' configurable 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 f1d6c5e..e16837f 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -135,8 +135,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog): elif self.action in ("ADD", "ADD_EXPLICITLY"): 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_config['type'] = _(u'<xkbtype>') + self.profile_config['layout'] = _(u'<xkblayout>') + self.profile_config['variant'] = _(u'<xkbvariant>') self.profile_name = self.profile_config['name'] = profile_name # we create a backup dict of our profile_config immediately (for being able to reset erroneously made changes) @@ -261,10 +262,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog): 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.CurrentKeyBoard = wx.CheckBox(self.tab_Settings, -1, _(u"Keep current keyboard settings")) - self.KeyboardLayoutLabel = wx.StaticText(self.tab_Settings, -1, _(u"Keyboard layout")+':') - self.KeyboardLayout = wx.TextCtrl(self.tab_Settings, -1, "") 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) @@ -427,10 +430,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog): 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, self._textfield_height)) self.KeyboardModelLabel.SetMinSize((-1, 16)) self.KeyboardModel.SetMinSize((-1, self._textfield_height)) + self.KeyboardLayoutLabel.SetMinSize((-1, 16)) + self.KeyboardLayout.SetMinSize((-1, self._textfield_height)) + self.KeyboardVariantLabel.SetMinSize((-1, 16)) + self.KeyboardVariant.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)) @@ -628,11 +633,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_4_2_1_2 = wx.BoxSizer(wx.HORIZONTAL) sizer_4_2_1_2.Add((32,0)) 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(self.KeyboardModelLabel, pos=(0,0),) + sizer_4_2_1_2_1.Add(self.KeyboardModel, 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_1.Add(self.KeyboardLayoutLabel, flag=wx.ALIGN_CENTRE_VERTICAL, pos=(0,2), ) + sizer_4_2_1_2_1.Add(self.KeyboardLayout, flag=wx.EXPAND, pos=(1,2), ) + sizer_4_2_1_2_1.Add((32,0), pos=(0,3), span=(2,1)) + sizer_4_2_1_2_1.Add(self.KeyboardVariantLabel, pos=(0,4),) + sizer_4_2_1_2_1.Add(self.KeyboardVariant, flag=wx.EXPAND, pos=(1,4),) sizer_4_2_1_2.Add(sizer_4_2_1_2_1) sizer_4_2_1.Add(sizer_4_2_1_1) sizer_4_2_1.Add(sizer_4_2_1_2) @@ -954,18 +962,23 @@ class PyHocaGUI_ProfileManager(wx.Dialog): # TODO Fill in the actual DPI self.CurrentKeyBoard.SetValue(not self.profile_config['usekbd']) - self.KeyboardLayout.SetValue(self.profile_config['layout']) self.KeyboardModel.SetValue(self.profile_config['type']) + self.KeyboardLayout.SetValue(self.profile_config['layout']) + self.KeyboardVariant.SetValue(self.profile_config['variant']) if self.CurrentKeyBoard.GetValue(): - self.KeyboardLayoutLabel.Enable(False) self.KeyboardModelLabel.Enable(False) - self.KeyboardLayout.Enable(False) + self.KeyboardLayoutLabel.Enable(False) + self.KeyboardVariantLabel.Enable(False) self.KeyboardModel.Enable(False) + self.KeyboardLayout.Enable(False) + self.KeyboardVariant.Enable(False) else: self.KeyboardLayoutLabel.Enable(True) self.KeyboardModelLabel.Enable(True) + self.KeyboardVariantLabel.Enable(True) self.KeyboardLayout.Enable(True) self.KeyboardModel.Enable(True) + self.KeyboardVariant.Enable(True) self.EnableSound.SetValue(self.profile_config['sound']) self.DefaultSoundPort.SetValue(self.profile_config['defsndport']) @@ -1157,8 +1170,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['dpi'] = self.DisplayDPI.GetValue() self.profile_config['usekbd'] = not self.CurrentKeyBoard.GetValue() - self.profile_config['layout'] = self.KeyboardLayout.GetValue() self.profile_config['type'] = self.KeyboardModel.GetValue() + self.profile_config['layout'] = self.KeyboardLayout.GetValue() + self.profile_config['variant'] = self.KeyboardVariant.GetValue() self.profile_config['sound'] = self.EnableSound.GetValue() self.profile_config['defsndport'] = self.DefaultSoundPort.GetValue() @@ -1466,15 +1480,19 @@ class PyHocaGUI_ProfileManager(wx.Dialog): def OnKeepKeyboard(self, event): if self.CurrentKeyBoard.GetValue(): - self.KeyboardLayoutLabel.Enable(False) self.KeyboardModelLabel.Enable(False) + self.KeyboardLayoutLabel.Enable(False) + self.KeyboardVariantLabel.Enable(False) self.KeyboardLayout.Enable(False) self.KeyboardModel.Enable(False) + self.KeyboardVariant.Enable(False) else: - self.KeyboardLayoutLabel.Enable(True) self.KeyboardModelLabel.Enable(True) + self.KeyboardLayoutLabel.Enable(True) + self.KeyboardVariantLabel.Enable(True) self.KeyboardLayout.Enable(True) self.KeyboardModel.Enable(True) + self.KeyboardVariant.Enable(True) def OnSoundEnable(self, event): # wxGlade: X2goMaintProfile.<event_handler> if self.EnableSound.GetValue(): 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)).