diff --git a/pom.xml b/pom.xml
index 7159f7aaa..ea8c4db9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.tonikelope
MegaBasterd
- 5.82
+ 5.83
jar
diff --git a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form
index f6078fd50..ebac234f9 100644
--- a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form
+++ b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form
@@ -86,7 +86,7 @@
-
+
@@ -189,6 +189,9 @@
+
+
+
diff --git a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java
index 559a64197..49ed16713 100644
--- a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java
+++ b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java
@@ -178,7 +178,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 224, Short.MAX_VALUE)
+ .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 228, Short.MAX_VALUE)
);
jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("Upload info"));
@@ -189,6 +189,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
dir_name_label.setEnabled(false);
dir_name_textfield.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
+ dir_name_textfield.setBorder(null);
dir_name_textfield.setDoubleBuffered(true);
dir_name_textfield.setEnabled(false);
diff --git a/src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.form b/src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.form
index 4e1e8207a..ea86c18d6 100644
--- a/src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.form
+++ b/src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.form
@@ -143,6 +143,9 @@
+
+
+
diff --git a/src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.java b/src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.java
index bbacc92b4..6d1e1eab1 100644
--- a/src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.java
+++ b/src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.java
@@ -183,6 +183,7 @@ public class FileSplitterDialog extends javax.swing.JDialog {
split_size_label.setEnabled(false);
split_size_text.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
+ split_size_text.setBorder(null);
split_size_text.setDoubleBuffered(true);
split_size_text.setEnabled(false);
diff --git a/src/main/java/com/tonikelope/megabasterd/Get2FACode.form b/src/main/java/com/tonikelope/megabasterd/Get2FACode.form
index 71da9d0bc..7329be8fc 100644
--- a/src/main/java/com/tonikelope/megabasterd/Get2FACode.form
+++ b/src/main/java/com/tonikelope/megabasterd/Get2FACode.form
@@ -39,8 +39,8 @@
-
-
+
+
@@ -135,16 +135,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/tonikelope/megabasterd/Get2FACode.java b/src/main/java/com/tonikelope/megabasterd/Get2FACode.java
index a28270542..ab1a6895f 100644
--- a/src/main/java/com/tonikelope/megabasterd/Get2FACode.java
+++ b/src/main/java/com/tonikelope/megabasterd/Get2FACode.java
@@ -14,6 +14,8 @@ public class Get2FACode extends javax.swing.JDialog {
private String _pin_code;
+ private static final int MAX_CODE_LENGTH = 6;
+
public boolean isCode_ok() {
return _code_ok;
}
@@ -89,11 +91,15 @@ public class Get2FACode extends javax.swing.JDialog {
status_label.setDoubleBuffered(true);
please_label.setFont(new java.awt.Font("Dialog", 1, 24)); // NOI18N
- please_label.setText("Please enter 2FA PIN CODE:");
+ please_label.setText(LabelTranslatorSingleton.getInstance().translate("Please enter 2FA PIN CODE"));
please_label.setDoubleBuffered(true);
+ current_code_textfield.setBackground(new java.awt.Color(0, 102, 153));
current_code_textfield.setFont(new java.awt.Font("Dialog", 0, 24)); // NOI18N
+ current_code_textfield.setForeground(new java.awt.Color(255, 255, 255));
+ current_code_textfield.setHorizontalAlignment(javax.swing.JTextField.CENTER);
current_code_textfield.setToolTipText("");
+ current_code_textfield.setBorder(null);
current_code_textfield.setDoubleBuffered(true);
current_code_textfield.addKeyListener(new java.awt.event.KeyAdapter() {
public void keyTyped(java.awt.event.KeyEvent evt) {
@@ -122,8 +128,8 @@ public class Get2FACode extends javax.swing.JDialog {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(email_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(please_label, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(current_code_textfield))))
+ .addComponent(current_code_textfield)
+ .addComponent(please_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
.addContainerGap())
);
layout.setVerticalGroup(
@@ -174,7 +180,7 @@ public class Get2FACode extends javax.swing.JDialog {
private void current_code_textfieldKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_current_code_textfieldKeyTyped
- if (!Character.isDigit(evt.getKeyChar()) && evt.getKeyCode() != KeyEvent.VK_BACK_SPACE && evt.getKeyCode() != KeyEvent.VK_DELETE) {
+ if (current_code_textfield.getText().length() == MAX_CODE_LENGTH || (!Character.isDigit(evt.getKeyChar()) && evt.getKeyCode() != KeyEvent.VK_BACK_SPACE && evt.getKeyCode() != KeyEvent.VK_DELETE)) {
evt.consume();
}
diff --git a/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.form b/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.form
index be9310cdb..fa8394967 100644
--- a/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.form
+++ b/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.form
@@ -84,6 +84,9 @@
+
+
+
diff --git a/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java b/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java
index 845b6222b..f73010420 100644
--- a/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java
+++ b/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java
@@ -99,6 +99,7 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog {
setTitle("Master password unlock");
current_pass_textfield.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
+ current_pass_textfield.setBorder(null);
current_pass_textfield.setDoubleBuffered(true);
current_pass_textfield.addKeyListener(new java.awt.event.KeyAdapter() {
public void keyPressed(java.awt.event.KeyEvent evt) {
diff --git a/src/main/java/com/tonikelope/megabasterd/LabelTranslatorSingleton.java b/src/main/java/com/tonikelope/megabasterd/LabelTranslatorSingleton.java
index b86900227..8d75066e9 100644
--- a/src/main/java/com/tonikelope/megabasterd/LabelTranslatorSingleton.java
+++ b/src/main/java/com/tonikelope/megabasterd/LabelTranslatorSingleton.java
@@ -38,6 +38,7 @@ public final class LabelTranslatorSingleton {
_addTranslation("There are a lot of files in this folder.\nNot all links will be provisioned at once to avoid saturating MegaBasterd", "Hay muchos archivos en esta carpeta.\nNo se aprovisionarán todos los enlaces de una vez para evitar saturar MegaBasterd");
_addTranslation("MEGA LINK ERROR!", "¡ENLACE DE MEGA ERRÓNEO!");
+ _addTranslation("Please enter 2FA PIN CODE", "Por favor, introduce el CÓDIGO 2FA");
_addTranslation("Font:", "Fuente:");
_addTranslation("Loading...", "Cargando...");
_addTranslation("DEFAULT", "POR DEFECTO");
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
index ed90b456d..db82e6a55 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -48,7 +48,7 @@ import javax.swing.UIManager;
*/
public final class MainPanel {
- public static final String VERSION = "5.82";
+ public static final String VERSION = "5.83";
public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;
public static final int STREAMER_PORT = 1337;
diff --git a/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.form b/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.form
index 35059aaa1..6eeb2c959 100644
--- a/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.form
+++ b/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.form
@@ -105,6 +105,9 @@
+
+
+
@@ -182,6 +185,9 @@
+
+
+
diff --git a/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java b/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java
index e7d07a205..7964aa8c5 100644
--- a/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java
+++ b/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java
@@ -93,6 +93,7 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog {
setResizable(false);
confirm_pass_textfield.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
+ confirm_pass_textfield.setBorder(null);
confirm_pass_textfield.setDoubleBuffered(true);
confirm_pass_textfield.addKeyListener(new java.awt.event.KeyAdapter() {
public void keyPressed(java.awt.event.KeyEvent evt) {
@@ -137,6 +138,7 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog {
new_pass_label.setDoubleBuffered(true);
new_pass_textfield.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
+ new_pass_textfield.setBorder(null);
new_pass_textfield.setDoubleBuffered(true);
status_label.setFont(new java.awt.Font("Dialog", 0, 14)); // NOI18N
diff --git a/src/main/resources/images/mbasterd_screen.png b/src/main/resources/images/mbasterd_screen.png
index c74e8de30..955789075 100644
Binary files a/src/main/resources/images/mbasterd_screen.png and b/src/main/resources/images/mbasterd_screen.png differ