Gurkengewuerz/ImgScroll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #882 from RipMeApp/revert-805-master

Browse Source 
Revert "Fix #789: Implemented wraparound for log window and status label"
This commit is contained in:
cyian-1756 2018-08-24 14:04:23 -04:00 committed by GitHub
commit 2f3e4a5326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java
View File

@ -300,7 +300,7 @@ public abstract class AbstractRipper
* Prefix to prepend to the saved filename. * Prefix to prepend to the saved filename.
* @param subdirectory * @param subdirectory
* Sub-directory of the working directory to save the images to. * Sub-directory of the working directory to save the images to.
* @return True on success, false on failure. * @return True on success, flase on failure.
*/ */
protected boolean addURLToDownload(URL url, String prefix, String subdirectory) { protected boolean addURLToDownload(URL url, String prefix, String subdirectory) {
return addURLToDownload(url, prefix, subdirectory, null, null, null); return addURLToDownload(url, prefix, subdirectory, null, null, null);
@ -317,7 +317,7 @@ public abstract class AbstractRipper
* URL to download * URL to download
* @param prefix * @param prefix
* Text to append to saved filename. * Text to append to saved filename.
* @return True on success, false on failure. * @return True on success, flase on failure.
*/ */
protected boolean addURLToDownload(URL url, String prefix) { protected boolean addURLToDownload(URL url, String prefix) {
// Use empty subdirectory // Use empty subdirectory

37
src/main/java/com/rarchives/ripme/ui/MainWindow.java
View File

@ -27,7 +27,6 @@ import javax.swing.ImageIcon;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JCheckBox; import javax.swing.JCheckBox;
import javax.swing.JComboBox; import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JLabel; import javax.swing.JLabel;
@ -159,30 +158,6 @@ public final class MainWindow implements Runnable, RipStatusHandler {
} }
} }
private static int getAverageFontWidth(JComponent component) {
int sum = 0;
int[] widths = component.getFontMetrics(component.getFont()).getWidths();
for(int i : widths) {
sum += i;
}
return sum / widths.length;
}
private static void insertWrappedString(JComponent parent, StyledDocument document, String string, SimpleAttributeSet s)
throws BadLocationException {
StringBuilder resultString = new StringBuilder();
int maxCharsToFit = parent.getWidth() / getAverageFontWidth(parent);
int i = 0;
while(i < string.length()/maxCharsToFit) {
if(i > 0) resultString.append(string.substring(i*maxCharsToFit-2, i*maxCharsToFit));
resultString.append(string.substring(i*maxCharsToFit, (i+1)*maxCharsToFit-2));
resultString.append("\n");
i++;
}
resultString.append(string.substring(string.length()-(string.length()%maxCharsToFit)));
resultString.append("\n");
document.insertString(document.getLength(), resultString.toString(), s);
}
private static void addCheckboxListener(JCheckBox checkBox, String configString) { private static void addCheckboxListener(JCheckBox checkBox, String configString) {
checkBox.addActionListener(arg0 -> { checkBox.addActionListener(arg0 -> {
@ -274,14 +249,7 @@ public final class MainWindow implements Runnable, RipStatusHandler {
private void statusWithColor(String text, Color color) { private void statusWithColor(String text, Color color) {
statusLabel.setForeground(color); statusLabel.setForeground(color);
statusLabel.setToolTipText(text); statusLabel.setText(text);
int averageWidth = getAverageFontWidth(statusLabel);
int numCharsToFit = statusLabel.getWidth() / averageWidth;
if(text.length() > (mainFrame.getWidth() / averageWidth)) {
statusLabel.setText(text.substring(0, numCharsToFit-6) + "...");
} else {
statusLabel.setText(text);
}
pack(); pack();
} }
@ -348,7 +316,6 @@ public final class MainWindow implements Runnable, RipStatusHandler {
gbc.weightx = 1; gbc.weightx = 1;
statusLabel = new JLabel(rb.getString("inactive")); statusLabel = new JLabel(rb.getString("inactive"));
statusLabel.setToolTipText(rb.getString("inactive"));
statusLabel.setHorizontalAlignment(JLabel.CENTER); statusLabel.setHorizontalAlignment(JLabel.CENTER);
openButton = new JButton(); openButton = new JButton();
openButton.setVisible(false); openButton.setVisible(false);
@ -1092,7 +1059,7 @@ public final class MainWindow implements Runnable, RipStatusHandler {
StyledDocument sd = logText.getStyledDocument(); StyledDocument sd = logText.getStyledDocument();
try { try {
synchronized (this) { synchronized (this) {
insertWrappedString(logText, sd, text, sas); sd.insertString(sd.getLength(), text + "\n", sas);
} }
} catch (BadLocationException e) { } } catch (BadLocationException e) { }