Merge b5dedc9 into 32b70a6

metaprime · web-flow · commit 9ea61f06bf49 · 2025-04-17T18:08:41.000-07:00
diff --git a/src/main/java/com/rarchives/ripme/ui/MainWindow.java b/src/main/java/com/rarchives/ripme/ui/MainWindow.java
@@ -1125,55 +1125,62 @@ public void windowIconified(WindowEvent e) {
         trayMenuMain.addActionListener(arg0 -> toggleTrayClick());
         MenuItem trayMenuAbout = new MenuItem("About " + mainFrame.getTitle());
         trayMenuAbout.addActionListener(arg0 -> {
-            StringBuilder about = new StringBuilder();
-
-            about.append("<html><h1>").append(mainFrame.getTitle()).append("</h1>");
-            about.append("Download albums from various websites:");
             try {
-                List<String> rippers = Utils.getListOfAlbumRippers();
-                about.append("<ul>");
-                for (String ripper : rippers) {
-                    about.append("<li>");
+                List<String> albumRippers = Utils.getListOfAlbumRippers();
+                List<String> videoRippers = Utils.getListOfVideoRippers();
+
+                JTextArea aboutTextArea = new JTextArea();
+                aboutTextArea.setEditable(false);
+                aboutTextArea.setLineWrap(true);
+                aboutTextArea.setWrapStyleWord(true);
+
+                JScrollPane scrollPane = new JScrollPane(aboutTextArea);
+                scrollPane.setPreferredSize(new Dimension(400, 300));
+
+                StringBuilder aboutContent = new StringBuilder();
+                aboutContent.append("Download albums from various websites:\n");
+                for (String ripper : albumRippers) {
                     ripper = ripper.substring(ripper.lastIndexOf('.') + 1);
                     if (ripper.contains("Ripper")) {
                         ripper = ripper.substring(0, ripper.indexOf("Ripper"));
                     }
-                    about.append(ripper);
-                    about.append("</li>");
+                    aboutContent.append("- ").append(ripper).append("\n");
                 }
-                about.append("</ul>");
-            } catch (Exception e) {
-                LOGGER.warn(e.getMessage());
-            }
 
-            about.append("<br>And download videos from video sites:");
-            try {
-                List<String> rippers = Utils.getListOfVideoRippers();
-                about.append("<ul>");
-                for (String ripper : rippers) {
-                    about.append("<li>");
+                aboutContent.append("\nDownload videos from video sites:\n");
+                for (String ripper : videoRippers) {
                     ripper = ripper.substring(ripper.lastIndexOf('.') + 1);
                     if (ripper.contains("Ripper")) {
                         ripper = ripper.substring(0, ripper.indexOf("Ripper"));
                     }
-                    about.append(ripper);
-                    about.append("</li>");
+                    aboutContent.append("- ").append(ripper).append("\n");
                 }
-                about.append("</ul>");
-            } catch (Exception e) {
-                LOGGER.warn(e.getMessage());
-            }
 
-            about.append("Do you want to visit the project homepage on Github?");
-            about.append("</html>");
-            int response = JOptionPane.showConfirmDialog(null, about.toString(), mainFrame.getTitle(),
-                    JOptionPane.YES_NO_OPTION, JOptionPane.PLAIN_MESSAGE, new ImageIcon(mainIcon));
-            if (response == JOptionPane.YES_OPTION) {
-                try {
-                    Desktop.getDesktop().browse(URI.create("http://github.com/ripmeapp/ripme"));
-                } catch (IOException e) {
-                    LOGGER.error("Exception while opening project home page", e);
+                aboutTextArea.setText(aboutContent.toString());
+
+                // Ensure the scroll pane starts at the top
+                SwingUtilities.invokeLater(() -> scrollPane.getVerticalScrollBar().setValue(0));
+
+                JPanel aboutPanel = new JPanel(new BorderLayout());
+                JLabel titleLabel = new JLabel("Download albums and videos from various websites", JLabel.CENTER);
+                titleLabel.setFont(titleLabel.getFont().deriveFont(Font.BOLD, 16));
+                aboutPanel.add(titleLabel, BorderLayout.NORTH);
+                aboutPanel.add(scrollPane, BorderLayout.CENTER);
+
+                JLabel footerLabel = new JLabel("Do you want to visit the project homepage on GitHub?", JLabel.CENTER);
+                aboutPanel.add(footerLabel, BorderLayout.SOUTH);
+
+                int response = JOptionPane.showConfirmDialog(null, aboutPanel, mainFrame.getTitle(),
+                        JOptionPane.YES_NO_OPTION, JOptionPane.PLAIN_MESSAGE, new ImageIcon(mainIcon));
+                if (response == JOptionPane.YES_OPTION) {
+                    try {
+                        Desktop.getDesktop().browse(URI.create("http://github.com/ripmeapp/ripme"));
+                    } catch (IOException e) {
+                        LOGGER.error("Exception while opening project home page", e);
+                    }
                 }
+            } catch (Exception e) {
+                LOGGER.warn(e.getMessage());
             }
         });
 
