This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit b0a8c29c9780d6bb32edf0ffd23072f35b44a843 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 4 13:51:18 2019 +0100 Add Xinerama checkbox to profile manager. --- debian/changelog | 1 + pyhoca/wxgui/profilemanager.py | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4a7a61f..df67676 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ pyhoca-gui (0.5.0.8-0x2go1) UNRELEASED; urgency=medium - pyhoca/wxgui/profilemanager.py: Rename shadowing sessiontype to 'X2Go/X11 Desktop Sharing (SHADOW)'. - pyhoca/wxgui/profilemanager.py: Support IceWM desktop environment. + - Add Xinerama checkbox to profile manager. -- X2Go Release Manager <git-admin@x2go.org> Sun, 24 Sep 2017 11:28:17 +0200 diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index ef3aab0..a6f19a7 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -329,6 +329,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): 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.EnableXinerama = wx.CheckBox(self.tab_IO, -1, _(u"Xinerama extension (support for two or more physical displays)")) self.ClipboardModeLabel = wx.StaticText(self.tab_IO, -1, _(u"Allow copy'n'paste")+": ") self.ClipboardMode = wx.ComboBox(self.tab_IO, -1, choices=self.clipboardModeChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) 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) @@ -538,6 +539,7 @@ 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.EnableXinerama.SetMinSize((-1, self._textfield_height)) self.DontSetKeyboard.SetMinSize((-1, self._textfield_height)) self.AutoSetKeyboard.SetMinSize((-1, self._textfield_height)) self.CustomSetKeyboard.SetMinSize((-1, self._textfield_height)) @@ -723,8 +725,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_5_1_1_2.Add(self.SetDisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL) sizer_5_1_1_2.Add((8,0)) sizer_5_1_1_2.Add(self.DisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_1_1_3 = wx.BoxSizer(wx.HORIZONTAL) + sizer_5_1_1_3.Add((-1,48)) + sizer_5_1_1_3.Add(self.EnableXinerama, flag=wx.ALIGN_CENTRE_VERTICAL) sizer_5_1_1.Add(sizer_5_1_1_1) sizer_5_1_1.Add(sizer_5_1_1_2) + sizer_5_1_1.Add(sizer_5_1_1_3) sizer_5_1.Add(sizer_5_1_1, flag=wx.EXPAND|wx.ALL, border=7) sizer_5_2 = wx.StaticBoxSizer(self.staticbox_Clipboard, wx.VERTICAL) @@ -1157,6 +1163,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): else: self.DisplayDPI.Enable(True) + self.EnableXinerama.SetValue(self.profile_config['xinerama']) + if _command != 'SHADOW': self.UseLocalFolderSharing.SetValue(self.profile_config['useexports']) else: @@ -1417,6 +1425,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['setdpi'] = self.SetDisplayDPI.GetValue() self.profile_config['dpi'] = self.DisplayDPI.GetValue() + self.profile_config['xinerama'] = self.EnableXinerama.GetValue() + self.profile_config['clipboard'] = [ m for m in self.clipboardModeChoices.keys() if self.clipboardModeChoices[m] == self.ClipboardMode.GetValue() ][0] self.profile_config['usekbd'] = self.CustomSetKeyboard.GetValue() or self.AutoSetKeyboard.GetValue() -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git