This commit is contained in:
tonikelope 2018-07-23 11:52:47 +02:00
parent c3b4131e06
commit 285f95bdf9
10 changed files with 181 additions and 136 deletions

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.tonikelope</groupId> <groupId>com.tonikelope</groupId>
<artifactId>MegaBasterd</artifactId> <artifactId>MegaBasterd</artifactId>
<version>4.10</version> <version>5.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>

View File

@ -3,7 +3,7 @@
<Form version="1.7" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> <Form version="1.7" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties> <Properties>
<Property name="defaultCloseOperation" type="int" value="2"/> <Property name="defaultCloseOperation" type="int" value="2"/>
<Property name="title" type="java.lang.String" value="FileGrabber"/> <Property name="title" type="java.lang.String" value="File Grabber"/>
</Properties> </Properties>
<SyntheticProperties> <SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/> <SyntheticProperty name="formSizePolicy" type="int" value="1"/>

View File

@ -127,7 +127,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
skip_button = new javax.swing.JButton(); skip_button = new javax.swing.JButton();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle("FileGrabber"); setTitle("File Grabber");
jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Files")); jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Files"));

View File

@ -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) { } catch (IOException ex) {
Logger.getLogger(FileMergerDialog.class.getName()).log(Level.SEVERE, null, 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();
} }
}); });

View File

@ -34,6 +34,7 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
import static javax.swing.WindowConstants.DO_NOTHING_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) { } catch (IOException ex) {
Logger.getLogger(FileSplitterDialog.class.getName()).log(Level.SEVERE, null, 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();
} }
}); });

View File

@ -3,7 +3,7 @@
<Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> <Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties> <Properties>
<Property name="defaultCloseOperation" type="int" value="2"/> <Property name="defaultCloseOperation" type="int" value="2"/>
<Property name="title" type="java.lang.String" value="LinkGrabber"/> <Property name="title" type="java.lang.String" value="Link Grabber"/>
</Properties> </Properties>
<SyntheticProperties> <SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/> <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
@ -28,18 +28,13 @@
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="links_scrollpane" max="32767" attributes="0"/> <Component id="links_scrollpane" max="32767" attributes="0"/>
<Group type="102" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="change_dir_button" min="-2" max="-2" attributes="0"/> <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="down_dir_to_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="download_dir_label" pref="295" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="dance_button" min="-2" max="-2" attributes="0"/> <Component id="dance_button" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="links_label" min="-2" max="-2" attributes="0"/> <Component id="links_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/> <EmptySpace pref="70" max="32767" attributes="0"/>
<Component id="dlc_button" max="-2" attributes="0"/> <Component id="dlc_button" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
@ -47,6 +42,15 @@
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="use_mega_account_down_combobox" max="32767" attributes="0"/> <Component id="use_mega_account_down_combobox" max="32767" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0">
<Component id="down_dir_to_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="download_dir_label" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="change_dir_button" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
@ -61,20 +65,22 @@
<Component id="dlc_button" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="dlc_button" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="links_scrollpane" pref="314" max="32767" attributes="0"/> <Component id="links_scrollpane" min="-2" pref="272" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="down_dir_to_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="download_dir_label" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="change_dir_button" min="-2" pref="34" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="use_mega_account_down_label" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="use_mega_account_down_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="use_mega_account_down_combobox" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="use_mega_account_down_combobox" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="32767" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Component id="dance_button" min="-2" max="-2" attributes="0"/>
<Component id="change_dir_button" alignment="3" min="-2" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="down_dir_to_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="download_dir_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="dance_button" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -132,12 +138,12 @@
<Component class="javax.swing.JButton" name="change_dir_button"> <Component class="javax.swing.JButton" name="change_dir_button">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="18" style="1"/> <Font name="Dialog" size="14" style="1"/>
</Property> </Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/images/icons8-folder-30.png"/> <Image iconType="3" name="/images/icons8-folder-30.png"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Change it"/> <Property name="text" type="java.lang.String" value="Change download folder"/>
<Property name="doubleBuffered" type="boolean" value="true"/> <Property name="doubleBuffered" type="boolean" value="true"/>
</Properties> </Properties>
<Events> <Events>
@ -149,7 +155,7 @@
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="1"/> <Font name="Dialog" size="16" style="1"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Download to -&gt; "/> <Property name="text" type="java.lang.String" value="Download folder: "/>
<Property name="doubleBuffered" type="boolean" value="true"/> <Property name="doubleBuffered" type="boolean" value="true"/>
</Properties> </Properties>
</Component> </Component>

View File

@ -133,7 +133,7 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
use_mega_account_down_combobox = new javax.swing.JComboBox<>(); use_mega_account_down_combobox = new javax.swing.JComboBox<>();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle("LinkGrabber"); setTitle("Link Grabber");
links_textarea.setColumns(20); links_textarea.setColumns(20);
links_textarea.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N 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.setText("Put your MEGA/MegaCrypter/ELC link/s here (one per line):");
links_label.setDoubleBuffered(true); 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.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.setDoubleBuffered(true);
change_dir_button.addActionListener(new java.awt.event.ActionListener() { change_dir_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { 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.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); down_dir_to_label.setDoubleBuffered(true);
download_dir_label.setFont(new java.awt.Font("Dialog", 2, 16)); // NOI18N 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) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(links_scrollpane) .addComponent(links_scrollpane)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(change_dir_button) .addGap(0, 0, Short.MAX_VALUE)
.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)
.addComponent(dance_button)) .addComponent(dance_button))
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(links_label) .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)) .addComponent(dlc_button))
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(use_mega_account_down_label) .addComponent(use_mega_account_down_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .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()) .addContainerGap())
); );
layout.setVerticalGroup( layout.setVerticalGroup(
@ -227,18 +229,20 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
.addComponent(links_label) .addComponent(links_label)
.addComponent(dlc_button)) .addComponent(dlc_button))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .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) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(use_mega_account_down_label) .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)) .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) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(dance_button)
.addComponent(change_dir_button) .addContainerGap())
.addComponent(down_dir_to_label)
.addComponent(download_dir_label)
.addComponent(dance_button))
.addGap(6, 6, 6))
); );
pack(); 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 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(); javax.swing.JFileChooser filechooser = new javax.swing.JFileChooser();
filechooser.setCurrentDirectory(new java.io.File(_download_path)); 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_path = file.getAbsolutePath();
download_dir_label.setText(truncateText(_download_path, 80)); 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 }//GEN-LAST:event_change_dir_buttonActionPerformed
private void dlc_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_dlc_buttonActionPerformed private void dlc_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_dlc_buttonActionPerformed

View File

@ -46,7 +46,7 @@ import static java.awt.event.WindowEvent.WINDOW_CLOSING;
*/ */
public final class MainPanel { 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 THROTTLE_SLICE_SIZE = 16 * 1024;
public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024; public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;
public static final int STREAMER_PORT = 1337; public static final int STREAMER_PORT = 1337;

View File

@ -118,7 +118,7 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="downloads_scroll_pane" pref="1121" max="32767" attributes="0"/> <Component id="downloads_scroll_pane" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
@ -127,7 +127,7 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="downloads_scroll_pane" pref="471" max="32767" attributes="0"/> <Component id="downloads_scroll_pane" pref="465" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
@ -197,7 +197,7 @@
<EmptySpace min="-2" pref="27" max="-2" attributes="0"/> <EmptySpace min="-2" pref="27" max="-2" attributes="0"/>
<Component id="use_mega_label" min="-2" max="-2" attributes="0"/> <Component id="use_mega_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="use_mega_account_down_combobox" pref="779" max="32767" attributes="0"/> <Component id="use_mega_account_down_combobox" pref="828" max="32767" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="27" max="-2" attributes="0"/> <EmptySpace min="-2" pref="27" max="-2" attributes="0"/>
@ -223,7 +223,7 @@
</Group> </Group>
</Group> </Group>
</Group> </Group>
<EmptySpace pref="84" max="32767" attributes="0"/> <EmptySpace pref="89" max="32767" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
@ -335,7 +335,7 @@
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="18" style="1"/> <Font name="Dialog" size="18" style="1"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Use Megacrypter reverse mode"/> <Property name="text" type="java.lang.String" value="Use MegaCrypter reverse mode"/>
</Properties> </Properties>
<Events> <Events>
<EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="megacrypter_reverse_checkboxStateChanged"/> <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="megacrypter_reverse_checkboxStateChanged"/>
@ -407,6 +407,7 @@
<Font name="Dialog" size="18" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Custom URL (optional):"/> <Property name="text" type="java.lang.String" value="Custom URL (optional):"/>
<Property name="enabled" type="boolean" value="false"/>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JSpinner" name="max_downloads_spinner"> <Component class="javax.swing.JSpinner" name="max_downloads_spinner">
@ -482,6 +483,7 @@
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="18" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="enabled" type="boolean" value="false"/>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="default_slots_down_label"> <Component class="javax.swing.JLabel" name="default_slots_down_label">
@ -498,7 +500,7 @@
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="18" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Mega account (default):"/> <Property name="text" type="java.lang.String" value="Default account:"/>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JCheckBox" name="multi_slot_down_checkbox"> <Component class="javax.swing.JCheckBox" name="multi_slot_down_checkbox">
@ -545,7 +547,7 @@
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="14" style="2"/> <Font name="Dialog" size="14" style="2"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Note: MULTI-SLOT REQUIRED. Be patient while MegaBasterd filters down proxies. MegaBasterd will try first to download chunk without proxy."/> <Property name="text" type="java.lang.String" value="Note: use it in order to mitigate bandwidth limit. (Multi slot required)."/>
</Properties> </Properties>
</Component> </Component>
</SubComponents> </SubComponents>
@ -637,7 +639,7 @@
<Component id="max_up_speed_label" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="max_up_speed_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="max_up_speed_spinner" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="max_up_speed_spinner" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace pref="275" max="32767" attributes="0"/> <EmptySpace pref="269" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -796,7 +798,7 @@
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" max="-2" attributes="0"/> <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="mega_accounts_scrollpane" pref="121" max="32767" attributes="0"/> <Component id="mega_accounts_scrollpane" pref="118" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="remove_mega_account_button" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="remove_mega_account_button" alignment="3" min="-2" max="-2" attributes="0"/>
@ -805,7 +807,7 @@
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="elc_accounts_label" min="-2" max="-2" attributes="0"/> <Component id="elc_accounts_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="elc_accounts_scrollpane" pref="121" max="32767" attributes="0"/> <Component id="elc_accounts_scrollpane" pref="118" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="remove_elc_account_button" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="remove_elc_account_button" alignment="3" min="-2" max="-2" attributes="0"/>

View File

@ -33,6 +33,7 @@ import javax.swing.table.DefaultTableModel;
import static com.tonikelope.megabasterd.DBTools.*; import static com.tonikelope.megabasterd.DBTools.*;
import static com.tonikelope.megabasterd.MainPanel.*; import static com.tonikelope.megabasterd.MainPanel.*;
import static com.tonikelope.megabasterd.MiscTools.*; 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()); 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()); smart_proxy_url_text.addMouseListener(new ContextMenuMouseListener());
downloads_scroll_pane.getVerticalScrollBar().setUnitIncrement(20); 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). "); 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.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() { megacrypter_reverse_checkbox.addChangeListener(new javax.swing.event.ChangeListener() {
public void stateChanged(javax.swing.event.ChangeEvent evt) { public void stateChanged(javax.swing.event.ChangeEvent evt) {
megacrypter_reverse_checkboxStateChanged(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.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
smart_proxy_url_label.setText("Custom URL (optional):"); 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.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
max_downloads_spinner.setDoubleBuffered(true); max_downloads_spinner.setDoubleBuffered(true);
@ -690,13 +696,14 @@ public final class SettingsDialog extends javax.swing.JDialog {
default_dir_label.setText("default dir"); default_dir_label.setText("default dir");
smart_proxy_url_text.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N 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.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
default_slots_down_label.setText("Default slots per file:"); default_slots_down_label.setText("Default slots per file:");
default_slots_down_label.setDoubleBuffered(true); default_slots_down_label.setDoubleBuffered(true);
use_mega_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N 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.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
multi_slot_down_checkbox.setText("Use multi slot download mode"); 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); down_dir_label.setDoubleBuffered(true);
rec_smart_proxy_label.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N 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); javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
jPanel3.setLayout(jPanel3Layout); jPanel3.setLayout(jPanel3Layout);
@ -765,7 +772,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addGap(27, 27, 27) .addGap(27, 27, 27)
.addComponent(use_mega_label) .addComponent(use_mega_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .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() .addGroup(jPanel3Layout.createSequentialGroup()
.addGap(27, 27, 27) .addGap(27, 27, 27)
.addComponent(megacrypter_reverse_port_label) .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(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(megacrypter_reverse_warning_label)
.addComponent(smart_proxy_checkbox)))) .addComponent(smart_proxy_checkbox))))
.addContainerGap(84, Short.MAX_VALUE)) .addContainerGap(89, Short.MAX_VALUE))
.addGroup(jPanel3Layout.createSequentialGroup() .addGroup(jPanel3Layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addComponent(rec_smart_proxy_label) .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) downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(downloads_panelLayout.createSequentialGroup() .addGroup(downloads_panelLayout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addComponent(downloads_scroll_pane, javax.swing.GroupLayout.DEFAULT_SIZE, 1121, Short.MAX_VALUE) .addComponent(downloads_scroll_pane)
.addContainerGap()) .addContainerGap())
); );
downloads_panelLayout.setVerticalGroup( downloads_panelLayout.setVerticalGroup(
downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(downloads_panelLayout.createSequentialGroup() .addGroup(downloads_panelLayout.createSequentialGroup()
.addContainerGap() .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()) .addContainerGap())
); );
@ -979,7 +986,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(max_up_speed_label) .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)) .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 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) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jLabel1) .addComponent(jLabel1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .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) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(remove_mega_account_button) .addComponent(remove_mega_account_button)
@ -1166,7 +1173,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(elc_accounts_label) .addComponent(elc_accounts_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .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) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(remove_elc_account_button) .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 private void save_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_save_buttonActionPerformed
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
try { try {
if (proxy_host_textfield.getText().isEmpty()) { if (proxy_host_textfield.getText().isEmpty()) {
@ -1774,6 +1783,10 @@ public final class SettingsDialog extends javax.swing.JDialog {
encrypt_pass_checkbox.setEnabled(true); encrypt_pass_checkbox.setEnabled(true);
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
pack();
} }
}); });
@ -1784,6 +1797,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
status.setText(""); status.setText("");
JOptionPane.showMessageDialog(tthis, "Settings successfully saved!", "Settings saved", JOptionPane.INFORMATION_MESSAGE); JOptionPane.showMessageDialog(tthis, "Settings successfully saved!", "Settings saved", JOptionPane.INFORMATION_MESSAGE);
_settings_ok = true; _settings_ok = true;
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
setVisible(false); 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); JOptionPane.showMessageDialog(this, "Settings successfully saved!", "Settings saved", JOptionPane.INFORMATION_MESSAGE);
_settings_ok = true; _settings_ok = true;
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
setVisible(false); setVisible(false);
} }