Mirrors/megabasterd
1
0
Fork 0
mirror of https://github.com/tonikelope/megabasterd.git synced 2025-05-13 04:47:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

6.25

Browse Source 
-Freeze transferences before start (option).
-Reorder waiting transferences.
This commit is contained in:
tonikelope 2019-08-11 18:58:05 +02:00
parent bbda2ba628
commit bca44f92d1
34 changed files with 984 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
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>6.24</version> <version>6.25</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
@ -18,11 +18,6 @@
<version>2.9.6</version> <version>2.9.6</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.9</version>
</dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
@ -39,6 +34,11 @@
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<version>2.2.11</version> <version>2.2.11</version>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.9.2</version>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

4
src/main/java/com/tonikelope/megabasterd/AboutDialog.java
View File

@ -26,7 +26,7 @@ public final class AboutDialog extends javax.swing.JDialog {
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, parent.getMain_panel().getZoom_factor()); updateFonts(this, GUI_FONT, parent.getMain_panel().getZoom_factor());
translateLabels(this); translateLabels(this);
@ -152,7 +152,7 @@ public final class AboutDialog extends javax.swing.JDialog {
check_version_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N check_version_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
check_version_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-restart-30.png"))); // NOI18N check_version_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-restart-30.png"))); // NOI18N
check_version_button.setText("Check version"); check_version_button.setText("Check for updates");
check_version_button.setDoubleBuffered(true); check_version_button.setDoubleBuffered(true);
check_version_button.addActionListener(new java.awt.event.ActionListener() { check_version_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {

2
src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java
View File

@ -126,7 +126,7 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable {
turbo_mode = true; turbo_mode = true;
} }
while (!_exit && !_download.isStopped()) { while (!_download.getMain_panel().isExit() && !_exit && !_download.isStopped()) {
if (_download.isPaused() && !_download.isStopped()) { if (_download.isPaused() && !_download.isStopped()) {

2
src/main/java/com/tonikelope/megabasterd/ChunkDownloaderMono.java
View File

@ -42,7 +42,7 @@ public class ChunkDownloaderMono extends ChunkDownloader {
CipherInputStream cis = null; CipherInputStream cis = null;
while (!isExit() && !getDownload().isStopped()) { while (!getDownload().getMain_panel().isExit() && !isExit() && !getDownload().isStopped()) {
if (worker_url == null || http_error == 403) { if (worker_url == null || http_error == 403) {

27
src/main/java/com/tonikelope/megabasterd/Download.java
View File

@ -69,6 +69,7 @@ public final class Download implements Transference, Runnable, SecureSingleThrea
private Long _file_size; private Long _file_size;
private String _file_pass; private String _file_pass;
private String _file_noexpire; private String _file_noexpire;
private volatile boolean _frozen;
private final boolean _use_slots; private final boolean _use_slots;
private int _slots; private int _slots;
private final boolean _restart; private final boolean _restart;
@ -100,6 +101,7 @@ public final class Download implements Transference, Runnable, SecureSingleThrea
_paused_workers = 0; _paused_workers = 0;
_ma = ma; _ma = ma;
_frozen = main_panel.isInit_paused();
_last_chunk_id_dispatched = 0L; _last_chunk_id_dispatched = 0L;
_status_error = false; _status_error = false;
_canceled = false; _canceled = false;
@ -515,6 +517,8 @@ public final class Download implements Transference, Runnable, SecureSingleThrea
@Override @Override
public void run() { public void run() {
getView().getClose_button().setVisible(false); getView().getClose_button().setVisible(false);
getView().getCopy_link_button().setVisible(false);
getView().getOpen_folder_button().setVisible(false);
} }
}); });
@ -1041,7 +1045,7 @@ public final class Download implements Transference, Runnable, SecureSingleThrea
} else { } else {
getView().printStatusNormal("Waiting to start..."); getView().printStatusNormal(_frozen ? "(FROZEN) Waiting to start..." : "Waiting to start...");
swingInvoke( swingInvoke(
new Runnable() { new Runnable() {
@ -1067,6 +1071,8 @@ public final class Download implements Transference, Runnable, SecureSingleThrea
public void run() { public void run() {
getView().getClose_button().setVisible(true); getView().getClose_button().setVisible(true);
getView().getQueue_up_button().setVisible(true);
getView().getQueue_down_button().setVisible(true);
} }
}); });
@ -1697,4 +1703,23 @@ public final class Download implements Transference, Runnable, SecureSingleThrea
return getChunkworkers().size(); return getChunkworkers().size();
} }
@Override
public boolean isFrozen() {
return this._frozen;
}
@Override
public void unfreeze() {
this._frozen = false;
}
@Override
public void upWaitQueue() {
_main_panel.getDownload_manager().upWaitQueue(this);
}
@Override
public void downWaitQueue() {
_main_panel.getDownload_manager().downWaitQueue(this);
}
} }

6
src/main/java/com/tonikelope/megabasterd/DownloadManager.java
View File

@ -38,6 +38,10 @@ public final class DownloadManager extends TransferenceManager {
getTransference_waitstart_queue().remove(d); getTransference_waitstart_queue().remove(d);
if (getTransference_waitstart_queue().isEmpty()) {
_frozen = false;
}
getTransference_running_list().remove(d); getTransference_running_list().remove(d);
getTransference_finished_queue().remove(d); getTransference_finished_queue().remove(d);
@ -116,7 +120,7 @@ public final class DownloadManager extends TransferenceManager {
if (!isPreprocessing_transferences() && !isProvisioning_transferences()) { if (!isPreprocessing_transferences() && !isProvisioning_transferences()) {
sortTransferenceStartQueue(); sortTransferenceWaitStartQueue();
swingInvoke( swingInvoke(
new Runnable() { new Runnable() {

101
src/main/java/com/tonikelope/megabasterd/DownloadView.form
View File

@ -30,16 +30,25 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="progress_pbar" alignment="0" max="32767" attributes="0"/> <Component id="progress_pbar" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
<Component id="status_label" max="32767" attributes="0"/> <Group type="103" groupAlignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/> <Group type="102" attributes="0">
<Component id="slots_label" min="-2" max="-2" attributes="0"/> <Component id="status_label" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="slots_label" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="queue_up_button" min="-2" pref="43" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="queue_down_button" min="-2" pref="42" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="slots_spinner" min="-2" pref="70" max="-2" attributes="0"/> <Component id="slots_spinner" min="-2" pref="70" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="file_name_label" max="32767" attributes="0"/> <Component id="file_name_label" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace min="6" pref="6" max="-2" attributes="0"/>
<Component id="slot_status_label" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
<Component id="file_size_label" max="32767" attributes="0"/> <Component id="file_size_label" max="32767" attributes="0"/>
@ -57,41 +66,53 @@
<Component id="close_button" min="-2" max="-2" attributes="0"/> <Component id="close_button" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="restart_button" min="-2" max="-2" attributes="0"/> <Component id="restart_button" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/> <EmptySpace pref="135" max="32767" attributes="0"/>
<Component id="keep_temp_checkbox" min="-2" max="-2" attributes="0"/> <Component id="keep_temp_checkbox" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="stop_button" min="-2" max="-2" attributes="0"/> <Component id="stop_button" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Component id="slot_status_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="slots_spinner" alignment="3" min="-2" pref="32" max="-2" attributes="0"/>
<Component id="slots_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="status_label" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="slot_status_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="file_name_label" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="copy_link_button" alignment="1" max="-2" attributes="0"/> <Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="3" attributes="0"> <EmptySpace min="-2" pref="50" max="-2" attributes="0"/>
<Component id="open_folder_button" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="slot_status_label" min="-2" max="-2" attributes="0"/>
<Component id="file_size_label" alignment="3" min="-2" max="-2" attributes="0"/> </Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="queue_down_button" pref="39" max="32767" attributes="0"/>
<Component id="queue_up_button" max="32767" attributes="0"/>
</Group>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="slots_spinner" alignment="3" min="-2" pref="32" max="-2" attributes="0"/>
<Component id="slots_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="status_label" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="file_name_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="copy_link_button" alignment="1" max="-2" attributes="0"/>
<Group type="103" alignment="0" groupAlignment="3" attributes="0">
<Component id="open_folder_button" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="file_size_label" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="progress_pbar" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
<EmptySpace min="-2" max="-2" attributes="0"/> <EmptySpace max="32767" attributes="0"/>
<Component id="progress_pbar" min="-2" 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="speed_label" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="speed_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="pause_button" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="pause_button" alignment="3" min="-2" max="-2" attributes="0"/>
@ -102,7 +123,7 @@
<Component id="close_button" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="close_button" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="restart_button" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="restart_button" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" alignment="0" groupAlignment="3" attributes="0">
<Component id="stop_button" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="stop_button" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="keep_temp_checkbox" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="keep_temp_checkbox" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
@ -303,5 +324,31 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="open_folder_buttonActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="open_folder_buttonActionPerformed"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JButton" name="queue_up_button">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="18" style="1"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/images/arriba_1.png"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="queue_up_buttonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="queue_down_button">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="18" style="1"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/images/abajo_1.png"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="queue_down_buttonActionPerformed"/>
</Events>
</Component>
</SubComponents> </SubComponents>
</Form> </Form>

136
src/main/java/com/tonikelope/megabasterd/DownloadView.java
View File

@ -25,6 +25,14 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen
private final Download _download; private final Download _download;
public JButton getQueue_down_button() {
return queue_down_button;
}
public JButton getQueue_up_button() {
return queue_up_button;
}
public JButton getClose_button() { public JButton getClose_button() {
return close_button; return close_button;
} }
@ -89,7 +97,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, download.getMain_panel().getZoom_factor()); updateFonts(this, GUI_FONT, download.getMain_panel().getZoom_factor());
translateLabels(this); translateLabels(this);
@ -106,7 +114,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen
status_label.setText(""); status_label.setText("");
for (JComponent c : new JComponent[]{slots_spinner, slots_label, pause_button, stop_button, speed_label, progress_pbar, keep_temp_checkbox, file_name_label, close_button, copy_link_button, restart_button, file_size_label, open_folder_button}) { for (JComponent c : new JComponent[]{queue_up_button, queue_down_button, slots_spinner, slots_label, pause_button, stop_button, speed_label, progress_pbar, keep_temp_checkbox, file_name_label, close_button, copy_link_button, restart_button, file_size_label, open_folder_button}) {
c.setVisible(false); c.setVisible(false);
} }
@ -157,6 +165,8 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen
file_size_label = new javax.swing.JLabel(); file_size_label = new javax.swing.JLabel();
slot_status_label = new javax.swing.JLabel(); slot_status_label = new javax.swing.JLabel();
open_folder_button = new javax.swing.JButton(); open_folder_button = new javax.swing.JButton();
queue_up_button = new javax.swing.JButton();
queue_down_button = new javax.swing.JButton();
setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 204, 255), 3, true)); setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 204, 255), 3, true));
@ -267,6 +277,22 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen
} }
}); });
queue_up_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
queue_up_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/arriba_1.png"))); // NOI18N
queue_up_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
queue_up_buttonActionPerformed(evt);
}
});
queue_down_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
queue_down_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/abajo_1.png"))); // NOI18N
queue_down_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
queue_down_buttonActionPerformed(evt);
}
});
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout); this.setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(
@ -276,15 +302,21 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(progress_pbar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(progress_pbar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addComponent(status_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createSequentialGroup()
.addComponent(slots_label) .addComponent(status_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(slots_label))
.addGroup(layout.createSequentialGroup()
.addComponent(queue_up_button, javax.swing.GroupLayout.PREFERRED_SIZE, 43, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(queue_down_button, javax.swing.GroupLayout.PREFERRED_SIZE, 42, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, Short.MAX_VALUE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(slots_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(slots_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(file_name_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(file_name_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGap(6, 6, 6))
.addComponent(slot_status_label))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addComponent(file_size_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(file_size_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(6, 6, 6) .addGap(6, 6, 6)
@ -299,33 +331,42 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen
.addComponent(close_button) .addComponent(close_button)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(restart_button) .addComponent(restart_button)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 135, Short.MAX_VALUE)
.addComponent(keep_temp_checkbox) .addComponent(keep_temp_checkbox)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(stop_button))) .addComponent(stop_button)))
.addGap(0, 0, 0)
.addComponent(slot_status_label)
.addContainerGap()) .addContainerGap())
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(slots_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(slots_label)
.addComponent(status_label))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(slot_status_label)
.addComponent(file_name_label))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(copy_link_button, javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGap(50, 50, 50)
.addComponent(open_folder_button) .addComponent(slot_status_label))
.addComponent(file_size_label))) .addGroup(layout.createSequentialGroup()
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addContainerGap()
.addComponent(progress_pbar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(queue_down_button, javax.swing.GroupLayout.DEFAULT_SIZE, 39, Short.MAX_VALUE)
.addComponent(queue_up_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGap(0, 0, 0)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(slots_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(slots_label)
.addComponent(status_label))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(file_name_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(copy_link_button, javax.swing.GroupLayout.Alignment.TRAILING)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(open_folder_button)
.addComponent(file_size_label)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(progress_pbar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(speed_label) .addComponent(speed_label)
.addComponent(pause_button)) .addComponent(pause_button))
@ -396,6 +437,49 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen
}//GEN-LAST:event_open_folder_buttonActionPerformed }//GEN-LAST:event_open_folder_buttonActionPerformed
private void queue_up_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_queue_up_buttonActionPerformed
// TODO add your handling code here:
queue_up_button.setEnabled(false);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
_download.upWaitQueue();
swingInvoke(
new Runnable() {
@Override
public void run() {
queue_up_button.setEnabled(true);
}
});
}
});
}//GEN-LAST:event_queue_up_buttonActionPerformed
private void queue_down_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_queue_down_buttonActionPerformed
// TODO add your handling code here:
queue_down_button.setEnabled(false);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
_download.downWaitQueue();
queue_down_button.setEnabled(true);
}
});
}//GEN-LAST:event_queue_down_buttonActionPerformed
@Override @Override
public void pause() { public void pause() {
@ -627,6 +711,8 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen
private javax.swing.JButton open_folder_button; private javax.swing.JButton open_folder_button;
private javax.swing.JButton pause_button; private javax.swing.JButton pause_button;
private javax.swing.JProgressBar progress_pbar; private javax.swing.JProgressBar progress_pbar;
private javax.swing.JButton queue_down_button;
private javax.swing.JButton queue_up_button;
private javax.swing.JButton restart_button; private javax.swing.JButton restart_button;
private javax.swing.JLabel slot_status_label; private javax.swing.JLabel slot_status_label;
private javax.swing.JLabel slots_label; private javax.swing.JLabel slots_label;

10
src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java
View File

@ -68,11 +68,11 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, _main_panel.getZoom_factor()); updateFonts(this, GUI_FONT, _main_panel.getZoom_factor());
updateTitledBorderFont(((javax.swing.border.TitledBorder) jPanel1.getBorder()), DEFAULT_FONT, _main_panel.getZoom_factor()); updateTitledBorderFont(((javax.swing.border.TitledBorder) jPanel1.getBorder()), GUI_FONT, _main_panel.getZoom_factor());
updateTitledBorderFont(((javax.swing.border.TitledBorder) jPanel2.getBorder()), DEFAULT_FONT, _main_panel.getZoom_factor()); updateTitledBorderFont(((javax.swing.border.TitledBorder) jPanel2.getBorder()), GUI_FONT, _main_panel.getZoom_factor());
translateLabels(this); translateLabels(this);
@ -396,7 +396,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
JFileChooser filechooser = new javax.swing.JFileChooser(); JFileChooser filechooser = new javax.swing.JFileChooser();
updateFonts(filechooser, DEFAULT_FONT, (float) (_main_panel.getZoom_factor() * 1.25)); updateFonts(filechooser, GUI_FONT, (float) (_main_panel.getZoom_factor() * 1.25));
filechooser.setDialogTitle("Add files"); filechooser.setDialogTitle("Add files");
@ -491,7 +491,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
JFileChooser filechooser = new javax.swing.JFileChooser(); JFileChooser filechooser = new javax.swing.JFileChooser();
updateFonts(filechooser, DEFAULT_FONT, (float) (_main_panel.getZoom_factor() * 1.2)); updateFonts(filechooser, GUI_FONT, (float) (_main_panel.getZoom_factor() * 1.2));
filechooser.setDialogTitle("Add directory"); filechooser.setDialogTitle("Add directory");

8
src/main/java/com/tonikelope/megabasterd/FileMergerDialog.java
View File

@ -16,7 +16,6 @@
*/ */
package com.tonikelope.megabasterd; package com.tonikelope.megabasterd;
import static com.tonikelope.megabasterd.MainPanel.DEFAULT_FONT;
import static com.tonikelope.megabasterd.MainPanel.THREAD_POOL; import static com.tonikelope.megabasterd.MainPanel.THREAD_POOL;
import static com.tonikelope.megabasterd.MiscTools.swingInvoke; import static com.tonikelope.megabasterd.MiscTools.swingInvoke;
import static com.tonikelope.megabasterd.MiscTools.translateLabels; import static com.tonikelope.megabasterd.MiscTools.translateLabels;
@ -36,6 +35,7 @@ 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.DISPOSE_ON_CLOSE;
import static com.tonikelope.megabasterd.MainPanel.GUI_FONT;
/** /**
* *
@ -57,7 +57,7 @@ public class FileMergerDialog extends javax.swing.JDialog {
super(parent, modal); super(parent, modal);
_main_panel = parent.getMain_panel(); _main_panel = parent.getMain_panel();
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, _main_panel.getZoom_factor()); updateFonts(this, GUI_FONT, _main_panel.getZoom_factor());
translateLabels(this); translateLabels(this);
jProgressBar2.setMinimum(0); jProgressBar2.setMinimum(0);
jProgressBar2.setMaximum(MAX_VALUE); jProgressBar2.setMaximum(MAX_VALUE);
@ -233,7 +233,7 @@ public class FileMergerDialog extends javax.swing.JDialog {
JFileChooser filechooser = new javax.swing.JFileChooser(); JFileChooser filechooser = new javax.swing.JFileChooser();
updateFonts(filechooser, DEFAULT_FONT, (float) (_main_panel.getZoom_factor() * 1.25)); updateFonts(filechooser, GUI_FONT, (float) (_main_panel.getZoom_factor() * 1.25));
filechooser.setDialogTitle("Select any part of the original file"); filechooser.setDialogTitle("Select any part of the original file");
@ -308,7 +308,7 @@ public class FileMergerDialog extends javax.swing.JDialog {
JFileChooser filechooser = new javax.swing.JFileChooser(); JFileChooser filechooser = new javax.swing.JFileChooser();
updateFonts(filechooser, DEFAULT_FONT, (float) (_main_panel.getZoom_factor() * 1.25)); updateFonts(filechooser, GUI_FONT, (float) (_main_panel.getZoom_factor() * 1.25));
filechooser.setDialogTitle("Add directory"); filechooser.setDialogTitle("Add directory");

8
src/main/java/com/tonikelope/megabasterd/FileSplitterDialog.java
View File

@ -16,7 +16,6 @@
*/ */
package com.tonikelope.megabasterd; package com.tonikelope.megabasterd;
import static com.tonikelope.megabasterd.MainPanel.DEFAULT_FONT;
import static com.tonikelope.megabasterd.MainPanel.THREAD_POOL; import static com.tonikelope.megabasterd.MainPanel.THREAD_POOL;
import static com.tonikelope.megabasterd.MiscTools.swingInvoke; import static com.tonikelope.megabasterd.MiscTools.swingInvoke;
import static com.tonikelope.megabasterd.MiscTools.translateLabels; import static com.tonikelope.megabasterd.MiscTools.translateLabels;
@ -38,6 +37,7 @@ 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.DISPOSE_ON_CLOSE;
import static javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE; import static javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE;
import static com.tonikelope.megabasterd.MainPanel.GUI_FONT;
/** /**
* *
@ -59,7 +59,7 @@ public class FileSplitterDialog extends javax.swing.JDialog {
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, _main_panel.getZoom_factor()); updateFonts(this, GUI_FONT, _main_panel.getZoom_factor());
translateLabels(this); translateLabels(this);
@ -259,7 +259,7 @@ public class FileSplitterDialog extends javax.swing.JDialog {
JFileChooser filechooser = new javax.swing.JFileChooser(); JFileChooser filechooser = new javax.swing.JFileChooser();
updateFonts(filechooser, DEFAULT_FONT, (float) (_main_panel.getZoom_factor() * 1.25)); updateFonts(filechooser, GUI_FONT, (float) (_main_panel.getZoom_factor() * 1.25));
filechooser.setDialogTitle("Select file"); filechooser.setDialogTitle("Select file");
@ -307,7 +307,7 @@ public class FileSplitterDialog extends javax.swing.JDialog {
JFileChooser filechooser = new javax.swing.JFileChooser(); JFileChooser filechooser = new javax.swing.JFileChooser();
updateFonts(filechooser, DEFAULT_FONT, (float) (_main_panel.getZoom_factor() * 1.25)); updateFonts(filechooser, GUI_FONT, (float) (_main_panel.getZoom_factor() * 1.25));
filechooser.setDialogTitle("Add directory"); filechooser.setDialogTitle("Add directory");

2
src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java
View File

@ -58,7 +58,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog {
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, parent.getMain_panel().getZoom_factor()); updateFonts(this, GUI_FONT, parent.getMain_panel().getZoom_factor());
translateLabels(this); translateLabels(this);

2
src/main/java/com/tonikelope/megabasterd/Get2FACode.java
View File

@ -29,7 +29,7 @@ public class Get2FACode extends javax.swing.JDialog {
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, main_panel.getZoom_factor()); updateFonts(this, GUI_FONT, main_panel.getZoom_factor());
translateLabels(this); translateLabels(this);

2
src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java
View File

@ -62,7 +62,7 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog {
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, main_panel.getZoom_factor()); updateFonts(this, GUI_FONT, main_panel.getZoom_factor());
translateLabels(this); translateLabels(this);

8
src/main/java/com/tonikelope/megabasterd/LabelTranslatorSingleton.java
View File

@ -36,6 +36,10 @@ public final class LabelTranslatorSingleton {
private void Spanish() { private void Spanish() {
_addTranslation("Freeze transferences before start", "Congelar transferencias antes de empezar");
_addTranslation("UNFREEZE WAITING TRANSFERENCES", "DESCONGELAR TRANSFERENCIAS A LA ESPERA");
_addTranslation("(FROZEN) Waiting to start...", "(CONGELADA) Esperando para empezar...");
_addTranslation("(FROZEN) Waiting to start (", "(CONGELADA) Esperando para empezar (");
_addTranslation("There are a lot of files in this folder.\nNot all links will be provisioned at once to avoid saturating MegaBasterd", "Hay muchos archivos en esta carpeta.\nNo se aprovisionarán todos los enlaces de una vez para evitar saturar MegaBasterd"); _addTranslation("There are a lot of files in this folder.\nNot all links will be provisioned at once to avoid saturating MegaBasterd", "Hay muchos archivos en esta carpeta.\nNo se aprovisionarán todos los enlaces de una vez para evitar saturar MegaBasterd");
_addTranslation("You've tried to login too many times. Wait an hour.", "Has intentado hacer login demasiadas veces. Prueba dentro de una hora."); _addTranslation("You've tried to login too many times. Wait an hour.", "Has intentado hacer login demasiadas veces. Prueba dentro de una hora.");
_addTranslation("MEGA LINK ERROR!", "¡ENLACE DE MEGA ERRÓNEO!"); _addTranslation("MEGA LINK ERROR!", "¡ENLACE DE MEGA ERRÓNEO!");
@ -52,7 +56,7 @@ public final class LabelTranslatorSingleton {
_addTranslation("ERROR: FILE NOT FOUND", "ERROR: ARCHIVO NO ENCONTRADO"); _addTranslation("ERROR: FILE NOT FOUND", "ERROR: ARCHIVO NO ENCONTRADO");
_addTranslation("Mega link is not valid! ", "Enlace de MEGA incorrecto! "); _addTranslation("Mega link is not valid! ", "Enlace de MEGA incorrecto! ");
_addTranslation("Checking your MEGA accounts, please wait...", "Comprobando tus cuentas de MEGA, por favor espera..."); _addTranslation("Checking your MEGA accounts, please wait...", "Comprobando tus cuentas de MEGA, por favor espera...");
_addTranslation("Check version", "Comprobar versión"); _addTranslation("Check for updates", "Comprobar actualización");
_addTranslation("Checking, please wait...", "Comprobando, por favor espera..."); _addTranslation("Checking, please wait...", "Comprobando, por favor espera...");
_addTranslation("You have the latest version ;)", "Tienes la versión más reciente ;)"); _addTranslation("You have the latest version ;)", "Tienes la versión más reciente ;)");
_addTranslation("Copy MegaBasterd download URL", "Copiar la URL de descarga de MegaBasterd"); _addTranslation("Copy MegaBasterd download URL", "Copiar la URL de descarga de MegaBasterd");
@ -131,7 +135,7 @@ public final class LabelTranslatorSingleton {
_addTranslation("Restoring data, please wait...", "Restaurando datos, por favor espera..."); _addTranslation("Restoring data, please wait...", "Restaurando datos, por favor espera...");
_addTranslation("File", "Archivo"); _addTranslation("File", "Archivo");
_addTranslation("Hide to tray", "Ocultar en la bandeja"); _addTranslation("Hide to tray", "Ocultar en la bandeja");
_addTranslation("Close all OK finished", "Cerrar las que finalizaron OK"); _addTranslation("Clear finished", "Cerrar las que finalizaron");
_addTranslation("Exit", "Salir"); _addTranslation("Exit", "Salir");
_addTranslation("Default slots per file:", "Slots por archivo por defecto:"); _addTranslation("Default slots per file:", "Slots por archivo por defecto:");
_addTranslation("Note: if you want to download without using a MEGA PREMIUM account you SHOULD enable it. (Slots consume RAM, so use them moderately).", "Nota: si quieres descargar sin utilizar una cuenta de MEGA PREMIUM es recomendable activarlo. (Los slots consumen RAM, así que úsalos con moderación)."); _addTranslation("Note: if you want to download without using a MEGA PREMIUM account you SHOULD enable it. (Slots consume RAM, so use them moderately).", "Nota: si quieres descargar sin utilizar una cuenta de MEGA PREMIUM es recomendable activarlo. (Los slots consumen RAM, así que úsalos con moderación).");

4
src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.form
View File

@ -28,13 +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">
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="622" max="32767" attributes="0"/> <EmptySpace min="0" pref="746" max="32767" attributes="0"/>
<Component id="dance_button" max="-2" attributes="0"/> <Component id="dance_button" max="-2" attributes="0"/>
</Group> </Group>
<Component id="links_scrollpane" max="32767" attributes="0"/> <Component id="links_scrollpane" max="32767" attributes="0"/>
<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 pref="57" max="32767" attributes="0"/> <EmptySpace pref="181" 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">

10
src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.java
View File

@ -61,7 +61,7 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, _main_panel.getZoom_factor()); updateFonts(this, GUI_FONT, _main_panel.getZoom_factor());
translateLabels(this); translateLabels(this);
@ -204,12 +204,12 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
.addContainerGap() .addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGap(0, 622, Short.MAX_VALUE) .addGap(0, 746, Short.MAX_VALUE)
.addComponent(dance_button)) .addComponent(dance_button))
.addComponent(links_scrollpane) .addComponent(links_scrollpane)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(links_label) .addComponent(links_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 57, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 181, 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)
@ -263,7 +263,7 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
javax.swing.JFileChooser filechooser = new javax.swing.JFileChooser(); javax.swing.JFileChooser filechooser = new javax.swing.JFileChooser();
updateFonts(filechooser, DEFAULT_FONT, (float) (_main_panel.getZoom_factor() * 1.25)); updateFonts(filechooser, GUI_FONT, (float) (_main_panel.getZoom_factor() * 1.25));
filechooser.setCurrentDirectory(new java.io.File(_download_path)); filechooser.setCurrentDirectory(new java.io.File(_download_path));
filechooser.setDialogTitle("Download folder"); filechooser.setDialogTitle("Download folder");
@ -300,7 +300,7 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
javax.swing.JFileChooser filechooser = new javax.swing.JFileChooser(); javax.swing.JFileChooser filechooser = new javax.swing.JFileChooser();
updateFonts(filechooser, DEFAULT_FONT, (float) (_main_panel.getZoom_factor() * 1.25)); updateFonts(filechooser, GUI_FONT, (float) (_main_panel.getZoom_factor() * 1.25));
filechooser.setDialogTitle("Select DLC container"); filechooser.setDialogTitle("Select DLC container");

37
src/main/java/com/tonikelope/megabasterd/MainPanel.java
View File

@ -50,7 +50,7 @@ import javax.swing.UIManager;
*/ */
public final class MainPanel { public final class MainPanel {
public static final String VERSION = "6.24"; public static final String VERSION = "6.25";
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;
@ -58,7 +58,7 @@ public final class MainPanel {
public static final int DEFAULT_MEGA_PROXY_PORT = 9999; public static final int DEFAULT_MEGA_PROXY_PORT = 9999;
public static final String DEFAULT_LANGUAGE = "EN"; public static final String DEFAULT_LANGUAGE = "EN";
public static final boolean DEFAULT_SMART_PROXY = true; public static final boolean DEFAULT_SMART_PROXY = true;
public static Font DEFAULT_FONT = createAndRegisterFont("/fonts/Kalam-Light.ttf"); public static Font GUI_FONT = createAndRegisterFont("/fonts/Kalam-Light.ttf");
public static final float ZOOM_FACTOR = 1.0f; public static final float ZOOM_FACTOR = 1.0f;
public static final String DEFAULT_USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0"; public static final String DEFAULT_USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:61.0) Gecko/20100101 Firefox/61.0";
public static final String ICON_FILE = "/images/pica_roja_big.png"; public static final String ICON_FILE = "/images/pica_roja_big.png";
@ -163,7 +163,7 @@ public final class MainPanel {
private final UploadManager _upload_manager; private final UploadManager _upload_manager;
private final StreamThrottlerSupervisor _stream_supervisor; private final StreamThrottlerSupervisor _stream_supervisor;
private int _max_dl, _max_ul, _default_slots_down, _default_slots_up, _max_dl_speed, _max_up_speed; private int _max_dl, _max_ul, _default_slots_down, _default_slots_up, _max_dl_speed, _max_up_speed;
private boolean _use_slots_down, _limit_download_speed, _limit_upload_speed, _use_mega_account_down; private boolean _use_slots_down, _limit_download_speed, _limit_upload_speed, _use_mega_account_down, _init_paused;
private String _mega_account_down; private String _mega_account_down;
private String _default_download_path; private String _default_download_path;
private boolean _use_custom_chunks_dir; private boolean _use_custom_chunks_dir;
@ -222,9 +222,9 @@ public final class MainPanel {
loadUserSettings(); loadUserSettings();
UIManager.put("OptionPane.messageFont", DEFAULT_FONT.deriveFont(15f * getZoom_factor())); UIManager.put("OptionPane.messageFont", GUI_FONT.deriveFont(15f * getZoom_factor()));
UIManager.put("OptionPane.buttonFont", DEFAULT_FONT.deriveFont(15f * getZoom_factor())); UIManager.put("OptionPane.buttonFont", GUI_FONT.deriveFont(15f * getZoom_factor()));
UIManager.put("OptionPane.cancelButtonText", LabelTranslatorSingleton.getInstance().translate("Cancel")); UIManager.put("OptionPane.cancelButtonText", LabelTranslatorSingleton.getInstance().translate("Cancel"));
@ -562,6 +562,10 @@ public final class MainPanel {
return _limit_upload_speed; return _limit_upload_speed;
} }
public boolean isInit_paused() {
return _init_paused;
}
public void loadUserSettings() { public void loadUserSettings() {
String use_custom_chunks_dir = DBTools.selectSettingValue("use_custom_chunks_dir"); String use_custom_chunks_dir = DBTools.selectSettingValue("use_custom_chunks_dir");
@ -599,16 +603,16 @@ public final class MainPanel {
if (_font != null) { if (_font != null) {
if (_font.equals("DEFAULT")) { if (_font.equals("DEFAULT")) {
DEFAULT_FONT = createAndRegisterFont("/fonts/Kalam-Light.ttf"); GUI_FONT = createAndRegisterFont("/fonts/Kalam-Light.ttf");
} else { } else {
DEFAULT_FONT = createAndRegisterFont("/fonts/NotoSansCJK-Regular.ttc"); GUI_FONT = createAndRegisterFont("/fonts/NotoSansCJK-Regular.ttc");
} }
} else { } else {
DEFAULT_FONT = createAndRegisterFont("/fonts/Kalam-Light.ttf"); GUI_FONT = createAndRegisterFont("/fonts/Kalam-Light.ttf");
} }
String def_slots = selectSettingValue("default_slots_down"); String def_slots = selectSettingValue("default_slots_down");
@ -695,6 +699,15 @@ public final class MainPanel {
_max_up_speed = MAX_TRANSFERENCE_SPEED_DEFAULT; _max_up_speed = MAX_TRANSFERENCE_SPEED_DEFAULT;
} }
String init_paused_string = DBTools.selectSettingValue("start_frozen");
if (init_paused_string != null) {
_init_paused = init_paused_string.equals("yes");
} else {
_init_paused = false;
}
try { try {
_mega_accounts = selectMegaAccounts(); _mega_accounts = selectMegaAccounts();
_elc_accounts = selectELCAccounts(); _elc_accounts = selectELCAccounts();
@ -846,7 +859,6 @@ public final class MainPanel {
} }
if (restart) { if (restart) {
JOptionPane.showMessageDialog(getView(), LabelTranslatorSingleton.getInstance().translate("MegaBasterd will restart"), LabelTranslatorSingleton.getInstance().translate("Restart required"), JOptionPane.WARNING_MESSAGE);
restartApplication(); restartApplication();
} else { } else {
exit(0); exit(0);
@ -874,7 +886,6 @@ public final class MainPanel {
} }
if (restart) { if (restart) {
JOptionPane.showMessageDialog(getView(), LabelTranslatorSingleton.getInstance().translate("MegaBasterd will restart"), LabelTranslatorSingleton.getInstance().translate("Restart required"), JOptionPane.WARNING_MESSAGE);
restartApplication(); restartApplication();
} else { } else {
exit(0); exit(0);
@ -887,6 +898,10 @@ public final class MainPanel {
if (!_exit && checkByeBye()) { if (!_exit && checkByeBye()) {
if (restart) {
JOptionPane.showMessageDialog(getView(), LabelTranslatorSingleton.getInstance().translate("MegaBasterd will restart"), LabelTranslatorSingleton.getInstance().translate("Restart required"), JOptionPane.WARNING_MESSAGE);
}
_exit = true; _exit = true;
getView().getPause_all_down_button().setEnabled(false); getView().getPause_all_down_button().setEnabled(false);
@ -1155,7 +1170,7 @@ public final class MainPanel {
PopupMenu menu = new PopupMenu(); PopupMenu menu = new PopupMenu();
Font new_font = DEFAULT_FONT; Font new_font = GUI_FONT;
menu.setFont(new_font.deriveFont(Font.BOLD, Math.round(14 * ZOOM_FACTOR))); menu.setFont(new_font.deriveFont(Font.BOLD, Math.round(14 * ZOOM_FACTOR)));

35
src/main/java/com/tonikelope/megabasterd/MainPanelView.form
View File

@ -242,17 +242,22 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="jTabbedPane1" alignment="1" max="32767" attributes="0"/> <Component id="jTabbedPane1" alignment="1" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
<Component id="kiss_server_status" pref="210" max="32767" attributes="0"/> <Component id="kiss_server_status" pref="202" max="32767" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="mc_reverse_status" pref="210" max="32767" attributes="0"/> <Component id="mc_reverse_status" pref="204" max="32767" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="smart_proxy_status" pref="210" max="32767" attributes="0"/> <Component id="smart_proxy_status" pref="203" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="271" max="-2" attributes="0"/> <EmptySpace min="-2" pref="271" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/> <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<Component id="logo_label" max="-2" attributes="0"/> <Component id="logo_label" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<Component id="unfreeze_transferences_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>
@ -262,6 +267,8 @@
<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="unfreeze_transferences_button" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jTabbedPane1" max="32767" attributes="0"/> <Component id="jTabbedPane1" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0"> <Group type="103" groupAlignment="1" attributes="0">
@ -367,7 +374,7 @@
<Component id="status_down_label" max="32767" attributes="0"/> <Component id="status_down_label" max="32767" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jScrollPane_down" pref="290" max="32767" attributes="0"/> <Component id="jScrollPane_down" pref="288" max="32767" attributes="0"/>
<EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/> <EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
<Component id="down_remtime_label" min="-2" max="-2" attributes="0"/> <Component id="down_remtime_label" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/>
@ -502,7 +509,7 @@
<Component id="status_up_label" alignment="0" max="32767" attributes="0"/> <Component id="status_up_label" alignment="0" max="32767" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jScrollPane_up" pref="290" max="32767" attributes="0"/> <Component id="jScrollPane_up" pref="288" max="32767" attributes="0"/>
<EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/> <EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
<Component id="up_remtime_label" min="-2" max="-2" attributes="0"/> <Component id="up_remtime_label" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/>
@ -599,5 +606,23 @@
</Container> </Container>
</SubComponents> </SubComponents>
</Container> </Container>
<Component class="javax.swing.JButton" name="unfreeze_transferences_button">
<Properties>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="ff" green="ff" red="ff" type="rgb"/>
</Property>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="18" style="1"/>
</Property>
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="ff" green="99" red="0" type="rgb"/>
</Property>
<Property name="text" type="java.lang.String" value="UNFREEZE WAITING TRANSFERENCES"/>
<Property name="doubleBuffered" type="boolean" value="true"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="unfreeze_transferences_buttonActionPerformed"/>
</Events>
</Component>
</SubComponents> </SubComponents>
</Form> </Form>

196
src/main/java/com/tonikelope/megabasterd/MainPanelView.java
View File

@ -112,6 +112,10 @@ public final class MainPanelView extends javax.swing.JFrame {
return status_up_label; return status_up_label;
} }
public JButton getUnfreeze_transferences_button() {
return unfreeze_transferences_button;
}
public MainPanel getMain_panel() { public MainPanel getMain_panel() {
return _main_panel; return _main_panel;
} }
@ -204,11 +208,11 @@ public final class MainPanelView extends javax.swing.JFrame {
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, _main_panel.getZoom_factor()); updateFonts(this, GUI_FONT, _main_panel.getZoom_factor());
translateLabels(this); translateLabels(this);
for (JComponent c : new JComponent[]{global_speed_down_label, global_speed_up_label, down_remtime_label, up_remtime_label, close_all_finished_down_button, close_all_finished_up_button, pause_all_down_button, pause_all_up_button}) { for (JComponent c : new JComponent[]{unfreeze_transferences_button, global_speed_down_label, global_speed_up_label, down_remtime_label, up_remtime_label, close_all_finished_down_button, close_all_finished_up_button, pause_all_down_button, pause_all_up_button}) {
c.setVisible(false); c.setVisible(false);
} }
@ -263,6 +267,7 @@ public final class MainPanelView extends javax.swing.JFrame {
jPanel_scroll_up = new javax.swing.JPanel(); jPanel_scroll_up = new javax.swing.JPanel();
pause_all_up_button = new javax.swing.JButton(); pause_all_up_button = new javax.swing.JButton();
up_remtime_label = new javax.swing.JLabel(); up_remtime_label = new javax.swing.JLabel();
unfreeze_transferences_button = new javax.swing.JButton();
main_menubar = new javax.swing.JMenuBar(); main_menubar = new javax.swing.JMenuBar();
file_menu = new javax.swing.JMenu(); file_menu = new javax.swing.JMenu();
new_download_menu = new javax.swing.JMenuItem(); new_download_menu = new javax.swing.JMenuItem();
@ -313,7 +318,7 @@ public final class MainPanelView extends javax.swing.JFrame {
close_all_finished_down_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N close_all_finished_down_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
close_all_finished_down_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-ok-30.png"))); // NOI18N close_all_finished_down_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-ok-30.png"))); // NOI18N
close_all_finished_down_button.setText("Close all OK finished"); close_all_finished_down_button.setText("Clear finished");
close_all_finished_down_button.setDoubleBuffered(true); close_all_finished_down_button.setDoubleBuffered(true);
close_all_finished_down_button.addActionListener(new java.awt.event.ActionListener() { close_all_finished_down_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
@ -363,7 +368,7 @@ public final class MainPanelView extends javax.swing.JFrame {
.addComponent(close_all_finished_down_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(close_all_finished_down_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(status_down_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addComponent(status_down_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jScrollPane_down, javax.swing.GroupLayout.DEFAULT_SIZE, 290, Short.MAX_VALUE) .addComponent(jScrollPane_down, javax.swing.GroupLayout.DEFAULT_SIZE, 288, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(down_remtime_label) .addComponent(down_remtime_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@ -383,7 +388,7 @@ public final class MainPanelView extends javax.swing.JFrame {
close_all_finished_up_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N close_all_finished_up_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
close_all_finished_up_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-ok-30.png"))); // NOI18N close_all_finished_up_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-ok-30.png"))); // NOI18N
close_all_finished_up_button.setText("Close all OK finished"); close_all_finished_up_button.setText("Clear finished");
close_all_finished_up_button.setDoubleBuffered(true); close_all_finished_up_button.setDoubleBuffered(true);
close_all_finished_up_button.addActionListener(new java.awt.event.ActionListener() { close_all_finished_up_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
@ -433,7 +438,7 @@ public final class MainPanelView extends javax.swing.JFrame {
.addComponent(close_all_finished_up_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(close_all_finished_up_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(status_up_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addComponent(status_up_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jScrollPane_up, javax.swing.GroupLayout.DEFAULT_SIZE, 290, Short.MAX_VALUE) .addComponent(jScrollPane_up, javax.swing.GroupLayout.DEFAULT_SIZE, 288, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(up_remtime_label) .addComponent(up_remtime_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@ -444,6 +449,17 @@ public final class MainPanelView extends javax.swing.JFrame {
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
unfreeze_transferences_button.setBackground(new java.awt.Color(255, 255, 255));
unfreeze_transferences_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
unfreeze_transferences_button.setForeground(new java.awt.Color(0, 153, 255));
unfreeze_transferences_button.setText("UNFREEZE WAITING TRANSFERENCES");
unfreeze_transferences_button.setDoubleBuffered(true);
unfreeze_transferences_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
unfreeze_transferences_buttonActionPerformed(evt);
}
});
file_menu.setText("File"); file_menu.setText("File");
file_menu.setDoubleBuffered(true); file_menu.setDoubleBuffered(true);
file_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N file_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
@ -595,21 +611,27 @@ public final class MainPanelView extends javax.swing.JFrame {
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jTabbedPane1, javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(jTabbedPane1, javax.swing.GroupLayout.Alignment.TRAILING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addComponent(kiss_server_status, javax.swing.GroupLayout.DEFAULT_SIZE, 210, Short.MAX_VALUE) .addComponent(kiss_server_status, javax.swing.GroupLayout.DEFAULT_SIZE, 202, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(mc_reverse_status, javax.swing.GroupLayout.DEFAULT_SIZE, 210, Short.MAX_VALUE) .addComponent(mc_reverse_status, javax.swing.GroupLayout.DEFAULT_SIZE, 204, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(smart_proxy_status, javax.swing.GroupLayout.DEFAULT_SIZE, 210, Short.MAX_VALUE) .addComponent(smart_proxy_status, javax.swing.GroupLayout.DEFAULT_SIZE, 203, Short.MAX_VALUE)
.addGap(271, 271, 271)) .addGap(271, 271, 271))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGap(0, 0, Short.MAX_VALUE) .addGap(0, 0, Short.MAX_VALUE)
.addComponent(logo_label))) .addComponent(logo_label))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGap(0, 0, Short.MAX_VALUE)
.addComponent(unfreeze_transferences_button)
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap()) .addContainerGap())
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addComponent(unfreeze_transferences_button)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jTabbedPane1) .addComponent(jTabbedPane1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
@ -863,106 +885,107 @@ public final class MainPanelView extends javax.swing.JFrame {
_main_panel.getElc_accounts().remove(host); _main_panel.getElc_accounts().remove(host);
} }
_main_panel.loadUserSettings(); if (_main_panel.isRestart()) {
if (_main_panel.isLimit_download_speed()) {
_main_panel.getStream_supervisor().setMaxBytesPerSecInput(_main_panel.getMax_dl_speed() * 1024);
global_speed_down_label.setForeground(new Color(255, 0, 0));
_main_panel.byebye(true);
} else { } else {
_main_panel.loadUserSettings();
_main_panel.getStream_supervisor().setMaxBytesPerSecInput(0); if (_main_panel.isLimit_download_speed()) {
global_speed_down_label.setForeground(new Color(0, 128, 255)); _main_panel.getStream_supervisor().setMaxBytesPerSecInput(_main_panel.getMax_dl_speed() * 1024);
} global_speed_down_label.setForeground(new Color(255, 0, 0));
if (_main_panel.isLimit_upload_speed()) { } else {
_main_panel.getStream_supervisor().setMaxBytesPerSecOutput(_main_panel.getMax_up_speed() * 1024); _main_panel.getStream_supervisor().setMaxBytesPerSecInput(0);
global_speed_up_label.setForeground(new Color(255, 0, 0)); global_speed_down_label.setForeground(new Color(0, 128, 255));
} else { }
_main_panel.getStream_supervisor().setMaxBytesPerSecOutput(0); if (_main_panel.isLimit_upload_speed()) {
global_speed_up_label.setForeground(new Color(0, 128, 255)); _main_panel.getStream_supervisor().setMaxBytesPerSecOutput(_main_panel.getMax_up_speed() * 1024);
} global_speed_up_label.setForeground(new Color(255, 0, 0));
_main_panel.getDownload_manager().setMax_running_trans(_main_panel.getMax_dl()); } else {
_main_panel.getUpload_manager().setMax_running_trans(_main_panel.getMax_ul()); _main_panel.getStream_supervisor().setMaxBytesPerSecOutput(0);
_main_panel.getDownload_manager().secureNotify(); global_speed_up_label.setForeground(new Color(0, 128, 255));
_main_panel.getUpload_manager().secureNotify(); }
if (_main_panel.isMegacrypter_reverse()) { _main_panel.getDownload_manager().setMax_running_trans(_main_panel.getMax_dl());
if (_main_panel.getMega_proxy_server() == null) { _main_panel.getUpload_manager().setMax_running_trans(_main_panel.getMax_ul());
_main_panel.setMega_proxy_server(new MegaProxyServer(_main_panel, UUID.randomUUID().toString(), _main_panel.getMegacrypter_reverse_port())); _main_panel.getDownload_manager().secureNotify();
THREAD_POOL.execute(_main_panel.getMega_proxy_server()); _main_panel.getUpload_manager().secureNotify();
} else if (_main_panel.getMega_proxy_server().getPort() != _main_panel.getMegacrypter_reverse_port()) { if (_main_panel.isMegacrypter_reverse()) {
try { if (_main_panel.getMega_proxy_server() == null) {
_main_panel.getMega_proxy_server().stopServer();
_main_panel.setMega_proxy_server(new MegaProxyServer(_main_panel, UUID.randomUUID().toString(), _main_panel.getMegacrypter_reverse_port())); _main_panel.setMega_proxy_server(new MegaProxyServer(_main_panel, UUID.randomUUID().toString(), _main_panel.getMegacrypter_reverse_port()));
THREAD_POOL.execute(_main_panel.getMega_proxy_server()); THREAD_POOL.execute(_main_panel.getMega_proxy_server());
} catch (IOException ex) { } else if (_main_panel.getMega_proxy_server().getPort() != _main_panel.getMegacrypter_reverse_port()) {
Logger.getLogger(getClass().getName()).log(Level.SEVERE, null, ex);
try {
_main_panel.getMega_proxy_server().stopServer();
_main_panel.setMega_proxy_server(new MegaProxyServer(_main_panel, UUID.randomUUID().toString(), _main_panel.getMegacrypter_reverse_port()));
THREAD_POOL.execute(_main_panel.getMega_proxy_server());
} catch (IOException ex) {
Logger.getLogger(getClass().getName()).log(Level.SEVERE, null, ex);
}
} }
} else {
if (_main_panel.getMega_proxy_server() != null) {
try {
_main_panel.getMega_proxy_server().stopServer();
} catch (IOException ex) {
Logger.getLogger(getClass().getName()).log(Level.SEVERE, null, ex);
}
}
_main_panel.setMega_proxy_server(null);
} }
} else { if (MainPanel.isUse_smart_proxy()) {
if (_main_panel.getMega_proxy_server() != null) { if (MainPanel.getProxy_manager() == null) {
MainPanel.setProxy_manager(new SmartMegaProxyManager(null, _main_panel));
try {
_main_panel.getMega_proxy_server().stopServer();
} catch (IOException ex) {
Logger.getLogger(getClass().getName()).log(Level.SEVERE, null, ex);
} }
}
_main_panel.setMega_proxy_server(null); MainPanel.getProxy_manager().refreshProxyList();
updateSmartProxyStatus("SmartProxy: ON (" + String.valueOf(MainPanel.getProxy_manager().getProxyCount()) + ")");
} else {
updateSmartProxyStatus("SmartProxy: OFF");
}
} }
if (MainPanel.isUse_smart_proxy()) { if (!dialog.isRemember_master_pass()) {
if (MainPanel.getProxy_manager() == null) { _main_panel.setMaster_pass(null);
MainPanel.setProxy_manager(new SmartMegaProxyManager(null, _main_panel));
}
MainPanel.getProxy_manager().refreshProxyList();
updateSmartProxyStatus("SmartProxy: ON (" + String.valueOf(MainPanel.getProxy_manager().getProxyCount()) + ")");
} else {
updateSmartProxyStatus("SmartProxy: OFF");
} }
dialog.dispose();
} }
if (_main_panel.isRestart()) {
_main_panel.byebye(true);
}
if (!dialog.isRemember_master_pass()) {
_main_panel.setMaster_pass(null);
}
dialog.dispose();
}//GEN-LAST:event_settings_menuActionPerformed }//GEN-LAST:event_settings_menuActionPerformed
private void hide_tray_menuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_hide_tray_menuActionPerformed private void hide_tray_menuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_hide_tray_menuActionPerformed
@ -1230,6 +1253,32 @@ public final class MainPanelView extends javax.swing.JFrame {
} }
}//GEN-LAST:event_auto_close_menuActionPerformed }//GEN-LAST:event_auto_close_menuActionPerformed
private void unfreeze_transferences_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_unfreeze_transferences_buttonActionPerformed
// TODO add your handling code here:
unfreeze_transferences_button.setVisible(false);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
_main_panel.getDownload_manager().unfreezeTransferenceWaitStartQueue();
}
});
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
_main_panel.getUpload_manager().unfreezeTransferenceWaitStartQueue();
}
});
}//GEN-LAST:event_unfreeze_transferences_buttonActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JMenuItem about_menu; private javax.swing.JMenuItem about_menu;
private javax.swing.JCheckBoxMenuItem auto_close_menu; private javax.swing.JCheckBoxMenuItem auto_close_menu;
@ -1269,6 +1318,7 @@ public final class MainPanelView extends javax.swing.JFrame {
private javax.swing.JMenuItem split_file_menu; private javax.swing.JMenuItem split_file_menu;
private javax.swing.JLabel status_down_label; private javax.swing.JLabel status_down_label;
private javax.swing.JLabel status_up_label; private javax.swing.JLabel status_up_label;
private javax.swing.JButton unfreeze_transferences_button;
private javax.swing.JLabel up_remtime_label; private javax.swing.JLabel up_remtime_label;
private javax.swing.JPanel uploads_panel; private javax.swing.JPanel uploads_panel;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables

2
src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java
View File

@ -54,7 +54,7 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog {
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, main_panel.getZoom_factor()); updateFonts(this, GUI_FONT, main_panel.getZoom_factor());
translateLabels(this); translateLabels(this);

222
src/main/java/com/tonikelope/megabasterd/SettingsDialog.form
View File

@ -48,7 +48,7 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jTabbedPane1" pref="468" max="32767" attributes="0"/> <Component id="jTabbedPane1" pref="595" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="18" max="-2" attributes="0"/> <EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0"> <Group type="103" groupAlignment="0" max="-2" attributes="0">
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
@ -131,7 +131,7 @@
<Layout> <Layout>
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" 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">
<Group type="102" attributes="0"> <Group type="102" attributes="0">
@ -150,11 +150,10 @@
</Group> </Group>
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
<Group type="103" groupAlignment="1" attributes="0"> <Group type="103" groupAlignment="1" attributes="0">
<Component id="jSeparator10" alignment="0" max="32767" attributes="0"/> <Component id="jSeparator10" alignment="0" pref="1023" max="32767" attributes="0"/>
<Component id="use_mega_account_down_combobox" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="1" attributes="0">
<Component id="smart_proxy_checkbox" min="-2" max="-2" attributes="0"/> <Component id="smart_proxy_checkbox" alignment="0" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="max_downloads_label" min="-2" max="-2" attributes="0"/> <Component id="max_downloads_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
@ -163,7 +162,7 @@
<Component id="multi_slot_down_checkbox" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="multi_slot_down_checkbox" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="limit_download_speed_checkbox" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="limit_download_speed_checkbox" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="rec_smart_proxy_label" alignment="0" max="-2" attributes="0"/> <Component id="rec_smart_proxy_label" alignment="0" max="-2" attributes="0"/>
<Group type="102" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace min="21" pref="21" max="-2" attributes="0"/> <EmptySpace min="21" pref="21" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="use_mega_label" min="-2" max="-2" attributes="0"/> <Component id="use_mega_label" min="-2" max="-2" attributes="0"/>
@ -181,8 +180,9 @@
</Group> </Group>
</Group> </Group>
</Group> </Group>
<EmptySpace min="0" pref="21" max="32767" attributes="0"/> <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group> </Group>
<Component id="use_mega_account_down_combobox" alignment="0" max="32767" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" pref="12" max="-2" attributes="0"/> <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
</Group> </Group>
@ -282,7 +282,7 @@
<Component id="smart_proxy_checkbox" min="-2" max="-2" attributes="0"/> <Component id="smart_proxy_checkbox" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="rec_smart_proxy_label" min="-2" max="-2" attributes="0"/> <Component id="rec_smart_proxy_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -548,36 +548,31 @@
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<EmptySpace min="-2" 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="jSeparator3" alignment="1" max="32767" attributes="0"/> <Component id="jSeparator3" alignment="1" max="32767" attributes="0"/>
<Component id="rec_upload_slots_label" alignment="0" pref="1040" max="32767" attributes="0"/> <Component id="rec_upload_slots_label" alignment="0" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
<Component id="max_up_speed_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="max_up_speed_spinner" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="limit_upload_speed_checkbox" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="default_slots_up_label" max="32767" attributes="0"/>
<Component id="max_uploads_label" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="default_slots_up_spinner" min="-2" max="-2" attributes="0"/>
<Component id="max_uploads_spinner" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Component id="jSeparator4" alignment="0" max="32767" attributes="0"/> <Component id="jSeparator4" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
<Component id="max_up_speed_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="max_up_speed_spinner" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="limit_upload_speed_checkbox" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="default_slots_up_label" max="32767" attributes="0"/>
<Component id="max_uploads_label" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="default_slots_up_spinner" min="-2" max="-2" attributes="0"/>
<Component id="max_uploads_spinner" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group> </Group>
<EmptySpace min="-2" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -607,7 +602,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="204" max="32767" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -765,7 +760,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="86" max="32767" attributes="0"/> <Component id="mega_accounts_scrollpane" pref="149" 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"/>
@ -774,7 +769,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="86" max="32767" attributes="0"/> <Component id="elc_accounts_scrollpane" pref="150" 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"/>
@ -1013,61 +1008,58 @@
<Layout> <Layout>
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" alignment="0" 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="jSeparator1" max="32767" attributes="0"/> <Group type="102" alignment="0" attributes="0">
<Component id="proxy_panel" max="32767" attributes="0"/> <Component id="rec_zoom_label" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="1" attributes="0"> <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="language_combo" max="32767" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="rec_zoom_label" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="zoom_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="zoom_spinner" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace min="0" pref="272" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="font_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="font_combo" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jSeparator2" min="-2" pref="2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Group type="102" attributes="0">
<Component id="import_settings_button" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="export_settings_button" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="jButton1" max="32767" attributes="0"/>
</Group>
</Group> </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="jSeparator1" max="32767" attributes="0"/>
<Component id="proxy_panel" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="font_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="font_combo" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="language_combo" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Group type="102" attributes="0">
<Component id="import_settings_button" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="export_settings_button" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="jButton1" max="32767" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="zoom_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="zoom_spinner" min="-2" pref="100" max="-2" attributes="0"/>
</Group>
<Component id="start_frozen_checkbox" min="-2" max="-2" attributes="0"/>
<Component id="custom_chunks_dir_checkbox" min="-2" max="-2" attributes="0"/> <Component id="custom_chunks_dir_checkbox" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="custom_chunks_dir_button" min="-2" max="-2" attributes="0"/> <Component id="custom_chunks_dir_button" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="custom_chunks_dir_current_label" min="-2" max="-2" attributes="0"/> <Component id="custom_chunks_dir_current_label" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Component id="jSeparator15" alignment="0" max="32767" attributes="0"/>
<Component id="jSeparator12" alignment="0" max="32767" attributes="0"/>
</Group> </Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
<Component id="jSeparator12" alignment="0" max="32767" attributes="0"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -1075,36 +1067,26 @@
<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"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Group type="102" attributes="0"> <Component id="font_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Component id="font_combo" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="export_settings_button" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="import_settings_button" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="import_settings_button" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="export_settings_button" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/> <Group type="103" groupAlignment="3" attributes="0">
</Group> <Component id="zoom_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="102" attributes="0"> <Component id="zoom_spinner" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> </Group>
<Component id="font_label" alignment="3" min="-2" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="font_combo" alignment="3" min="-2" max="-2" attributes="0"/> <Group type="103" groupAlignment="3" attributes="0">
</Group> <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <Component id="language_combo" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="zoom_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="zoom_spinner" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="language_combo" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Component id="jSeparator2" min="-2" pref="112" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jSeparator1" min="-2" max="-2" attributes="0"/> <Component id="jSeparator1" min="-2" pref="8" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="custom_chunks_dir_checkbox" min="-2" max="-2" attributes="0"/> <Component id="custom_chunks_dir_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">
@ -1112,12 +1094,16 @@
<Component id="custom_chunks_dir_current_label" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="custom_chunks_dir_current_label" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace type="separate" max="-2" attributes="0"/> <EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="jSeparator12" min="-2" max="-2" attributes="0"/> <Component id="jSeparator12" min="-2" pref="2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="start_frozen_checkbox" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jSeparator15" min="-2" pref="8" 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 max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="rec_zoom_label" min="-2" max="-2" attributes="0"/> <Component id="rec_zoom_label" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="47" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@ -1409,11 +1395,6 @@
</Component> </Component>
<Component class="javax.swing.JSeparator" name="jSeparator1"> <Component class="javax.swing.JSeparator" name="jSeparator1">
</Component> </Component>
<Component class="javax.swing.JSeparator" name="jSeparator2">
<Properties>
<Property name="orientation" type="int" value="1"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel2"> <Component class="javax.swing.JLabel" name="jLabel2">
<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">
@ -1490,6 +1471,19 @@
</Component> </Component>
<Component class="javax.swing.JSeparator" name="jSeparator12"> <Component class="javax.swing.JSeparator" name="jSeparator12">
</Component> </Component>
<Component class="javax.swing.JCheckBox" name="start_frozen_checkbox">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="18" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="Freeze transferences before start"/>
</Properties>
<Events>
<EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="start_frozen_checkboxStateChanged"/>
</Events>
</Component>
<Component class="javax.swing.JSeparator" name="jSeparator15">
</Component>
</SubComponents> </SubComponents>
</Container> </Container>
</SubComponents> </SubComponents>

217
src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
View File

@ -79,11 +79,11 @@ public final class SettingsDialog extends javax.swing.JDialog {
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, _main_panel.getZoom_factor()); updateFonts(this, GUI_FONT, _main_panel.getZoom_factor());
updateTitledBorderFont(((javax.swing.border.TitledBorder) proxy_panel.getBorder()), DEFAULT_FONT, _main_panel.getZoom_factor()); updateTitledBorderFont(((javax.swing.border.TitledBorder) proxy_panel.getBorder()), GUI_FONT, _main_panel.getZoom_factor());
updateTitledBorderFont(((javax.swing.border.TitledBorder) proxy_auth_panel.getBorder()), DEFAULT_FONT, _main_panel.getZoom_factor()); updateTitledBorderFont(((javax.swing.border.TitledBorder) proxy_auth_panel.getBorder()), GUI_FONT, _main_panel.getZoom_factor());
translateLabels(this); translateLabels(this);
@ -518,6 +518,17 @@ public final class SettingsDialog extends javax.swing.JDialog {
rec_smart_proxy_label.setEnabled(false); rec_smart_proxy_label.setEnabled(false);
} }
boolean init_paused = false;
String init_paused_string = DBTools.selectSettingValue("start_frozen");
if (init_paused_string != null) {
init_paused = init_paused_string.equals("yes");
}
start_frozen_checkbox.setSelected(init_paused);
boolean use_proxy = false; boolean use_proxy = false;
String use_proxy_val = DBTools.selectSettingValue("use_proxy"); String use_proxy_val = DBTools.selectSettingValue("use_proxy");
@ -668,7 +679,6 @@ public final class SettingsDialog extends javax.swing.JDialog {
rec_zoom_label = new javax.swing.JLabel(); rec_zoom_label = new javax.swing.JLabel();
jButton1 = new javax.swing.JButton(); jButton1 = new javax.swing.JButton();
jSeparator1 = new javax.swing.JSeparator(); jSeparator1 = new javax.swing.JSeparator();
jSeparator2 = new javax.swing.JSeparator();
jLabel2 = new javax.swing.JLabel(); jLabel2 = new javax.swing.JLabel();
language_combo = new javax.swing.JComboBox<>(); language_combo = new javax.swing.JComboBox<>();
font_label = new javax.swing.JLabel(); font_label = new javax.swing.JLabel();
@ -677,6 +687,8 @@ public final class SettingsDialog extends javax.swing.JDialog {
custom_chunks_dir_current_label = new javax.swing.JLabel(); custom_chunks_dir_current_label = new javax.swing.JLabel();
custom_chunks_dir_checkbox = new javax.swing.JCheckBox(); custom_chunks_dir_checkbox = new javax.swing.JCheckBox();
jSeparator12 = new javax.swing.JSeparator(); jSeparator12 = new javax.swing.JSeparator();
start_frozen_checkbox = new javax.swing.JCheckBox();
jSeparator15 = new javax.swing.JSeparator();
status = new javax.swing.JLabel(); status = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@ -830,19 +842,18 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addContainerGap()) .addContainerGap())
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, downloads_panelLayout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, downloads_panelLayout.createSequentialGroup()
.addGroup(downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jSeparator10, javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jSeparator10, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 1023, Short.MAX_VALUE)
.addComponent(use_mega_account_down_combobox, javax.swing.GroupLayout.Alignment.LEADING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, downloads_panelLayout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.LEADING, downloads_panelLayout.createSequentialGroup()
.addGroup(downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(smart_proxy_checkbox) .addComponent(smart_proxy_checkbox, javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(downloads_panelLayout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.LEADING, downloads_panelLayout.createSequentialGroup()
.addComponent(max_downloads_label) .addComponent(max_downloads_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(max_downloads_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(max_downloads_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(multi_slot_down_checkbox) .addComponent(multi_slot_down_checkbox, javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(limit_download_speed_checkbox) .addComponent(limit_download_speed_checkbox, javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(rec_smart_proxy_label) .addComponent(rec_smart_proxy_label, javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(downloads_panelLayout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.LEADING, downloads_panelLayout.createSequentialGroup()
.addGap(21, 21, 21) .addGap(21, 21, 21)
.addGroup(downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(use_mega_label) .addComponent(use_mega_label)
@ -855,7 +866,8 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addComponent(max_down_speed_label) .addComponent(max_down_speed_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.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)))))
.addGap(0, 21, Short.MAX_VALUE))) .addGap(0, 0, Short.MAX_VALUE))
.addComponent(use_mega_account_down_combobox, javax.swing.GroupLayout.Alignment.LEADING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGap(12, 12, 12)) .addGap(12, 12, 12))
.addGroup(downloads_panelLayout.createSequentialGroup() .addGroup(downloads_panelLayout.createSequentialGroup()
.addGroup(downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@ -938,7 +950,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addComponent(smart_proxy_checkbox) .addComponent(smart_proxy_checkbox)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(rec_smart_proxy_label) .addComponent(rec_smart_proxy_label)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap())
); );
downloads_scrollpane.setViewportView(downloads_panel); downloads_scrollpane.setViewportView(downloads_panel);
@ -986,25 +998,22 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addContainerGap() .addContainerGap()
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jSeparator3, javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(jSeparator3, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(rec_upload_slots_label, javax.swing.GroupLayout.DEFAULT_SIZE, 1040, Short.MAX_VALUE) .addComponent(rec_upload_slots_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jSeparator4)
.addGroup(uploads_panelLayout.createSequentialGroup() .addGroup(uploads_panelLayout.createSequentialGroup()
.addGap(20, 20, 20)
.addComponent(max_up_speed_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(limit_upload_speed_checkbox)
.addGroup(uploads_panelLayout.createSequentialGroup()
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(default_slots_up_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(max_uploads_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(uploads_panelLayout.createSequentialGroup() .addComponent(default_slots_up_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(20, 20, 20) .addComponent(max_uploads_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
.addComponent(max_up_speed_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(limit_upload_speed_checkbox)
.addGroup(uploads_panelLayout.createSequentialGroup()
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(default_slots_up_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(max_uploads_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(default_slots_up_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(max_uploads_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
.addGap(0, 0, Short.MAX_VALUE))
.addComponent(jSeparator4))
.addContainerGap()) .addContainerGap())
); );
uploads_panelLayout.setVerticalGroup( uploads_panelLayout.setVerticalGroup(
@ -1030,7 +1039,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(204, Short.MAX_VALUE)) .addContainerGap())
); );
uploads_scrollpane.setViewportView(uploads_panel); uploads_scrollpane.setViewportView(uploads_panel);
@ -1213,7 +1222,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, 86, Short.MAX_VALUE) .addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 149, 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)
@ -1221,7 +1230,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, 86, Short.MAX_VALUE) .addComponent(elc_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 150, 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)
@ -1398,8 +1407,6 @@ public final class SettingsDialog extends javax.swing.JDialog {
} }
}); });
jSeparator2.setOrientation(javax.swing.SwingConstants.VERTICAL);
jLabel2.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N jLabel2.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
jLabel2.setText("Language:"); jLabel2.setText("Language:");
@ -1429,6 +1436,14 @@ public final class SettingsDialog extends javax.swing.JDialog {
} }
}); });
start_frozen_checkbox.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
start_frozen_checkbox.setText("Freeze transferences before start");
start_frozen_checkbox.addChangeListener(new javax.swing.event.ChangeListener() {
public void stateChanged(javax.swing.event.ChangeEvent evt) {
start_frozen_checkboxStateChanged(evt);
}
});
javax.swing.GroupLayout advanced_panelLayout = new javax.swing.GroupLayout(advanced_panel); javax.swing.GroupLayout advanced_panelLayout = new javax.swing.GroupLayout(advanced_panel);
advanced_panel.setLayout(advanced_panelLayout); advanced_panel.setLayout(advanced_panelLayout);
advanced_panelLayout.setHorizontalGroup( advanced_panelLayout.setHorizontalGroup(
@ -1436,85 +1451,81 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addGroup(advanced_panelLayout.createSequentialGroup() .addGroup(advanced_panelLayout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jSeparator1) .addGroup(advanced_panelLayout.createSequentialGroup()
.addComponent(proxy_panel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(rec_zoom_label)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, advanced_panelLayout.createSequentialGroup() .addGap(0, 0, Short.MAX_VALUE))
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(advanced_panelLayout.createSequentialGroup()
.addComponent(jLabel2)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(language_combo, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGroup(advanced_panelLayout.createSequentialGroup()
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(rec_zoom_label)
.addGroup(advanced_panelLayout.createSequentialGroup()
.addComponent(zoom_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(zoom_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addGap(0, 272, Short.MAX_VALUE))
.addGroup(advanced_panelLayout.createSequentialGroup()
.addComponent(font_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(font_combo, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 2, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addGroup(advanced_panelLayout.createSequentialGroup()
.addComponent(import_settings_button)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(export_settings_button))
.addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addGroup(advanced_panelLayout.createSequentialGroup() .addGroup(advanced_panelLayout.createSequentialGroup()
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jSeparator1)
.addComponent(proxy_panel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(advanced_panelLayout.createSequentialGroup()
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, advanced_panelLayout.createSequentialGroup()
.addComponent(font_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(font_combo, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, advanced_panelLayout.createSequentialGroup()
.addComponent(jLabel2)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(language_combo, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addGap(18, 18, 18)
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addGroup(advanced_panelLayout.createSequentialGroup()
.addComponent(import_settings_button)
.addGap(18, 18, 18)
.addComponent(export_settings_button))
.addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addGroup(advanced_panelLayout.createSequentialGroup()
.addComponent(zoom_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(zoom_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(start_frozen_checkbox)
.addComponent(custom_chunks_dir_checkbox) .addComponent(custom_chunks_dir_checkbox)
.addGroup(advanced_panelLayout.createSequentialGroup() .addGroup(advanced_panelLayout.createSequentialGroup()
.addComponent(custom_chunks_dir_button) .addComponent(custom_chunks_dir_button)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(custom_chunks_dir_current_label))) .addComponent(custom_chunks_dir_current_label))
.addGap(0, 0, Short.MAX_VALUE)) .addComponent(jSeparator15)
.addComponent(jSeparator12)) .addComponent(jSeparator12))
.addContainerGap()) .addContainerGap())))
); );
advanced_panelLayout.setVerticalGroup( advanced_panelLayout.setVerticalGroup(
advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(advanced_panelLayout.createSequentialGroup() .addGroup(advanced_panelLayout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addGroup(advanced_panelLayout.createSequentialGroup() .addComponent(font_label)
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(font_combo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(export_settings_button) .addComponent(import_settings_button)
.addComponent(import_settings_button)) .addComponent(export_settings_button))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jButton1)) .addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addGroup(advanced_panelLayout.createSequentialGroup() .addComponent(zoom_label)
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(zoom_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(font_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(font_combo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jLabel2)
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(language_combo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(zoom_label) .addComponent(jButton1))
.addComponent(zoom_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel2)
.addComponent(language_combo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 112, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jSeparator1, 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)
.addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 8, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(custom_chunks_dir_checkbox) .addComponent(custom_chunks_dir_checkbox)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(custom_chunks_dir_button) .addComponent(custom_chunks_dir_button)
.addComponent(custom_chunks_dir_current_label)) .addComponent(custom_chunks_dir_current_label))
.addGap(18, 18, 18) .addGap(18, 18, 18)
.addComponent(jSeparator12, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jSeparator12, javax.swing.GroupLayout.PREFERRED_SIZE, 2, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(start_frozen_checkbox)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jSeparator15, javax.swing.GroupLayout.PREFERRED_SIZE, 8, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.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)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(rec_zoom_label) .addComponent(rec_zoom_label)
.addGap(47, 47, 47)) .addContainerGap())
); );
advanced_scrollpane.setViewportView(advanced_panel); advanced_scrollpane.setViewportView(advanced_panel);
@ -1544,7 +1555,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 468, Short.MAX_VALUE) .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 595, Short.MAX_VALUE)
.addGap(18, 18, 18) .addGap(18, 18, 18)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
@ -1591,6 +1602,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
settings.put("megacrypter_reverse", megacrypter_reverse_checkbox.isSelected() ? "yes" : "no"); settings.put("megacrypter_reverse", megacrypter_reverse_checkbox.isSelected() ? "yes" : "no");
settings.put("megacrypter_reverse_port", String.valueOf(megacrypter_reverse_port_spinner.getValue())); settings.put("megacrypter_reverse_port", String.valueOf(megacrypter_reverse_port_spinner.getValue()));
settings.put("smart_proxy", smart_proxy_checkbox.isSelected() ? "yes" : "no"); settings.put("smart_proxy", smart_proxy_checkbox.isSelected() ? "yes" : "no");
settings.put("start_frozen", start_frozen_checkbox.isSelected() ? "yes" : "no");
settings.put("use_custom_chunks_dir", custom_chunks_dir_checkbox.isSelected() ? "yes" : "no"); settings.put("use_custom_chunks_dir", custom_chunks_dir_checkbox.isSelected() ? "yes" : "no");
settings.put("custom_chunks_dir", _custom_chunks_dir); settings.put("custom_chunks_dir", _custom_chunks_dir);
@ -2100,7 +2112,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
if (n == 1) { if (n == 1) {
JFileChooser filechooser = new JFileChooser(); JFileChooser filechooser = new JFileChooser();
updateFonts(filechooser, DEFAULT_FONT, (float) (_main_panel.getZoom_factor() * 1.25)); updateFonts(filechooser, GUI_FONT, (float) (_main_panel.getZoom_factor() * 1.25));
filechooser.setCurrentDirectory(new File(_download_path)); filechooser.setCurrentDirectory(new File(_download_path));
filechooser.setDialogTitle("Select settings file"); filechooser.setDialogTitle("Select settings file");
@ -2154,7 +2166,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
if (n == 1) { if (n == 1) {
JFileChooser filechooser = new JFileChooser(); JFileChooser filechooser = new JFileChooser();
updateFonts(filechooser, DEFAULT_FONT, (float) (_main_panel.getZoom_factor() * 1.25)); updateFonts(filechooser, GUI_FONT, (float) (_main_panel.getZoom_factor() * 1.25));
filechooser.setCurrentDirectory(new File(_download_path)); filechooser.setCurrentDirectory(new File(_download_path));
filechooser.setDialogTitle("Save as"); filechooser.setDialogTitle("Save as");
@ -2609,7 +2621,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
private void change_download_dir_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_change_download_dir_buttonActionPerformed private void change_download_dir_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_change_download_dir_buttonActionPerformed
javax.swing.JFileChooser filechooser = new javax.swing.JFileChooser(); javax.swing.JFileChooser filechooser = new javax.swing.JFileChooser();
updateFonts(filechooser, DEFAULT_FONT, (float) (_main_panel.getZoom_factor() * 1.25)); updateFonts(filechooser, GUI_FONT, (float) (_main_panel.getZoom_factor() * 1.25));
filechooser.setCurrentDirectory(new java.io.File(_download_path)); filechooser.setCurrentDirectory(new java.io.File(_download_path));
filechooser.setDialogTitle("Default download directory"); filechooser.setDialogTitle("Default download directory");
@ -2744,7 +2756,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
private void custom_chunks_dir_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_custom_chunks_dir_buttonActionPerformed private void custom_chunks_dir_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_custom_chunks_dir_buttonActionPerformed
javax.swing.JFileChooser filechooser = new javax.swing.JFileChooser(); javax.swing.JFileChooser filechooser = new javax.swing.JFileChooser();
updateFonts(filechooser, DEFAULT_FONT, (float) (_main_panel.getZoom_factor() * 1.25)); updateFonts(filechooser, GUI_FONT, (float) (_main_panel.getZoom_factor() * 1.25));
filechooser.setCurrentDirectory(new java.io.File(_download_path)); filechooser.setCurrentDirectory(new java.io.File(_download_path));
filechooser.setDialogTitle("Temporary chunks directory"); filechooser.setDialogTitle("Temporary chunks directory");
@ -2761,6 +2773,10 @@ public final class SettingsDialog extends javax.swing.JDialog {
} }
}//GEN-LAST:event_custom_chunks_dir_buttonActionPerformed }//GEN-LAST:event_custom_chunks_dir_buttonActionPerformed
private void start_frozen_checkboxStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_start_frozen_checkboxStateChanged
// TODO add your handling code here:
}//GEN-LAST:event_start_frozen_checkboxStateChanged
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JPanel accounts_panel; private javax.swing.JPanel accounts_panel;
private javax.swing.JButton add_elc_account_button; private javax.swing.JButton add_elc_account_button;
@ -2797,7 +2813,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
private javax.swing.JSeparator jSeparator10; private javax.swing.JSeparator jSeparator10;
private javax.swing.JSeparator jSeparator11; private javax.swing.JSeparator jSeparator11;
private javax.swing.JSeparator jSeparator12; private javax.swing.JSeparator jSeparator12;
private javax.swing.JSeparator jSeparator2; private javax.swing.JSeparator jSeparator15;
private javax.swing.JSeparator jSeparator3; private javax.swing.JSeparator jSeparator3;
private javax.swing.JSeparator jSeparator4; private javax.swing.JSeparator jSeparator4;
private javax.swing.JSeparator jSeparator5; private javax.swing.JSeparator jSeparator5;
@ -2844,6 +2860,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
private javax.swing.JButton remove_mega_account_button; private javax.swing.JButton remove_mega_account_button;
private javax.swing.JButton save_button; private javax.swing.JButton save_button;
private javax.swing.JCheckBox smart_proxy_checkbox; private javax.swing.JCheckBox smart_proxy_checkbox;
private javax.swing.JCheckBox start_frozen_checkbox;
private javax.swing.JLabel status; private javax.swing.JLabel status;
private javax.swing.JButton unlock_accounts_button; private javax.swing.JButton unlock_accounts_button;
private javax.swing.JPanel uploads_panel; private javax.swing.JPanel uploads_panel;

2
src/main/java/com/tonikelope/megabasterd/StreamerDialog.java
View File

@ -50,7 +50,7 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, _main_panel.getZoom_factor()); updateFonts(this, GUI_FONT, _main_panel.getZoom_factor());
translateLabels(this); translateLabels(this);

8
src/main/java/com/tonikelope/megabasterd/Transference.java
View File

@ -33,6 +33,14 @@ public interface Transference {
boolean isStopped(); boolean isStopped();
boolean isFrozen();
void unfreeze();
void upWaitQueue();
void downWaitQueue();
void checkSlotsAndWorkers(); void checkSlotsAndWorkers();
ConcurrentLinkedQueue<Long> getPartialProgress(); ConcurrentLinkedQueue<Long> getPartialProgress();

161
src/main/java/com/tonikelope/megabasterd/TransferenceManager.java
View File

@ -5,6 +5,7 @@ import static com.tonikelope.megabasterd.MiscTools.*;
import java.awt.Component; import java.awt.Component;
import java.awt.TrayIcon; import java.awt.TrayIcon;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.logging.Level; import java.util.logging.Level;
@ -45,6 +46,7 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
private volatile boolean _preprocessing_transferences; private volatile boolean _preprocessing_transferences;
private volatile boolean _paused_all; private volatile boolean _paused_all;
private volatile boolean _pausing_all; private volatile boolean _pausing_all;
protected volatile boolean _frozen;
private boolean _tray_icon_finish; private boolean _tray_icon_finish;
protected volatile long _total_size; protected volatile long _total_size;
protected final Object _total_size_lock; protected final Object _total_size_lock;
@ -55,6 +57,7 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
_notified = false; _notified = false;
_paused_all = false; _paused_all = false;
_pausing_all = false; _pausing_all = false;
_frozen = false;
_removing_transferences = false; _removing_transferences = false;
_provisioning_transferences = false; _provisioning_transferences = false;
_starting_transferences = false; _starting_transferences = false;
@ -83,6 +86,10 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
_transference_preprocess_queue = new ConcurrentLinkedQueue<>(); _transference_preprocess_queue = new ConcurrentLinkedQueue<>();
} }
public boolean isFrozen() {
return _frozen;
}
public boolean no_transferences() { public boolean no_transferences() {
return getTransference_preprocess_queue().isEmpty() && getTransference_provision_queue().isEmpty() && getTransference_waitstart_queue().isEmpty() && getTransference_running_list().isEmpty(); return getTransference_preprocess_queue().isEmpty() && getTransference_provision_queue().isEmpty() && getTransference_waitstart_queue().isEmpty() && getTransference_running_list().isEmpty();
} }
@ -289,6 +296,109 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
return _pausing_all; return _pausing_all;
} }
public void upWaitQueue(Transference t) {
synchronized (getWait_queue_lock()) {
ArrayList<Transference> wait_array = new ArrayList(getTransference_waitstart_queue());
int pos = 0;
for (Transference t1 : wait_array) {
if (t1 == t) {
break;
}
pos++;
}
if (pos > 0) {
Collections.swap(wait_array, pos, pos - 1);
}
getTransference_waitstart_queue().clear();
getTransference_waitstart_queue().addAll(wait_array);
swingInvoke(
new Runnable() {
@Override
public void run() {
for (final Transference t : getTransference_waitstart_queue()) {
getScroll_panel().remove((Component) t.getView());
getScroll_panel().add((Component) t.getView());
}
for (final Transference t : getTransference_finished_queue()) {
getScroll_panel().remove((Component) t.getView());
getScroll_panel().add((Component) t.getView());
}
}
});
_frozen = false;
}
secureNotify();
}
public void downWaitQueue(Transference t) {
synchronized (getWait_queue_lock()) {
ArrayList<Transference> wait_array = new ArrayList(getTransference_waitstart_queue());
int pos = 0;
for (Transference t1 : wait_array) {
if (t1 == t) {
break;
}
pos++;
}
if (pos < wait_array.size() - 1) {
Collections.swap(wait_array, pos, pos + 1);
}
getTransference_waitstart_queue().clear();
getTransference_waitstart_queue().addAll(wait_array);
swingInvoke(
new Runnable() {
@Override
public void run() {
for (final Transference t : getTransference_waitstart_queue()) {
getScroll_panel().remove((Component) t.getView());
getScroll_panel().add((Component) t.getView());
}
for (final Transference t : getTransference_finished_queue()) {
getScroll_panel().remove((Component) t.getView());
getScroll_panel().add((Component) t.getView());
}
}
});
_frozen = false;
}
secureNotify();
}
public void start(final Transference transference) { public void start(final Transference transference) {
_transference_running_list.add(transference); _transference_running_list.add(transference);
@ -339,7 +449,7 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
secureNotify(); secureNotify();
} }
protected void sortTransferenceStartQueue() { protected void sortTransferenceWaitStartQueue() {
synchronized (_queue_sort_lock) { synchronized (_queue_sort_lock) {
@ -360,6 +470,26 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
} }
} }
protected void unfreezeTransferenceWaitStartQueue() {
synchronized (_queue_sort_lock) {
ArrayList<Transference> trans_list = new ArrayList(getTransference_waitstart_queue());
for (Transference t : trans_list) {
t.unfreeze();
}
getTransference_waitstart_queue().clear();
getTransference_waitstart_queue().addAll(trans_list);
_frozen = false;
}
secureNotify();
}
private void _updateView() { private void _updateView() {
swingInvoke( swingInvoke(
@ -391,7 +521,7 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
if (!_transference_finished_queue.isEmpty() && _isOKFinishedInQueue()) { if (!_transference_finished_queue.isEmpty() && _isOKFinishedInQueue()) {
_close_all_button.setText(LabelTranslatorSingleton.getInstance().translate("Close all OK finished")); _close_all_button.setText(LabelTranslatorSingleton.getInstance().translate("Clear finished"));
_close_all_button.setVisible(true); _close_all_button.setVisible(true);
@ -402,6 +532,8 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
_status.setText(_genStatus()); _status.setText(_genStatus());
_main_panel.getView().getUnfreeze_transferences_button().setVisible(_main_panel.getDownload_manager().isFrozen() || _main_panel.getUpload_manager().isFrozen());
_main_panel.getView().revalidate(); _main_panel.getView().revalidate();
_main_panel.getView().repaint(); _main_panel.getView().repaint();
@ -418,7 +550,7 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
int rem = _transference_remove_queue.size(); int rem = _transference_remove_queue.size();
int wait = getTransference_waitstart_queue().size(); int wait = _transference_waitstart_queue.size();
int run = _transference_running_list.size(); int run = _transference_running_list.size();
@ -532,6 +664,8 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
} }
} }
_frozen = false;
setProvisioning_transferences(false); setProvisioning_transferences(false);
secureNotify(); secureNotify();
@ -541,7 +675,7 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
} }
if (!_main_panel.isExit() && !isPausing_all() && !isRemoving_transferences() && !isStarting_transferences() && !getTransference_waitstart_queue().isEmpty() && getTransference_running_list().size() < _max_running_trans) { if (!_frozen && !_main_panel.isExit() && !isPausing_all() && !isRemoving_transferences() && !isStarting_transferences() && !getTransference_waitstart_queue().isEmpty() && getTransference_running_list().size() < _max_running_trans) {
setStarting_transferences(true); setStarting_transferences(true);
@ -549,20 +683,27 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
@Override @Override
public void run() { public void run() {
while (!getTransference_waitstart_queue().isEmpty() && getTransference_running_list().size() < _max_running_trans) { while (!_frozen && !getTransference_waitstart_queue().isEmpty() && getTransference_running_list().size() < _max_running_trans) {
Transference transference = getTransference_waitstart_queue().poll(); Transference transference = getTransference_waitstart_queue().peek();
if (transference != null) { if (transference != null && !transference.isFrozen()) {
getTransference_waitstart_queue().poll();
start(transference); start(transference);
}
synchronized (getWait_queue_lock()) { } else {
getWait_queue_lock().notifyAll();
_frozen = true;
} }
} }
synchronized (getWait_queue_lock()) {
getWait_queue_lock().notifyAll();
}
setStarting_transferences(false); setStarting_transferences(false);
secureNotify(); secureNotify();

35
src/main/java/com/tonikelope/megabasterd/Upload.java
View File

@ -34,6 +34,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
private final Object _progress_lock; private final Object _progress_lock;
private String _status_error_message; private String _status_error_message;
private volatile boolean _exit; private volatile boolean _exit;
private volatile boolean _frozen;
private int _slots; private int _slots;
private final Object _secure_notify_lock; private final Object _secure_notify_lock;
private final Object _workers_lock; private final Object _workers_lock;
@ -76,6 +77,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
public Upload(MainPanel main_panel, MegaAPI ma, String filename, String parent_node, int[] ul_key, String ul_url, String root_node, byte[] share_key, String folder_link) { public Upload(MainPanel main_panel, MegaAPI ma, String filename, String parent_node, int[] ul_key, String ul_url, String root_node, byte[] share_key, String folder_link) {
_notified = false; _notified = false;
_frozen = main_panel.isInit_paused();
_provision_ok = true; _provision_ok = true;
_status_error = false; _status_error = false;
_canceled = false; _canceled = false;
@ -443,7 +445,7 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
} else { } else {
getView().printStatusNormal(LabelTranslatorSingleton.getInstance().translate("Waiting to start (") + _ma.getFull_email() + ") ..."); getView().printStatusNormal(LabelTranslatorSingleton.getInstance().translate(_frozen ? "(FROZEN) Waiting to start (" : "Waiting to start (") + _ma.getFull_email() + ") ...");
swingInvoke( swingInvoke(
new Runnable() { new Runnable() {
@ -472,6 +474,8 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
public void run() { public void run() {
getView().getClose_button().setVisible(true); getView().getClose_button().setVisible(true);
getView().getQueue_down_button().setVisible(true);
getView().getQueue_up_button().setVisible(true);
} }
}); });
@ -677,6 +681,16 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Uploader hello! {1}", new Object[]{Thread.currentThread().getName(), this.getFile_name()}); Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} Uploader hello! {1}", new Object[]{Thread.currentThread().getName(), this.getFile_name()});
swingInvoke(
new Runnable() {
@Override
public void run() {
getView().getQueue_down_button().setVisible(false);
getView().getQueue_up_button().setVisible(false);
}
});
getView().printStatusNormal("Starting upload, please wait..."); getView().printStatusNormal("Starting upload, please wait...");
if (!_exit) { if (!_exit) {
@ -1260,4 +1274,23 @@ public final class Upload implements Transference, Runnable, SecureSingleThreadN
return getChunkworkers().size(); return getChunkworkers().size();
} }
@Override
public boolean isFrozen() {
return this._frozen;
}
@Override
public void unfreeze() {
this._frozen = false;
}
@Override
public void upWaitQueue() {
_main_panel.getUpload_manager().upWaitQueue(this);
}
@Override
public void downWaitQueue() {
_main_panel.getUpload_manager().downWaitQueue(this);
}
} }

6
src/main/java/com/tonikelope/megabasterd/UploadManager.java
View File

@ -56,7 +56,7 @@ public final class UploadManager extends TransferenceManager {
if (!isPreprocessing_transferences() && !isProvisioning_transferences()) { if (!isPreprocessing_transferences() && !isProvisioning_transferences()) {
sortTransferenceStartQueue(); sortTransferenceWaitStartQueue();
swingInvoke( swingInvoke(
new Runnable() { new Runnable() {
@ -106,6 +106,10 @@ public final class UploadManager extends TransferenceManager {
getTransference_waitstart_queue().remove(u); getTransference_waitstart_queue().remove(u);
if (getTransference_waitstart_queue().isEmpty()) {
_frozen = false;
}
getTransference_running_list().remove(u); getTransference_running_list().remove(u);
getTransference_finished_queue().remove(u); getTransference_finished_queue().remove(u);

41
src/main/java/com/tonikelope/megabasterd/UploadView.form
View File

@ -57,9 +57,15 @@
<Component id="close_button" min="-2" max="-2" attributes="0"/> <Component id="close_button" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="restart_button" min="-2" max="-2" attributes="0"/> <Component id="restart_button" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/> <EmptySpace pref="327" max="32767" attributes="0"/>
<Component id="stop_button" min="-2" max="-2" attributes="0"/> <Component id="stop_button" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0">
<Component id="queue_up_button" min="-2" pref="43" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="queue_down_button" min="-2" pref="42" 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>
@ -69,6 +75,11 @@
<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"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="queue_down_button" alignment="0" max="32767" attributes="0"/>
<Component id="queue_up_button" alignment="0" min="-2" pref="39" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="slots_spinner" alignment="3" min="-2" pref="32" max="-2" attributes="0"/> <Component id="slots_spinner" alignment="3" min="-2" pref="32" max="-2" attributes="0"/>
<Component id="slots_label" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="slots_label" alignment="3" min="-2" max="-2" attributes="0"/>
@ -87,7 +98,7 @@
</Group> </Group>
<EmptySpace min="-2" max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="progress_pbar" min="-2" max="-2" attributes="0"/> <Component id="progress_pbar" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="32767" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="speed_label" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="speed_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="pause_button" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="pause_button" alignment="3" min="-2" max="-2" attributes="0"/>
@ -285,5 +296,31 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="file_link_buttonActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="file_link_buttonActionPerformed"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JButton" name="queue_up_button">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="18" style="1"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/images/arriba_1.png"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="queue_up_buttonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="queue_down_button">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="18" style="1"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/images/abajo_1.png"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="queue_down_buttonActionPerformed"/>
</Events>
</Component>
</SubComponents> </SubComponents>
</Form> </Form>

88
src/main/java/com/tonikelope/megabasterd/UploadView.java
View File

@ -77,11 +77,19 @@ public final class UploadView extends javax.swing.JPanel implements Transference
return status_label; return status_label;
} }
public JButton getQueue_down_button() {
return queue_down_button;
}
public JButton getQueue_up_button() {
return queue_up_button;
}
public UploadView(Upload upload) { public UploadView(Upload upload) {
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, upload.getMain_panel().getZoom_factor()); updateFonts(this, GUI_FONT, upload.getMain_panel().getZoom_factor());
translateLabels(this); translateLabels(this);
@ -128,6 +136,8 @@ public final class UploadView extends javax.swing.JPanel implements Transference
slot_status_label = new javax.swing.JLabel(); slot_status_label = new javax.swing.JLabel();
folder_link_button = new javax.swing.JButton(); folder_link_button = new javax.swing.JButton();
file_link_button = new javax.swing.JButton(); file_link_button = new javax.swing.JButton();
queue_up_button = new javax.swing.JButton();
queue_down_button = new javax.swing.JButton();
setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 204, 255), 3, true)); setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 204, 255), 3, true));
@ -232,6 +242,22 @@ public final class UploadView extends javax.swing.JPanel implements Transference
} }
}); });
queue_up_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
queue_up_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/arriba_1.png"))); // NOI18N
queue_up_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
queue_up_buttonActionPerformed(evt);
}
});
queue_down_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
queue_down_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/abajo_1.png"))); // NOI18N
queue_down_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
queue_down_buttonActionPerformed(evt);
}
});
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout); this.setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(
@ -264,14 +290,23 @@ public final class UploadView extends javax.swing.JPanel implements Transference
.addComponent(close_button) .addComponent(close_button)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(restart_button) .addComponent(restart_button)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 327, Short.MAX_VALUE)
.addComponent(stop_button))) .addComponent(stop_button))
.addGroup(layout.createSequentialGroup()
.addComponent(queue_up_button, javax.swing.GroupLayout.PREFERRED_SIZE, 43, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(queue_down_button, javax.swing.GroupLayout.PREFERRED_SIZE, 42, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap()) .addContainerGap())
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(queue_down_button, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(queue_up_button, javax.swing.GroupLayout.PREFERRED_SIZE, 39, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(0, 0, 0)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(slots_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(slots_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(slots_label) .addComponent(slots_label)
@ -287,7 +322,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference
.addComponent(file_size_label)) .addComponent(file_size_label))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(progress_pbar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(progress_pbar, 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.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(speed_label) .addComponent(speed_label)
.addComponent(pause_button)) .addComponent(pause_button))
@ -385,6 +420,49 @@ public final class UploadView extends javax.swing.JPanel implements Transference
}//GEN-LAST:event_file_link_buttonActionPerformed }//GEN-LAST:event_file_link_buttonActionPerformed
private void queue_up_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_queue_up_buttonActionPerformed
// TODO add your handling code here:
queue_up_button.setEnabled(false);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
_upload.upWaitQueue();
swingInvoke(
new Runnable() {
@Override
public void run() {
queue_up_button.setEnabled(true);
}
});
}
});
}//GEN-LAST:event_queue_up_buttonActionPerformed
private void queue_down_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_queue_down_buttonActionPerformed
// TODO add your handling code here:
queue_down_button.setEnabled(false);
THREAD_POOL.execute(new Runnable() {
@Override
public void run() {
_upload.downWaitQueue();
queue_down_button.setEnabled(true);
}
});
}//GEN-LAST:event_queue_down_buttonActionPerformed
@Override @Override
public void pause() { public void pause() {
@ -595,6 +673,8 @@ public final class UploadView extends javax.swing.JPanel implements Transference
private javax.swing.JButton folder_link_button; private javax.swing.JButton folder_link_button;
private javax.swing.JButton pause_button; private javax.swing.JButton pause_button;
private javax.swing.JProgressBar progress_pbar; private javax.swing.JProgressBar progress_pbar;
private javax.swing.JButton queue_down_button;
private javax.swing.JButton queue_up_button;
private javax.swing.JButton restart_button; private javax.swing.JButton restart_button;
private javax.swing.JLabel slot_status_label; private javax.swing.JLabel slot_status_label;
private javax.swing.JLabel slots_label; private javax.swing.JLabel slots_label;

4
src/main/java/com/tonikelope/megabasterd/WarningExitMessage.java
View File

@ -16,9 +16,9 @@
*/ */
package com.tonikelope.megabasterd; package com.tonikelope.megabasterd;
import static com.tonikelope.megabasterd.MainPanel.DEFAULT_FONT;
import static com.tonikelope.megabasterd.MiscTools.translateLabels; import static com.tonikelope.megabasterd.MiscTools.translateLabels;
import static com.tonikelope.megabasterd.MiscTools.updateFonts; import static com.tonikelope.megabasterd.MiscTools.updateFonts;
import static com.tonikelope.megabasterd.MainPanel.GUI_FONT;
/** /**
* *
@ -36,7 +36,7 @@ public class WarningExitMessage extends javax.swing.JDialog {
super(parent, modal); super(parent, modal);
initComponents(); initComponents();
updateFonts(this, DEFAULT_FONT, main_panel.getZoom_factor()); updateFonts(this, GUI_FONT, main_panel.getZoom_factor());
translateLabels(this); translateLabels(this);

BIN
src/main/resources/images/abajo_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 932 B

BIN
src/main/resources/images/arriba_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 943 B

BIN
src/main/resources/images/mbasterd_screen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 213 KiB

After

Width:  |  Height:  |  Size: 214 KiB