From f894d80f5c7572b2db5cc34fb6295deeb5258d4f Mon Sep 17 00:00:00 2001 From: tonikelope Date: Sun, 22 Oct 2023 22:16:30 +0200 Subject: [PATCH] 8.3 https://github.com/tonikelope/megabasterd/issues/593 --- pom.xml | 2 +- .../megabasterd/FileGrabberDialog.form | 22 +++++++++- .../megabasterd/FileGrabberDialog.java | 42 +++++++++++++++++-- .../com/tonikelope/megabasterd/MainPanel.java | 2 +- 4 files changed, 61 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 68e387a2c..21a78a0ae 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.tonikelope MegaBasterd - 8.2 + 8.3 jar diff --git a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form index 51c69adb6..c6cc84f1b 100644 --- a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form +++ b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form @@ -153,8 +153,12 @@ - + + + + + @@ -174,6 +178,7 @@ + @@ -305,6 +310,21 @@ + + + + + + + + + + + + + + + diff --git a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java index b442e749e..4dc5e5fec 100644 --- a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java @@ -260,6 +260,7 @@ private void initComponents() { add_files_button = new javax.swing.JButton(); upload_log_checkbox = new javax.swing.JCheckBox(); priority_checkbox = new javax.swing.JCheckBox(); + copy_email_button = new javax.swing.JButton(); dance_button = new javax.swing.JButton(); total_file_size_label = new javax.swing.JLabel(); warning_label = new javax.swing.JLabel(); @@ -354,6 +355,16 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { priority_checkbox.setDoubleBuffered(true); priority_checkbox.setEnabled(false); + copy_email_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + copy_email_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-copy-to-clipboard-30.png"))); // NOI18N + copy_email_button.setText("Copy email"); + copy_email_button.setEnabled(false); + copy_email_button.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + copy_email_buttonActionPerformed(evt); + } + }); + javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); jPanel2.setLayout(jPanel2Layout); jPanel2Layout.setHorizontalGroup( @@ -376,8 +387,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(add_folder_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addComponent(dir_name_textfield) - .addComponent(account_combobox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(used_space_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) + .addComponent(used_space_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(jPanel2Layout.createSequentialGroup() + .addComponent(account_combobox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(copy_email_button))))) .addContainerGap()) ); jPanel2Layout.setVerticalGroup( @@ -390,7 +404,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addGap(18, 18, 18) .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(account_label) - .addComponent(account_combobox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(account_combobox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(copy_email_button)) .addGap(18, 18, 18) .addComponent(used_space_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -718,6 +733,7 @@ private void account_comboboxItemStateChanged(java.awt.event.ItemEvent evt) {//G used_space_label.setText(LabelTranslatorSingleton.getInstance().translate("Checking account quota, please wait...")); account_combobox.setEnabled(false); + copy_email_button.setEnabled(false); account_label.setEnabled(false); dance_button.setEnabled(false); add_files_button.setEnabled(false); @@ -760,7 +776,7 @@ private void account_comboboxItemStateChanged(java.awt.event.ItemEvent evt) {//G used_space_label.setForeground(used_space_color); - for (JComponent c : new JComponent[]{used_space_label, add_files_button, add_folder_button, account_combobox, account_label, upload_log_checkbox, priority_checkbox}) { + for (JComponent c : new JComponent[]{copy_email_button, used_space_label, add_files_button, add_folder_button, account_combobox, account_label, upload_log_checkbox, priority_checkbox}) { c.setEnabled(true); } @@ -775,6 +791,7 @@ private void account_comboboxItemStateChanged(java.awt.event.ItemEvent evt) {//G account_combobox.setEnabled(true); account_label.setEnabled(true); account_combobox.setSelectedIndex(-1); + copy_email_button.setEnabled(true); used_space_label.setForeground(Color.red); used_space_label.setText(LabelTranslatorSingleton.getInstance().translate("ERROR checking account quota!")); used_space_label.setEnabled(true); @@ -799,6 +816,7 @@ private void account_comboboxItemStateChanged(java.awt.event.ItemEvent evt) {//G account_combobox.setEnabled(true); account_label.setEnabled(true); account_combobox.setSelectedIndex(-1); + copy_email_button.setEnabled(true); used_space_label.setForeground(Color.red); used_space_label.setText(LabelTranslatorSingleton.getInstance().translate("ERROR checking account quota!")); used_space_label.setEnabled(true); @@ -861,6 +879,21 @@ private void skip_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F } }//GEN-LAST:event_skip_buttonActionPerformed + private void copy_email_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_copy_email_buttonActionPerformed + // TODO add your handling code here: + if (account_combobox.getSelectedIndex() >= 0) { + copy_email_button.setEnabled(false); + + copy_email_button.setText(LabelTranslatorSingleton.getInstance().translate("Please wait...")); + + copyTextToClipboard((String) account_combobox.getSelectedItem()); + + copy_email_button.setText(LabelTranslatorSingleton.getInstance().translate("Copy email")); + + copy_email_button.setEnabled(true); + } + }//GEN-LAST:event_copy_email_buttonActionPerformed + private void _genFileTree(String directoryName, DefaultMutableTreeNode root, File[] files) { File directory = new File(directoryName); @@ -954,6 +987,7 @@ private void _genFileList() { private javax.swing.JLabel account_label; private javax.swing.JButton add_files_button; private javax.swing.JButton add_folder_button; + private javax.swing.JButton copy_email_button; private javax.swing.JButton dance_button; private javax.swing.JLabel dir_name_label; private javax.swing.JTextField dir_name_textfield; diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java index 10a70178f..96b261b31 100644 --- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java +++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java @@ -70,7 +70,7 @@ */ public final class MainPanel { - public static final String VERSION = "8.2"; + public static final String VERSION = "8.3"; 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;