This commit is contained in:
tonikelope 2017-11-29 22:09:29 +01:00
parent 89d70cb6b8
commit 599b7ef3df
4 changed files with 178 additions and 151 deletions

View File

@ -45,7 +45,7 @@ import org.apache.http.auth.UsernamePasswordCredentials;
*/ */
public final class MainPanel { public final class MainPanel {
public static final String VERSION = "2.35"; public static final String VERSION = "2.36";
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

@ -23,6 +23,7 @@ import java.math.BigInteger;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;
@ -884,13 +885,17 @@ public final class MiscTools {
if (data != null) { if (data != null) {
ArrayList<String> links = findAllRegex("(?:https?|mega)://[^/]*/(#.*?)?!.+![^\r\n]+", data, 0); try {
ArrayList<String> links = findAllRegex("(?:https?|mega)://[^/]*/(#.*?)?!.+![^\r\n]+", URLDecoder.decode(data, "UTF-8"), 0);
links.addAll(findAllRegex("mega://e(n|l)c.*?[^\r\n]+", data, 0)); links.addAll(findAllRegex("mega://e(n|l)c.*?[^\r\n]+", data, 0));
for (String s : links) { for (String s : links) {
res += s + "\n"; res += s + "\n";
}
} catch (UnsupportedEncodingException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
} }
} }
@ -903,13 +908,17 @@ public final class MiscTools {
if (data != null) { if (data != null) {
ArrayList<String> links = findAllRegex("(?:https?|mega)://[^/]*/(#.*?)?!.+![^\r\n]+", data, 0); try {
ArrayList<String> links = findAllRegex("(?:https?|mega)://[^/]*/(#.*?)?!.+![^\r\n]+", URLDecoder.decode(data, "UTF-8"), 0);
links.addAll(findAllRegex("mega://e(n|l)c.*?[^\r\n]+", data, 0)); links.addAll(findAllRegex("mega://e(n|l)c.*?[^\r\n]+", data, 0));
if (links.size() > 0) { if (links.size() > 0) {
res = links.get(0); res = links.get(0);
}
} catch (UnsupportedEncodingException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
} }
} }

View File

@ -34,7 +34,7 @@
<EmptySpace type="separate" max="-2" attributes="0"/> <EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="cancel_button" min="-2" pref="130" max="-2" attributes="0"/> <Component id="cancel_button" min="-2" pref="130" max="-2" attributes="0"/>
</Group> </Group>
<Component id="jTabbedPane1" pref="1076" max="32767" attributes="0"/> <Component id="jTabbedPane1" max="32767" attributes="0"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
@ -105,7 +105,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="jScrollPane2" pref="1047" max="32767" attributes="0"/> <Component id="jScrollPane2" pref="947" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
@ -114,7 +114,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="jScrollPane2" pref="536" max="32767" attributes="0"/> <Component id="jScrollPane2" pref="502" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
@ -148,7 +148,11 @@
<Component id="jSeparator7" alignment="0" max="32767" attributes="0"/> <Component id="jSeparator7" alignment="0" max="32767" attributes="0"/>
<Component id="jSeparator8" alignment="0" max="32767" attributes="0"/> <Component id="jSeparator8" alignment="0" max="32767" attributes="0"/>
<Component id="jSeparator10" alignment="1" max="32767" attributes="0"/> <Component id="jSeparator10" alignment="1" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0"> <Component id="jSeparator2" alignment="0" max="32767" attributes="0"/>
<Component id="jSeparator3" alignment="0" max="32767" attributes="0"/>
<Component id="jLabel2" alignment="0" max="32767" attributes="0"/>
<Component id="rec_download_slots_label" alignment="0" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="smart_proxy_checkbox" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="smart_proxy_checkbox" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="megacrypter_reverse_checkbox" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="megacrypter_reverse_checkbox" alignment="0" min="-2" max="-2" attributes="0"/>
@ -179,30 +183,32 @@
</Group> </Group>
<Component id="use_mega_account_down_checkbox" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="use_mega_account_down_checkbox" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="verify_file_down_checkbox" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="verify_file_down_checkbox" alignment="0" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0"> <Group type="102" attributes="0">
<Component id="use_mega_label" min="-2" max="-2" attributes="0"/> <EmptySpace min="21" pref="21" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <Group type="103" groupAlignment="0" attributes="0">
<Component id="use_mega_account_down_combobox" min="-2" pref="569" max="-2" attributes="0"/> <Group type="102" alignment="0" attributes="0">
</Group> <Component id="use_mega_label" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0"> <EmptySpace max="-2" attributes="0"/>
<Component id="megacrypter_reverse_port_label" min="-2" max="-2" attributes="0"/> <Component id="use_mega_account_down_combobox" min="-2" pref="569" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> </Group>
<Component id="megacrypter_reverse_port_spinner" min="-2" pref="93" max="-2" attributes="0"/> <Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/> <Component id="megacrypter_reverse_port_label" min="-2" max="-2" attributes="0"/>
<Component id="megacrypter_reverse_warning_label" min="-2" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="megacrypter_reverse_port_spinner" min="-2" pref="93" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="megacrypter_reverse_warning_label" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group> </Group>
</Group> </Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/> <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group> </Group>
<Component id="jSeparator2" alignment="0" max="32767" attributes="0"/>
<Component id="jSeparator3" alignment="0" max="32767" attributes="0"/>
<Component id="jLabel2" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
<Component id="smart_proxy_url_label" min="-2" max="-2" attributes="0"/> <Component id="smart_proxy_url_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="smart_proxy_url_text" max="32767" attributes="0"/> <Component id="smart_proxy_url_text" max="32767" attributes="0"/>
</Group> </Group>
<Component id="rec_download_slots_label" alignment="0" max="32767" attributes="0"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
@ -266,10 +272,12 @@
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="megacrypter_reverse_checkbox" min="-2" max="-2" attributes="0"/> <Component id="megacrypter_reverse_checkbox" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="megacrypter_reverse_port_label" alignment="3" min="-2" max="-2" attributes="0"/> <Group type="103" alignment="0" groupAlignment="3" attributes="0">
<Component id="megacrypter_reverse_warning_label" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="megacrypter_reverse_port_spinner" alignment="3" min="-2" pref="24" max="-2" attributes="0"/>
<Component id="megacrypter_reverse_port_spinner" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="megacrypter_reverse_port_label" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="megacrypter_reverse_warning_label" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jSeparator10" min="-2" pref="10" max="-2" attributes="0"/> <Component id="jSeparator10" min="-2" pref="10" max="-2" attributes="0"/>
@ -355,7 +363,7 @@
<Component class="javax.swing.JSpinner" name="max_down_speed_spinner"> <Component class="javax.swing.JSpinner" name="max_down_speed_spinner">
<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="20" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
@ -382,7 +390,7 @@
<Component class="javax.swing.JLabel" name="smart_proxy_url_label"> <Component class="javax.swing.JLabel" name="smart_proxy_url_label">
<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="16" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="URL:"/> <Property name="text" type="java.lang.String" value="URL:"/>
</Properties> </Properties>
@ -390,7 +398,7 @@
<Component class="javax.swing.JSpinner" name="max_downloads_spinner"> <Component class="javax.swing.JSpinner" name="max_downloads_spinner">
<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="20" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="doubleBuffered" type="boolean" value="true"/> <Property name="doubleBuffered" type="boolean" value="true"/>
</Properties> </Properties>
@ -431,7 +439,7 @@
<Component class="javax.swing.JLabel" name="max_down_speed_label"> <Component class="javax.swing.JLabel" name="max_down_speed_label">
<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="20" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Max speed (KB/s):"/> <Property name="text" type="java.lang.String" value="Max speed (KB/s):"/>
</Properties> </Properties>
@ -439,7 +447,7 @@
<Component class="javax.swing.JLabel" name="megacrypter_reverse_port_label"> <Component class="javax.swing.JLabel" name="megacrypter_reverse_port_label">
<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="16" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="TCP Port:"/> <Property name="text" type="java.lang.String" value="TCP Port:"/>
</Properties> </Properties>
@ -461,7 +469,7 @@
<Component class="javax.swing.JLabel" name="default_slots_down_label"> <Component class="javax.swing.JLabel" name="default_slots_down_label">
<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="20" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Default slots per file:"/> <Property name="text" type="java.lang.String" value="Default slots per file:"/>
<Property name="doubleBuffered" type="boolean" value="true"/> <Property name="doubleBuffered" type="boolean" value="true"/>
@ -470,7 +478,7 @@
<Component class="javax.swing.JLabel" name="use_mega_label"> <Component class="javax.swing.JLabel" name="use_mega_label">
<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="16" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Mega account:"/> <Property name="text" type="java.lang.String" value="Mega account:"/>
</Properties> </Properties>
@ -490,7 +498,7 @@
<Component class="javax.swing.JSpinner" name="default_slots_down_spinner"> <Component class="javax.swing.JSpinner" name="default_slots_down_spinner">
<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="20" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="doubleBuffered" type="boolean" value="true"/> <Property name="doubleBuffered" type="boolean" value="true"/>
<Property name="value" type="java.lang.Object" editor="org.netbeans.modules.form.RADConnectionPropertyEditor"> <Property name="value" type="java.lang.Object" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
@ -501,7 +509,7 @@
<Component class="javax.swing.JSpinner" name="megacrypter_reverse_port_spinner"> <Component class="javax.swing.JSpinner" name="megacrypter_reverse_port_spinner">
<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="16" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
@ -543,37 +551,40 @@
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<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="jSeparator5" alignment="0" max="32767" attributes="0"/> <Group type="102" alignment="0" attributes="0">
<Component id="jSeparator6" alignment="0" max="32767" attributes="0"/> <EmptySpace min="12" pref="12" max="-2" attributes="0"/>
<Component id="default_slots_up_label" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="164" max="-2" attributes="0"/>
<Component id="default_slots_up_spinner" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="rec_upload_slots_label" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="jSeparator5" alignment="0" max="32767" attributes="0"/>
<Component id="multi_slot_up_checkbox" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="jSeparator6" alignment="0" max="32767" attributes="0"/>
<Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0"> <Group type="102" attributes="0">
<Group type="102" alignment="1" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="12" pref="12" max="-2" attributes="0"/> <Group type="102" alignment="0" attributes="0">
<Component id="default_slots_up_label" min="-2" max="-2" attributes="0"/> <Component id="max_uploads_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/> <EmptySpace min="-2" pref="116" max="-2" attributes="0"/>
<Component id="default_slots_up_spinner" min="-2" max="-2" attributes="0"/> <Component id="max_uploads_spinner" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" attributes="0"> <Component id="rec_upload_slots_label" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="max_uploads_label" min="-2" max="-2" attributes="0"/> <Component id="multi_slot_up_checkbox" alignment="0" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="120" max="-2" attributes="0"/> <Group type="102" alignment="0" attributes="0">
<Component id="max_uploads_spinner" min="-2" max="-2" attributes="0"/> <EmptySpace min="12" pref="12" max="-2" attributes="0"/>
<Component id="max_up_speed_label" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="116" max="-2" attributes="0"/>
<Component id="max_up_speed_spinner" min="-2" pref="100" max="-2" attributes="0"/>
</Group>
<Component id="limit_upload_speed_checkbox" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="0" pref="330" max="32767" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="12" pref="12" max="-2" attributes="0"/>
<Component id="max_up_speed_label" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="98" max="-2" attributes="0"/>
<Component id="max_up_speed_spinner" min="-2" pref="100" max="-2" attributes="0"/>
</Group>
<Component id="limit_upload_speed_checkbox" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="0" pref="410" max="32767" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -587,14 +598,14 @@
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="jSeparator5" min="-2" pref="10" max="-2" attributes="0"/> <Component id="jSeparator5" min="-2" pref="10" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="multi_slot_up_checkbox" min="-2" max="-2" attributes="0"/> <Component id="multi_slot_up_checkbox" min="-2" 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="default_slots_up_spinner" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="default_slots_up_label" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="default_slots_up_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="default_slots_up_spinner" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="rec_upload_slots_label" min="-2" max="-2" attributes="0"/> <Component id="rec_upload_slots_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="jSeparator6" min="-2" pref="11" max="-2" attributes="0"/> <Component id="jSeparator6" min="-2" pref="11" max="-2" attributes="0"/>
@ -605,7 +616,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="334" max="32767" attributes="0"/> <EmptySpace pref="302" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -614,7 +625,7 @@
<Component class="javax.swing.JLabel" name="default_slots_up_label"> <Component class="javax.swing.JLabel" name="default_slots_up_label">
<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="20" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Default slots per file:"/> <Property name="text" type="java.lang.String" value="Default slots per file:"/>
<Property name="doubleBuffered" type="boolean" value="true"/> <Property name="doubleBuffered" type="boolean" value="true"/>
@ -632,7 +643,7 @@
<Component class="javax.swing.JSpinner" name="default_slots_up_spinner"> <Component class="javax.swing.JSpinner" name="default_slots_up_spinner">
<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="20" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="doubleBuffered" type="boolean" value="true"/> <Property name="doubleBuffered" type="boolean" value="true"/>
<Property name="value" type="java.lang.Object" editor="org.netbeans.modules.form.RADConnectionPropertyEditor"> <Property name="value" type="java.lang.Object" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
@ -643,7 +654,7 @@
<Component class="javax.swing.JSpinner" name="max_uploads_spinner"> <Component class="javax.swing.JSpinner" name="max_uploads_spinner">
<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="20" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="doubleBuffered" type="boolean" value="true"/> <Property name="doubleBuffered" type="boolean" value="true"/>
</Properties> </Properties>
@ -663,7 +674,7 @@
<Component class="javax.swing.JLabel" name="max_up_speed_label"> <Component class="javax.swing.JLabel" name="max_up_speed_label">
<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="20" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Max speed (KB/s):"/> <Property name="text" type="java.lang.String" value="Max speed (KB/s):"/>
</Properties> </Properties>
@ -671,7 +682,7 @@
<Component class="javax.swing.JSpinner" name="max_up_speed_spinner"> <Component class="javax.swing.JSpinner" name="max_up_speed_spinner">
<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="20" style="0"/> <Font name="Dialog" size="18" style="0"/>
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
@ -693,7 +704,7 @@
<Component class="javax.swing.JLabel" name="rec_upload_slots_label"> <Component class="javax.swing.JLabel" name="rec_upload_slots_label">
<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="16" style="2"/> <Font name="Dialog" size="14" style="2"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Note: MULTI-SLOT it&apos;s more robust against upload errors but it might be slower."/> <Property name="text" type="java.lang.String" value="Note: MULTI-SLOT it&apos;s more robust against upload errors but it might be slower."/>
</Properties> </Properties>
@ -761,7 +772,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="162" max="32767" attributes="0"/> <Component id="mega_accounts_scrollpane" pref="145" 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"/>
@ -770,7 +781,7 @@
<EmptySpace max="32767" attributes="0"/> <EmptySpace max="32767" 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="161" max="32767" attributes="0"/> <Component id="elc_accounts_scrollpane" pref="144" 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"/>
@ -949,7 +960,7 @@
<Component class="javax.swing.JLabel" name="jLabel1"> <Component class="javax.swing.JLabel" name="jLabel1">
<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="16" style="2"/> <Font name="Dialog" size="14" style="2"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Note: you can use a (optional) alias for your email addresses -&gt; bob@supermail.com#bob_mail"/> <Property name="text" type="java.lang.String" value="Note: you can use a (optional) alias for your email addresses -&gt; bob@supermail.com#bob_mail"/>
</Properties> </Properties>
@ -980,7 +991,7 @@
<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="proxy_panel" min="-2" max="-2" attributes="0"/> <Component id="proxy_panel" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="351" max="32767" attributes="0"/> <EmptySpace pref="319" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -1018,7 +1029,7 @@
<Component id="proxy_port_label" min="-2" max="-2" attributes="0"/> <Component id="proxy_port_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="proxy_port_textfield" min="-2" pref="90" max="-2" attributes="0"/> <Component id="proxy_port_textfield" min="-2" pref="90" max="-2" attributes="0"/>
<EmptySpace min="0" pref="463" max="32767" attributes="0"/> <EmptySpace min="0" pref="363" max="32767" attributes="0"/>
</Group> </Group>
<Component id="proxy_auth_panel" alignment="0" max="32767" attributes="0"/> <Component id="proxy_auth_panel" alignment="0" max="32767" attributes="0"/>
</Group> </Group>
@ -1109,7 +1120,7 @@
<Component class="javax.swing.JLabel" name="proxy_warning_label"> <Component class="javax.swing.JLabel" name="proxy_warning_label">
<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="16" style="0"/> <Font name="Dialog" size="14" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Warning: Megabasterd will use this proxy for ALL connections."/> <Property name="text" type="java.lang.String" value="Warning: Megabasterd will use this proxy for ALL connections."/>
<Property name="enabled" type="boolean" value="false"/> <Property name="enabled" type="boolean" value="false"/>
@ -1135,7 +1146,7 @@
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="proxy_pass_label" min="-2" max="-2" attributes="0"/> <Component id="proxy_pass_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="proxy_pass_textfield" pref="699" max="32767" attributes="0"/> <Component id="proxy_pass_textfield" pref="599" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>

View File

@ -63,7 +63,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
public SettingsDialog(javax.swing.JFrame parent, boolean modal) { public SettingsDialog(javax.swing.JFrame parent, boolean modal) {
super(parent, modal); super(parent, modal);
initComponents(); initComponents();
swingReflectionInvoke("setUnitIncrement", this.jScrollPane2.getVerticalScrollBar(), 20); swingReflectionInvoke("setUnitIncrement", this.jScrollPane2.getVerticalScrollBar(), 20);
swingReflectionInvoke("setUnitIncrement", this.jScrollPane2.getHorizontalScrollBar(), 20); swingReflectionInvoke("setUnitIncrement", this.jScrollPane2.getHorizontalScrollBar(), 20);
@ -626,7 +626,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
} }
}); });
max_down_speed_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N max_down_speed_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
verify_file_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N verify_file_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
verify_file_down_checkbox.setText("Verify file integrity (when download is finished)"); verify_file_down_checkbox.setText("Verify file integrity (when download is finished)");
@ -640,10 +640,10 @@ public final class SettingsDialog extends javax.swing.JDialog {
} }
}); });
smart_proxy_url_label.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N smart_proxy_url_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
smart_proxy_url_label.setText("URL:"); smart_proxy_url_label.setText("URL:");
max_downloads_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N max_downloads_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
max_downloads_spinner.setDoubleBuffered(true); max_downloads_spinner.setDoubleBuffered(true);
use_mega_account_down_combobox.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N use_mega_account_down_combobox.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N
@ -657,21 +657,21 @@ public final class SettingsDialog extends javax.swing.JDialog {
} }
}); });
max_down_speed_label.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N max_down_speed_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
max_down_speed_label.setText("Max speed (KB/s):"); max_down_speed_label.setText("Max speed (KB/s):");
megacrypter_reverse_port_label.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N megacrypter_reverse_port_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
megacrypter_reverse_port_label.setText("TCP Port:"); megacrypter_reverse_port_label.setText("TCP Port:");
default_dir_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N default_dir_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
smart_proxy_url_text.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N smart_proxy_url_text.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N
default_slots_down_label.setFont(new java.awt.Font("Dialog", 0, 20)); // 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, 16)); // NOI18N use_mega_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
use_mega_label.setText("Mega account:"); use_mega_label.setText("Mega account:");
multi_slot_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N multi_slot_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
@ -683,11 +683,11 @@ public final class SettingsDialog extends javax.swing.JDialog {
} }
}); });
default_slots_down_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N default_slots_down_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
default_slots_down_spinner.setDoubleBuffered(true); default_slots_down_spinner.setDoubleBuffered(true);
default_slots_down_spinner.setValue(2); default_slots_down_spinner.setValue(2);
megacrypter_reverse_port_spinner.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N megacrypter_reverse_port_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
down_dir_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N down_dir_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
down_dir_label.setText("Default downloads directory:"); down_dir_label.setText("Default downloads directory:");
@ -712,6 +712,10 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addComponent(jSeparator7) .addComponent(jSeparator7)
.addComponent(jSeparator8) .addComponent(jSeparator8)
.addComponent(jSeparator10, javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(jSeparator10, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jSeparator2)
.addComponent(jSeparator3)
.addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(rec_download_slots_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(jPanel3Layout.createSequentialGroup() .addGroup(jPanel3Layout.createSequentialGroup()
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(smart_proxy_checkbox) .addComponent(smart_proxy_checkbox)
@ -738,24 +742,24 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addComponent(use_mega_account_down_checkbox) .addComponent(use_mega_account_down_checkbox)
.addComponent(verify_file_down_checkbox) .addComponent(verify_file_down_checkbox)
.addGroup(jPanel3Layout.createSequentialGroup() .addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(use_mega_label) .addGap(21, 21, 21)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(use_mega_account_down_combobox, javax.swing.GroupLayout.PREFERRED_SIZE, 569, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(jPanel3Layout.createSequentialGroup()
.addGroup(jPanel3Layout.createSequentialGroup() .addComponent(use_mega_label)
.addComponent(megacrypter_reverse_port_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(use_mega_account_down_combobox, javax.swing.GroupLayout.PREFERRED_SIZE, 569, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(megacrypter_reverse_port_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 93, javax.swing.GroupLayout.PREFERRED_SIZE) .addGroup(jPanel3Layout.createSequentialGroup()
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(megacrypter_reverse_port_label)
.addComponent(megacrypter_reverse_warning_label))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(megacrypter_reverse_port_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 93, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(megacrypter_reverse_warning_label)))))
.addGap(0, 0, Short.MAX_VALUE)) .addGap(0, 0, Short.MAX_VALUE))
.addComponent(jSeparator2)
.addComponent(jSeparator3)
.addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(jPanel3Layout.createSequentialGroup() .addGroup(jPanel3Layout.createSequentialGroup()
.addGap(20, 20, 20)
.addComponent(smart_proxy_url_label) .addComponent(smart_proxy_url_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(smart_proxy_url_text)) .addComponent(smart_proxy_url_text)))
.addComponent(rec_download_slots_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap()) .addContainerGap())
); );
jPanel3Layout.setVerticalGroup( jPanel3Layout.setVerticalGroup(
@ -810,10 +814,11 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(megacrypter_reverse_checkbox) .addComponent(megacrypter_reverse_checkbox)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(megacrypter_reverse_port_label) .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(megacrypter_reverse_warning_label) .addComponent(megacrypter_reverse_port_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(megacrypter_reverse_port_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(megacrypter_reverse_port_label))
.addComponent(megacrypter_reverse_warning_label))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jSeparator10, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jSeparator10, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@ -835,20 +840,20 @@ 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(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 1047, Short.MAX_VALUE) .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 947, Short.MAX_VALUE)
.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(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 536, Short.MAX_VALUE) .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 502, Short.MAX_VALUE)
.addContainerGap()) .addContainerGap())
); );
jTabbedPane1.addTab("Downloads", downloads_panel); jTabbedPane1.addTab("Downloads", downloads_panel);
default_slots_up_label.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N default_slots_up_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
default_slots_up_label.setText("Default slots per file:"); default_slots_up_label.setText("Default slots per file:");
default_slots_up_label.setDoubleBuffered(true); default_slots_up_label.setDoubleBuffered(true);
@ -856,11 +861,11 @@ public final class SettingsDialog extends javax.swing.JDialog {
max_uploads_label.setText("Max parallel uploads:"); max_uploads_label.setText("Max parallel uploads:");
max_uploads_label.setDoubleBuffered(true); max_uploads_label.setDoubleBuffered(true);
default_slots_up_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N default_slots_up_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
default_slots_up_spinner.setDoubleBuffered(true); default_slots_up_spinner.setDoubleBuffered(true);
default_slots_up_spinner.setValue(2); default_slots_up_spinner.setValue(2);
max_uploads_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N max_uploads_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
max_uploads_spinner.setDoubleBuffered(true); max_uploads_spinner.setDoubleBuffered(true);
multi_slot_up_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N multi_slot_up_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
@ -872,10 +877,10 @@ public final class SettingsDialog extends javax.swing.JDialog {
} }
}); });
max_up_speed_label.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N max_up_speed_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
max_up_speed_label.setText("Max speed (KB/s):"); max_up_speed_label.setText("Max speed (KB/s):");
max_up_speed_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N max_up_speed_spinner.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
limit_upload_speed_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N limit_upload_speed_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
limit_upload_speed_checkbox.setText("Limit upload speed"); limit_upload_speed_checkbox.setText("Limit upload speed");
@ -885,7 +890,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
} }
}); });
rec_upload_slots_label.setFont(new java.awt.Font("Dialog", 2, 16)); // NOI18N rec_upload_slots_label.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N
rec_upload_slots_label.setText("Note: MULTI-SLOT it's more robust against upload errors but it might be slower."); rec_upload_slots_label.setText("Note: MULTI-SLOT it's more robust against upload errors but it might be slower.");
javax.swing.GroupLayout uploads_panelLayout = new javax.swing.GroupLayout(uploads_panel); javax.swing.GroupLayout uploads_panelLayout = new javax.swing.GroupLayout(uploads_panel);
@ -895,30 +900,32 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addGroup(uploads_panelLayout.createSequentialGroup() .addGroup(uploads_panelLayout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jSeparator5) .addGroup(uploads_panelLayout.createSequentialGroup()
.addComponent(jSeparator6) .addGap(12, 12, 12)
.addComponent(default_slots_up_label)
.addGap(164, 164, 164)
.addComponent(default_slots_up_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(uploads_panelLayout.createSequentialGroup() .addGroup(uploads_panelLayout.createSequentialGroup()
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(rec_upload_slots_label) .addComponent(jSeparator5)
.addComponent(multi_slot_up_checkbox) .addComponent(jSeparator6)
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
.addGroup(uploads_panelLayout.createSequentialGroup()
.addGap(12, 12, 12)
.addComponent(default_slots_up_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(default_slots_up_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(uploads_panelLayout.createSequentialGroup()
.addComponent(max_uploads_label)
.addGap(120, 120, 120)
.addComponent(max_uploads_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addGroup(uploads_panelLayout.createSequentialGroup() .addGroup(uploads_panelLayout.createSequentialGroup()
.addGap(12, 12, 12) .addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(max_up_speed_label) .addGroup(uploads_panelLayout.createSequentialGroup()
.addGap(98, 98, 98) .addComponent(max_uploads_label)
.addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGap(116, 116, 116)
.addComponent(limit_upload_speed_checkbox)) .addComponent(max_uploads_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(0, 410, Short.MAX_VALUE))) .addComponent(rec_upload_slots_label)
.addContainerGap()) .addComponent(multi_slot_up_checkbox)
.addGroup(uploads_panelLayout.createSequentialGroup()
.addGap(12, 12, 12)
.addComponent(max_up_speed_label)
.addGap(116, 116, 116)
.addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(limit_upload_speed_checkbox))
.addGap(0, 330, Short.MAX_VALUE)))
.addContainerGap())))
); );
uploads_panelLayout.setVerticalGroup( uploads_panelLayout.setVerticalGroup(
uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@ -933,9 +940,9 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addComponent(multi_slot_up_checkbox) .addComponent(multi_slot_up_checkbox)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(default_slots_up_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(default_slots_up_label)
.addComponent(default_slots_up_label)) .addComponent(default_slots_up_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(rec_upload_slots_label) .addComponent(rec_upload_slots_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jSeparator6, javax.swing.GroupLayout.PREFERRED_SIZE, 11, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jSeparator6, javax.swing.GroupLayout.PREFERRED_SIZE, 11, javax.swing.GroupLayout.PREFERRED_SIZE)
@ -945,7 +952,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(334, Short.MAX_VALUE)) .addContainerGap(302, Short.MAX_VALUE))
); );
jTabbedPane1.addTab("Uploads", uploads_panel); jTabbedPane1.addTab("Uploads", uploads_panel);
@ -1068,7 +1075,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
} }
}); });
jLabel1.setFont(new java.awt.Font("Dialog", 2, 16)); // NOI18N jLabel1.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N
jLabel1.setText("Note: you can use a (optional) alias for your email addresses -> bob@supermail.com#bob_mail"); jLabel1.setText("Note: you can use a (optional) alias for your email addresses -> bob@supermail.com#bob_mail");
javax.swing.GroupLayout accounts_panelLayout = new javax.swing.GroupLayout(accounts_panel); javax.swing.GroupLayout accounts_panelLayout = new javax.swing.GroupLayout(accounts_panel);
@ -1115,7 +1122,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, 162, Short.MAX_VALUE) .addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 145, 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)
@ -1123,7 +1130,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.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, 161, Short.MAX_VALUE) .addComponent(elc_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 144, 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)
@ -1164,7 +1171,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
} }
}); });
proxy_warning_label.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N proxy_warning_label.setFont(new java.awt.Font("Dialog", 0, 14)); // NOI18N
proxy_warning_label.setText("Warning: Megabasterd will use this proxy for ALL connections."); proxy_warning_label.setText("Warning: Megabasterd will use this proxy for ALL connections.");
proxy_warning_label.setEnabled(false); proxy_warning_label.setEnabled(false);
@ -1201,7 +1208,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(proxy_pass_label) .addComponent(proxy_pass_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(proxy_pass_textfield, javax.swing.GroupLayout.DEFAULT_SIZE, 699, Short.MAX_VALUE) .addComponent(proxy_pass_textfield, javax.swing.GroupLayout.DEFAULT_SIZE, 599, Short.MAX_VALUE)
.addContainerGap()) .addContainerGap())
); );
proxy_auth_panelLayout.setVerticalGroup( proxy_auth_panelLayout.setVerticalGroup(
@ -1237,7 +1244,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addComponent(proxy_port_label) .addComponent(proxy_port_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(proxy_port_textfield, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(proxy_port_textfield, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 463, Short.MAX_VALUE)) .addGap(0, 363, Short.MAX_VALUE))
.addComponent(proxy_auth_panel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addComponent(proxy_auth_panel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap()))) .addContainerGap())))
); );
@ -1273,7 +1280,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addComponent(proxy_panel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(proxy_panel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap(351, Short.MAX_VALUE)) .addContainerGap(319, Short.MAX_VALUE))
); );
jTabbedPane1.addTab("Advanced", jPanel1); jTabbedPane1.addTab("Advanced", jPanel1);
@ -1294,7 +1301,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addComponent(ok_button, javax.swing.GroupLayout.PREFERRED_SIZE, 130, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(ok_button, javax.swing.GroupLayout.PREFERRED_SIZE, 130, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, 18) .addGap(18, 18, 18)
.addComponent(cancel_button, javax.swing.GroupLayout.PREFERRED_SIZE, 130, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(cancel_button, javax.swing.GroupLayout.PREFERRED_SIZE, 130, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 1076, Short.MAX_VALUE)) .addComponent(jTabbedPane1))
.addContainerGap()) .addContainerGap())
); );
layout.setVerticalGroup( layout.setVerticalGroup(