diff --git a/pom.xml b/pom.xml index 254b07cbd..68e387a2c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.tonikelope MegaBasterd - 8.1 + 8.2 jar diff --git a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form index e196e1c1d..51c69adb6 100644 --- a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form +++ b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form @@ -88,7 +88,7 @@ - + @@ -329,7 +329,10 @@ - + + + + diff --git a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java index 3ac80d23c..b442e749e 100644 --- a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java @@ -288,7 +288,7 @@ public class FileGrabberDialog extends javax.swing.JDialog { ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 171, Short.MAX_VALUE) + .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 165, Short.MAX_VALUE) ); jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("Upload info")); @@ -416,7 +416,8 @@ public class FileGrabberDialog extends javax.swing.JDialog { } }); - total_file_size_label.setFont(new java.awt.Font("Dialog", 1, 28)); // NOI18N + total_file_size_label.setFont(new java.awt.Font("Dialog", 1, 32)); // NOI18N + total_file_size_label.setForeground(new java.awt.Color(0, 0, 255)); total_file_size_label.setText("[0 B]"); total_file_size_label.setDoubleBuffered(true); total_file_size_label.setEnabled(false); diff --git a/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.form b/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.form index ce842a97f..6053799c1 100644 --- a/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.form +++ b/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.form @@ -213,7 +213,7 @@ - + diff --git a/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java b/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java index eb600918f..d5924fc52 100644 --- a/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java @@ -232,7 +232,7 @@ public class FolderLinkDialog extends javax.swing.JDialog { }); total_space_label.setFont(new java.awt.Font("Dialog", 1, 32)); // NOI18N - total_space_label.setForeground(new java.awt.Color(0, 51, 255)); + total_space_label.setForeground(new java.awt.Color(0, 0, 255)); total_space_label.setText("[---]"); total_space_label.setDoubleBuffered(true); total_space_label.setEnabled(false); diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java index 013513ad6..10a70178f 100644 --- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java +++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java @@ -70,7 +70,7 @@ import javax.swing.UIManager; */ public final class MainPanel { - public static final String VERSION = "8.1"; + public static final String VERSION = "8.2"; public static final boolean FORCE_SMART_PROXY = false; //TRUE FOR DEBUGING SMART PROXY public static final int THROTTLE_SLICE_SIZE = 16 * 1024; public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024; diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java index 4063cf833..286e34e26 100644 --- a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java +++ b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java @@ -1022,8 +1022,7 @@ public final class MainPanelView extends javax.swing.JFrame { Runnable run = () -> { - //Convert to legacy link format - String link_data = MiscTools.newMegaLinks2Legacy(dialog.getLinks_textarea().getText()); + String link_data = MiscTools.extractMegaLinksFromString(dialog.getLinks_textarea().getText()); Set urls = new HashSet(findAllRegex("(?:https?|mega)://[^\r\n]+(#[^\r\n!]*?)?![^\r\n!]+![^\\?\r\n/]+", link_data, 0));