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

5.0c

Browse Source
This commit is contained in:
tonikelope 2018-07-23 12:48:29 +02:00
parent 5254dbb21a
commit c0d5fb6402
3 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
private long _total_space; private long _total_space;
private final MainPanel _main_panel; private final MainPanel _main_panel;
private final boolean _remember_master_pass; private final boolean _remember_master_pass;
private boolean _inserting_mega_accounts;
public boolean isUpload() { public boolean isUpload() {
return _upload; return _upload;
@ -65,6 +66,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
_total_space = 0L; _total_space = 0L;
_base_path = null; _base_path = null;
_upload = false; _upload = false;
_inserting_mega_accounts = false;
_remember_master_pass = true; _remember_master_pass = true;
_files = new ArrayList<>(); _files = new ArrayList<>();
@ -80,16 +82,31 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
@Override @Override
public void run() { public void run() {
for (Object o : _main_panel.getMega_accounts().keySet()) { if (!_main_panel.getMega_active_accounts().isEmpty()) {
_inserting_mega_accounts = true;
account_combobox.addItem((String) o); for (Object o : _main_panel.getMega_accounts().keySet()) {
}
for (Object o : _main_panel.getMega_active_accounts().keySet()) { account_combobox.addItem((String) o);
}
account_combobox.setSelectedItem((String) o); _inserting_mega_accounts = false;
break; for (Object o : _main_panel.getMega_active_accounts().keySet()) {
account_combobox.setSelectedItem((String) o);
account_comboboxItemStateChanged(null);
break;
}
} else {
for (Object o : _main_panel.getMega_accounts().keySet()) {
account_combobox.addItem((String) o);
}
} }
} }
}); });
@ -521,7 +538,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
String selected_item = (String) account_combobox.getSelectedItem(); String selected_item = (String) account_combobox.getSelectedItem();
if (selected_item != null) { if (!_inserting_mega_accounts && selected_item != null) {
final String email = selected_item; final String email = selected_item;

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

@ -242,7 +242,7 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="jTabbedPane1" max="32767" attributes="0"/> <Component id="jTabbedPane1" pref="441" 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">
<Component id="logo_label" min="-2" max="-2" attributes="0"/> <Component id="logo_label" min="-2" max="-2" attributes="0"/>
@ -347,7 +347,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="321" max="32767" attributes="0"/> <Component id="jScrollPane_down" pref="260" 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"/>
@ -482,7 +482,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="321" max="32767" attributes="0"/> <Component id="jScrollPane_up" pref="260" 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"/>

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

@ -348,7 +348,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, 321, Short.MAX_VALUE) .addComponent(jScrollPane_down, javax.swing.GroupLayout.DEFAULT_SIZE, 260, 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)
@ -418,7 +418,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, 321, Short.MAX_VALUE) .addComponent(jScrollPane_up, javax.swing.GroupLayout.DEFAULT_SIZE, 260, 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)
@ -581,7 +581,7 @@ public final class MainPanelView extends javax.swing.JFrame {
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addComponent(jTabbedPane1) .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 441, Short.MAX_VALUE)
.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)
.addComponent(logo_label) .addComponent(logo_label)