fix #52: add alway on top feature

jiangxincode · May 19, 2024 · 83d02fe · 83d02fe
1 parent 75c217f
commit 83d02fe
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 13 deletions.
diff --git a/src/main/java/edu/jiangxin/apktoolbox/help/settings/AlwaysOnTopPanel.java b/src/main/java/edu/jiangxin/apktoolbox/help/settings/AlwaysOnTopPanel.java
@@ -0,0 +1,40 @@
+package edu.jiangxin.apktoolbox.help.settings;
+
+import edu.jiangxin.apktoolbox.swing.extend.EasyChildTabbedPanel;
+import edu.jiangxin.apktoolbox.utils.Constants;
+
+import javax.swing.*;
+
+public class AlwaysOnTopPanel extends EasyChildTabbedPanel {
+    private JPanel optionPanel;
+
+    @Override
+    public void createUI() {
+        BoxLayout boxLayout = new BoxLayout(this, BoxLayout.Y_AXIS);
+        setLayout(boxLayout);
+
+        createOptionPanel();
+        add(optionPanel);
+
+        add(Box.createVerticalStrut(15 * Constants.DEFAULT_Y_BORDER));
+    }
+
+    private void createOptionPanel() {
+        optionPanel = new JPanel();
+        optionPanel.setLayout(new BoxLayout(optionPanel, BoxLayout.X_AXIS));
+
+        JLabel typeLabel = new JLabel("Always on top:");
+        JCheckBox alwaysOnTopCheckBox = new JCheckBox();
+        alwaysOnTopCheckBox.setSelected(conf.getBoolean("always.on.top", false));
+        alwaysOnTopCheckBox.addActionListener(e -> {
+            conf.setProperty("always.on.top", alwaysOnTopCheckBox.isSelected());
+            getFrame().setAlwaysOnTop(alwaysOnTopCheckBox.isSelected());
+            SwingUtilities.updateComponentTreeUI(getFrame());
+            getFrame().refreshSizeAndLocation();
+        });
+
+        optionPanel.add(typeLabel);
+        optionPanel.add(Box.createHorizontalStrut(Constants.DEFAULT_X_BORDER));
+        optionPanel.add(alwaysOnTopCheckBox);
+    }
+}
diff --git a/src/main/java/edu/jiangxin/apktoolbox/help/settings/SettingsPanel.java b/src/main/java/edu/jiangxin/apktoolbox/help/settings/SettingsPanel.java
@@ -23,6 +23,10 @@ public void initUI() {
         String localeTitle = bundle.getString("help.settings.locale.title");
         tabbedPane.addTab(localeTitle, null, localePanel, localeTitle);
 
+        EasyChildTabbedPanel alwaysOnTopPanel = new AlwaysOnTopPanel();
+        String alwaysOnTopTitle = bundle.getString("help.settings.always.on.top.title");
+        tabbedPane.addTab(alwaysOnTopTitle, null, alwaysOnTopPanel, alwaysOnTopTitle);
+
         EasyChildTabbedPanel dependencyPathPanel = new DependencyPathPanel();
         String dependencyPathTitle = bundle.getString("help.settings.dependency.path");
         tabbedPane.addTab(dependencyPathTitle, null, dependencyPathPanel, dependencyPathTitle);

diff --git a/src/main/java/edu/jiangxin/apktoolbox/main/MainFrame.java b/src/main/java/edu/jiangxin/apktoolbox/main/MainFrame.java
@@ -88,6 +88,11 @@ public static void main(String[] args) {
             Locale.setDefault(new Locale(currentLocaleLanguage));
 
             MainFrame frame = new MainFrame();
+
+            boolean isAlwaysOnTop = conf.getBoolean("always.on.top", false);
+            conf.setProperty("always.on.top", isAlwaysOnTop);
+            frame.setAlwaysOnTop(isAlwaysOnTop);
+
             frame.setVisible(true);
         });
     }

diff --git a/src/main/resources/apktoolbox.properties b/src/main/resources/apktoolbox.properties
@@ -41,6 +41,7 @@ help.settings.title = Settings
 help.settings.dependency.path = Dependency Path
 help.settings.locale.title = Set Display Language
 help.settings.look.and.feel.title = Set Look and Feel
+help.settings.always.on.top.title = Set Always On Top
 help.feedback.title = Feedback
 help.checkupdate.title = Check for Updates
 help.contribute.title = Contribute

diff --git a/src/main/resources/apktoolbox_zh.properties b/src/main/resources/apktoolbox_zh.properties
@@ -41,6 +41,7 @@ help.settings.title = \u8bbe\u7f6e
 help.settings.dependency.path = \u4f9d\u8d56\u8def\u5f84
 help.settings.locale.title = \u8bbe\u7f6e\u663e\u793a\u8bed\u8a00
 help.settings.look.and.feel.title = \u8bbe\u7f6e\u5916\u89c2
+help.settings.always.on.top.title = \u6c38\u8fdc\u5728\u6700\u4e0a\u65b9
 help.feedback.title = \u610f\u89c1\u53cd\u9988
 help.checkupdate.title = \u68c0\u67e5\u66f4\u65b0
 help.contribute.title = \u8d21\u732e

diff --git a/src/site/markdown/getting_started_guide/how_to_change_language.md b/src/site/markdown/getting_started_guide/how_to_change_language.md
diff --git a/src/site/markdown/getting_started_guide/how_to_change_look_and_feel.md b/src/site/markdown/getting_started_guide/how_to_change_look_and_feel.md
diff --git a/src/site/markdown/getting_started_guide/settings.md b/src/site/markdown/getting_started_guide/settings.md
@@ -0,0 +1,18 @@
+## Settings
+
+### How To Change Language
+
+You can change language by:
+
+* `Help->Settings->Set Display Language`
+* Restart the software
+
+However, There are many pages which is not translated. I have less time on it, so any pull request is very welcomed. I will merge them as long as I check them.
+
+## How To Change Look And Feel
+
+* `Help->Settings->Set Look and Feel`
+
+## How To Set Always On Top
+
+* `Help->Settings->Set Always On Top`
diff --git a/src/site/site.xml b/src/site/site.xml
@@ -35,8 +35,7 @@
         </breadcrumbs>
         <menu name="Getting Started Guide">
             <item name="Getting Started Guide" href="getting_started_guide/getting_started_guide.html"/>
-            <item name="How To Change Language" href="getting_started_guide/how_to_change_language.html"/>
-            <item name="How To Change Look And Feel" href="getting_started_guide/how_to_change_look_and_feel.html"/>
+            <item name="Settings" href="getting_started_guide/settings.html"/>
         </menu>
         <menu name="Features">
             <item name="Recovery File Password" href="features/recovery_file_password.html"/>