wxGUI: make single-window default, put it under Appearance (OSGeo#2810)

nilason · Nov 7, 2023 · 26aaf10 · 26aaf10
1 parent 548247b
commit 26aaf10
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/gui/wxpython/core/settings.py b/gui/wxpython/core/settings.py
@@ -153,7 +153,6 @@ def _defaultSettings(self):
                 "region": {
                     "resAlign": {"enabled": False},
                 },
-                "singleWindow": {"enabled": False},
             },
             #
             # datacatalog
@@ -191,6 +190,7 @@ def _defaultSettings(self):
                 "gSelectPopupHeight": {"value": 200},
                 "iconTheme": {"type": "grass"},
                 "commandNotebook": {"selection": 0},
+                "singleWindow": {"enabled": True},
             },
             #
             # language

diff --git a/gui/wxpython/gui_core/preferences.py b/gui/wxpython/gui_core/preferences.py
@@ -405,19 +405,6 @@ def _createGeneralPage(self, notebook):
         gridSizer = wx.GridBagSizer(hgap=3, vgap=3)
 
         row = 0
-        singleWindow = wx.CheckBox(
-            parent=panel,
-            id=wx.ID_ANY,
-            label=_("Use single-window mode (experimental, requires GUI restart)"),
-            name="IsChecked",
-        )
-        singleWindow.SetValue(
-            self.settings.Get(group="general", key="singleWindow", subkey="enabled")
-        )
-        self.winId["general:singleWindow:enabled"] = singleWindow.GetId()
-        gridSizer.Add(singleWindow, pos=(row, 0), span=(1, 2))
-
-        row += 1
         posDisplay = wx.CheckBox(
             parent=panel,
             id=wx.ID_ANY,
@@ -516,6 +503,29 @@ def _createAppearancePage(self, notebook):
 
         border = wx.BoxSizer(wx.VERTICAL)
 
+        #
+        # single window settings
+        #
+        box = StaticBox(
+            parent=panel, id=wx.ID_ANY, label=" %s " % _("Window layout settings")
+        )
+        sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
+        singleWindow = wx.CheckBox(
+            parent=panel,
+            id=wx.ID_ANY,
+            label=_("Use single-window mode (requires GUI restart)"),
+            name="IsChecked",
+        )
+        singleWindow.SetToolTip(
+            _("Use single-window mode instead of multi-window mode")
+        )
+        singleWindow.SetValue(
+            self.settings.Get(group="appearance", key="singleWindow", subkey="enabled")
+        )
+        self.winId["appearance:singleWindow:enabled"] = singleWindow.GetId()
+        sizer.Add(singleWindow, proportion=0, flag=wx.ALL | wx.EXPAND, border=5)
+        border.Add(sizer, proportion=0, flag=wx.ALL | wx.EXPAND, border=3)
+
         box = StaticBox(parent=panel, id=wx.ID_ANY, label=" %s " % _("Font settings"))
         sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
 

diff --git a/gui/wxpython/lmgr/layertree.py b/gui/wxpython/lmgr/layertree.py
@@ -1249,7 +1249,7 @@ def OnNvizProperties(self, event):
             vector/volume
         """
         if not UserSettings.Get(
-            group="general",
+            group="appearance",
             key="singleWindow",
             subkey="enabled",
         ):

diff --git a/gui/wxpython/wxgui.py b/gui/wxpython/wxgui.py
@@ -85,7 +85,7 @@ def OnInit(self):
         def show_main_gui():
             # create and show main frame
             single = UserSettings.Get(
-                group="general", key="singleWindow", subkey="enabled"
+                group="appearance", key="singleWindow", subkey="enabled"
             )
             if single:
                 from main_window.frame import GMFrame