add single window to settings

OSGeo · Dec 17, 2021 · be1a4bb · be1a4bb
1 parent 3a65856
commit be1a4bb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/gui/wxpython/core/settings.py b/gui/wxpython/core/settings.py
@@ -153,6 +153,7 @@ def _defaultSettings(self):
                 "region": {
                     "resAlign": {"enabled": False},
                 },
+                "singleWindow": {"enabled": False},
             },
             #
             # datacatalog

diff --git a/gui/wxpython/gui_core/preferences.py b/gui/wxpython/gui_core/preferences.py
@@ -401,6 +401,19 @@ 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 (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,

diff --git a/gui/wxpython/wxgui.py b/gui/wxpython/wxgui.py
@@ -30,6 +30,7 @@
 
 from core import globalvar
 from core.utils import registerPid, unregisterPid
+from core.settings import UserSettings
 
 import wx
 
@@ -83,7 +84,13 @@ def OnInit(self):
 
         def show_main_gui():
             # create and show main frame
-            from lmgr.frame import GMFrame
+            single = UserSettings.Get(
+                group="general", key="singleWindow", subkey="enabled"
+            )
+            if single:
+                from main_window.frame import GMFrame
+            else:
+                from lmgr.frame import GMFrame
 
             mainframe = GMFrame(parent=None, id=wx.ID_ANY, workspace=self.workspaceFile)
             mainframe.Show()