From 285f95bdf9f564e94ac637e1b1162610a74037e7 Mon Sep 17 00:00:00 2001 From: tonikelope Date: Mon, 23 Jul 2018 11:52:47 +0200 Subject: [PATCH] 5.0 --- pom.xml | 2 +- .../megabasterd/FileGrabberDialog.form | 2 +- .../megabasterd/FileGrabberDialog.java | 2 +- .../megabasterd/FileMergerDialog.java | 76 ++++++++++--------- .../megabasterd/FileSplitterDialog.java | 73 +++++++++--------- .../megabasterd/LinkGrabberDialog.form | 48 +++++++----- .../megabasterd/LinkGrabberDialog.java | 55 +++++++++----- .../com/tonikelope/megabasterd/MainPanel.java | 2 +- .../megabasterd/SettingsDialog.form | 22 +++--- .../megabasterd/SettingsDialog.java | 35 ++++++--- 10 files changed, 181 insertions(+), 136 deletions(-) diff --git a/pom.xml b/pom.xml index fd0f30075..9aed082ee 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.tonikelope MegaBasterd - 4.10 + 5.0 jar diff --git a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form index 0e8ddcaa3..89c7e651a 100644 --- a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form +++ b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.form @@ -3,7 +3,7 @@
- + diff --git a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java index 2d987c868..bf14dc3cc 100644 --- a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java @@ -127,7 +127,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { skip_button = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - setTitle("FileGrabber"); + setTitle("File Grabber"); jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Files")); diff --git a/src/main/java/com/tonikelope/megabasterd/FileMergerDialog.java b/src/main/java/com/tonikelope/megabasterd/FileMergerDialog.java index 6107b0568..1313432b6 100644 --- a/src/main/java/com/tonikelope/megabasterd/FileMergerDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/FileMergerDialog.java @@ -370,47 +370,51 @@ public class FileMergerDialog extends javax.swing.JDialog { } } + setDefaultCloseOperation(DISPOSE_ON_CLOSE); + + setVisible(false); + + } else { + _file_parts.clear(); + + file_name_label.setText(""); + + file_size_label.setText(""); + + output_folder_label.setText(""); + + _output_dir = null; + + _file_name = null; + + _file_size = 0L; + + _progress = 0L; + + jProgressBar2.setMinimum(0); + jProgressBar2.setMaximum(MAX_VALUE); + jProgressBar2.setStringPainted(true); + jProgressBar2.setValue(0); + jProgressBar2.setVisible(false); + + merge_button.setText("MERGE FILE"); + + file_button.setEnabled(true); + + output_button.setEnabled(true); + + merge_button.setEnabled(true); + + delete_parts_checkbox.setEnabled(true); + + setDefaultCloseOperation(DISPOSE_ON_CLOSE); + + pack(); } } catch (IOException ex) { Logger.getLogger(FileMergerDialog.class.getName()).log(Level.SEVERE, null, ex); } - _file_parts.clear(); - - file_name_label.setText(""); - - file_size_label.setText(""); - - output_folder_label.setText(""); - - _output_dir = null; - - _file_name = null; - - _file_size = 0L; - - _progress = 0L; - - jProgressBar2.setMinimum(0); - jProgressBar2.setMaximum(MAX_VALUE); - jProgressBar2.setStringPainted(true); - jProgressBar2.setValue(0); - jProgressBar2.setVisible(false); - - merge_button.setText("MERGE FILE"); - - file_button.setEnabled(true); - - output_button.setEnabled(true); - - merge_button.setEnabled(true); - - delete_parts_checkbox.setEnabled(true); - - setDefaultCloseOperation(DISPOSE_ON_CLOSE); - - pack(); - } }); diff --git a/src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.java b/src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.java index c66fca317..f80ad7502 100644 --- a/src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.java @@ -34,6 +34,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.JFileChooser; import javax.swing.JOptionPane; +import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE; import static javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE; /** @@ -356,45 +357,49 @@ public class FileSplitterDialog extends javax.swing.JDialog { } } + setDefaultCloseOperation(DISPOSE_ON_CLOSE); + + setVisible(false); + + } else { + _file = null; + + _output_dir = null; + + file_name_label.setText(""); + + output_folder_label.setText(""); + + split_size_text.setText(""); + + file_size_label.setText(""); + + _progress = 0L; + + jProgressBar2.setMinimum(0); + jProgressBar2.setMaximum(MAX_VALUE); + jProgressBar2.setStringPainted(true); + jProgressBar2.setValue(0); + jProgressBar2.setVisible(false); + + split_button.setText("SPLIT FILE"); + + file_button.setEnabled(true); + + output_button.setEnabled(true); + + split_button.setEnabled(true); + + split_size_text.setEnabled(true); + + setDefaultCloseOperation(DISPOSE_ON_CLOSE); + + pack(); } } catch (IOException ex) { Logger.getLogger(FileSplitterDialog.class.getName()).log(Level.SEVERE, null, ex); } - _file = null; - - _output_dir = null; - - file_name_label.setText(""); - - output_folder_label.setText(""); - - split_size_text.setText(""); - - file_size_label.setText(""); - - _progress = 0L; - - jProgressBar2.setMinimum(0); - jProgressBar2.setMaximum(MAX_VALUE); - jProgressBar2.setStringPainted(true); - jProgressBar2.setValue(0); - jProgressBar2.setVisible(false); - - split_button.setText("SPLIT FILE"); - - file_button.setEnabled(true); - - output_button.setEnabled(true); - - split_button.setEnabled(true); - - split_size_text.setEnabled(true); - - setDefaultCloseOperation(DISPOSE_ON_CLOSE); - - pack(); - } }); diff --git a/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.form b/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.form index c1a9aa43f..e57805fb6 100644 --- a/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.form +++ b/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.form @@ -3,7 +3,7 @@ - + @@ -28,18 +28,13 @@ - - - - - - - + + - + @@ -47,6 +42,15 @@ + + + + + + + + + @@ -61,20 +65,22 @@ - + + + + + + + + - - - - - - - - + + + @@ -132,12 +138,12 @@ - + - + @@ -149,7 +155,7 @@ - + diff --git a/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.java b/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.java index 60c207b84..a6a5de63f 100644 --- a/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.java @@ -133,7 +133,7 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip use_mega_account_down_combobox = new javax.swing.JComboBox<>(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - setTitle("LinkGrabber"); + setTitle("Link Grabber"); links_textarea.setColumns(20); links_textarea.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N @@ -157,9 +157,9 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip links_label.setText("Put your MEGA/MegaCrypter/ELC link/s here (one per line):"); links_label.setDoubleBuffered(true); - change_dir_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + change_dir_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N change_dir_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-folder-30.png"))); // NOI18N - change_dir_button.setText("Change it"); + change_dir_button.setText("Change download folder"); change_dir_button.setDoubleBuffered(true); change_dir_button.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -168,7 +168,7 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip }); down_dir_to_label.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N - down_dir_to_label.setText("Download to -> "); + down_dir_to_label.setText("Download folder: "); down_dir_to_label.setDoubleBuffered(true); download_dir_label.setFont(new java.awt.Font("Dialog", 2, 16)); // NOI18N @@ -202,21 +202,23 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(links_scrollpane) .addGroup(layout.createSequentialGroup() - .addComponent(change_dir_button) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(down_dir_to_label) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(download_dir_label, javax.swing.GroupLayout.DEFAULT_SIZE, 295, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGap(0, 0, Short.MAX_VALUE) .addComponent(dance_button)) .addGroup(layout.createSequentialGroup() .addComponent(links_label) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 70, Short.MAX_VALUE) .addComponent(dlc_button)) .addGroup(layout.createSequentialGroup() .addComponent(use_mega_account_down_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(use_mega_account_down_combobox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) + .addComponent(use_mega_account_down_combobox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(layout.createSequentialGroup() + .addComponent(down_dir_to_label) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(download_dir_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(layout.createSequentialGroup() + .addComponent(change_dir_button) + .addGap(0, 0, Short.MAX_VALUE))) .addContainerGap()) ); layout.setVerticalGroup( @@ -227,18 +229,20 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip .addComponent(links_label) .addComponent(dlc_button)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(links_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 314, Short.MAX_VALUE) + .addComponent(links_scrollpane, javax.swing.GroupLayout.PREFERRED_SIZE, 272, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(down_dir_to_label) + .addComponent(download_dir_label)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(change_dir_button, javax.swing.GroupLayout.PREFERRED_SIZE, 34, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(use_mega_account_down_label) .addComponent(use_mega_account_down_combobox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(change_dir_button) - .addComponent(down_dir_to_label) - .addComponent(download_dir_label) - .addComponent(dance_button)) - .addGap(6, 6, 6)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(dance_button) + .addContainerGap()) ); pack(); @@ -253,6 +257,9 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip private void change_dir_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_change_dir_buttonActionPerformed + change_dir_button.setText("Selecting dir..."); + change_dir_button.setEnabled(false); + javax.swing.JFileChooser filechooser = new javax.swing.JFileChooser(); filechooser.setCurrentDirectory(new java.io.File(_download_path)); @@ -267,9 +274,15 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip _download_path = file.getAbsolutePath(); download_dir_label.setText(truncateText(_download_path, 80)); + + - pack(); } + + change_dir_button.setText("Select download dir"); + change_dir_button.setEnabled(true); + + pack(); }//GEN-LAST:event_change_dir_buttonActionPerformed private void dlc_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_dlc_buttonActionPerformed diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java index 5828b9aae..559201830 100644 --- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java +++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java @@ -46,7 +46,7 @@ import static java.awt.event.WindowEvent.WINDOW_CLOSING; */ public final class MainPanel { - public static final String VERSION = "4.10"; + public static final String VERSION = "5.0"; 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/SettingsDialog.form b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form index a4bcb8898..00dc9de52 100644 --- a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form +++ b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.form @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -335,7 +335,7 @@ - + @@ -407,6 +407,7 @@ + @@ -482,6 +483,7 @@ + @@ -498,7 +500,7 @@ - + @@ -545,7 +547,7 @@ - + @@ -637,7 +639,7 @@ - + @@ -796,7 +798,7 @@ - + @@ -805,7 +807,7 @@ - + diff --git a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java index 5dac93a82..84a9bbfdd 100644 --- a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java @@ -33,6 +33,7 @@ import javax.swing.table.DefaultTableModel; import static com.tonikelope.megabasterd.DBTools.*; import static com.tonikelope.megabasterd.MainPanel.*; import static com.tonikelope.megabasterd.MiscTools.*; +import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE; /** * @@ -74,6 +75,10 @@ public final class SettingsDialog extends javax.swing.JDialog { updateFonts(this.getRootPane(), DEFAULT_FONT, _main_panel.getZoom_factor()); + smart_proxy_url_text.setVisible(false); + + smart_proxy_url_label.setVisible(false); + smart_proxy_url_text.addMouseListener(new ContextMenuMouseListener()); downloads_scroll_pane.getVerticalScrollBar().setUnitIncrement(20); @@ -621,7 +626,7 @@ public final class SettingsDialog extends javax.swing.JDialog { 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). "); megacrypter_reverse_checkbox.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N - megacrypter_reverse_checkbox.setText("Use Megacrypter reverse mode"); + megacrypter_reverse_checkbox.setText("Use MegaCrypter reverse mode"); megacrypter_reverse_checkbox.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { megacrypter_reverse_checkboxStateChanged(evt); @@ -664,6 +669,7 @@ public final class SettingsDialog extends javax.swing.JDialog { smart_proxy_url_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N smart_proxy_url_label.setText("Custom URL (optional):"); + smart_proxy_url_label.setEnabled(false); max_downloads_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N max_downloads_spinner.setDoubleBuffered(true); @@ -690,13 +696,14 @@ public final class SettingsDialog extends javax.swing.JDialog { default_dir_label.setText("default dir"); smart_proxy_url_text.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + smart_proxy_url_text.setEnabled(false); 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); use_mega_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N - use_mega_label.setText("Mega account (default):"); + use_mega_label.setText("Default account:"); multi_slot_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N multi_slot_down_checkbox.setText("Use multi slot download mode"); @@ -718,7 +725,7 @@ public final class SettingsDialog extends javax.swing.JDialog { down_dir_label.setDoubleBuffered(true); rec_smart_proxy_label.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N - rec_smart_proxy_label.setText("Note: MULTI-SLOT REQUIRED. Be patient while MegaBasterd filters down proxies. MegaBasterd will try first to download chunk without proxy."); + rec_smart_proxy_label.setText("Note: use it in order to mitigate bandwidth limit. (Multi slot required)."); javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3); jPanel3.setLayout(jPanel3Layout); @@ -765,7 +772,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addGap(27, 27, 27) .addComponent(use_mega_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(use_mega_account_down_combobox, 0, 779, Short.MAX_VALUE)) + .addComponent(use_mega_account_down_combobox, 0, 828, Short.MAX_VALUE)) .addGroup(jPanel3Layout.createSequentialGroup() .addGap(27, 27, 27) .addComponent(megacrypter_reverse_port_label) @@ -785,7 +792,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addComponent(max_down_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(megacrypter_reverse_warning_label) .addComponent(smart_proxy_checkbox)))) - .addContainerGap(84, Short.MAX_VALUE)) + .addContainerGap(89, Short.MAX_VALUE)) .addGroup(jPanel3Layout.createSequentialGroup() .addContainerGap() .addComponent(rec_smart_proxy_label) @@ -867,14 +874,14 @@ public final class SettingsDialog extends javax.swing.JDialog { downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(downloads_panelLayout.createSequentialGroup() .addContainerGap() - .addComponent(downloads_scroll_pane, javax.swing.GroupLayout.DEFAULT_SIZE, 1121, Short.MAX_VALUE) + .addComponent(downloads_scroll_pane) .addContainerGap()) ); downloads_panelLayout.setVerticalGroup( downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(downloads_panelLayout.createSequentialGroup() .addContainerGap() - .addComponent(downloads_scroll_pane, javax.swing.GroupLayout.DEFAULT_SIZE, 471, Short.MAX_VALUE) + .addComponent(downloads_scroll_pane, javax.swing.GroupLayout.DEFAULT_SIZE, 465, Short.MAX_VALUE) .addContainerGap()) ); @@ -979,7 +986,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(max_up_speed_label) .addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(275, Short.MAX_VALUE)) + .addContainerGap(269, Short.MAX_VALUE)) ); jTabbedPane1.addTab("Uploads", new javax.swing.ImageIcon(getClass().getResource("/images/icons8-upload-to-ftp-30.png")), uploads_panel); // NOI18N @@ -1158,7 +1165,7 @@ public final 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, 121, Short.MAX_VALUE) + .addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 118, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(remove_mega_account_button) @@ -1166,7 +1173,7 @@ public final 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, 121, Short.MAX_VALUE) + .addComponent(elc_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 118, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(remove_elc_account_button) @@ -1424,6 +1431,8 @@ public final class SettingsDialog extends javax.swing.JDialog { private void save_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_save_buttonActionPerformed + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + try { if (proxy_host_textfield.getText().isEmpty()) { @@ -1774,6 +1783,10 @@ public final class SettingsDialog extends javax.swing.JDialog { encrypt_pass_checkbox.setEnabled(true); + setDefaultCloseOperation(DISPOSE_ON_CLOSE); + + pack(); + } }); @@ -1784,6 +1797,7 @@ public final class SettingsDialog extends javax.swing.JDialog { status.setText(""); JOptionPane.showMessageDialog(tthis, "Settings successfully saved!", "Settings saved", JOptionPane.INFORMATION_MESSAGE); _settings_ok = true; + setDefaultCloseOperation(DISPOSE_ON_CLOSE); setVisible(false); } }); @@ -1795,6 +1809,7 @@ public final class SettingsDialog extends javax.swing.JDialog { JOptionPane.showMessageDialog(this, "Settings successfully saved!", "Settings saved", JOptionPane.INFORMATION_MESSAGE); _settings_ok = true; + setDefaultCloseOperation(DISPOSE_ON_CLOSE); setVisible(false); }