diff --git a/pom.xml b/pom.xml
index 3fde9a06b..ec03b0826 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.tonikelope
MegaBasterd
- 7.85
+ 7.86
jar
diff --git a/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java b/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java
index 104034b1d..f15bf324c 100644
--- a/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java
+++ b/src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java
@@ -143,7 +143,7 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable {
SmartMegaProxyManager proxy_manager = MainPanel.getProxy_manager();
- if (proxy_manager.isForce_smart_proxy()) {
+ if (MainPanel.isUse_smart_proxy() && proxy_manager.isForce_smart_proxy()) {
String[] smart_proxy = proxy_manager.getProxy(_excluded_proxy_list);
diff --git a/src/main/java/com/tonikelope/megabasterd/Download.java b/src/main/java/com/tonikelope/megabasterd/Download.java
index 6788f35cc..d96247394 100644
--- a/src/main/java/com/tonikelope/megabasterd/Download.java
+++ b/src/main/java/com/tonikelope/megabasterd/Download.java
@@ -716,9 +716,8 @@ public class Download implements Transference, Runnable, SecureSingleThreadNotif
if (!isExit() && !_thread_pool.isShutdown() && _status_error == null && progress < getFile_size() && progress <= last_progress) {
stopDownloader("PROGRESS WATCHDOG TIMEOUT!");
- if (MainPanel.getProxy_manager() != null) {
+ if (MainPanel.isUse_smart_proxy()) {
String lista_proxy = DBTools.selectSettingValue("custom_proxy_list");
-
String url_list = MiscTools.findFirstRegex("^#(http.+)$", lista_proxy.trim(), 1);
MainPanel.getProxy_manager().refreshProxyList(url_list); //Force SmartProxy proxy list refresh
}
diff --git a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java
index 960ec8e95..ebb473092 100644
--- a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java
+++ b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java
@@ -522,7 +522,7 @@ public class FileGrabberDialog extends javax.swing.JDialog {
_base_path = files_selected[0].getParentFile().getAbsolutePath();
- dir_name_textfield.setText(files_selected[0].getParentFile().getName() + "_" + genID(10));
+ dir_name_textfield.setText(files_selected[0].getParentFile().getName() + "_" + String.valueOf(System.currentTimeMillis()/1000));
dir_name_textfield.setEnabled(true);
@@ -624,7 +624,7 @@ public class FileGrabberDialog extends javax.swing.JDialog {
_base_path = filechooser.getSelectedFile().getAbsolutePath();
- dir_name_textfield.setText(filechooser.getSelectedFile().getName() + "_" + genID(10));
+ dir_name_textfield.setText(filechooser.getSelectedFile().getName() + "_" + String.valueOf(System.currentTimeMillis()/1000));
dir_name_textfield.setEnabled(true);
@@ -988,7 +988,7 @@ public class FileGrabberDialog extends javax.swing.JDialog {
_base_path = (files.size() == 1 && files.get(0).isDirectory()) ? files.get(0).getAbsolutePath() : files.get(0).getParentFile().getAbsolutePath();
MiscTools.GUIRunAndWait(() -> {
- dir_name_textfield.setText(((files.size() == 1 && files.get(0).isDirectory()) ? files.get(0).getName() : files.get(0).getParentFile().getName()) + "_" + genID(10));
+ dir_name_textfield.setText(((files.size() == 1 && files.get(0).isDirectory()) ? files.get(0).getName() : files.get(0).getParentFile().getName()) + "_" + String.valueOf(System.currentTimeMillis()/1000));
dir_name_textfield.setEnabled(true);
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
index 85c124b86..43c6a6c9c 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -69,7 +69,7 @@ import javax.swing.UIManager;
*/
public final class MainPanel {
- public static final String VERSION = "7.85";
+ public static final String VERSION = "7.86";
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;
@@ -270,7 +270,7 @@ public final class MainPanel {
PrintStream fileOut;
try {
- fileOut = new PrintStream(new FileOutputStream(MainPanel.MEGABASTERD_HOME_DIR + "/.MEGABASTERD_DEBUG.log"));
+ fileOut = new PrintStream(new FileOutputStream(MainPanel.MEGABASTERD_HOME_DIR + "/MEGABASTERD_DEBUG.log"));
System.setOut(fileOut);
System.setErr(fileOut);
diff --git a/src/main/java/com/tonikelope/megabasterd/MegaAPI.java b/src/main/java/com/tonikelope/megabasterd/MegaAPI.java
index 36c22a18e..c90f5ff58 100644
--- a/src/main/java/com/tonikelope/megabasterd/MegaAPI.java
+++ b/src/main/java/com/tonikelope/megabasterd/MegaAPI.java
@@ -381,7 +381,7 @@ public class MegaAPI implements Serializable {
SmartMegaProxyManager proxy_manager = MainPanel.getProxy_manager();
- if (proxy_manager.isForce_smart_proxy()) {
+ if (MainPanel.isUse_smart_proxy() && proxy_manager.isForce_smart_proxy()) {
String[] smart_proxy = proxy_manager.getProxy(excluded_proxy_list);
diff --git a/src/main/java/com/tonikelope/megabasterd/MiscTools.java b/src/main/java/com/tonikelope/megabasterd/MiscTools.java
index 93a9dd88c..66e9defd9 100644
--- a/src/main/java/com/tonikelope/megabasterd/MiscTools.java
+++ b/src/main/java/com/tonikelope/megabasterd/MiscTools.java
@@ -1011,7 +1011,7 @@ public class MiscTools {
ArrayList excluded_proxy_list = new ArrayList<>();
- if (proxy_manager.isForce_smart_proxy()) {
+ if (MainPanel.isUse_smart_proxy() && proxy_manager.isForce_smart_proxy()) {
String[] smart_proxy = proxy_manager.getProxy(excluded_proxy_list);
diff --git a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form
index 3b12ddd17..ab9038626 100644
--- a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form
+++ b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form
@@ -261,6 +261,7 @@
+
@@ -269,6 +270,7 @@
+
@@ -319,6 +321,7 @@
+
@@ -357,6 +360,7 @@
+
@@ -383,6 +387,7 @@
+
@@ -391,6 +396,7 @@
+
@@ -412,6 +418,7 @@
+
@@ -420,6 +427,7 @@
+
@@ -440,6 +448,7 @@
+
@@ -450,6 +459,7 @@
+
@@ -829,6 +839,7 @@
+
@@ -836,6 +847,7 @@
+
@@ -1838,7 +1850,7 @@
-
+
diff --git a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
index 1cafbae20..15ae5714f 100644
--- a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
+++ b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
@@ -708,6 +708,10 @@ public class SettingsDialog extends javax.swing.JDialog {
custom_proxy_textarea.setText(custom_proxy_list);
}
+ revalidate();
+
+ repaint();
+
setPreferredSize(parent.getSize());
pack();
@@ -866,9 +870,11 @@ public class SettingsDialog extends javax.swing.JDialog {
megacrypter_reverse_warning_label.setFont(new java.awt.Font("Dialog", 0, 14)); // NOI18N
megacrypter_reverse_warning_label.setText("Note: you MUST \"OPEN\" this port in your router/firewall.");
+ megacrypter_reverse_warning_label.setEnabled(false);
rec_download_slots_label.setFont(new java.awt.Font("Dialog", 2, 16)); // NOI18N
rec_download_slots_label.setText("Note: if you want to download without using a MEGA PREMIUM account you SHOULD enable it. (Slots consume RAM, so use them moderately).");
+ rec_download_slots_label.setEnabled(false);
megacrypter_reverse_checkbox.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
megacrypter_reverse_checkbox.setText("Use MegaCrypter reverse mode");
@@ -904,6 +910,7 @@ public class SettingsDialog extends javax.swing.JDialog {
});
max_down_speed_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
+ max_down_speed_spinner.setEnabled(false);
verify_file_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
verify_file_down_checkbox.setText("Verify file integrity (when download is finished)");
@@ -921,6 +928,7 @@ public class SettingsDialog extends javax.swing.JDialog {
max_downloads_spinner.setDoubleBuffered(true);
use_mega_account_down_combobox.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N
+ use_mega_account_down_combobox.setEnabled(false);
change_download_dir_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
change_download_dir_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-folder-30.png"))); // NOI18N
@@ -934,9 +942,11 @@ public class SettingsDialog extends javax.swing.JDialog {
max_down_speed_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
max_down_speed_label.setText("Max speed (KB/s):");
+ max_down_speed_label.setEnabled(false);
megacrypter_reverse_port_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
megacrypter_reverse_port_label.setText("TCP Port:");
+ megacrypter_reverse_port_label.setEnabled(false);
default_dir_label.setBackground(new java.awt.Color(153, 255, 153));
default_dir_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
@@ -946,9 +956,11 @@ public class SettingsDialog extends javax.swing.JDialog {
default_slots_down_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
default_slots_down_label.setText("Default slots per file:");
default_slots_down_label.setDoubleBuffered(true);
+ default_slots_down_label.setEnabled(false);
use_mega_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
use_mega_label.setText("Default account:");
+ use_mega_label.setEnabled(false);
multi_slot_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
multi_slot_down_checkbox.setText("Use multi slot download mode");
@@ -961,9 +973,11 @@ public class SettingsDialog extends javax.swing.JDialog {
default_slots_down_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
default_slots_down_spinner.setDoubleBuffered(true);
+ default_slots_down_spinner.setEnabled(false);
default_slots_down_spinner.setValue(2);
megacrypter_reverse_port_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
+ megacrypter_reverse_port_spinner.setEnabled(false);
down_dir_label.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
down_dir_label.setText("Download folder:");
@@ -1212,8 +1226,10 @@ public class SettingsDialog extends javax.swing.JDialog {
max_up_speed_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
max_up_speed_label.setText("Max speed (KB/s):");
+ max_up_speed_label.setEnabled(false);
max_up_speed_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
+ max_up_speed_spinner.setEnabled(false);
limit_upload_speed_checkbox.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
limit_upload_speed_checkbox.setText("Limit upload speed");
@@ -1813,7 +1829,7 @@ public class SettingsDialog extends javax.swing.JDialog {
);
debug_file_path.setFont(new java.awt.Font("Noto Sans", 0, 18)); // NOI18N
- debug_file_path.setText(MainPanel.MEGABASTERD_HOME_DIR + "/.MEGABASTERD_DEBUG.log");
+ debug_file_path.setText(MainPanel.MEGABASTERD_HOME_DIR + "/MEGABASTERD_DEBUG.log");
javax.swing.GroupLayout advanced_panelLayout = new javax.swing.GroupLayout(advanced_panel);
advanced_panel.setLayout(advanced_panelLayout);
@@ -3200,6 +3216,7 @@ public class SettingsDialog extends javax.swing.JDialog {
megacrypter_reverse_port_label.setEnabled(megacrypter_reverse_checkbox.isSelected());
megacrypter_reverse_port_spinner.setEnabled(megacrypter_reverse_checkbox.isSelected());
megacrypter_reverse_warning_label.setEnabled(megacrypter_reverse_checkbox.isSelected());
+
}//GEN-LAST:event_megacrypter_reverse_checkboxStateChanged
private void import_mega_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_import_mega_buttonActionPerformed
diff --git a/src/main/resources/images/mbasterd_screen.png b/src/main/resources/images/mbasterd_screen.png
index b1d2a887a..260cf44dd 100644
Binary files a/src/main/resources/images/mbasterd_screen.png and b/src/main/resources/images/mbasterd_screen.png differ