From fbf5a2451eddb30255b61c52010ea110bb55312f Mon Sep 17 00:00:00 2001 From: subhra74 Date: Sun, 19 Apr 2020 12:46:24 +0200 Subject: [PATCH] settings reset functionality --- .../components/settings/SettingsDialog.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/muon-app/src/main/java/muon/app/ui/components/settings/SettingsDialog.java b/muon-app/src/main/java/muon/app/ui/components/settings/SettingsDialog.java index 593eab19..4504b877 100644 --- a/muon-app/src/main/java/muon/app/ui/components/settings/SettingsDialog.java +++ b/muon-app/src/main/java/muon/app/ui/components/settings/SettingsDialog.java @@ -149,6 +149,11 @@ public SettingsDialog(JFrame window) { super.setVisible(false); }); + btnReset.addActionListener(e -> { + loadSettings(new Settings()); + JOptionPane.showMessageDialog(this, "Settings have been reset,\nplease save and restart the app"); + }); + bottomBox.add(btnReset); bottomBox.add(Box.createHorizontalGlue()); bottomBox.add(btnCancel); @@ -587,9 +592,20 @@ public boolean showDialog(JFrame window) { } public boolean showDialog(JFrame window, SettingsPageName page) { + this.setLocationRelativeTo(window); Settings settings = App.getGlobalSettings(); - this.setLocationRelativeTo(window); + if (page != null) { + navList.setSelectedIndex(page.index); + } + + loadSettings(settings); + + super.setVisible(true); + return false; + } + + private void loadSettings(Settings settings) { this.chkAudibleBell.setSelected(settings.isTerminalBell()); this.chkPuttyLikeCopyPaste.setSelected(settings.isPuttyLikeCopyPaste()); @@ -671,15 +687,9 @@ public boolean showDialog(JFrame window, SettingsPageName page) { this.editorModel.clear(); this.editorModel.addEntries(settings.getEditors()); - if (page != null) { - navList.setSelectedIndex(page.index); - } - this.chkUseManualScaling.setSelected(settings.isManualScaling()); this.spScaleValue.setValue(settings.getUiScaling()); - super.setVisible(true); - return false; } private String[] getTerminalFonts() {