This commit is contained in:
tonikelope 2016-10-13 11:42:31 +02:00
parent 6cbbf6f278
commit f197df08ba
3 changed files with 61 additions and 58 deletions

View File

@ -133,9 +133,9 @@
</Group>
<Component id="limit_download_speed_checkbox" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="down_dir_label" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="multi_slot_down_checkbox" alignment="0" min="-2" pref="788" max="-2" attributes="0"/>
<Component id="multi_slot_down_checkbox" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="132" max="32767" attributes="0"/>
<EmptySpace min="0" pref="296" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
@ -251,7 +251,7 @@
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="20" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="Use multi slot download mode (NOT recommended; download restart needed)"/>
<Property name="text" type="java.lang.String" value="Use multi slot download mode (download restart needed)"/>
<Property name="doubleBuffered" type="boolean" value="true"/>
</Properties>
<Events>
@ -309,9 +309,29 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="accounts_scrollpane" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="remove_account_button" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="add_account_button" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="accounts_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="unlock_accounts_button" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="delete_all_accounts_button" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" pref="75" max="32767" attributes="0"/>
<Component id="encrypt_pass_checkbox" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Group type="102" attributes="0">
<Component id="max_uploads_label" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="124" max="-2" attributes="0"/>
<Component id="max_uploads_spinner" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Component id="defaut_slots_up_label" min="-2" max="-2" attributes="0"/>
<Group type="103" alignment="1" groupAlignment="0" attributes="0">
@ -325,29 +345,11 @@
<Component id="max_up_speed_spinner" min="-2" pref="100" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="max_uploads_label" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="123" max="-2" attributes="0"/>
<Component id="max_uploads_spinner" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="multi_slot_up_checkbox" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="remove_account_button" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="add_account_button" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="accounts_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="unlock_accounts_button" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="delete_all_accounts_button" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="32767" attributes="0"/>
<Component id="encrypt_pass_checkbox" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@ -498,7 +500,7 @@
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="20" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="Use multi slot upload mode (Recommended; upload restart needed)"/>
<Property name="text" type="java.lang.String" value="Use multi slot upload mode (Upload restart needed)"/>
<Property name="doubleBuffered" type="boolean" value="true"/>
</Properties>
<Events>

View File

@ -187,7 +187,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
}
max_down_speed_spinner.setModel(new SpinnerNumberModel(max_download_speed, 0, Integer.MAX_VALUE, 1));
max_down_speed_spinner.setModel(new SpinnerNumberModel(max_download_speed, 1, Integer.MAX_VALUE, 5));
((JSpinner.DefaultEditor)max_down_speed_spinner.getEditor()).getTextField().setEditable(true);
@ -218,7 +218,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
max_upload_speed = Integer.parseInt(max_ul_speed);
}
max_up_speed_spinner.setModel(new SpinnerNumberModel(max_upload_speed, 0, Integer.MAX_VALUE, 1));
max_up_speed_spinner.setModel(new SpinnerNumberModel(max_upload_speed, 1, Integer.MAX_VALUE, 5));
((JSpinner.DefaultEditor)max_up_speed_spinner.getEditor()).getTextField().setEditable(true);
@ -454,7 +454,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
default_slots_down_label.setDoubleBuffered(true);
multi_slot_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
multi_slot_down_checkbox.setText("Use multi slot download mode (NOT recommended; download restart needed)");
multi_slot_down_checkbox.setText("Use multi slot download mode (download restart needed)");
multi_slot_down_checkbox.setDoubleBuffered(true);
multi_slot_down_checkbox.addChangeListener(new javax.swing.event.ChangeListener() {
public void stateChanged(javax.swing.event.ChangeEvent evt) {
@ -506,8 +506,8 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addComponent(default_slots_down_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addComponent(limit_download_speed_checkbox)
.addComponent(down_dir_label)
.addComponent(multi_slot_down_checkbox, javax.swing.GroupLayout.PREFERRED_SIZE, 788, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(0, 132, Short.MAX_VALUE)))
.addComponent(multi_slot_down_checkbox))
.addGap(0, 296, Short.MAX_VALUE)))
.addContainerGap())
);
downloads_panelLayout.setVerticalGroup(
@ -595,7 +595,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
max_uploads_spinner.setDoubleBuffered(true);
multi_slot_up_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
multi_slot_up_checkbox.setText("Use multi slot upload mode (Recommended; upload restart needed)");
multi_slot_up_checkbox.setText("Use multi slot upload mode (Upload restart needed)");
multi_slot_up_checkbox.setDoubleBuffered(true);
multi_slot_up_checkbox.addChangeListener(new javax.swing.event.ChangeListener() {
public void stateChanged(javax.swing.event.ChangeEvent evt) {
@ -652,24 +652,6 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addContainerGap()
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(accounts_scrollpane)
.addGroup(uploads_panelLayout.createSequentialGroup()
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(uploads_panelLayout.createSequentialGroup()
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(defaut_slots_up_label)
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(max_up_speed_label)
.addComponent(limit_upload_speed_checkbox)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(default_slots_up, 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, 100, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addGroup(uploads_panelLayout.createSequentialGroup()
.addComponent(max_uploads_label)
.addGap(123, 123, 123)
.addComponent(max_uploads_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(multi_slot_up_checkbox))
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(uploads_panelLayout.createSequentialGroup()
.addComponent(remove_account_button)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@ -680,8 +662,27 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addComponent(unlock_accounts_button)
.addGap(18, 18, 18)
.addComponent(delete_all_accounts_button)
.addGap(18, 18, Short.MAX_VALUE)
.addComponent(encrypt_pass_checkbox)))
.addGap(18, 75, Short.MAX_VALUE)
.addComponent(encrypt_pass_checkbox))
.addGroup(uploads_panelLayout.createSequentialGroup()
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addGroup(uploads_panelLayout.createSequentialGroup()
.addComponent(max_uploads_label)
.addGap(124, 124, 124)
.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.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(defaut_slots_up_label)
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(max_up_speed_label)
.addComponent(limit_upload_speed_checkbox)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(default_slots_up, 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, 100, javax.swing.GroupLayout.PREFERRED_SIZE))))
.addComponent(multi_slot_up_checkbox))
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())
);
uploads_panelLayout.setVerticalGroup(

View File

@ -11,10 +11,10 @@ public interface Transference {
int MIN_WORKERS = 2;
int MAX_WORKERS = 20;
int MAX_SIM_TRANSFERENCES=20;
int WORKERS_DEFAULT = 2;
int WORKERS_DEFAULT = 4;
int SIM_TRANSFERENCES_DEFAULT=2;
boolean LIMIT_TRANSFERENCE_SPEED_DEFAULT=false;
int MAX_TRANSFERENCE_SPEED_DEFAULT=1;
int MAX_TRANSFERENCE_SPEED_DEFAULT=5;
void start();