diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/sevenUnitsGUI/Presenter.java | 5 | ||||
| -rw-r--r-- | src/main/java/sevenUnitsGUI/TabbedView.java | 29 |
2 files changed, 26 insertions, 8 deletions
diff --git a/src/main/java/sevenUnitsGUI/Presenter.java b/src/main/java/sevenUnitsGUI/Presenter.java index 1cbac47..6467f03 100644 --- a/src/main/java/sevenUnitsGUI/Presenter.java +++ b/src/main/java/sevenUnitsGUI/Presenter.java @@ -84,7 +84,7 @@ public final class Presenter { * <li>Users are initialized with this locale. * </ul> */ - static final String DEFAULT_LOCALE = "eo"; + static final String DEFAULT_LOCALE = "en"; private static final List<String> LOCAL_LOCALES = List.of("en", "fr"); private static final Path USER_LOCALES_DIR = userConfigDir() @@ -998,7 +998,7 @@ public final class Presenter { this.setSearchRuleFromString(value); break; case "locale": - this.setUserLocale(value); + this.userLocale = value; break; default: System.err.printf("Warning: unrecognized setting \"%s\".%n", @@ -1055,6 +1055,7 @@ public final class Presenter { } this.updateView(); + this.view.updateText(); } void prefixSelected() { diff --git a/src/main/java/sevenUnitsGUI/TabbedView.java b/src/main/java/sevenUnitsGUI/TabbedView.java index cb0a4d2..1da119e 100644 --- a/src/main/java/sevenUnitsGUI/TabbedView.java +++ b/src/main/java/sevenUnitsGUI/TabbedView.java @@ -196,6 +196,7 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView { private final JTextArea prefixTextBox; // SETTINGS STUFF + private final JComboBox<String> localeSelector; private StandardRoundingType roundingType; private int precision; @@ -218,8 +219,7 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView { // initialize important components this.presenter = new Presenter(this); - this.frame = new JFrame(this.presenter.getLocalizedText("tv.title") - .replace("[v]", ProgramInfo.VERSION.toString())); + this.frame = new JFrame("7Units (Unlocalized)"); this.frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); // master components (those that contain everything else within them) @@ -361,12 +361,14 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView { infoTextArea.setText(this.presenter.getAboutText()); // ============ SETTINGS PANEL ============ + this.localeSelector = new JComboBox<>(); this.masterPane.addTab("\u2699", new JScrollPane(this.createSettingsPanel())); this.masterPane.setMnemonicAt(5, KeyEvent.VK_S); // ============ FINALIZE CREATION OF VIEW ============ this.presenter.postViewInitialize(); + this.updateText(); this.frame.pack(); this.frame.setVisible(true); } @@ -604,7 +606,7 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView { e.getStateChange() == ItemEvent.SELECTED); this.presenter.saveSettings(); }); - miscPanel.add(oneWay, new GridBagBuilder(0, 0) + miscPanel.add(oneWay, new GridBagBuilder(0, 0, 2, 1) .setAnchor(GridBagConstraints.LINE_START).build()); final JCheckBox showAllVariations = new JCheckBox( @@ -615,12 +617,26 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView { .setShowDuplicates(e.getStateChange() == ItemEvent.SELECTED); this.presenter.saveSettings(); }); - miscPanel.add(showAllVariations, new GridBagBuilder(0, 1) + miscPanel.add(showAllVariations, new GridBagBuilder(0, 1, 2, 1) + .setAnchor(GridBagConstraints.LINE_START).build()); + + final JLabel localeLabel = new JLabel("Locale:"); + miscPanel.add(localeLabel, new GridBagBuilder(0, 2, 1, 1) .setAnchor(GridBagConstraints.LINE_START).build()); + this.presenter.getAvailableLocales().stream().sorted() + .forEachOrdered(this.localeSelector::addItem); + this.localeSelector.setSelectedItem(this.presenter.getUserLocale()); + this.localeSelector.addItemListener(e -> { + this.presenter.setUserLocale((String) e.getItem()); + this.presenter.saveSettings(); + }); + miscPanel.add(localeSelector, new GridBagBuilder(1, 2, 1, 1) + .setAnchor(GridBagConstraints.LINE_END).build()); + final JButton unitFileButton = new JButton("Manage Unit Data Files"); unitFileButton.setEnabled(false); - miscPanel.add(unitFileButton, new GridBagBuilder(0, 2) + miscPanel.add(unitFileButton, new GridBagBuilder(0, 3, 2, 1) .setAnchor(GridBagConstraints.LINE_START).build()); } @@ -831,6 +847,7 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView { @Override public void updateText() { - // TODO Auto-generated method stub + this.frame.setTitle(this.presenter.getLocalizedText("tv.title") + .replace("[v]", ProgramInfo.VERSION.toString())); } } |