diff --git a/pom.xml b/pom.xml
index 8c7290b0b..d80be9755 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.tonikelope
MegaBasterd
- 7.76
+ 7.77
jar
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
index 9f69278d9..cf786d85b 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -67,7 +67,7 @@ import javax.swing.UIManager;
*/
public final class MainPanel {
- public static final String VERSION = "7.76";
+ public static final String VERSION = "7.77";
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;
@@ -1120,7 +1120,7 @@ public final class MainPanel {
upload.getView().printStatusNormal("Stopping upload safely before exit MegaBasterd, please wait...");
upload.getView().getSlots_spinner().setEnabled(false);
upload.getView().getPause_button().setEnabled(false);
- upload.getView().getFolder_link_button().setEnabled(false);
+
upload.getView().getFile_link_button().setEnabled(false);
upload.getView().getFile_size_label().setEnabled(false);
upload.getView().getFile_name_label().setEnabled(false);
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
index 37d51b1ff..82b4ef915 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
@@ -261,9 +261,9 @@ public final class MainPanelView extends javax.swing.JFrame {
LOG.log(Level.INFO, "{0} Dir {1} created", new Object[]{Thread.currentThread().getName(), parent_node});
- ma.shareFolder(parent_node, parent_key, share_key);
-
- String folder_link = ma.getPublicFolderLink(parent_node, share_key);
+ //ma.shareFolder(parent_node, parent_key, share_key); //DE MOMENTO NO HAY OTRA
+ //String folder_link = ma.getPublicFolderLink(parent_node, share_key);
+ String folder_link = null; //No hay otra
if (dialog.getUpload_log_checkbox().isSelected()) {
diff --git a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form
index 62c8b2c5e..a296cc2a1 100644
--- a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form
+++ b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form
@@ -1063,7 +1063,6 @@
-
@@ -1151,8 +1150,6 @@
-
-
@@ -1580,83 +1577,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
index 9b303f530..3dae8a812 100644
--- a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
+++ b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
@@ -12,7 +12,6 @@ package com.tonikelope.megabasterd;
import static com.tonikelope.megabasterd.DBTools.*;
import static com.tonikelope.megabasterd.MainPanel.*;
import static com.tonikelope.megabasterd.MiscTools.*;
-import java.awt.Color;
import java.awt.Dialog;
import java.awt.Frame;
import java.io.BufferedInputStream;
@@ -661,22 +660,6 @@ public class SettingsDialog extends javax.swing.JDialog {
custom_proxy_textarea.setText(custom_proxy_list);
}
- String mega_api_key_sql = DBTools.selectSettingValue("mega_api_key");
-
- if (mega_api_key_sql != null && !"".equals(mega_api_key_sql)) {
- mega_api_key.setText(mega_api_key_sql);
- mega_api_key_panel.setBackground(new Color(153, 255, 153));
- mega_api_key_warning.setVisible(false);
- mega_api_key_label.setVisible(modal);
- MegaAPI.API_KEY = mega_api_key_sql.trim();
- } else {
- mega_api_key_panel.setBackground(Color.red);
- mega_api_key_warning.setForeground(Color.white);
- mega_api_key_label.setForeground(Color.WHITE);
- mega_api_key_warning.setVisible(true);
- MegaAPI.API_KEY = null;
- }
-
setPreferredSize(parent.getSize());
pack();
@@ -787,11 +770,6 @@ public class SettingsDialog extends javax.swing.JDialog {
run_command_textbox.addMouseListener(new ContextMenuMouseListener());
run_command_test_button = new javax.swing.JButton();
debug_file_checkbox = new javax.swing.JCheckBox();
- mega_api_key_panel = new javax.swing.JPanel();
- mega_api_key_label = new javax.swing.JLabel();
- mega_api_key = new javax.swing.JTextField();
- mega_api_key.addMouseListener(new ContextMenuMouseListener());
- mega_api_key_warning = new javax.swing.JLabel();
status = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@@ -1599,49 +1577,6 @@ public class SettingsDialog extends javax.swing.JDialog {
debug_file_checkbox.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
debug_file_checkbox.setText("Save debug info to file");
- mega_api_key_panel.setOpaque(false);
-
- mega_api_key_label.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
- mega_api_key_label.setText("MEGA API KEY:");
- mega_api_key_label.setDoubleBuffered(true);
-
- mega_api_key.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
- mega_api_key.setDoubleBuffered(true);
- mega_api_key.setEnabled(false);
-
- mega_api_key_warning.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
- mega_api_key_warning.setForeground(new java.awt.Color(0, 0, 255));
- mega_api_key_warning.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- mega_api_key_warning.setText("MEGA API KEY IS NO LONGER REQUIRED (DISABLED)");
- mega_api_key_warning.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR));
- mega_api_key_warning.setDoubleBuffered(true);
-
- javax.swing.GroupLayout mega_api_key_panelLayout = new javax.swing.GroupLayout(mega_api_key_panel);
- mega_api_key_panel.setLayout(mega_api_key_panelLayout);
- mega_api_key_panelLayout.setHorizontalGroup(
- mega_api_key_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(mega_api_key_panelLayout.createSequentialGroup()
- .addContainerGap()
- .addGroup(mega_api_key_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(mega_api_key_warning, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addGroup(mega_api_key_panelLayout.createSequentialGroup()
- .addComponent(mega_api_key_label)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(mega_api_key)))
- .addContainerGap())
- );
- mega_api_key_panelLayout.setVerticalGroup(
- mega_api_key_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(mega_api_key_panelLayout.createSequentialGroup()
- .addContainerGap()
- .addGroup(mega_api_key_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(mega_api_key_label)
- .addComponent(mega_api_key, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(mega_api_key_warning)
- .addContainerGap())
- );
-
javax.swing.GroupLayout advanced_panelLayout = new javax.swing.GroupLayout(advanced_panel);
advanced_panel.setLayout(advanced_panelLayout);
advanced_panelLayout.setHorizontalGroup(
@@ -1649,7 +1584,6 @@ public class SettingsDialog extends javax.swing.JDialog {
.addGroup(advanced_panelLayout.createSequentialGroup()
.addContainerGap()
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(mega_api_key_panel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(advanced_panelLayout.createSequentialGroup()
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(advanced_panelLayout.createSequentialGroup()
@@ -1718,8 +1652,6 @@ public class SettingsDialog extends javax.swing.JDialog {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(custom_chunks_dir_current_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(mega_api_key_panel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(18, 18, 18)
.addComponent(start_frozen_checkbox)
.addGap(18, 18, 18)
.addComponent(debug_file_checkbox)
@@ -1838,7 +1770,7 @@ public class SettingsDialog extends javax.swing.JDialog {
settings.put("custom_chunks_dir", _custom_chunks_dir);
settings.put("run_command", run_command_checkbox.isSelected() ? "yes" : "no");
settings.put("run_command_path", run_command_textbox.getText());
- settings.put("mega_api_key", mega_api_key.getText().trim());
+
settings.put("clipboardspy", clipboardspy_checkbox.isSelected() ? "yes" : "no");
settings.put("thumbnails", thumbnail_checkbox.isSelected() ? "yes" : "no");
settings.put("upload_log", upload_log_checkbox.isSelected() ? "yes" : "no");
@@ -3168,10 +3100,6 @@ public class SettingsDialog extends javax.swing.JDialog {
private javax.swing.JLabel mega_accounts_label;
private javax.swing.JScrollPane mega_accounts_scrollpane;
private javax.swing.JTable mega_accounts_table;
- private javax.swing.JTextField mega_api_key;
- private javax.swing.JLabel mega_api_key_label;
- private javax.swing.JPanel mega_api_key_panel;
- private javax.swing.JLabel mega_api_key_warning;
private javax.swing.JCheckBox megacrypter_reverse_checkbox;
private javax.swing.JLabel megacrypter_reverse_port_label;
private javax.swing.JSpinner megacrypter_reverse_port_spinner;
diff --git a/src/main/java/com/tonikelope/megabasterd/UploadView.form b/src/main/java/com/tonikelope/megabasterd/UploadView.form
index 015b6986d..91d7d8b5f 100644
--- a/src/main/java/com/tonikelope/megabasterd/UploadView.form
+++ b/src/main/java/com/tonikelope/megabasterd/UploadView.form
@@ -31,11 +31,7 @@
-
-
-
-
-
+
@@ -68,7 +64,7 @@
-
+
@@ -106,13 +102,9 @@
-
-
-
-
-
-
-
+
+
+
@@ -285,20 +277,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -380,20 +358,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/java/com/tonikelope/megabasterd/UploadView.java b/src/main/java/com/tonikelope/megabasterd/UploadView.java
index 8b975fd38..721e36697 100644
--- a/src/main/java/com/tonikelope/megabasterd/UploadView.java
+++ b/src/main/java/com/tonikelope/megabasterd/UploadView.java
@@ -93,14 +93,6 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
return file_link_button;
}
- public JButton getFolder_link_button() {
- return folder_link_button;
- }
-
- public JButton getOpen_browser_button() {
- return open_browser_button;
- }
-
public JLabel getStatus_label() {
return status_label;
}
@@ -165,14 +157,12 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
restart_button = new javax.swing.JButton();
file_size_label = new javax.swing.JLabel();
slot_status_label = new javax.swing.JLabel();
- folder_link_button = new javax.swing.JButton();
file_link_button = new javax.swing.JButton();
queue_up_button = new javax.swing.JButton();
queue_down_button = new javax.swing.JButton();
cbc_label = new javax.swing.JLabel();
queue_top_button = new javax.swing.JButton();
queue_bottom_button = new javax.swing.JButton();
- open_browser_button = new javax.swing.JButton();
setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 204, 255), 3, true));
@@ -258,15 +248,6 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
slot_status_label.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
slot_status_label.setDoubleBuffered(true);
- folder_link_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
- folder_link_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-copy-to-clipboard-30.png"))); // NOI18N
- folder_link_button.setText("Copy folder link");
- folder_link_button.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- folder_link_buttonActionPerformed(evt);
- }
- });
-
file_link_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
file_link_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-copy-to-clipboard-30.png"))); // NOI18N
file_link_button.setText("Copy file link");
@@ -316,16 +297,6 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
}
});
- open_browser_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
- open_browser_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-export-30.png"))); // NOI18N
- open_browser_button.setText("Open folder in browser");
- open_browser_button.setDoubleBuffered(true);
- open_browser_button.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- open_browser_buttonActionPerformed(evt);
- }
- });
-
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
@@ -336,11 +307,7 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
.addComponent(progress_pbar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup()
.addComponent(file_size_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(open_browser_button)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(folder_link_button)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(file_link_button))
.addGroup(layout.createSequentialGroup()
.addComponent(file_name_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -368,7 +335,7 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
.addComponent(queue_bottom_button)
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(layout.createSequentialGroup()
- .addComponent(status_label, javax.swing.GroupLayout.DEFAULT_SIZE, 446, Short.MAX_VALUE)
+ .addComponent(status_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(18, 18, 18)
.addComponent(cbc_label)))
.addGap(18, 18, 18)
@@ -397,12 +364,9 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
.addComponent(file_name_label)
.addComponent(slot_status_label))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(open_browser_button)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(folder_link_button)
- .addComponent(file_link_button)
- .addComponent(file_size_label)))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(file_link_button)
+ .addComponent(file_size_label))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(progress_pbar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -463,19 +427,6 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
});
}
- private void folder_link_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_folder_link_buttonActionPerformed
-
- folder_link_button.setEnabled(false);
-
- folder_link_button.setText(LabelTranslatorSingleton.getInstance().translate("Please wait..."));
-
- copyTextToClipboard(_upload.getFolder_link());
-
- folder_link_button.setText(LabelTranslatorSingleton.getInstance().translate("Copy folder link"));
-
- folder_link_button.setEnabled(true);
- }//GEN-LAST:event_folder_link_buttonActionPerformed
-
private void file_link_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_file_link_buttonActionPerformed
file_link_button.setEnabled(false);
@@ -541,11 +492,6 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
});
}//GEN-LAST:event_queue_bottom_buttonActionPerformed
- private void open_browser_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_open_browser_buttonActionPerformed
- // TODO add your handling code here:
- MiscTools.openBrowserURL(_upload.getFolder_link());
- }//GEN-LAST:event_open_browser_buttonActionPerformed
-
public void updateCBC(String status) {
MiscTools.GUIRunAndWait(() -> {
@@ -697,8 +643,6 @@ public class UploadView extends javax.swing.JPanel implements TransferenceView {
private javax.swing.JButton file_link_button;
private javax.swing.JLabel file_name_label;
private javax.swing.JLabel file_size_label;
- private javax.swing.JButton folder_link_button;
- private javax.swing.JButton open_browser_button;
private javax.swing.JButton pause_button;
private javax.swing.JProgressBar progress_pbar;
private javax.swing.JButton queue_bottom_button;
diff --git a/src/main/resources/images/mbasterd_screen.png b/src/main/resources/images/mbasterd_screen.png
index 8ddbf20c8..072f91a3d 100644
Binary files a/src/main/resources/images/mbasterd_screen.png and b/src/main/resources/images/mbasterd_screen.png differ