From 7deb07e3d6e9fcf2b206f5ec0729cdf2019b25ba Mon Sep 17 00:00:00 2001
From: Edi Morales <edi.moralcruz@gmail.com>
Date: Fri, 8 Mar 2024 02:12:00 -0600
Subject: [PATCH] Sets new icon. Sets JFileChooser CANCEL button based on
 language selected

---
 src/main/java/jpass/ui/JPassFrame.java        | 15 +++++++++++----
 src/main/java/jpass/util/Constants.java       |  2 ++
 src/main/resources/resources/images/world.svg |  2 ++
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/resources/images/world.svg

diff --git a/src/main/java/jpass/ui/JPassFrame.java b/src/main/java/jpass/ui/JPassFrame.java
index 3cc1772..5522b93 100644
--- a/src/main/java/jpass/ui/JPassFrame.java
+++ b/src/main/java/jpass/ui/JPassFrame.java
@@ -61,6 +61,7 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
 import javax.swing.JToolBar;
+import javax.swing.UIManager;
 import javax.swing.WindowConstants;
 
 import static jpass.ui.MessageDialog.NO_OPTION;
@@ -70,7 +71,9 @@
 import static jpass.ui.MessageDialog.showQuestionMessage;
 import static jpass.util.Constants.BOTTOM_MENU_ENTRIES_COUNT;
 import static jpass.util.Constants.BOTTOM_MENU_ENTRIES_FOUND;
+import static jpass.util.Constants.BUTTON_MESSAGE_CANCEL;
 import static jpass.util.Constants.EDIT_MENU;
+import static jpass.util.Constants.FILE_CHOOSER_CANCEL_BUTTON_TEXT;
 import static jpass.util.Constants.FILE_MENU;
 import static jpass.util.Constants.HELP_MENU;
 import static jpass.util.Constants.LANGUAGE_EN_US;
@@ -127,6 +130,7 @@ private JPassFrame(String fileName, Locale locale) {
 
         setSupportedLanguages();
         setLocalizedMessages(locale);
+        UIManager.put("FileChooser.cancelButtonText", localizedMessages.getString(BUTTON_MESSAGE_CANCEL));
 
         this.toolBar = new JToolBar();
         this.toolBar.setFloatable(false);
@@ -199,13 +203,12 @@ private JPassFrame(String fileName, Locale locale) {
 
         JMenu languageMenu = new JMenu(localizedMessages.getString(SETTINGS_MENU_LANGUAGE));
         languageMenu.setActionCommand(SETTINGS_MENU_LANGUAGE);
+        languageMenu.setIcon(getIcon("world"));
 
         SUPPORTED_LANGUAGES.forEach((key, value) -> {
             JMenuItem language = new JMenuItem(localizedMessages.getString(key));
             language.setActionCommand(key);
-            language.addActionListener(e -> {
-                refreshComponentsWithLanguage(e.getActionCommand());
-            });
+            language.addActionListener(e -> refreshComponentsWithLanguage(e.getActionCommand()));
             languageMenu.add(language);
         });
         settingsMenu.add(languageMenu);
@@ -346,6 +349,8 @@ private void refreshComponentsWithLanguage(String actionCommand) {
         Locale locale = Locale.forLanguageTag(getSupportedLanguages().get(actionCommand));
         setLocalizedMessages(locale);
 
+        UIManager.put(FILE_CHOOSER_CANCEL_BUTTON_TEXT, localizedMessages.getString(BUTTON_MESSAGE_CANCEL));
+
         fileMenu.setText(localizedMessages.getString(FILE_MENU));
         editMenu.setText(localizedMessages.getString(EDIT_MENU));
         toolsMenu.setText(localizedMessages.getString(TOOLS_MENU));
@@ -357,8 +362,11 @@ private void refreshComponentsWithLanguage(String actionCommand) {
         updateMenuComponents(toolsMenu);
         updateMenuComponents(settingsMenu);
         updateMenuComponents(helpMenu);
+        //updateMenuComponents(toolBar);
 
         refreshEntryTitleList(null);
+
+        MessageDialog.showInformationMessage(this, "Language has been changed");
     }
 
     private void updateMenuComponents(JMenu menu) {
@@ -366,7 +374,6 @@ private void updateMenuComponents(JMenu menu) {
             JMenuItem item = menu.getItem(i);
             if (null != item) {
                 if (null != item.getActionCommand()) {
-                    LOG.log(Level.INFO, String.format("ActionCommand: %s ", item.getActionCommand()));
                     item.setText(localizedMessages.getString(item.getActionCommand()));
                 }
 
diff --git a/src/main/java/jpass/util/Constants.java b/src/main/java/jpass/util/Constants.java
index 62bb624..598b450 100644
--- a/src/main/java/jpass/util/Constants.java
+++ b/src/main/java/jpass/util/Constants.java
@@ -5,6 +5,8 @@ private Constants() {
         // not intended to be instantiated
     }
 
+    public static final String FILE_CHOOSER_CANCEL_BUTTON_TEXT = "FileChooser.cancelButtonText";
+
     public static final String FILE_MENU = "menuBar.fileMenu";
     public static final String EDIT_MENU = "menuBar.editMenu";
     public static final String TOOLS_MENU = "menuBar.toolsMenu";
diff --git a/src/main/resources/resources/images/world.svg b/src/main/resources/resources/images/world.svg
new file mode 100644
index 0000000..a1a9d03
--- /dev/null
+++ b/src/main/resources/resources/images/world.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="16" height="16" viewBox="0 -8 72 72" id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg"><title>world</title><path d="M59.25,12.42l-.83.27L54,13.08l-1.27,2-.91-.29L48.23,11.6l-.52-1.66L47,8.16l-2.23-2-2.63-.51-.06,1.2,2.58,2.52,1.26,1.48-1.42.75-1.15-.34-1.73-.73,0-1.39L39.42,8.2l-.75,3.29L36.38,12l.23,1.84,3,.57.52-2.93,2.46.37,1.14.67h1.84L46.8,15l3.34,3.38-.25,1.32-2.69-.34-4.64,2.34-3.34,4-.43,1.78H37.58l-2.23-1-2.17,1,.54,2.29.94-1.09,1.67,0-.12,2,1.38.4L39,32.67,41.2,32l2.57.4,3,.8,1.48.18,2.52,2.86,4.87,2.86-3.15,6-3.32,1.54-1.26,3.44-4.81,3.21-.51,1.85A28,28,0,0,0,59.25,12.42Z"/><path d="M39.22,42.63l-2-3.78L39.05,35l-1.87-.56-2.1-2.11-4.66-1L28.88,28v1.92H28.2l-4-5.44V20l-2.94-4.78-4.67.83H13.43l-1.59-1,2-1.6-2,.46A28,28,0,0,0,36,56a29,29,0,0,0,3.51-.25l-.29-3.39s1.29-5,1.29-5.2S39.22,42.63,39.22,42.63Z"/><path d="M18.41,9l5-.7,2.29-1.25,2.58.74,4.12-.23,1.42-2.22,2.05.34,5-.47,1.38-1.52,2-1.29,2.74.41,1-.15a27.91,27.91,0,0,0-33.51,7.49h0ZM37.18,2.78,40,1.21l1.84,1.06-2.66,2-2.54.26-1.14-.74ZM28.71,3,30,3.54,31.63,3l.9,1.56-3.82,1L26.88,4.5S28.67,3.35,28.71,3Z"/></svg>
\ No newline at end of file