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

2.93

Browse Source
This commit is contained in:
tonikelope 2018-02-04 23:47:30 +01:00
parent 41b86e5bdc
commit 7bcffdfae1
9 changed files with 113 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.tonikelope</groupId>
<artifactId>MegaBasterd</artifactId>
<version>2.92</version>
<version>2.93</version>
<packaging>jar</packaging>
<dependencies>
<dependency>

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

@ -46,7 +46,7 @@
<Component id="remember_checkbox" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Component id="please_label" alignment="0" pref="584" max="32767" attributes="0"/>
<Component id="please_label" alignment="0" pref="524" max="32767" attributes="0"/>
</Group>
</Group>
</Group>

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

@ -161,7 +161,7 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog {
.addGroup(layout.createSequentialGroup()
.addComponent(remember_checkbox)
.addGap(0, 0, Short.MAX_VALUE))
.addComponent(please_label, javax.swing.GroupLayout.DEFAULT_SIZE, 584, Short.MAX_VALUE))))
.addComponent(please_label, javax.swing.GroupLayout.DEFAULT_SIZE, 524, Short.MAX_VALUE))))
.addContainerGap())
);
layout.setVerticalGroup(

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

@ -24,7 +24,7 @@ import static com.tonikelope.megabasterd.MainPanel.*;
public final class LinkGrabberDialog extends javax.swing.JDialog implements ClipboardChangeObserver {
private boolean _download;
private String _download_path;
private String _download_path, _selected_item;
private final ClipboardSpy _clipboardspy;
private final MainPanel _main_panel;
@ -66,6 +66,8 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
_download_path = download_path;
_selected_item = null;
_clipboardspy = clipboardspy;
download_dir_label.setText(truncateText(download_path, 80));
@ -79,7 +81,19 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
swingInvoke(new Runnable() {
@Override
public void run() {
use_mega_account_down_combobox.addItem(_main_panel.getMega_account_down());
String mega_default_down = _main_panel.getMega_account_down();
use_mega_account_down_combobox.addItem(mega_default_down);
for (Object k : _main_panel.getMega_accounts().keySet()) {
if (!mega_default_down.equals(k)) {
use_mega_account_down_combobox.addItem((String) k);
}
}
use_mega_account_down_combobox.addItem("");
use_mega_account_down_combobox.setSelectedIndex(0);
}
@ -366,9 +380,10 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
private void use_mega_account_down_comboboxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_use_mega_account_down_comboboxItemStateChanged
String selected_item = (String) use_mega_account_down_combobox.getSelectedItem();
if (_selected_item == null || !((String) use_mega_account_down_combobox.getSelectedItem()).equals(_selected_item)) {
_selected_item = (String) use_mega_account_down_combobox.getSelectedItem();
if (_main_panel.isUse_mega_account_down() && !"".equals(selected_item)) {
if (_main_panel.isUse_mega_account_down() && !"".equals(_selected_item)) {
use_mega_account_down_combobox.setEnabled(false);
@ -378,8 +393,6 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
pack();
final String email = selected_item;
final LinkGrabberDialog tthis = this;
THREAD_POOL.execute(new Runnable() {
@ -387,13 +400,13 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
public void run() {
try {
checkMegaAccountLoginAndShowMasterPassDialog(_main_panel, tthis, email);
checkMegaAccountLoginAndShowMasterPassDialog(_main_panel, tthis, _selected_item);
} catch (Exception ex) {
swingInvoke(new Runnable() {
@Override
public void run() {
use_mega_account_down_combobox.setSelectedIndex(1);
use_mega_account_down_combobox.setSelectedIndex(_main_panel.getMega_accounts().size());
}
});
@ -417,6 +430,7 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
});
}
}
}//GEN-LAST:event_use_mega_account_down_comboboxItemStateChanged
// Variables declaration - do not modify//GEN-BEGIN:variables

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

@ -48,7 +48,7 @@ import org.apache.http.auth.UsernamePasswordCredentials;
*/
public final class MainPanel {
public static final String VERSION = "2.92";
public static final String VERSION = "2.93";
public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;
public static final int STREAMER_PORT = 1337;

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

@ -370,7 +370,11 @@
<Container class="javax.swing.JScrollPane" name="jScrollPane_down">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="null"/>
<Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
<LineBorder>
<Color PropertyName="color" blue="99" green="99" red="99" type="rgb"/>
</LineBorder>
</Border>
</Property>
</Properties>
@ -500,7 +504,11 @@
<Container class="javax.swing.JScrollPane" name="jScrollPane_up">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="null"/>
<Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
<LineBorder>
<Color PropertyName="color" blue="99" green="99" red="99" type="rgb"/>
</LineBorder>
</Border>
</Property>
</Properties>

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

@ -273,7 +273,7 @@ public final class MainPanelView extends javax.swing.JFrame {
}
});
jScrollPane_down.setBorder(null);
jScrollPane_down.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(153, 153, 153)));
jPanel_scroll_down.setLayout(new javax.swing.BoxLayout(jPanel_scroll_down, javax.swing.BoxLayout.Y_AXIS));
jScrollPane_down.setViewportView(jPanel_scroll_down);
@ -343,7 +343,7 @@ public final class MainPanelView extends javax.swing.JFrame {
}
});
jScrollPane_up.setBorder(null);
jScrollPane_up.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(153, 153, 153)));
jPanel_scroll_up.setLayout(new javax.swing.BoxLayout(jPanel_scroll_up, javax.swing.BoxLayout.Y_AXIS));
jScrollPane_up.setViewportView(jPanel_scroll_up);

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

@ -109,7 +109,7 @@
<Component class="javax.swing.JComboBox" name="use_mega_account_down_combobox">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="1"/>
<Font name="Dialog" size="16" style="0"/>
</Property>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="0"/>

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

@ -23,6 +23,7 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
private final ClipboardSpy _clipboardspy;
private final MainPanelView _mainPanelView;
private final MainPanel _main_panel;
private String _selected_item;
public JButton getDance_button() {
return dance_button;
@ -53,6 +54,8 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
_clipboardspy = clipboardspy;
_selected_item = null;
_mainPanelView = parent;
if (_main_panel.isUse_mega_account_down() && _main_panel.getMega_accounts().size() > 0) {
@ -64,7 +67,17 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
swingInvoke(new Runnable() {
@Override
public void run() {
use_mega_account_down_combobox.addItem(_main_panel.getMega_account_down());
String mega_default_down = _main_panel.getMega_account_down();
use_mega_account_down_combobox.addItem(mega_default_down);
for (Object k : _main_panel.getMega_accounts().keySet()) {
if (!mega_default_down.equals(k)) {
use_mega_account_down_combobox.addItem((String) k);
}
}
use_mega_account_down_combobox.addItem("");
use_mega_account_down_combobox.setSelectedIndex(0);
}
@ -123,7 +136,7 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
use_mega_account_down_label.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
use_mega_account_down_label.setText("Use this account for streaming:");
use_mega_account_down_combobox.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
use_mega_account_down_combobox.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N
use_mega_account_down_combobox.addItemListener(new java.awt.event.ItemListener() {
public void itemStateChanged(java.awt.event.ItemEvent evt) {
use_mega_account_down_comboboxItemStateChanged(evt);
@ -258,9 +271,11 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
}//GEN-LAST:event_dance_buttonActionPerformed
private void use_mega_account_down_comboboxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_use_mega_account_down_comboboxItemStateChanged
final String selected_item = (String) use_mega_account_down_combobox.getSelectedItem();
if (_main_panel.isUse_mega_account_down() && !"".equals(selected_item)) {
if (_selected_item == null || !((String) use_mega_account_down_combobox.getSelectedItem()).equals(_selected_item)) {
_selected_item = (String) use_mega_account_down_combobox.getSelectedItem();
if (_main_panel.isUse_mega_account_down() && !"".equals(_selected_item)) {
use_mega_account_down_combobox.setEnabled(false);
@ -270,8 +285,6 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
pack();
final String email = selected_item;
final StreamerDialog tthis = this;
THREAD_POOL.execute(new Runnable() {
@ -279,13 +292,13 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
public void run() {
try {
checkMegaAccountLoginAndShowMasterPassDialog(_main_panel, tthis, email);
checkMegaAccountLoginAndShowMasterPassDialog(_main_panel, tthis, _selected_item);
} catch (Exception ex) {
swingInvoke(new Runnable() {
@Override
public void run() {
use_mega_account_down_combobox.setSelectedIndex(1);
use_mega_account_down_combobox.setSelectedIndex(_main_panel.getMega_accounts().size());
}
});
@ -307,6 +320,8 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
}
});
}
}
}//GEN-LAST:event_use_mega_account_down_comboboxItemStateChanged