Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wxGUI/preferences: fix PreferencesDialog class OnSave method #3368

Merged
merged 2 commits into from
Jan 21, 2024
Merged

wxGUI/preferences: fix PreferencesDialog class OnSave method #3368

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bd7cd2
fix PreferencesBaseDialog.OnSave()
landam Jan 18, 2024
50d2569
fix previous commit, avoid running _updateSettings() twice
landam Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 46 additions & 37 deletions gui/wxpython/gui_core/preferences.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,46 +189,11 @@ def OnCancel(self, event):
"""Button 'Cancel' pressed"""
self.Close()

def OnSave(self, event):
def OnSave(self, event, force=False):
"""Button 'Save' pressed
Emits signal settingsChanged.
"""
if self._updateSettings():
lang = self.settings.Get(group="language", key="locale", subkey="lc_all")
if lang == "system":
# Most fool proof way to use system locale is to not provide
# any locale info at all
self.settings.Set(
group="language", key="locale", subkey="lc_all", value=None
)
lang = None
env = grass.gisenv()
nprocs_gisenv = "NPROCS"
memorydb_gisenv = "MEMORYMB"
# Set gisenv MEMORYMB var value
memorymb = self.memorymb.GetValue()
if memorymb:
grass.run_command(
"g.gisenv",
set=f"{memorydb_gisenv}={memorymb}",
)
elif env.get(memorydb_gisenv):
grass.run_command(
"g.gisenv",
unset=memorydb_gisenv,
)
# Set gisenv NPROCS var value
nprocs = self.nprocs.GetValue()
if nprocs:
grass.run_command(
"g.gisenv",
set=f"{nprocs_gisenv}={nprocs}",
)
elif env.get(nprocs_gisenv):
grass.run_command(
"g.gisenv",
unset=nprocs_gisenv,
)
if force is True or self._updateSettings():
self.settings.SaveToFile()
Debug.msg(1, "Settings saved to file '%s'" % self.settings.filePath)
self.settingsChanged.emit()
Expand Down Expand Up @@ -2245,6 +2210,50 @@ def OnEnableWheelZoom(self, event):
scrollId = self.winId["display:scrollDirection:selection"]
self.FindWindowById(scrollId).Enable(enable)

def OnSave(self, event):
"""Button 'Save' pressed
Emits signal settingsChanged.
"""
if self._updateSettings():
lang = self.settings.Get(group="language", key="locale", subkey="lc_all")
if lang == "system":
# Most fool proof way to use system locale is to not provide
# any locale info at all
self.settings.Set(
group="language", key="locale", subkey="lc_all", value=None
)
lang = None
env = grass.gisenv()

# Set gisenv MEMORYMB var value
memorydb_gisenv = "MEMORYMB"
memorymb = self.memorymb.GetValue()
if memorymb:
grass.run_command(
"g.gisenv",
set=f"{memorydb_gisenv}={memorymb}",
)
elif env.get(memorydb_gisenv):
grass.run_command(
"g.gisenv",
unset=memorydb_gisenv,
)
# Set gisenv NPROCS var value
nprocs_gisenv = "NPROCS"
nprocs = self.nprocs.GetValue()
if nprocs:
grass.run_command(
"g.gisenv",
set=f"{nprocs_gisenv}={nprocs}",
)
elif env.get(nprocs_gisenv):
grass.run_command(
"g.gisenv",
unset=nprocs_gisenv,
)

PreferencesBaseDialog.OnSave(self, event, force=True)


class MapsetAccess(wx.Dialog):
"""Controls setting options and displaying/hiding map overlay
Expand Down
Loading