Slight UX improvements

- Busy cursor when loading modpack
- Reorganized buttons & menu bar slightly
- Automatically make packwiz executable if possible (Owner only)

Author: AmberIsFrozen

src/main/java/com/lx862/pwgui/gui/action/CloseWindowAction.java

@@ -8,8 +8,8 @@
 public class CloseWindowAction extends AbstractAction {
     private final Window parent;
 
-    public CloseWindowAction(Window parent, boolean useCancelText) {
-        super(useCancelText ? "Cancel" : "Close");
+    public CloseWindowAction(String title, Window parent) {
+        super(title);
         this.parent = parent;
         putValue(MNEMONIC_KEY, KeyEvent.VK_C);
     }

src/main/java/com/lx862/pwgui/gui/action/LocatePackwizAction.java

@@ -9,20 +9,21 @@
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.Set;
 
 public class LocatePackwizAction extends AbstractAction {
     private final Window parent;
     private final Runnable finishCallback;
 
-    public LocatePackwizAction(Window parent, Runnable finishCallback) {
-        super("Locate packwiz...");
+    public LocatePackwizAction(String title, Window parent, Runnable finishCallback) {
+        super(title);
         this.parent = parent;
         this.finishCallback = finishCallback;
-
-        putValue(MNEMONIC_KEY, KeyEvent.VK_L);
     }
 
     @Override
@@ -33,14 +34,20 @@ public void actionPerformed(ActionEvent actionEvent) {
         if(fileChooser.showOpenDialog(parent) == JFileChooser.APPROVE_OPTION) {
             File selectedFile = fileChooser.getSelectedFile();
             if(!selectedFile.canExecute()) {
-                JOptionPane.showMessageDialog(parent, "The selected file is not executable!\nConsider adding the executable (x) permission to the file.", Util.withTitlePrefix("File Not Executable!"), JOptionPane.ERROR_MESSAGE);
-                return;
+                try {
+                    Set<PosixFilePermission> perms = Files.getPosixFilePermissions(selectedFile.toPath(), LinkOption.NOFOLLOW_LINKS);
+                    perms.add(PosixFilePermission.OWNER_EXECUTE);
+                    Files.setPosixFilePermissions(selectedFile.toPath(), perms);
+                } catch (Exception ignored) {
+                    JOptionPane.showMessageDialog(parent, "The selected file is not executable!\nConsider adding the executable (x) permission to the file.", Util.withTitlePrefix("File Not Executable!"), JOptionPane.ERROR_MESSAGE);
+                    return;
+                }
             }
 
             PWGUI.getConfig().packwizExecutablePath.setValue(selectedFile.toPath());
             String newProbedPath = Executables.packwiz.probe(null);
             if(newProbedPath == null) {
-                JOptionPane.showMessageDialog(parent, "The selected executable is not valid!\nAre you sure you can run the executable?", Util.withTitlePrefix("Invalid Executable"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(parent, "The selected executable is not valid!\nPlease confirm that you can run the executable?", Util.withTitlePrefix("Invalid Executable"), JOptionPane.ERROR_MESSAGE);
                 return;
             }
 

src/main/java/com/lx862/pwgui/gui/action/ReinstallAction.java

@@ -22,8 +22,8 @@ public class ReinstallAction extends AbstractAction {
     private final Window parent;
     private final Modpack modpack;
 
-    public ReinstallAction(Window parent, Modpack modpack) {
-        super("Reinstall...");
+    public ReinstallAction(String title, Window parent, Modpack modpack) {
+        super(title);
         this.parent = parent;
         this.modpack = modpack;
         putValue(MNEMONIC_KEY, KeyEvent.VK_R);

src/main/java/com/lx862/pwgui/gui/dialog/ChangeAcceptableGameVersionDialog.java

@@ -92,7 +92,7 @@ public ChangeAcceptableGameVersionDialog(JFrame parentFrame, String requiredVers
             });
         });
 
-        KButton cancelButton = new KButton(new CloseWindowAction(this, true));
+        KButton cancelButton = new KButton(new CloseWindowAction("Cancel", this));
 
         KActionPanel actionPanel = new KActionPanel.Builder().setPositiveButton(okButton).setNegativeButton(cancelButton).build();
         actionPanel.setAlignmentX(Component.LEFT_ALIGNMENT);

src/main/java/com/lx862/pwgui/gui/dialog/ChangeLicenseDialog.java

@@ -122,7 +122,7 @@ public ChangeLicenseDialog(JFrame parent, File licenseFile) {
         contentPanel.add(splitPane);
 
         JButton changeLicenseButton = new KButton(new ChangeLicenseAction(licenseFile));
-        JButton cancelButton = new KButton(new CloseWindowAction(this, true));
+        JButton cancelButton = new KButton(new CloseWindowAction("Cancel", this));
 
         KActionPanel actionPanel = new KActionPanel.Builder().setNegativeButton(cancelButton).setPositiveButton(changeLicenseButton).build();
         actionPanel.setAlignmentX(Component.LEFT_ALIGNMENT);

src/main/java/com/lx862/pwgui/gui/dialog/GenerateModListDialog.java

@@ -115,9 +115,8 @@ public GenerateModListDialog(Window frame, PackFile packFile) {
 
         KButton saveAsButton = new KButton(new SaveModlistAction());
         KButton copyButton = new KButton(new CopyModListAction());
-        KButton closeButton = new KButton(new CloseWindowAction(this, false));
 
-        KActionPanel actionPanel = new KActionPanel.Builder().add(saveAsButton, copyButton, closeButton).build();
+        KActionPanel actionPanel = new KActionPanel.Builder().add(saveAsButton, copyButton).build();
         contentPanel.add(actionPanel, BorderLayout.PAGE_END);
 
         add(contentPanel);

src/main/java/com/lx862/pwgui/gui/dialog/SettingsDialog.java

@@ -7,7 +7,7 @@
 import com.lx862.pwgui.core.data.ApplicationTheme;
 import com.lx862.pwgui.executable.Executables;
 import com.lx862.pwgui.gui.action.DownloadPackwizAction;
-import com.lx862.pwgui.gui.components.filter.PackwizExecutableFileFilter;
+import com.lx862.pwgui.gui.action.LocatePackwizAction;
 import com.lx862.pwgui.gui.components.kui.*;
 import com.lx862.pwgui.util.GUIHelper;
 import com.lx862.pwgui.util.Util;
@@ -196,15 +196,11 @@ public PackwizPanel() {
             packwizLocationPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
             this.packwizLocationLabel = new JLabel("Location: ???");
 
-            KButton changePackwizLocationButton = new KButton("Change...");
-            changePackwizLocationButton.addActionListener(actionEvent -> {
-                KFileChooser fileChooser = new KFileChooser("locate-pw");
-                fileChooser.setFileFilter(new PackwizExecutableFileFilter());
-
-                if(fileChooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) {
-                    updatePackwizPath(fileChooser.getSelectedFile().toPath());
-                }
-            });
+            KButton changePackwizLocationButton = new KButton(new LocatePackwizAction("Change...", SettingsDialog.this, () -> {
+                Path newPath = PWGUI.getConfig().packwizExecutablePath.getValue();
+                packwizLocationLabel.setText(String.format("Location: %s", newPath.toString()));
+                packwizLocationLabel.setToolTipText(newPath.toString());
+            }));
 
             packwizLocationPanel.addRow(1, 0, packwizLocationLabel, changePackwizLocationButton);
 

src/main/java/com/lx862/pwgui/gui/dialog/ViewLogDialog.java

@@ -13,15 +13,11 @@
 import org.apache.commons.io.FileUtils;
 
 import javax.swing.*;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Document;
-import javax.swing.text.Style;
-import javax.swing.text.StyleConstants;
+import javax.swing.text.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
@@ -55,17 +51,17 @@ public ViewLogDialog(JFrame frame) {
 
             Document doc = logTextPane.getDocument();
             try {
-                doc.insertString(doc.getLength(), line + "\n", style);
+                doc.insertString(doc.getLength(), line + "\n\n", style);
                 logHistory.append(line).append("\n");
             } catch (BadLocationException ignored) {}
             logTextAreaScrollPane.getVerticalScrollBar().setValue(logTextAreaScrollPane.getVerticalScrollBar().getMaximum()); // Jump to bottom
+            SimpleAttributeSet aSet = new SimpleAttributeSet();
         };
 
         PWGUI.LOGGER.addListener(appendLogCallback);
 
         KButton saveAsButton = new KButton(new SaveLogAction());
-        KButton closeButton = new KButton(new CloseWindowAction(this, false));
-        KActionPanel actionPanel = new KActionPanel.Builder().add(saveAsButton, closeButton).build();
+        KActionPanel actionPanel = new KActionPanel.Builder().add(saveAsButton).build();
 
         contentPanel.add(actionPanel, BorderLayout.PAGE_END);
         add(contentPanel);

src/main/java/com/lx862/pwgui/gui/frame/BaseFrame.java

@@ -57,13 +57,6 @@ protected KMenu getToolMenu(Modpack modpack) {
 //        KMenuItem refreshMenuItem = new KMenuItem(new RefreshPackAction(this));
 //        toolMenu.add(refreshMenuItem);
 
-        KMenuItem reinstallMenuItem = new KMenuItem(new ReinstallAction(this, modpack));
-        toolMenu.add(reinstallMenuItem);
-
-        KMenuItem updateAllMenuItem = new KMenuItem(new UpdateAction(() -> this));
-        toolMenu.add(updateAllMenuItem);
-
-
         KMenuItem generateModlistItem = new KMenuItem(new GenerateModlistAction(this, modpack.packFile.get()));
         toolMenu.add(generateModlistItem);
 
@@ -83,6 +76,12 @@ protected KMenu getToolMenu(Modpack modpack) {
 
     protected KMenu getEditMenu(Modpack modpack) {
         KMenu editMenu = new KMenu("Edit");
+        KMenuItem reinstallMenuItem = new KMenuItem(new ReinstallAction("Reinstall Modpack", this, modpack));
+        editMenu.add(reinstallMenuItem);
+
+        KMenuItem updateAllMenuItem = new KMenuItem(new UpdateAction(() -> this));
+        editMenu.add(updateAllMenuItem);
+
         KMenu addMissingMenu = new KMenu("Add Missing...");
 
         KMenuItem modsDirectoryMenuItem = new KMenuItem(new CreateMissingDirectoryAction(this, modpack.getRootPath(), "mods", "Mods Folder"));

src/main/java/com/lx862/pwgui/gui/frame/SetupFrame.java

@@ -12,6 +12,9 @@
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.KeyEvent;
+
+import static javax.swing.Action.MNEMONIC_KEY;
 
 /** The greeting splash screen if the packwiz executable is not found */
 public class SetupFrame extends BaseFrame {
@@ -75,11 +78,15 @@ public MainPanel(JFrame parent) {
 
             add(Box.createRigidArea(new Dimension(0, 8)));
 
-            KButton locateButton = new KButton(new LocatePackwizAction(parent, () -> {
+            LocatePackwizAction action = new LocatePackwizAction("Locate Packwiz...", parent, () -> {
+                JOptionPane.showMessageDialog(parent, "Packwiz executable has been configured!", Util.withTitlePrefix("Configure Success!"), JOptionPane.INFORMATION_MESSAGE);
                 WelcomeFrame welcomeFrame = new WelcomeFrame(parent);
                 welcomeFrame.setVisible(true);
                 parent.dispose();
-            }));
+            });
+            action.putValue(MNEMONIC_KEY, KeyEvent.VK_L);
+
+            KButton locateButton = new KButton(action);
             locateButton.setAlignmentX(Component.CENTER_ALIGNMENT);
             add(locateButton);