diff --git a/pom.xml b/pom.xml
index a2a54d0ac..254b07cbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.tonikelope
MegaBasterd
- 8.0
+ 8.1
jar
diff --git a/src/main/java/com/tonikelope/megabasterd/ClipboardSpy.java b/src/main/java/com/tonikelope/megabasterd/ClipboardSpy.java
index 998a15882..0a1c6d2a8 100644
--- a/src/main/java/com/tonikelope/megabasterd/ClipboardSpy.java
+++ b/src/main/java/com/tonikelope/megabasterd/ClipboardSpy.java
@@ -76,7 +76,7 @@ public class ClipboardSpy implements Runnable, ClipboardOwner, SecureSingleThrea
LOG.log(Level.INFO, "{0} Monitoring clipboard ON...", Thread.currentThread().getName());
- } else {
+ } else if (monitor_clipboard) {
LOG.log(Level.INFO, "{0} Monitoring clipboard OFF...", Thread.currentThread().getName());
}
}
diff --git a/src/main/java/com/tonikelope/megabasterd/DownloadView.form b/src/main/java/com/tonikelope/megabasterd/DownloadView.form
index 1b579c903..312321cad 100644
--- a/src/main/java/com/tonikelope/megabasterd/DownloadView.form
+++ b/src/main/java/com/tonikelope/megabasterd/DownloadView.form
@@ -38,11 +38,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -86,10 +86,10 @@
-
-
-
-
+
+
+
+
@@ -358,9 +358,8 @@
-
+
-
@@ -372,9 +371,8 @@
-
+
-
diff --git a/src/main/java/com/tonikelope/megabasterd/DownloadView.java b/src/main/java/com/tonikelope/megabasterd/DownloadView.java
index 6309de6c6..1bd655c44 100644
--- a/src/main/java/com/tonikelope/megabasterd/DownloadView.java
+++ b/src/main/java/com/tonikelope/megabasterd/DownloadView.java
@@ -314,8 +314,7 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
});
queue_top_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
- queue_top_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/arriba_1.png"))); // NOI18N
- queue_top_button.setText("TOP");
+ queue_top_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/arrow_up.png"))); // NOI18N
queue_top_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
queue_top_buttonActionPerformed(evt);
@@ -323,8 +322,7 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
});
queue_bottom_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
- queue_bottom_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/abajo_1.png"))); // NOI18N
- queue_bottom_button.setText("BOTTOM");
+ queue_bottom_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/arrow_down.png"))); // NOI18N
queue_bottom_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
queue_bottom_buttonActionPerformed(evt);
@@ -347,11 +345,11 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
.addComponent(slots_label))
.addGroup(layout.createSequentialGroup()
.addComponent(queue_top_button)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(queue_up_button, javax.swing.GroupLayout.PREFERRED_SIZE, 42, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(queue_down_button, javax.swing.GroupLayout.PREFERRED_SIZE, 42, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(queue_up_button)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(queue_down_button)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(queue_bottom_button)
.addGap(0, 0, Short.MAX_VALUE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -385,10 +383,10 @@ public class DownloadView extends javax.swing.JPanel implements TransferenceView
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(queue_down_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(queue_up_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(queue_top_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(queue_bottom_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(queue_down_button)
+ .addComponent(queue_up_button)
+ .addComponent(queue_top_button)
+ .addComponent(queue_bottom_button))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(slots_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE)
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
index 32670a2e9..013513ad6 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.0";
+ public static final String VERSION = "8.1";
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;
@@ -345,10 +345,6 @@ public final class MainPanel {
} else {
_mega_proxy_server = null;
- MiscTools.GUIRun(() -> {
- getView().updateMCReverseStatus("MC reverse mode: OFF");
- });
-
}
if (_use_smart_proxy) {
@@ -383,7 +379,7 @@ public final class MainPanel {
long used_memory = instance.totalMemory() - instance.freeMemory();
long max_memory = instance.maxMemory();
MiscTools.GUIRun(() -> {
- _view.getMemory_status().setText(MiscTools.formatBytes(used_memory) + " / " + MiscTools.formatBytes(max_memory));
+ _view.getMemory_status().setText("JVM-RAM used: " + MiscTools.formatBytes(used_memory) + " / " + MiscTools.formatBytes(max_memory));
});
try {
Thread.sleep(2000);
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanelView.form b/src/main/java/com/tonikelope/megabasterd/MainPanelView.form
index 05f59f5fa..0fbb2a3b4 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanelView.form
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanelView.form
@@ -115,7 +115,7 @@
-
-
-
-
-
-
-
+
+
+
+
@@ -294,7 +295,6 @@
-
@@ -326,16 +326,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
index 477a0ad83..4063cf833 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
@@ -162,14 +162,14 @@ public final class MainPanelView extends javax.swing.JFrame {
return smart_proxy_status;
}
- public JLabel getMc_reverse_status() {
- return mc_reverse_status;
- }
-
public JCheckBoxMenuItem getAuto_close_menu() {
return auto_close_menu;
}
+ public JMenuItem getCancel_all_downloads_menu() {
+ return cancel_all_downloads_menu;
+ }
+
public void updateKissStreamServerStatus(final String status) {
MiscTools.GUIRun(() -> {
@@ -196,19 +196,6 @@ public final class MainPanelView extends javax.swing.JFrame {
});
}
- public void updateMCReverseStatus(final String status) {
-
- MiscTools.GUIRun(() -> {
-
- String old_status = getMc_reverse_status().getText();
-
- if (!old_status.equals(status + " ")) {
-
- getMc_reverse_status().setText(status + " ");
- }
- });
- }
-
private void _new_upload_dialog(FileGrabberDialog dialog) {
try {
@@ -463,6 +450,7 @@ public final class MainPanelView extends javax.swing.JFrame {
clean_all_down_menu.setEnabled(false);
clean_all_up_menu.setEnabled(false);
+ cancel_all_downloads_menu.setEnabled(false);
jScrollPane_down.getVerticalScrollBar().setUnitIncrement(20);
jScrollPane_up.getVerticalScrollBar().setUnitIncrement(20);
@@ -548,7 +536,6 @@ public final class MainPanelView extends javax.swing.JFrame {
logo_label = new javax.swing.JLabel();
kiss_server_status = new javax.swing.JLabel();
- mc_reverse_status = new javax.swing.JLabel();
smart_proxy_status = new javax.swing.JLabel();
memory_status = new javax.swing.JLabel();
jTabbedPane1 = new javax.swing.JTabbedPane();
@@ -582,7 +569,7 @@ public final class MainPanelView extends javax.swing.JFrame {
jSeparator4 = new javax.swing.JPopupMenu.Separator();
clean_all_down_menu = new javax.swing.JMenuItem();
clean_all_up_menu = new javax.swing.JMenuItem();
- jMenuItem1 = new javax.swing.JMenuItem();
+ cancel_all_downloads_menu = new javax.swing.JMenuItem();
jSeparator2 = new javax.swing.JPopupMenu.Separator();
hide_tray_menu = new javax.swing.JMenuItem();
auto_close_menu = new javax.swing.JCheckBoxMenuItem();
@@ -604,9 +591,6 @@ public final class MainPanelView extends javax.swing.JFrame {
kiss_server_status.setForeground(new java.awt.Color(102, 102, 102));
kiss_server_status.setDoubleBuffered(true);
- mc_reverse_status.setFont(new java.awt.Font("Dialog", 0, 14)); // NOI18N
- mc_reverse_status.setForeground(new java.awt.Color(102, 102, 102));
-
smart_proxy_status.setFont(new java.awt.Font("Dialog", 0, 14)); // NOI18N
smart_proxy_status.setForeground(new java.awt.Color(102, 102, 102));
smart_proxy_status.setDoubleBuffered(true);
@@ -873,18 +857,19 @@ public final class MainPanelView extends javax.swing.JFrame {
});
file_menu.add(clean_all_up_menu);
- jMenuItem1.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
- jMenuItem1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-minus-30.png"))); // NOI18N
- jMenuItem1.setText("CANCEL ALL DOWNLOADS");
- jMenuItem1.addActionListener(new java.awt.event.ActionListener() {
+ cancel_all_downloads_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
+ cancel_all_downloads_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-minus-30.png"))); // NOI18N
+ cancel_all_downloads_menu.setText("CANCEL ALL DOWNLOADS");
+ cancel_all_downloads_menu.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- jMenuItem1ActionPerformed(evt);
+ cancel_all_downloads_menuActionPerformed(evt);
}
});
- file_menu.add(jMenuItem1);
+ file_menu.add(cancel_all_downloads_menu);
file_menu.add(jSeparator2);
hide_tray_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
+ hide_tray_menu.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/pica_roja_menu.png"))); // NOI18N
hide_tray_menu.setText("Hide to tray");
hide_tray_menu.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -963,13 +948,11 @@ public final class MainPanelView extends javax.swing.JFrame {
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(layout.createSequentialGroup()
.addComponent(kiss_server_status, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(mc_reverse_status, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(smart_proxy_status, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(memory_status, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(smart_proxy_status, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(memory_status, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(logo_label)))
.addContainerGap())
);
@@ -985,7 +968,6 @@ public final class MainPanelView extends javax.swing.JFrame {
.addComponent(logo_label)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(mc_reverse_status)
.addComponent(smart_proxy_status)
.addComponent(memory_status))
.addComponent(kiss_server_status)))
@@ -1535,7 +1517,7 @@ public final class MainPanelView extends javax.swing.JFrame {
JOptionPane.showMessageDialog(this, LabelTranslatorSingleton.getInstance().translate(total > 0 ? "ALL DOWNLOAD LINKS COPIED!" : "NO DOWNLOAD LINKS TO COPY"));
}//GEN-LAST:event_jButton1ActionPerformed
- private void jMenuItem1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem1ActionPerformed
+ private void cancel_all_downloads_menuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancel_all_downloads_menuActionPerformed
// TODO add your handling code here:
Object[] options = {"No",
LabelTranslatorSingleton.getInstance().translate("Yes")};
@@ -1551,7 +1533,7 @@ public final class MainPanelView extends javax.swing.JFrame {
_main_panel.getDownload_manager().closeAllPreProWaiting();
_main_panel.getDownload_manager().cancelAllTransferences();
}
- }//GEN-LAST:event_jMenuItem1ActionPerformed
+ }//GEN-LAST:event_cancel_all_downloads_menuActionPerformed
private void force_chunk_reset_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_force_chunk_reset_buttonActionPerformed
// TODO add your handling code here:
@@ -1565,6 +1547,7 @@ public final class MainPanelView extends javax.swing.JFrame {
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JMenuItem about_menu;
private javax.swing.JCheckBoxMenuItem auto_close_menu;
+ private javax.swing.JMenuItem cancel_all_downloads_menu;
private javax.swing.JMenuItem clean_all_down_menu;
private javax.swing.JMenuItem clean_all_up_menu;
private javax.swing.JButton close_all_finished_down_button;
@@ -1580,7 +1563,6 @@ public final class MainPanelView extends javax.swing.JFrame {
private javax.swing.JMenu help_menu;
private javax.swing.JMenuItem hide_tray_menu;
private javax.swing.JButton jButton1;
- private javax.swing.JMenuItem jMenuItem1;
private javax.swing.JPanel jPanel_scroll_down;
private javax.swing.JPanel jPanel_scroll_up;
private javax.swing.JScrollPane jScrollPane_down;
@@ -1592,7 +1574,6 @@ public final class MainPanelView extends javax.swing.JFrame {
private javax.swing.JLabel kiss_server_status;
private javax.swing.JLabel logo_label;
private javax.swing.JMenuBar main_menubar;
- private javax.swing.JLabel mc_reverse_status;
private javax.swing.JLabel memory_status;
private javax.swing.JMenuItem merge_file_menu;
private javax.swing.JMenuItem new_download_menu;
diff --git a/src/main/java/com/tonikelope/megabasterd/MegaProxyServer.java b/src/main/java/com/tonikelope/megabasterd/MegaProxyServer.java
index 85dab07e5..06cb37680 100644
--- a/src/main/java/com/tonikelope/megabasterd/MegaProxyServer.java
+++ b/src/main/java/com/tonikelope/megabasterd/MegaProxyServer.java
@@ -58,8 +58,6 @@ public class MegaProxyServer implements Runnable {
@Override
public void run() {
- _main_panel.getView().updateMCReverseStatus(LabelTranslatorSingleton.getInstance().translate("MC reverse mode: ON (port ") + _port + ")");
-
try {
_serverSocket = new ServerSocket(_port);
@@ -87,8 +85,6 @@ public class MegaProxyServer implements Runnable {
}
}
}
-
- _main_panel.getView().updateMCReverseStatus("MC reverse mode: OFF");
}
public static class Handler extends Thread {
diff --git a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form
index ab9038626..9450d0f9b 100644
--- a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form
+++ b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form
@@ -38,7 +38,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
@@ -134,10 +134,6 @@
-
-
-
-
@@ -146,6 +142,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -159,39 +167,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
-
+
@@ -269,7 +260,7 @@
-
+
@@ -488,17 +479,13 @@
-
+
-
-
-
-
-
-
-
+
+
+
@@ -520,10 +507,12 @@
-
+
+
+
-
+
@@ -731,7 +720,7 @@
-
+
@@ -753,10 +742,10 @@
-
-
+
+
-
+
@@ -866,7 +855,7 @@
-
+
@@ -1004,7 +993,7 @@
-
+
@@ -1014,7 +1003,7 @@
-
+
@@ -1300,7 +1289,7 @@
-
+
diff --git a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
index 15ae5714f..493130a64 100644
--- a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
+++ b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
@@ -873,7 +873,7 @@ public class SettingsDialog extends javax.swing.JDialog {
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.setText("Note: slots consume resources, so use them moderately.");
rec_download_slots_label.setEnabled(false);
megacrypter_reverse_checkbox.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
@@ -1040,16 +1040,13 @@ public class SettingsDialog extends javax.swing.JDialog {
smart_proxy_settingsLayout.setHorizontalGroup(
smart_proxy_settingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(smart_proxy_settingsLayout.createSequentialGroup()
- .addGroup(smart_proxy_settingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(smart_proxy_settingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addGroup(smart_proxy_settingsLayout.createSequentialGroup()
.addContainerGap()
.addGroup(smart_proxy_settingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(smart_proxy_settingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(rec_smart_proxy_label1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(custom_proxy_list_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 1151, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(rec_smart_proxy_label)
- .addComponent(rec_smart_proxy_label2))
+ .addComponent(rec_smart_proxy_label1)
+ .addComponent(rec_smart_proxy_label)
+ .addComponent(rec_smart_proxy_label2)
.addGroup(smart_proxy_settingsLayout.createSequentialGroup()
.addGroup(smart_proxy_settingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel3)
@@ -1065,8 +1062,10 @@ public class SettingsDialog extends javax.swing.JDialog {
.addGroup(smart_proxy_settingsLayout.createSequentialGroup()
.addComponent(force_smart_proxy_checkbox)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jLabel7)))
- .addContainerGap())
+ .addComponent(jLabel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(custom_proxy_list_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(jScrollPane1))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
smart_proxy_settingsLayout.setVerticalGroup(
smart_proxy_settingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1105,15 +1104,23 @@ public class SettingsDialog extends javax.swing.JDialog {
.addGroup(downloads_panelLayout.createSequentialGroup()
.addContainerGap()
.addGroup(downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(downloads_panelLayout.createSequentialGroup()
- .addGap(27, 27, 27)
- .addComponent(smart_proxy_settings, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(smart_proxy_checkbox)
.addGroup(downloads_panelLayout.createSequentialGroup()
.addComponent(max_downloads_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(max_downloads_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(multi_slot_down_checkbox)
+ .addGroup(downloads_panelLayout.createSequentialGroup()
+ .addComponent(change_download_dir_button)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(down_dir_label)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(default_dir_label))
+ .addComponent(megacrypter_reverse_checkbox)
+ .addComponent(use_mega_account_down_checkbox)
+ .addComponent(verify_file_down_checkbox)
+ .addComponent(limit_download_speed_checkbox)
+ .addComponent(clipboardspy_checkbox)
.addGroup(downloads_panelLayout.createSequentialGroup()
.addGap(21, 21, 21)
.addGroup(downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1125,32 +1132,18 @@ public class SettingsDialog extends javax.swing.JDialog {
.addGroup(downloads_panelLayout.createSequentialGroup()
.addComponent(use_mega_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(use_mega_account_down_combobox, javax.swing.GroupLayout.PREFERRED_SIZE, 700, javax.swing.GroupLayout.PREFERRED_SIZE))))
- .addGroup(downloads_panelLayout.createSequentialGroup()
- .addComponent(change_download_dir_button)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(down_dir_label)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(default_dir_label))
- .addComponent(megacrypter_reverse_checkbox)
- .addComponent(use_mega_account_down_checkbox)
- .addComponent(verify_file_down_checkbox)
- .addGroup(downloads_panelLayout.createSequentialGroup()
- .addGap(21, 21, 21)
- .addGroup(downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(use_mega_account_down_combobox, javax.swing.GroupLayout.PREFERRED_SIZE, 700, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(megacrypter_reverse_warning_label)
.addGroup(downloads_panelLayout.createSequentialGroup()
.addComponent(megacrypter_reverse_port_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(megacrypter_reverse_port_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
- .addComponent(limit_download_speed_checkbox)
- .addGroup(downloads_panelLayout.createSequentialGroup()
- .addGap(21, 21, 21)
- .addComponent(max_down_speed_label)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(max_down_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addComponent(clipboardspy_checkbox))
- .addContainerGap(155, Short.MAX_VALUE))
+ .addComponent(megacrypter_reverse_port_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(downloads_panelLayout.createSequentialGroup()
+ .addComponent(max_down_speed_label)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(max_down_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+ .addComponent(smart_proxy_settings, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(0, 0, 0))
);
downloads_panelLayout.setVerticalGroup(
downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1240,7 +1233,7 @@ public class SettingsDialog extends javax.swing.JDialog {
});
rec_upload_slots_label.setFont(new java.awt.Font("Dialog", 2, 16)); // NOI18N
- rec_upload_slots_label.setText("Note: slots consume RAM, so use them moderately.");
+ rec_upload_slots_label.setText("Note: slots consume resources, so use them moderately.");
thumbnail_checkbox.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
thumbnail_checkbox.setText("Create and upload image/video thumbnails");
@@ -1276,7 +1269,7 @@ public class SettingsDialog extends javax.swing.JDialog {
uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(uploads_panelLayout.createSequentialGroup()
.addContainerGap()
- .addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(uploads_panelLayout.createSequentialGroup()
.addGap(20, 20, 20)
.addComponent(max_up_speed_label)
@@ -1294,9 +1287,9 @@ public class SettingsDialog extends javax.swing.JDialog {
.addComponent(thumbnail_checkbox)
.addComponent(upload_log_checkbox)
.addComponent(upload_public_folder_checkbox)
- .addComponent(rec_upload_slots_label, javax.swing.GroupLayout.DEFAULT_SIZE, 1003, Short.MAX_VALUE)
- .addComponent(public_folder_panel))
- .addGap(187, 330, Short.MAX_VALUE))
+ .addComponent(public_folder_panel, javax.swing.GroupLayout.PREFERRED_SIZE, 1003, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(rec_upload_slots_label))
+ .addGap(0, 0, 0))
);
uploads_panelLayout.setVerticalGroup(
uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1519,7 +1512,7 @@ public class SettingsDialog extends javax.swing.JDialog {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jLabel1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 467, Short.MAX_VALUE)
+ .addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 395, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(remove_mega_account_button)
@@ -1528,7 +1521,7 @@ public class SettingsDialog extends javax.swing.JDialog {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(elc_accounts_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(elc_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 467, Short.MAX_VALUE)
+ .addComponent(elc_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 395, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(remove_elc_account_button)
@@ -1862,7 +1855,7 @@ public class SettingsDialog extends javax.swing.JDialog {
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
.addComponent(jPanel1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jPanel2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
- .addGap(0, 409, Short.MAX_VALUE)))
+ .addGap(0, 0, 0)))
.addContainerGap())
);
advanced_panelLayout.setVerticalGroup(
@@ -1917,14 +1910,14 @@ public class SettingsDialog extends javax.swing.JDialog {
.addComponent(save_button)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(cancel_button))
- .addComponent(panel_tabs, javax.swing.GroupLayout.DEFAULT_SIZE, 935, Short.MAX_VALUE))
+ .addComponent(panel_tabs, javax.swing.GroupLayout.DEFAULT_SIZE, 1194, Short.MAX_VALUE))
.addContainerGap())
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addContainerGap()
- .addComponent(panel_tabs, javax.swing.GroupLayout.DEFAULT_SIZE, 1226, Short.MAX_VALUE)
+ .addComponent(panel_tabs, javax.swing.GroupLayout.DEFAULT_SIZE, 1082, Short.MAX_VALUE)
.addGap(18, 18, 18)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
diff --git a/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java b/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java
index edc3fb167..4117e15e0 100644
--- a/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java
+++ b/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java
@@ -653,6 +653,7 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
if (this instanceof DownloadManager) {
this._main_panel.getView().getForce_chunk_reset_button().setVisible(MainPanel.isUse_smart_proxy() && !getTransference_running_list().isEmpty());
+ this._main_panel.getView().getCancel_all_downloads_menu().setEnabled(!_transference_preprocess_queue.isEmpty() || !_transference_provision_queue.isEmpty() || !getTransference_waitstart_queue().isEmpty() || !getTransference_running_list().isEmpty());
}
if (_paused_all) {
diff --git a/src/main/java/com/tonikelope/megabasterd/UploadView.form b/src/main/java/com/tonikelope/megabasterd/UploadView.form
index 015b6986d..3161971b7 100644
--- a/src/main/java/com/tonikelope/megabasterd/UploadView.form
+++ b/src/main/java/com/tonikelope/megabasterd/UploadView.form
@@ -59,11 +59,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -88,10 +88,10 @@
-
-
-
-
+
+
+
+
@@ -358,9 +358,8 @@
-
+
-
@@ -372,9 +371,8 @@
-
+
-
diff --git a/src/main/java/com/tonikelope/megabasterd/UploadView.java b/src/main/java/com/tonikelope/megabasterd/UploadView.java
index ee0950e4a..14d7ea8fc 100644
--- a/src/main/java/com/tonikelope/megabasterd/UploadView.java
+++ b/src/main/java/com/tonikelope/megabasterd/UploadView.java
@@ -304,8 +304,7 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
cbc_label.setDoubleBuffered(true);
queue_top_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
- queue_top_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/arriba_1.png"))); // NOI18N
- queue_top_button.setText("TOP");
+ queue_top_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/arrow_up.png"))); // NOI18N
queue_top_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
queue_top_buttonActionPerformed(evt);
@@ -313,8 +312,7 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
});
queue_bottom_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
- queue_bottom_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/abajo_1.png"))); // NOI18N
- queue_bottom_button.setText("BOTTOM");
+ queue_bottom_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/arrow_down.png"))); // NOI18N
queue_bottom_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
queue_bottom_buttonActionPerformed(evt);
@@ -365,11 +363,11 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(queue_top_button)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(queue_up_button, javax.swing.GroupLayout.PREFERRED_SIZE, 42, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(queue_down_button, javax.swing.GroupLayout.PREFERRED_SIZE, 42, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(queue_up_button)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(queue_down_button)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(queue_bottom_button)
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(layout.createSequentialGroup()
@@ -387,10 +385,10 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(queue_up_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(queue_top_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(queue_down_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(queue_bottom_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(queue_up_button)
+ .addComponent(queue_top_button)
+ .addComponent(queue_down_button)
+ .addComponent(queue_bottom_button))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(slots_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE)
diff --git a/src/main/resources/images/arrow_down.png b/src/main/resources/images/arrow_down.png
new file mode 100644
index 000000000..018e6de12
Binary files /dev/null and b/src/main/resources/images/arrow_down.png differ
diff --git a/src/main/resources/images/arrow_up.png b/src/main/resources/images/arrow_up.png
new file mode 100644
index 000000000..b31e710c3
Binary files /dev/null and b/src/main/resources/images/arrow_up.png differ
diff --git a/src/main/resources/images/pica_roja_menu.png b/src/main/resources/images/pica_roja_menu.png
new file mode 100644
index 000000000..ed3e7b69a
Binary files /dev/null and b/src/main/resources/images/pica_roja_menu.png differ