Commit ffec0fa3 authored by Guillaume Seguin's avatar Guillaume Seguin

Merge General and Printer settings

parent cc882146
...@@ -120,8 +120,7 @@ class MacroEditor(wx.Dialog): ...@@ -120,8 +120,7 @@ class MacroEditor(wx.Dialog):
reindented += self.indent_chars + line + "\n" reindented += self.indent_chars + line + "\n"
return reindented return reindented
SETTINGS_GROUPS = {"General": _("General"), SETTINGS_GROUPS = {"Printer": _("Printer settings"),
"Printer": _("Printer settings"),
"UI": _("User interface"), "UI": _("User interface"),
"External": _("External commands")} "External": _("External commands")}
...@@ -136,7 +135,7 @@ class PronterOptionsDialog(wx.Dialog): ...@@ -136,7 +135,7 @@ class PronterOptionsDialog(wx.Dialog):
all_settings = pronterface.settings._all_settings() all_settings = pronterface.settings._all_settings()
group_list = [] group_list = []
groups = {} groups = {}
for group in ["General", "UI", "Printer"]: for group in ["Printer", "UI", "External"]:
group_list.append(group) group_list.append(group)
groups[group] = [] groups[group] = []
for setting in all_settings: for setting in all_settings:
......
...@@ -67,7 +67,7 @@ def setting_add_tooltip(func): ...@@ -67,7 +67,7 @@ def setting_add_tooltip(func):
class Setting(object): class Setting(object):
DEFAULT_GROUP = "General" DEFAULT_GROUP = "Printer"
hidden = False hidden = False
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment