This commit is contained in:
tonikelope 2016-10-29 22:16:03 +02:00
parent f823b51a6a
commit 93802a2bf3
9 changed files with 50 additions and 50 deletions

View File

@ -38,7 +38,7 @@
<Component id="skip_button" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace min="0" pref="91" max="32767" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
@ -91,7 +91,7 @@
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="file_tree_scrollpane" alignment="0" pref="275" max="32767" attributes="0"/>
<Component id="file_tree_scrollpane" alignment="0" pref="215" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>

View File

@ -172,7 +172,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 275, Short.MAX_VALUE)
.addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 215, Short.MAX_VALUE)
);
dir_name_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
@ -320,7 +320,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
.addComponent(skip_rest_button)
.addGap(18, 18, 18)
.addComponent(skip_button)))
.addGap(0, 91, Short.MAX_VALUE))
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGap(0, 0, Short.MAX_VALUE)
.addComponent(dance_button, javax.swing.GroupLayout.PREFERRED_SIZE, 300, javax.swing.GroupLayout.PREFERRED_SIZE))

View File

@ -64,7 +64,7 @@
<Component id="restore_button" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="file_tree_scrollpane" pref="482" max="32767" attributes="0"/>
<Component id="file_tree_scrollpane" pref="368" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="total_space_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>

View File

@ -223,7 +223,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog {
.addComponent(folder_link_label)
.addComponent(restore_button))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 482, Short.MAX_VALUE)
.addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 368, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(total_space_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)

View File

@ -59,7 +59,7 @@ import static megabasterd.Transference.MAX_TRANSFERENCE_SPEED_DEFAULT;
*/
public final class MainPanel {
public static final String VERSION = "1.47";
public static final String VERSION = "1.48";
public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
public static final int STREAMER_PORT = 1337;
public static final int WATCHDOG_PORT = 1338;

View File

@ -28,7 +28,7 @@
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jTabbedPane1" max="32767" attributes="0"/>
<Component id="jTabbedPane1" pref="0" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Component id="status" min="-2" pref="657" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
@ -46,7 +46,7 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jTabbedPane1" max="32767" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="ok_button" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="cancel_button" alignment="3" min="-2" max="-2" attributes="0"/>
@ -136,7 +136,7 @@
<Component id="down_dir_label" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="multi_slot_down_checkbox" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="317" max="32767" attributes="0"/>
<EmptySpace min="0" pref="237" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
@ -174,7 +174,7 @@
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="verify_file_down_checkbox" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="256" max="32767" attributes="0"/>
<EmptySpace pref="170" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@ -332,7 +332,7 @@
</Group>
</Group>
</Group>
<EmptySpace pref="393" max="32767" attributes="0"/>
<EmptySpace pref="313" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@ -358,7 +358,7 @@
<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"/>
</Group>
<EmptySpace pref="390" max="32767" attributes="0"/>
<EmptySpace pref="304" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@ -456,18 +456,20 @@
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="mega_accounts_scrollpane" alignment="0" pref="998" max="32767" attributes="0"/>
<Component id="mega_accounts_scrollpane" alignment="0" pref="918" max="32767" attributes="0"/>
<Component id="elc_accounts_scrollpane" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Component id="delete_all_accounts_button" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="unlock_accounts_button" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="encrypt_pass_checkbox" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="remove_mega_account_button" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="add_mega_account_button" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="remove_elc_account_button" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="add_elc_account_button" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="mega_accounts_label" min="-2" max="-2" attributes="0"/>
@ -475,12 +477,10 @@
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="delete_all_accounts_button" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="unlock_accounts_button" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="remove_elc_account_button" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="encrypt_pass_checkbox" min="-2" max="-2" attributes="0"/>
<Component id="add_elc_account_button" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
@ -496,19 +496,19 @@
<Component id="delete_all_accounts_button" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="encrypt_pass_checkbox" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="mega_accounts_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="mega_accounts_scrollpane" min="-2" pref="180" max="-2" attributes="0"/>
<Component id="mega_accounts_scrollpane" min="-2" pref="140" max="-2" attributes="0"/>
<EmptySpace max="-2" 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="add_mega_account_button" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="elc_accounts_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="elc_accounts_scrollpane" min="-2" pref="180" max="-2" attributes="0"/>
<Component id="elc_accounts_scrollpane" min="-2" pref="140" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="remove_elc_account_button" alignment="3" min="-2" max="-2" attributes="0"/>

View File

@ -582,7 +582,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addComponent(limit_download_speed_checkbox)
.addComponent(down_dir_label)
.addComponent(multi_slot_down_checkbox))
.addGap(0, 317, Short.MAX_VALUE)))
.addGap(0, 237, Short.MAX_VALUE)))
.addContainerGap())
);
downloads_panelLayout.setVerticalGroup(
@ -612,7 +612,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addComponent(max_down_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, 18)
.addComponent(verify_file_down_checkbox)
.addContainerGap(256, Short.MAX_VALUE))
.addContainerGap(170, Short.MAX_VALUE))
);
jTabbedPane1.addTab("Downloads", downloads_panel);
@ -677,7 +677,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.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))
.addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE))))
.addContainerGap(393, Short.MAX_VALUE))
.addContainerGap(313, Short.MAX_VALUE))
);
uploads_panelLayout.setVerticalGroup(
uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@ -698,7 +698,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.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))
.addContainerGap(390, Short.MAX_VALUE))
.addContainerGap(304, Short.MAX_VALUE))
);
jTabbedPane1.addTab("Uploads", uploads_panel);
@ -828,27 +828,27 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addGroup(accounts_panelLayout.createSequentialGroup()
.addContainerGap()
.addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 998, Short.MAX_VALUE)
.addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 918, Short.MAX_VALUE)
.addComponent(elc_accounts_scrollpane)
.addGroup(accounts_panelLayout.createSequentialGroup()
.addComponent(delete_all_accounts_button)
.addGap(18, 18, 18)
.addComponent(unlock_accounts_button)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(encrypt_pass_checkbox))
.addGroup(accounts_panelLayout.createSequentialGroup()
.addComponent(remove_mega_account_button)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(add_mega_account_button))
.addGroup(accounts_panelLayout.createSequentialGroup()
.addComponent(remove_elc_account_button)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(add_elc_account_button))
.addGroup(accounts_panelLayout.createSequentialGroup()
.addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(mega_accounts_label)
.addComponent(elc_accounts_label))
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(accounts_panelLayout.createSequentialGroup()
.addComponent(delete_all_accounts_button)
.addGap(18, 18, 18)
.addComponent(unlock_accounts_button)
.addComponent(remove_elc_account_button)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(encrypt_pass_checkbox)))
.addComponent(add_elc_account_button)))
.addContainerGap())
);
accounts_panelLayout.setVerticalGroup(
@ -859,18 +859,18 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addComponent(unlock_accounts_button)
.addComponent(delete_all_accounts_button)
.addComponent(encrypt_pass_checkbox))
.addGap(18, 18, 18)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(mega_accounts_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(remove_mega_account_button)
.addComponent(add_mega_account_button))
.addGap(18, 18, 18)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(elc_accounts_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(elc_accounts_scrollpane, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(elc_accounts_scrollpane, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(remove_elc_account_button)
@ -890,7 +890,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jTabbedPane1)
.addComponent(jTabbedPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup()
.addComponent(status, javax.swing.GroupLayout.PREFERRED_SIZE, 657, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@ -904,7 +904,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addComponent(jTabbedPane1)
.addGap(18, 18, 18)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(ok_button)
.addComponent(cancel_button)

View File

@ -62,7 +62,7 @@
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="20" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="Put your mega/megacrypter link here in order to get a streaming link:"/>
<Property name="text" type="java.lang.String" value="Put your MEGA/MegaCrypter/ELC link here in order to get a streaming link:"/>
<Property name="doubleBuffered" type="boolean" value="true"/>
</Properties>
</Component>

View File

@ -70,7 +70,7 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
setResizable(false);
put_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
put_label.setText("Put your mega/megacrypter link here in order to get a streaming link:");
put_label.setText("Put your MEGA/MegaCrypter/ELC link here in order to get a streaming link:");
put_label.setDoubleBuffered(true);
dance_button.setBackground(new java.awt.Color(102, 204, 255));
@ -188,7 +188,7 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
if (error) {
JOptionPane.showMessageDialog(tthis, "Please, paste a mega/megacrypter/elc link!", "Error", JOptionPane.ERROR_MESSAGE);
JOptionPane.showMessageDialog(tthis, "Please, paste a Mega/MegaCrypter/ELC link!", "Error", JOptionPane.ERROR_MESSAGE);
swingReflectionInvoke("setText", original_link_textfield, "");