mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-27 07:44:20 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1120 from Tush-r/master

Browse Source 
Fixed update dialog going out of screen.
This commit is contained in:
cyian-1756
2018-12-22 14:06:44 -05:00
committed by GitHub
parent 8805425b5c 2bdcb5edf5
commit 09a9534ae6
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
View File

@@ -1,11 +1,14 @@
package com.rarchives.ripme.ui; package com.rarchives.ripme.ui;
import java.awt.Dimension;
import java.io.*; import java.io.*;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import javax.swing.JEditorPane;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JScrollPane;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.json.JSONArray; import org.json.JSONArray;
@@ -125,12 +128,14 @@ public class UpdateUtils {
String latestVersion = ripmeJson.getString("latestVersion"); String latestVersion = ripmeJson.getString("latestVersion");
if (UpdateUtils.isNewerVersion(latestVersion)) { if (UpdateUtils.isNewerVersion(latestVersion)) {
logger.info("Found newer version: " + latestVersion); logger.info("Found newer version: " + latestVersion);
int result = JOptionPane.showConfirmDialog( JEditorPane changeListPane = new JEditorPane("text/html", String.format(
null, "<html><font color=\"green\">New version (%s) is available!</font>" + "<br><br>Recent changes: %s"
String.format("<html><font color=\"green\">New version (%s) is available!</font>" + "<br><br>Do you want to download and run the newest version?</html>",
+ "<br><br>Recent changes: %s" latestVersion, changeList.replaceAll("\n", "<br><br>")));
+ "<br><br>Do you want to download and run the newest version?</html>", latestVersion, changeList.replaceAll("\n", "")), changeListPane.setEditable(false);
"RipMe Updater", JScrollPane changeListScrollPane = new JScrollPane(changeListPane);
changeListScrollPane.setPreferredSize(new Dimension(250, 200));
int result = JOptionPane.showConfirmDialog(null, changeListScrollPane, "RipMe Updater",
JOptionPane.YES_NO_OPTION); JOptionPane.YES_NO_OPTION);
if (result != JOptionPane.YES_OPTION) { if (result != JOptionPane.YES_OPTION) {
configUpdateLabel.setText("<html>Current Version: " + getThisJarVersion() configUpdateLabel.setText("<html>Current Version: " + getThisJarVersion()