From b1083ffff0cedf965e3767fb90bf2d5b81696eda Mon Sep 17 00:00:00 2001 From: tonikelope Date: Sun, 24 Sep 2017 17:58:09 +0200 Subject: [PATCH] 2.13 --- src/megabasterd/AboutDialog.form | 12 +-- src/megabasterd/AboutDialog.java | 12 +-- src/megabasterd/DownloadView.form | 34 +++--- src/megabasterd/DownloadView.java | 34 +++--- src/megabasterd/FileGrabberDialog.form | 38 +++---- src/megabasterd/FileGrabberDialog.java | 34 +++--- src/megabasterd/FolderLinkDialog.form | 46 +++++---- src/megabasterd/FolderLinkDialog.java | 43 ++++---- src/megabasterd/GetMasterPasswordDialog.form | 10 +- src/megabasterd/GetMasterPasswordDialog.java | 10 +- src/megabasterd/LinkGrabberDialog.form | 24 ++--- src/megabasterd/LinkGrabberDialog.java | 24 ++--- src/megabasterd/MainPanel.java | 2 +- src/megabasterd/MainPanelView.form | 56 +++++----- src/megabasterd/MainPanelView.java | 56 +++++----- src/megabasterd/SetMasterPasswordDialog.form | 18 ++-- src/megabasterd/SetMasterPasswordDialog.java | 18 ++-- src/megabasterd/SettingsDialog.form | 103 ++++++++++--------- src/megabasterd/SettingsDialog.java | 101 +++++++++--------- src/megabasterd/StreamerDialog.form | 14 +-- src/megabasterd/StreamerDialog.java | 14 +-- src/megabasterd/UploadView.form | 28 ++--- src/megabasterd/UploadView.java | 28 ++--- 23 files changed, 383 insertions(+), 376 deletions(-) diff --git a/src/megabasterd/AboutDialog.form b/src/megabasterd/AboutDialog.form index cbe327466..1d0055ce6 100644 --- a/src/megabasterd/AboutDialog.form +++ b/src/megabasterd/AboutDialog.form @@ -92,7 +92,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -159,12 +159,12 @@ - + - + @@ -191,7 +191,7 @@ - + diff --git a/src/megabasterd/AboutDialog.java b/src/megabasterd/AboutDialog.java index d69d74079..828ca4977 100644 --- a/src/megabasterd/AboutDialog.java +++ b/src/megabasterd/AboutDialog.java @@ -51,7 +51,7 @@ public final class AboutDialog extends javax.swing.JDialog { setIconImage(null); setResizable(false); - title_label.setFont(new java.awt.Font("Dialog", 1, 48)); // NOI18N + title_label.setFont(new java.awt.Font("Ubuntu", 1, 48)); // NOI18N title_label.setText("MegaBasterd X.X"); title_label.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); title_label.setDoubleBuffered(true); @@ -70,7 +70,7 @@ public final class AboutDialog extends javax.swing.JDialog { } }); - subtitle_label.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + subtitle_label.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N subtitle_label.setForeground(new java.awt.Color(102, 102, 102)); subtitle_label.setText("(Made with love by tonikelope)"); subtitle_label.setDoubleBuffered(true); @@ -84,7 +84,7 @@ public final class AboutDialog extends javax.swing.JDialog { } }); - mcdown_url_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + mcdown_url_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N mcdown_url_button.setText("Copy MegaBasterd download URL"); mcdown_url_button.setDoubleBuffered(true); mcdown_url_button.addActionListener(new java.awt.event.ActionListener() { @@ -93,9 +93,9 @@ public final class AboutDialog extends javax.swing.JDialog { } }); - author_webpage_label.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + author_webpage_label.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N author_webpage_label.setForeground(new java.awt.Color(102, 102, 102)); - author_webpage_label.setText("http://t0ni.xyz"); + author_webpage_label.setText("http://t0ni.world"); author_webpage_label.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); author_webpage_label.setDoubleBuffered(true); author_webpage_label.addMouseListener(new java.awt.event.MouseAdapter() { @@ -113,7 +113,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("Ubuntu", 1, 14)); // NOI18N check_version_button.setText("Check version"); check_version_button.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { diff --git a/src/megabasterd/DownloadView.form b/src/megabasterd/DownloadView.form index d7678ae80..5a161c48e 100644 --- a/src/megabasterd/DownloadView.form +++ b/src/megabasterd/DownloadView.form @@ -35,12 +35,12 @@ - + - + @@ -57,7 +57,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -212,7 +212,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -266,7 +266,7 @@ - + @@ -286,7 +286,7 @@ - + diff --git a/src/megabasterd/DownloadView.java b/src/megabasterd/DownloadView.java index 24492b9b4..a3191bd00 100644 --- a/src/megabasterd/DownloadView.java +++ b/src/megabasterd/DownloadView.java @@ -126,15 +126,15 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 204, 255), 4, true)); - status_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + status_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N status_label.setText("status"); status_label.setDoubleBuffered(true); - slots_label.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + slots_label.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N slots_label.setText("Slots"); slots_label.setDoubleBuffered(true); - slots_spinner.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + slots_spinner.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N slots_spinner.setToolTipText("Slots"); slots_spinner.setDoubleBuffered(true); slots_spinner.addChangeListener(new javax.swing.event.ChangeListener() { @@ -143,16 +143,16 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen } }); - speed_label.setFont(new java.awt.Font("Verdana", 3, 26)); // NOI18N + speed_label.setFont(new java.awt.Font("Ubuntu", 3, 26)); // NOI18N speed_label.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); speed_label.setText("speed"); speed_label.setDoubleBuffered(true); - progress_pbar.setFont(new java.awt.Font("Verdana", 1, 18)); // NOI18N + progress_pbar.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N progress_pbar.setDoubleBuffered(true); pause_button.setBackground(new java.awt.Color(255, 153, 0)); - pause_button.setFont(new java.awt.Font("Verdana", 1, 16)); // NOI18N + pause_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N pause_button.setForeground(java.awt.Color.white); pause_button.setText("PAUSE DOWNLOAD"); pause_button.setDoubleBuffered(true); @@ -163,7 +163,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen }); stop_button.setBackground(new java.awt.Color(255, 0, 0)); - stop_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + stop_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N stop_button.setForeground(java.awt.Color.white); stop_button.setText("CANCEL DOWNLOAD"); stop_button.setDoubleBuffered(true); @@ -173,17 +173,17 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen } }); - keep_temp_checkbox.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + keep_temp_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N keep_temp_checkbox.setSelected(true); keep_temp_checkbox.setText("Keep temp file"); keep_temp_checkbox.setDoubleBuffered(true); - file_name_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + file_name_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N file_name_label.setForeground(new java.awt.Color(51, 51, 255)); file_name_label.setText("file_name"); file_name_label.setDoubleBuffered(true); - close_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + close_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N close_button.setText("Close"); close_button.setDoubleBuffered(true); close_button.addActionListener(new java.awt.event.ActionListener() { @@ -192,7 +192,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen } }); - copy_link_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + copy_link_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N copy_link_button.setText("Copy link"); copy_link_button.setDoubleBuffered(true); copy_link_button.addActionListener(new java.awt.event.ActionListener() { @@ -202,7 +202,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen }); restart_button.setBackground(new java.awt.Color(51, 51, 255)); - restart_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + restart_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N restart_button.setForeground(new java.awt.Color(255, 255, 255)); restart_button.setText("Restart"); restart_button.setDoubleBuffered(true); @@ -212,7 +212,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen } }); - file_size_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + file_size_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N file_size_label.setForeground(new java.awt.Color(51, 51, 255)); file_size_label.setText("file_size"); file_size_label.setDoubleBuffered(true); @@ -220,7 +220,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen slot_status_label.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N slot_status_label.setDoubleBuffered(true); - open_folder_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + open_folder_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N open_folder_button.setText("Open folder"); open_folder_button.setDoubleBuffered(true); open_folder_button.addActionListener(new java.awt.event.ActionListener() { @@ -243,11 +243,11 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(keep_temp_checkbox) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(stop_button)) + .addComponent(stop_button, javax.swing.GroupLayout.PREFERRED_SIZE, 199, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(progress_pbar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() .addComponent(speed_label, javax.swing.GroupLayout.PREFERRED_SIZE, 340, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 73, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 91, Short.MAX_VALUE) .addComponent(pause_button)) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addComponent(status_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) @@ -261,7 +261,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen .addComponent(slot_status_label)) .addGroup(layout.createSequentialGroup() .addComponent(file_size_label) - .addGap(0, 503, Short.MAX_VALUE)) + .addGap(0, 539, Short.MAX_VALUE)) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGap(0, 0, Short.MAX_VALUE) .addComponent(open_folder_button) diff --git a/src/megabasterd/FileGrabberDialog.form b/src/megabasterd/FileGrabberDialog.form index 164bbfae8..b43ab1005 100644 --- a/src/megabasterd/FileGrabberDialog.form +++ b/src/megabasterd/FileGrabberDialog.form @@ -38,13 +38,13 @@ - - - - - + + + + + @@ -91,7 +91,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -175,7 +175,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -288,7 +288,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -311,7 +311,7 @@ - + diff --git a/src/megabasterd/FileGrabberDialog.java b/src/megabasterd/FileGrabberDialog.java index d3f0fb40c..d035bda16 100644 --- a/src/megabasterd/FileGrabberDialog.java +++ b/src/megabasterd/FileGrabberDialog.java @@ -134,7 +134,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Files")); - file_tree.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N + file_tree.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N javax.swing.tree.DefaultMutableTreeNode treeNode1 = new javax.swing.tree.DefaultMutableTreeNode("root"); file_tree.setModel(new javax.swing.tree.DefaultTreeModel(treeNode1)); file_tree.setDoubleBuffered(true); @@ -150,24 +150,24 @@ 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, 215, Short.MAX_VALUE) + .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 216, Short.MAX_VALUE) ); - dir_name_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + dir_name_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N dir_name_label.setText("Upload name:"); dir_name_label.setDoubleBuffered(true); dir_name_label.setEnabled(false); - dir_name_textfield.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N + dir_name_textfield.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N dir_name_textfield.setDoubleBuffered(true); dir_name_textfield.setEnabled(false); - account_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + account_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N account_label.setText("Account:"); account_label.setDoubleBuffered(true); account_label.setEnabled(false); - account_combobox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + account_combobox.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N account_combobox.setDoubleBuffered(true); account_combobox.setEnabled(false); account_combobox.addItemListener(new java.awt.event.ItemListener() { @@ -176,11 +176,11 @@ public final class FileGrabberDialog extends javax.swing.JDialog { } }); - used_space_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + used_space_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N used_space_label.setText("Used space: 0.00GB"); used_space_label.setDoubleBuffered(true); - add_folder_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + add_folder_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N add_folder_button.setText("Add folder"); add_folder_button.setDoubleBuffered(true); add_folder_button.setEnabled(false); @@ -190,7 +190,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { } }); - add_files_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + add_files_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N add_files_button.setText("Add files"); add_files_button.setDoubleBuffered(true); add_files_button.setEnabled(false); @@ -241,7 +241,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { ); dance_button.setBackground(new java.awt.Color(102, 204, 255)); - dance_button.setFont(new java.awt.Font("Dialog", 1, 24)); // NOI18N + dance_button.setFont(new java.awt.Font("Ubuntu", 1, 24)); // NOI18N dance_button.setForeground(new java.awt.Color(255, 255, 255)); dance_button.setText("Let's dance, baby"); dance_button.setDoubleBuffered(true); @@ -252,17 +252,17 @@ public final class FileGrabberDialog extends javax.swing.JDialog { } }); - total_file_size_label.setFont(new java.awt.Font("Dialog", 1, 28)); // NOI18N + total_file_size_label.setFont(new java.awt.Font("Ubuntu", 1, 28)); // NOI18N total_file_size_label.setText("[0 B]"); total_file_size_label.setDoubleBuffered(true); total_file_size_label.setEnabled(false); - warning_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + warning_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N warning_label.setText("If you DO NOT want to upload some folder or file you can REMOVE it."); warning_label.setDoubleBuffered(true); warning_label.setEnabled(false); - skip_rest_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + skip_rest_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N skip_rest_button.setText("REMOVE ALL EXCEPT THIS"); skip_rest_button.setDoubleBuffered(true); skip_rest_button.setEnabled(false); @@ -272,7 +272,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog { } }); - skip_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + skip_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N skip_button.setText("REMOVE THIS"); skip_button.setDoubleBuffered(true); skip_button.setEnabled(false); @@ -298,11 +298,11 @@ public final class FileGrabberDialog extends javax.swing.JDialog { .addComponent(skip_rest_button) .addGap(18, 18, 18) .addComponent(skip_button))) - .addGap(0, 121, Short.MAX_VALUE)) + .addGap(0, 245, Short.MAX_VALUE)) + .addComponent(total_file_size_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 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)) - .addComponent(total_file_size_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(dance_button))) .addContainerGap()) ); layout.setVerticalGroup( diff --git a/src/megabasterd/FolderLinkDialog.form b/src/megabasterd/FolderLinkDialog.form index d4ee1fba2..7fcf425a4 100644 --- a/src/megabasterd/FolderLinkDialog.form +++ b/src/megabasterd/FolderLinkDialog.form @@ -28,25 +28,27 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -64,7 +66,7 @@ - + @@ -98,7 +100,7 @@ - + @@ -112,7 +114,7 @@ - + @@ -125,7 +127,7 @@ - + @@ -137,7 +139,7 @@ - + @@ -153,7 +155,7 @@ - + @@ -162,7 +164,7 @@ - + @@ -172,7 +174,7 @@ - + @@ -185,7 +187,7 @@ - + @@ -197,7 +199,7 @@ - + diff --git a/src/megabasterd/FolderLinkDialog.java b/src/megabasterd/FolderLinkDialog.java index 7d180aa9e..1be15f093 100644 --- a/src/megabasterd/FolderLinkDialog.java +++ b/src/megabasterd/FolderLinkDialog.java @@ -101,14 +101,14 @@ public final class FolderLinkDialog extends javax.swing.JDialog { setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("FolderLink"); - file_tree.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N + file_tree.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N javax.swing.tree.DefaultMutableTreeNode treeNode1 = new javax.swing.tree.DefaultMutableTreeNode("root"); file_tree.setModel(new javax.swing.tree.DefaultTreeModel(treeNode1)); file_tree.setDoubleBuffered(true); file_tree.setEnabled(false); file_tree_scrollpane.setViewportView(file_tree); - skip_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + skip_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N skip_button.setText("REMOVE THIS"); skip_button.setDoubleBuffered(true); skip_button.setEnabled(false); @@ -118,12 +118,12 @@ public final class FolderLinkDialog extends javax.swing.JDialog { } }); - link_detected_label.setFont(new java.awt.Font("Dialog", 1, 30)); // NOI18N + link_detected_label.setFont(new java.awt.Font("Ubuntu", 1, 30)); // NOI18N link_detected_label.setText("Folder link detected!"); link_detected_label.setDoubleBuffered(true); dance_button.setBackground(new java.awt.Color(102, 204, 255)); - dance_button.setFont(new java.awt.Font("Dialog", 1, 24)); // NOI18N + dance_button.setFont(new java.awt.Font("Ubuntu", 1, 24)); // NOI18N dance_button.setForeground(new java.awt.Color(255, 255, 255)); dance_button.setText("Let's dance, baby"); dance_button.setDoubleBuffered(true); @@ -134,16 +134,16 @@ public final class FolderLinkDialog extends javax.swing.JDialog { } }); - folder_link_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + folder_link_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N folder_link_label.setText("jLabel2"); folder_link_label.setDoubleBuffered(true); - warning_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + warning_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N warning_label.setText("If you DO NOT want to download some folder or file you can REMOVE it."); warning_label.setDoubleBuffered(true); warning_label.setEnabled(false); - skip_rest_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + skip_rest_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N skip_rest_button.setText("REMOVE ALL EXCEPT THIS"); skip_rest_button.setDoubleBuffered(true); skip_rest_button.setEnabled(false); @@ -153,7 +153,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog { } }); - restore_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N + restore_button.setFont(new java.awt.Font("Ubuntu", 1, 14)); // NOI18N restore_button.setText("Restore folder data"); restore_button.setDoubleBuffered(true); restore_button.addActionListener(new java.awt.event.ActionListener() { @@ -162,7 +162,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog { } }); - total_space_label.setFont(new java.awt.Font("Dialog", 1, 28)); // NOI18N + total_space_label.setFont(new java.awt.Font("Ubuntu", 1, 28)); // NOI18N total_space_label.setText("[0 B]"); total_space_label.setDoubleBuffered(true); total_space_label.setEnabled(false); @@ -175,22 +175,23 @@ public final class FolderLinkDialog extends javax.swing.JDialog { .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(file_tree_scrollpane) - .addGroup(layout.createSequentialGroup() - .addComponent(skip_rest_button) - .addGap(18, 18, 18) - .addComponent(skip_button) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(dance_button, javax.swing.GroupLayout.PREFERRED_SIZE, 300, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(layout.createSequentialGroup() - .addComponent(folder_link_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(restore_button)) .addComponent(total_space_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addComponent(skip_rest_button) + .addGap(18, 18, 18) + .addComponent(skip_button)) .addComponent(link_detected_label) .addComponent(warning_label)) - .addGap(0, 0, Short.MAX_VALUE))) + .addGap(0, 87, Short.MAX_VALUE)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addGap(0, 0, Short.MAX_VALUE) + .addComponent(dance_button)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addComponent(folder_link_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(restore_button))) .addContainerGap()) ); layout.setVerticalGroup( @@ -203,7 +204,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, 368, Short.MAX_VALUE) + .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 369, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(total_space_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) diff --git a/src/megabasterd/GetMasterPasswordDialog.form b/src/megabasterd/GetMasterPasswordDialog.form index 477bd4c51..6588f5f59 100644 --- a/src/megabasterd/GetMasterPasswordDialog.form +++ b/src/megabasterd/GetMasterPasswordDialog.form @@ -83,7 +83,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -143,7 +143,7 @@ - + diff --git a/src/megabasterd/GetMasterPasswordDialog.java b/src/megabasterd/GetMasterPasswordDialog.java index 8b4a9ba41..cb4abf027 100644 --- a/src/megabasterd/GetMasterPasswordDialog.java +++ b/src/megabasterd/GetMasterPasswordDialog.java @@ -91,7 +91,7 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog { setTitle("MasterPassword"); setResizable(false); - current_pass_textfield.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + current_pass_textfield.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N current_pass_textfield.setDoubleBuffered(true); current_pass_textfield.addKeyListener(new java.awt.event.KeyAdapter() { public void keyPressed(java.awt.event.KeyEvent evt) { @@ -99,7 +99,7 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog { } }); - cancel_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + cancel_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N cancel_button.setText("CANCEL"); cancel_button.setDoubleBuffered(true); cancel_button.addActionListener(new java.awt.event.ActionListener() { @@ -108,7 +108,7 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog { } }); - ok_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + ok_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N ok_button.setText("OK"); ok_button.setDoubleBuffered(true); ok_button.addActionListener(new java.awt.event.ActionListener() { @@ -120,14 +120,14 @@ public class GetMasterPasswordDialog extends javax.swing.JDialog { lock_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/lock_medium.png"))); // NOI18N lock_label.setDoubleBuffered(true); - please_label.setFont(new java.awt.Font("Dialog", 1, 26)); // NOI18N + please_label.setFont(new java.awt.Font("Ubuntu", 1, 26)); // NOI18N please_label.setText("Please, enter your master password"); please_label.setDoubleBuffered(true); status_label.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N status_label.setDoubleBuffered(true); - remember_checkbox.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + remember_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N remember_checkbox.setSelected(true); remember_checkbox.setText("Remember for this session"); remember_checkbox.setDoubleBuffered(true); diff --git a/src/megabasterd/LinkGrabberDialog.form b/src/megabasterd/LinkGrabberDialog.form index ddb6b6a25..cde45ebb8 100644 --- a/src/megabasterd/LinkGrabberDialog.form +++ b/src/megabasterd/LinkGrabberDialog.form @@ -34,9 +34,9 @@ - - - + + + @@ -62,7 +62,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -180,7 +180,7 @@ - + diff --git a/src/megabasterd/LinkGrabberDialog.java b/src/megabasterd/LinkGrabberDialog.java index 3ff94fe50..d23dce1d2 100644 --- a/src/megabasterd/LinkGrabberDialog.java +++ b/src/megabasterd/LinkGrabberDialog.java @@ -119,14 +119,14 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip setModal(true); links_textarea.setColumns(20); - links_textarea.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + links_textarea.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N links_textarea.setRows(5); links_textarea.setDoubleBuffered(true); links_scrollpane.setViewportView(links_textarea); links_textarea.addMouseListener(new ContextMenuMouseListener()); dance_button.setBackground(new java.awt.Color(102, 204, 255)); - dance_button.setFont(new java.awt.Font("Dialog", 1, 24)); // NOI18N + dance_button.setFont(new java.awt.Font("Ubuntu", 1, 24)); // NOI18N dance_button.setForeground(new java.awt.Color(255, 255, 255)); dance_button.setText("Let's dance, baby"); dance_button.setDoubleBuffered(true); @@ -136,11 +136,11 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip } }); - links_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + links_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N links_label.setText("Put your MEGA/MegaCrypter/ELC link/s here (one per line):"); links_label.setDoubleBuffered(true); - change_dir_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + change_dir_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N change_dir_button.setText("Change it"); change_dir_button.setDoubleBuffered(true); change_dir_button.addActionListener(new java.awt.event.ActionListener() { @@ -149,13 +149,13 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip } }); - down_dir_to_label.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + down_dir_to_label.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N down_dir_to_label.setText("Download to: "); down_dir_to_label.setDoubleBuffered(true); download_dir_label.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N - dlc_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + dlc_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N dlc_button.setText("Load DLC container"); dlc_button.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -163,10 +163,10 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip } }); - use_mega_account_down_label.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + use_mega_account_down_label.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N use_mega_account_down_label.setText("Use this account for download:"); - use_mega_account_down_combobox.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N + use_mega_account_down_combobox.setFont(new java.awt.Font("Ubuntu", 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); @@ -186,9 +186,9 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(down_dir_to_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(download_dir_label, javax.swing.GroupLayout.DEFAULT_SIZE, 359, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(dance_button, javax.swing.GroupLayout.PREFERRED_SIZE, 300, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(download_dir_label, javax.swing.GroupLayout.DEFAULT_SIZE, 464, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(dance_button)) .addGroup(layout.createSequentialGroup() .addComponent(links_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) @@ -207,7 +207,7 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip .addComponent(links_label) .addComponent(dlc_button)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(links_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 343, Short.MAX_VALUE) + .addComponent(links_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 344, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(use_mega_account_down_label) diff --git a/src/megabasterd/MainPanel.java b/src/megabasterd/MainPanel.java index 84dc607f0..72138631b 100644 --- a/src/megabasterd/MainPanel.java +++ b/src/megabasterd/MainPanel.java @@ -58,7 +58,7 @@ import org.apache.http.auth.UsernamePasswordCredentials; */ public final class MainPanel { - public static final String VERSION = "2.12"; + public static final String VERSION = "2.13"; public static final int THROTTLE_SLICE_SIZE = 16 * 1024; public static final int STREAMER_PORT = 1337; public static final int WATCHDOG_PORT = 1338; diff --git a/src/megabasterd/MainPanelView.form b/src/megabasterd/MainPanelView.form index c151fb09b..931701bbc 100644 --- a/src/megabasterd/MainPanelView.form +++ b/src/megabasterd/MainPanelView.form @@ -9,14 +9,14 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -101,14 +101,14 @@ - + - + @@ -123,14 +123,14 @@ - + - + @@ -207,7 +207,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -258,7 +258,7 @@ - + @@ -274,7 +274,7 @@ - + @@ -283,7 +283,7 @@ - + @@ -294,7 +294,7 @@ - + @@ -324,7 +324,7 @@ - + @@ -339,7 +339,7 @@ - + @@ -364,7 +364,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -397,7 +397,7 @@ - + @@ -406,7 +406,7 @@ - + @@ -416,7 +416,7 @@ - + @@ -446,7 +446,7 @@ - + @@ -461,7 +461,7 @@ - + diff --git a/src/megabasterd/MainPanelView.java b/src/megabasterd/MainPanelView.java index dee94c9f4..edc9c53be 100644 --- a/src/megabasterd/MainPanelView.java +++ b/src/megabasterd/MainPanelView.java @@ -186,21 +186,21 @@ public final class MainPanelView extends javax.swing.JFrame { logo_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/mbasterd_logo_nuevo.png"))); // NOI18N logo_label.setDoubleBuffered(true); - kiss_server_status.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N + kiss_server_status.setFont(new java.awt.Font("Ubuntu", 2, 14)); // NOI18N kiss_server_status.setDoubleBuffered(true); jTabbedPane1.setDoubleBuffered(true); - jTabbedPane1.setFont(new java.awt.Font("Dialog", 1, 22)); // NOI18N + jTabbedPane1.setFont(new java.awt.Font("Ubuntu", 1, 22)); // NOI18N - global_speed_down_label.setFont(new java.awt.Font("Dialog", 1, 54)); // NOI18N + global_speed_down_label.setFont(new java.awt.Font("Ubuntu", 1, 54)); // NOI18N global_speed_down_label.setText("Speed"); global_speed_down_label.setDoubleBuffered(true); - status_down_label.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + status_down_label.setFont(new java.awt.Font("Ubuntu", 2, 16)); // NOI18N status_down_label.setDoubleBuffered(true); close_all_finished_down_button.setBackground(new java.awt.Color(0, 153, 51)); - close_all_finished_down_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + close_all_finished_down_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N close_all_finished_down_button.setForeground(new java.awt.Color(255, 255, 255)); close_all_finished_down_button.setText("Close all OK finished"); close_all_finished_down_button.setDoubleBuffered(true); @@ -214,7 +214,7 @@ public final class MainPanelView extends javax.swing.JFrame { jScrollPane_down.setViewportView(jPanel_scroll_down); pause_all_down_button.setBackground(new java.awt.Color(255, 153, 0)); - pause_all_down_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + pause_all_down_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N pause_all_down_button.setForeground(new java.awt.Color(255, 255, 255)); pause_all_down_button.setText("PAUSE ALL"); pause_all_down_button.setDoubleBuffered(true); @@ -224,7 +224,7 @@ public final class MainPanelView extends javax.swing.JFrame { } }); - down_remtime_label.setFont(new java.awt.Font("DejaVu Sans", 1, 20)); // NOI18N + down_remtime_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N javax.swing.GroupLayout downloads_panelLayout = new javax.swing.GroupLayout(downloads_panel); downloads_panel.setLayout(downloads_panelLayout); @@ -236,7 +236,7 @@ public final class MainPanelView extends javax.swing.JFrame { .addComponent(pause_all_down_button)) .addGroup(downloads_panelLayout.createSequentialGroup() .addContainerGap() - .addComponent(status_down_label, javax.swing.GroupLayout.DEFAULT_SIZE, 657, Short.MAX_VALUE) + .addComponent(status_down_label, javax.swing.GroupLayout.DEFAULT_SIZE, 683, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(close_all_finished_down_button)) .addComponent(jScrollPane_down) @@ -250,7 +250,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(status_down_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane_down, javax.swing.GroupLayout.DEFAULT_SIZE, 314, Short.MAX_VALUE) + .addComponent(jScrollPane_down, javax.swing.GroupLayout.DEFAULT_SIZE, 318, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(down_remtime_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -261,14 +261,14 @@ public final class MainPanelView extends javax.swing.JFrame { jTabbedPane1.addTab("Downloads", downloads_panel); - global_speed_up_label.setFont(new java.awt.Font("Dialog", 1, 54)); // NOI18N + global_speed_up_label.setFont(new java.awt.Font("Ubuntu", 1, 54)); // NOI18N global_speed_up_label.setText("Speed"); global_speed_up_label.setDoubleBuffered(true); - status_up_label.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + status_up_label.setFont(new java.awt.Font("Ubuntu", 2, 16)); // NOI18N close_all_finished_up_button.setBackground(new java.awt.Color(0, 153, 51)); - close_all_finished_up_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + close_all_finished_up_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N close_all_finished_up_button.setForeground(new java.awt.Color(255, 255, 255)); close_all_finished_up_button.setText("Close all OK finished"); close_all_finished_up_button.setDoubleBuffered(true); @@ -282,7 +282,7 @@ public final class MainPanelView extends javax.swing.JFrame { jScrollPane_up.setViewportView(jPanel_scroll_up); pause_all_up_button.setBackground(new java.awt.Color(255, 153, 0)); - pause_all_up_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + pause_all_up_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N pause_all_up_button.setForeground(new java.awt.Color(255, 255, 255)); pause_all_up_button.setText("PAUSE ALL"); pause_all_up_button.setDoubleBuffered(true); @@ -292,7 +292,7 @@ public final class MainPanelView extends javax.swing.JFrame { } }); - up_remtime_label.setFont(new java.awt.Font("DejaVu Sans", 1, 20)); // NOI18N + up_remtime_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N javax.swing.GroupLayout uploads_panelLayout = new javax.swing.GroupLayout(uploads_panel); uploads_panel.setLayout(uploads_panelLayout); @@ -304,7 +304,7 @@ public final class MainPanelView extends javax.swing.JFrame { .addComponent(pause_all_up_button)) .addGroup(uploads_panelLayout.createSequentialGroup() .addContainerGap() - .addComponent(status_up_label, javax.swing.GroupLayout.DEFAULT_SIZE, 657, Short.MAX_VALUE) + .addComponent(status_up_label, javax.swing.GroupLayout.DEFAULT_SIZE, 683, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(close_all_finished_up_button)) .addComponent(jScrollPane_up) @@ -318,7 +318,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(status_up_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane_up, javax.swing.GroupLayout.DEFAULT_SIZE, 314, Short.MAX_VALUE) + .addComponent(jScrollPane_up, javax.swing.GroupLayout.DEFAULT_SIZE, 318, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(up_remtime_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -331,9 +331,9 @@ public final class MainPanelView extends javax.swing.JFrame { file_menu.setText("File"); file_menu.setDoubleBuffered(true); - file_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + file_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N - new_download_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + new_download_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N new_download_menu.setText("New download"); new_download_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -342,7 +342,7 @@ public final class MainPanelView extends javax.swing.JFrame { }); file_menu.add(new_download_menu); - new_upload_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + new_upload_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N new_upload_menu.setText("New upload"); new_upload_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -351,7 +351,7 @@ public final class MainPanelView extends javax.swing.JFrame { }); file_menu.add(new_upload_menu); - new_stream_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + new_stream_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N new_stream_menu.setText("New stream"); new_stream_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -361,7 +361,7 @@ public final class MainPanelView extends javax.swing.JFrame { file_menu.add(new_stream_menu); file_menu.add(jSeparator4); - clean_all_down_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + clean_all_down_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N clean_all_down_menu.setText("Remove all pre/pro/wait downloads"); clean_all_down_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -370,7 +370,7 @@ public final class MainPanelView extends javax.swing.JFrame { }); file_menu.add(clean_all_down_menu); - clean_all_up_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + clean_all_up_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N clean_all_up_menu.setText("Remove all pre/pro/wait uploads"); clean_all_up_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -380,7 +380,7 @@ public final class MainPanelView extends javax.swing.JFrame { file_menu.add(clean_all_up_menu); file_menu.add(jSeparator2); - hide_tray_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + hide_tray_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N hide_tray_menu.setText("Hide to tray"); hide_tray_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -389,7 +389,7 @@ public final class MainPanelView extends javax.swing.JFrame { }); file_menu.add(hide_tray_menu); - exit_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + exit_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N exit_menu.setText("EXIT"); exit_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -402,9 +402,9 @@ public final class MainPanelView extends javax.swing.JFrame { edit_menu.setText("Edit"); edit_menu.setDoubleBuffered(true); - edit_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + edit_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N - settings_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + settings_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N settings_menu.setText("Settings"); settings_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -417,9 +417,9 @@ public final class MainPanelView extends javax.swing.JFrame { help_menu.setText("Help"); help_menu.setDoubleBuffered(true); - help_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + help_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N - about_menu.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + about_menu.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N about_menu.setText("About"); about_menu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { diff --git a/src/megabasterd/SetMasterPasswordDialog.form b/src/megabasterd/SetMasterPasswordDialog.form index 84ee34f6c..e4cdef23c 100644 --- a/src/megabasterd/SetMasterPasswordDialog.form +++ b/src/megabasterd/SetMasterPasswordDialog.form @@ -37,7 +37,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -166,7 +166,7 @@ - + diff --git a/src/megabasterd/SetMasterPasswordDialog.java b/src/megabasterd/SetMasterPasswordDialog.java index 22f945490..71da0d5f0 100644 --- a/src/megabasterd/SetMasterPasswordDialog.java +++ b/src/megabasterd/SetMasterPasswordDialog.java @@ -86,7 +86,7 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog { setTitle("MasterPassword"); setResizable(false); - confirm_pass_textfield.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + confirm_pass_textfield.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N confirm_pass_textfield.setDoubleBuffered(true); confirm_pass_textfield.addKeyListener(new java.awt.event.KeyAdapter() { public void keyPressed(java.awt.event.KeyEvent evt) { @@ -94,11 +94,11 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog { } }); - confirm_pass_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + confirm_pass_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N confirm_pass_label.setText("Confirm new:"); confirm_pass_label.setDoubleBuffered(true); - cancel_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + cancel_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N cancel_button.setText("CANCEL"); cancel_button.setDoubleBuffered(true); cancel_button.addActionListener(new java.awt.event.ActionListener() { @@ -107,7 +107,7 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog { } }); - ok_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + ok_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N ok_button.setText("OK"); ok_button.setDoubleBuffered(true); ok_button.addActionListener(new java.awt.event.ActionListener() { @@ -119,15 +119,15 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog { lock_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/lock_medium.png"))); // NOI18N lock_label.setDoubleBuffered(true); - warning_label.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N + warning_label.setFont(new java.awt.Font("Ubuntu", 1, 14)); // NOI18N warning_label.setText("WARNING: if you forget this password, you will have to insert all your accounts again."); warning_label.setDoubleBuffered(true); - new_pass_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + new_pass_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N new_pass_label.setText("New pass:"); new_pass_label.setDoubleBuffered(true); - new_pass_textfield.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + new_pass_textfield.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N new_pass_textfield.setDoubleBuffered(true); status_label.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N @@ -148,7 +148,7 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog { .addComponent(new_pass_label)) .addGap(15, 15, 15) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(confirm_pass_textfield, javax.swing.GroupLayout.DEFAULT_SIZE, 418, Short.MAX_VALUE) + .addComponent(confirm_pass_textfield, javax.swing.GroupLayout.DEFAULT_SIZE, 443, Short.MAX_VALUE) .addComponent(new_pass_textfield)) .addContainerGap()) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() @@ -178,7 +178,7 @@ public class SetMasterPasswordDialog extends javax.swing.JDialog { .addComponent(confirm_pass_label)))) .addGap(18, 18, 18) .addComponent(warning_label) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 20, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 21, Short.MAX_VALUE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(ok_button) diff --git a/src/megabasterd/SettingsDialog.form b/src/megabasterd/SettingsDialog.form index 47e9a5ad5..ecb430ce3 100644 --- a/src/megabasterd/SettingsDialog.form +++ b/src/megabasterd/SettingsDialog.form @@ -61,7 +61,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -230,7 +230,7 @@ - + @@ -247,7 +247,7 @@ - + @@ -256,7 +256,7 @@ - + @@ -265,7 +265,7 @@ - + @@ -277,7 +277,7 @@ - + @@ -286,7 +286,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -309,7 +309,7 @@ - + @@ -324,7 +324,7 @@ - + @@ -339,7 +339,7 @@ - + @@ -347,7 +347,7 @@ - + @@ -358,7 +358,7 @@ - + @@ -373,7 +373,7 @@ - + @@ -422,7 +422,7 @@ - + @@ -457,7 +457,7 @@ - + @@ -466,7 +466,7 @@ - + @@ -475,7 +475,7 @@ - + @@ -484,7 +484,7 @@ - + @@ -495,7 +495,7 @@ - + @@ -503,7 +503,7 @@ - + @@ -515,7 +515,7 @@ - + @@ -523,14 +523,14 @@ - + - + @@ -545,7 +545,7 @@ - + @@ -641,7 +641,7 @@ - + @@ -661,7 +661,7 @@ - + @@ -670,7 +670,7 @@ - + @@ -683,7 +683,7 @@ - + @@ -695,7 +695,7 @@ - + @@ -709,7 +709,7 @@ - + @@ -726,7 +726,7 @@ - + @@ -740,6 +740,9 @@ + + + @@ -747,7 +750,7 @@ - +
@@ -764,7 +767,7 @@ - + @@ -773,7 +776,7 @@ - + @@ -786,7 +789,7 @@ - + @@ -821,7 +824,7 @@ - + @@ -894,7 +897,7 @@ - + @@ -904,7 +907,7 @@ - + @@ -916,7 +919,7 @@ - + @@ -926,7 +929,7 @@ - + @@ -938,7 +941,7 @@ - + @@ -950,7 +953,7 @@ - + @@ -999,7 +1002,7 @@ - + @@ -1009,7 +1012,7 @@ - + @@ -1021,7 +1024,7 @@ - + @@ -1031,7 +1034,7 @@ - + diff --git a/src/megabasterd/SettingsDialog.java b/src/megabasterd/SettingsDialog.java index 86418965c..89439c9d8 100644 --- a/src/megabasterd/SettingsDialog.java +++ b/src/megabasterd/SettingsDialog.java @@ -498,7 +498,7 @@ public final class SettingsDialog extends javax.swing.JDialog { setTitle("Settings"); setResizable(false); - ok_button.setFont(new java.awt.Font("Dialog", 1, 22)); // NOI18N + ok_button.setFont(new java.awt.Font("Ubuntu", 1, 22)); // NOI18N ok_button.setText("OK"); ok_button.setDoubleBuffered(true); ok_button.addActionListener(new java.awt.event.ActionListener() { @@ -507,7 +507,7 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - cancel_button.setFont(new java.awt.Font("Dialog", 1, 22)); // NOI18N + cancel_button.setFont(new java.awt.Font("Ubuntu", 1, 22)); // NOI18N cancel_button.setText("CANCEL"); cancel_button.setDoubleBuffered(true); cancel_button.addActionListener(new java.awt.event.ActionListener() { @@ -517,28 +517,28 @@ public final class SettingsDialog extends javax.swing.JDialog { }); jTabbedPane1.setDoubleBuffered(true); - jTabbedPane1.setFont(new java.awt.Font("Dialog", 1, 22)); // NOI18N + jTabbedPane1.setFont(new java.awt.Font("Ubuntu", 1, 22)); // NOI18N default_slots_down_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N default_slots_down_spinner.setDoubleBuffered(true); default_slots_down_spinner.setValue(2); - max_downloads_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + max_downloads_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N max_downloads_label.setText("Max parallel downloads:"); max_downloads_label.setDoubleBuffered(true); max_downloads_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N max_downloads_spinner.setDoubleBuffered(true); - verify_file_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + verify_file_down_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N verify_file_down_checkbox.setText("Verify file integrity (when download is finished)"); verify_file_down_checkbox.setDoubleBuffered(true); - down_dir_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + down_dir_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N down_dir_label.setText("Default downloads directory:"); down_dir_label.setDoubleBuffered(true); - change_download_dir_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + change_download_dir_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N change_download_dir_button.setText("Change it"); change_download_dir_button.setDoubleBuffered(true); change_download_dir_button.addActionListener(new java.awt.event.ActionListener() { @@ -547,11 +547,11 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - default_slots_down_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + default_slots_down_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N default_slots_down_label.setText("Default slots per file:"); default_slots_down_label.setDoubleBuffered(true); - multi_slot_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + multi_slot_down_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N multi_slot_down_checkbox.setText("Use multi slot download mode (download restart needed)"); multi_slot_down_checkbox.setDoubleBuffered(true); multi_slot_down_checkbox.addChangeListener(new javax.swing.event.ChangeListener() { @@ -560,7 +560,7 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - limit_download_speed_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + limit_download_speed_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N limit_download_speed_checkbox.setText("Limit download speed"); limit_download_speed_checkbox.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { @@ -568,17 +568,17 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - max_down_speed_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + max_down_speed_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N max_down_speed_label.setText("Max speed (KB/s):"); max_down_speed_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N - default_dir_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + default_dir_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N - rec_download_slots_label.setFont(new java.awt.Font("DejaVu Sans", 0, 12)); // NOI18N + rec_download_slots_label.setFont(new java.awt.Font("Ubuntu", 0, 12)); // NOI18N rec_download_slots_label.setText("Note: it is recommended not to enable MULTI SLOT (unless you want to download +5GB file without PRO account, in which case you will MUST USE multi slot). "); - use_mega_account_down_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + use_mega_account_down_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N use_mega_account_down_checkbox.setText("Use MEGA account for download/stream"); use_mega_account_down_checkbox.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { @@ -586,9 +586,9 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - use_mega_account_down_combobox.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N + use_mega_account_down_combobox.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N - use_mega_label.setFont(new java.awt.Font("DejaVu Sans", 0, 16)); // NOI18N + use_mega_label.setFont(new java.awt.Font("Ubuntu", 0, 16)); // NOI18N use_mega_label.setText("Default account:"); javax.swing.GroupLayout downloads_panelLayout = new javax.swing.GroupLayout(downloads_panel); @@ -683,27 +683,27 @@ public final class SettingsDialog extends javax.swing.JDialog { .addGroup(downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(use_mega_account_down_combobox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(use_mega_label)) - .addContainerGap(90, Short.MAX_VALUE)) + .addContainerGap(92, Short.MAX_VALUE)) ); jTabbedPane1.addTab("Downloads", downloads_panel); - default_slots_up_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + default_slots_up_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N default_slots_up_label.setText("Default slots per file:"); default_slots_up_label.setDoubleBuffered(true); - max_uploads_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + max_uploads_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N max_uploads_label.setText("Max parallel uploads:"); max_uploads_label.setDoubleBuffered(true); - default_slots_up_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N + default_slots_up_spinner.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N default_slots_up_spinner.setDoubleBuffered(true); default_slots_up_spinner.setValue(2); - max_uploads_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N + max_uploads_spinner.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N max_uploads_spinner.setDoubleBuffered(true); - multi_slot_up_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + multi_slot_up_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N multi_slot_up_checkbox.setText("Use multi slot upload mode (upload restart needed)"); multi_slot_up_checkbox.setDoubleBuffered(true); multi_slot_up_checkbox.addActionListener(new java.awt.event.ActionListener() { @@ -712,12 +712,12 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - max_up_speed_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + max_up_speed_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N max_up_speed_label.setText("Max speed (KB/s):"); - max_up_speed_spinner.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N + max_up_speed_spinner.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N - limit_upload_speed_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + limit_upload_speed_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N limit_upload_speed_checkbox.setText("Limit upload speed"); limit_upload_speed_checkbox.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { @@ -725,7 +725,7 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - rec_upload_slots_label.setFont(new java.awt.Font("DejaVu Sans", 0, 16)); // NOI18N + rec_upload_slots_label.setFont(new java.awt.Font("Ubuntu", 0, 16)); // NOI18N rec_upload_slots_label.setText("Note: it is recommended to enable MULTI SLOT with 4 slots."); javax.swing.GroupLayout uploads_panelLayout = new javax.swing.GroupLayout(uploads_panel); @@ -757,7 +757,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addGap(98, 98, 98) .addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(limit_upload_speed_checkbox)) - .addGap(0, 353, Short.MAX_VALUE))) + .addGap(0, 451, Short.MAX_VALUE))) .addContainerGap()) ); uploads_panelLayout.setVerticalGroup( @@ -785,12 +785,12 @@ 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(290, Short.MAX_VALUE)) + .addContainerGap(312, Short.MAX_VALUE)) ); jTabbedPane1.addTab("Uploads", uploads_panel); - mega_accounts_table.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + mega_accounts_table.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N mega_accounts_table.setModel(new javax.swing.table.DefaultTableModel( new Object [][] { @@ -812,11 +812,11 @@ public final class SettingsDialog extends javax.swing.JDialog { mega_accounts_table.setRowHeight(24); mega_accounts_scrollpane.setViewportView(mega_accounts_table); - mega_accounts_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + mega_accounts_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N mega_accounts_label.setText("Your MEGA accounts:"); mega_accounts_label.setDoubleBuffered(true); - remove_mega_account_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + remove_mega_account_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N remove_mega_account_button.setText("Remove selected"); remove_mega_account_button.setDoubleBuffered(true); remove_mega_account_button.setEnabled(false); @@ -826,7 +826,7 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - add_mega_account_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + add_mega_account_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N add_mega_account_button.setText("Add account"); add_mega_account_button.setDoubleBuffered(true); add_mega_account_button.addActionListener(new java.awt.event.ActionListener() { @@ -835,7 +835,7 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - encrypt_pass_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + encrypt_pass_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N encrypt_pass_checkbox.setText("Encrypt on disk sensitive information"); encrypt_pass_checkbox.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -844,7 +844,7 @@ public final class SettingsDialog extends javax.swing.JDialog { }); delete_all_accounts_button.setBackground(new java.awt.Color(255, 51, 0)); - delete_all_accounts_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + delete_all_accounts_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N delete_all_accounts_button.setForeground(new java.awt.Color(255, 255, 255)); delete_all_accounts_button.setText("RESET ACCOUNTS"); delete_all_accounts_button.addActionListener(new java.awt.event.ActionListener() { @@ -854,7 +854,7 @@ public final class SettingsDialog extends javax.swing.JDialog { }); unlock_accounts_button.setBackground(new java.awt.Color(0, 153, 51)); - unlock_accounts_button.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + unlock_accounts_button.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N unlock_accounts_button.setForeground(new java.awt.Color(255, 255, 255)); unlock_accounts_button.setText("Unlock accounts"); unlock_accounts_button.addActionListener(new java.awt.event.ActionListener() { @@ -864,8 +864,9 @@ public final class SettingsDialog extends javax.swing.JDialog { }); elc_accounts_scrollpane.setDoubleBuffered(true); + elc_accounts_scrollpane.setFont(new java.awt.Font("Ubuntu", 0, 12)); // NOI18N - elc_accounts_table.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + elc_accounts_table.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N elc_accounts_table.setModel(new javax.swing.table.DefaultTableModel( new Object [][] { @@ -885,11 +886,11 @@ public final class SettingsDialog extends javax.swing.JDialog { elc_accounts_table.setRowHeight(24); elc_accounts_scrollpane.setViewportView(elc_accounts_table); - elc_accounts_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + elc_accounts_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N elc_accounts_label.setText("Your ELC accounts:"); elc_accounts_label.setDoubleBuffered(true); - remove_elc_account_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + remove_elc_account_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N remove_elc_account_button.setText("Remove selected"); remove_elc_account_button.setDoubleBuffered(true); remove_elc_account_button.setEnabled(false); @@ -899,7 +900,7 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - add_elc_account_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + add_elc_account_button.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N add_elc_account_button.setText("Add account"); add_elc_account_button.setDoubleBuffered(true); add_elc_account_button.addActionListener(new java.awt.event.ActionListener() { @@ -969,27 +970,27 @@ public final class SettingsDialog extends javax.swing.JDialog { proxy_panel.setBorder(javax.swing.BorderFactory.createTitledBorder("Proxy settings")); - proxy_host_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + proxy_host_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N proxy_host_label.setText("Host:"); proxy_host_label.setDoubleBuffered(true); proxy_host_label.setEnabled(false); - proxy_host_textfield.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N + proxy_host_textfield.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N proxy_host_textfield.setDoubleBuffered(true); proxy_host_textfield.setEnabled(false); proxy_host_textfield.addMouseListener(new ContextMenuMouseListener()); - proxy_port_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + proxy_port_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N proxy_port_label.setText("Port:"); proxy_port_label.setDoubleBuffered(true); proxy_port_label.setEnabled(false); - proxy_port_textfield.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N + proxy_port_textfield.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N proxy_port_textfield.setDoubleBuffered(true); proxy_port_textfield.setEnabled(false); proxy_port_textfield.addMouseListener(new ContextMenuMouseListener()); - use_proxy_checkbox.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + use_proxy_checkbox.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N use_proxy_checkbox.setText("Use HTTP(S) PROXY (app restart required)"); use_proxy_checkbox.setDoubleBuffered(true); use_proxy_checkbox.addChangeListener(new javax.swing.event.ChangeListener() { @@ -998,28 +999,28 @@ public final class SettingsDialog extends javax.swing.JDialog { } }); - proxy_warning_label.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N + proxy_warning_label.setFont(new java.awt.Font("Ubuntu", 0, 16)); // NOI18N proxy_warning_label.setText("Warning: Megabasterd will use this proxy for ALL connections."); proxy_warning_label.setEnabled(false); proxy_auth_panel.setBorder(javax.swing.BorderFactory.createTitledBorder("Authentication")); - proxy_user_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + proxy_user_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N proxy_user_label.setText("Username:"); proxy_user_label.setDoubleBuffered(true); proxy_user_label.setEnabled(false); - proxy_user_textfield.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N + proxy_user_textfield.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N proxy_user_textfield.setDoubleBuffered(true); proxy_user_textfield.setEnabled(false); proxy_user_textfield.addMouseListener(new ContextMenuMouseListener()); - proxy_pass_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + proxy_pass_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N proxy_pass_label.setText("Password:"); proxy_pass_label.setDoubleBuffered(true); proxy_pass_label.setEnabled(false); - proxy_pass_textfield.setFont(new java.awt.Font("Dialog", 0, 20)); // NOI18N + proxy_pass_textfield.setFont(new java.awt.Font("Ubuntu", 0, 20)); // NOI18N proxy_pass_textfield.setText("jPasswordField1"); proxy_pass_textfield.setEnabled(false); @@ -1107,7 +1108,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addGroup(jPanel1Layout.createSequentialGroup() .addContainerGap() .addComponent(proxy_panel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(327, Short.MAX_VALUE)) + .addContainerGap(329, Short.MAX_VALUE)) ); jTabbedPane1.addTab("Advanced", jPanel1); diff --git a/src/megabasterd/StreamerDialog.form b/src/megabasterd/StreamerDialog.form index 01036e4e2..168a53160 100644 --- a/src/megabasterd/StreamerDialog.form +++ b/src/megabasterd/StreamerDialog.form @@ -31,8 +31,8 @@ - - + + @@ -63,7 +63,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -109,7 +109,7 @@ - + diff --git a/src/megabasterd/StreamerDialog.java b/src/megabasterd/StreamerDialog.java index b723ecdb3..a4faa775a 100644 --- a/src/megabasterd/StreamerDialog.java +++ b/src/megabasterd/StreamerDialog.java @@ -95,12 +95,12 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("Streamer"); - put_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + put_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N 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)); - dance_button.setFont(new java.awt.Font("Dialog", 1, 24)); // NOI18N + dance_button.setFont(new java.awt.Font("Ubuntu", 1, 24)); // NOI18N dance_button.setForeground(new java.awt.Color(255, 255, 255)); dance_button.setText("Let's dance, baby"); dance_button.setDoubleBuffered(true); @@ -110,13 +110,13 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa } }); - original_link_textfield.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N + original_link_textfield.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N original_link_textfield.setDoubleBuffered(true); - use_mega_account_down_label.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + use_mega_account_down_label.setFont(new java.awt.Font("Ubuntu", 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("Ubuntu", 1, 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); @@ -134,8 +134,8 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa .addComponent(use_mega_account_down_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(use_mega_account_down_combobox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGap(18, 18, 18) - .addComponent(dance_button, javax.swing.GroupLayout.PREFERRED_SIZE, 300, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(dance_button)) .addComponent(original_link_textfield) .addComponent(put_label, javax.swing.GroupLayout.DEFAULT_SIZE, 1076, Short.MAX_VALUE)) .addContainerGap()) diff --git a/src/megabasterd/UploadView.form b/src/megabasterd/UploadView.form index 296465385..2bcc0c257 100644 --- a/src/megabasterd/UploadView.form +++ b/src/megabasterd/UploadView.form @@ -38,7 +38,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -218,7 +218,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/src/megabasterd/UploadView.java b/src/megabasterd/UploadView.java index 63c0292da..75542b361 100644 --- a/src/megabasterd/UploadView.java +++ b/src/megabasterd/UploadView.java @@ -115,15 +115,15 @@ public final class UploadView extends javax.swing.JPanel implements Transference setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 204, 255), 4, true)); - status_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + status_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N status_label.setText("status"); status_label.setDoubleBuffered(true); - slots_label.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + slots_label.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N slots_label.setText("Slots"); slots_label.setDoubleBuffered(true); - slots_spinner.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + slots_spinner.setFont(new java.awt.Font("Ubuntu", 0, 18)); // NOI18N slots_spinner.setToolTipText("Slots"); slots_spinner.setDoubleBuffered(true); slots_spinner.addChangeListener(new javax.swing.event.ChangeListener() { @@ -132,16 +132,16 @@ public final class UploadView extends javax.swing.JPanel implements Transference } }); - speed_label.setFont(new java.awt.Font("Verdana", 3, 26)); // NOI18N + speed_label.setFont(new java.awt.Font("Ubuntu", 3, 26)); // NOI18N speed_label.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); speed_label.setText("speed"); speed_label.setDoubleBuffered(true); - progress_pbar.setFont(new java.awt.Font("Verdana", 1, 18)); // NOI18N + progress_pbar.setFont(new java.awt.Font("Ubuntu", 1, 18)); // NOI18N progress_pbar.setDoubleBuffered(true); pause_button.setBackground(new java.awt.Color(255, 153, 0)); - pause_button.setFont(new java.awt.Font("Verdana", 1, 16)); // NOI18N + pause_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N pause_button.setForeground(java.awt.Color.white); pause_button.setText("PAUSE UPLOAD"); pause_button.setDoubleBuffered(true); @@ -152,7 +152,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference }); stop_button.setBackground(new java.awt.Color(255, 0, 0)); - stop_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + stop_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N stop_button.setForeground(java.awt.Color.white); stop_button.setText("CANCEL UPLOAD"); stop_button.setDoubleBuffered(true); @@ -162,12 +162,12 @@ public final class UploadView extends javax.swing.JPanel implements Transference } }); - file_name_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + file_name_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N file_name_label.setForeground(new java.awt.Color(51, 51, 255)); file_name_label.setText("file_name"); file_name_label.setDoubleBuffered(true); - close_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + close_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N close_button.setText("Close"); close_button.setDoubleBuffered(true); close_button.addActionListener(new java.awt.event.ActionListener() { @@ -177,7 +177,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference }); restart_button.setBackground(new java.awt.Color(51, 51, 255)); - restart_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + restart_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N restart_button.setForeground(new java.awt.Color(255, 255, 255)); restart_button.setText("Restart"); restart_button.setDoubleBuffered(true); @@ -187,7 +187,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference } }); - file_size_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N + file_size_label.setFont(new java.awt.Font("Ubuntu", 1, 20)); // NOI18N file_size_label.setForeground(new java.awt.Color(51, 51, 255)); file_size_label.setText("file_size"); file_size_label.setDoubleBuffered(true); @@ -195,7 +195,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference slot_status_label.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N slot_status_label.setDoubleBuffered(true); - folder_link_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + folder_link_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N folder_link_button.setText("Copy folder link"); folder_link_button.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -203,7 +203,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference } }); - file_link_button.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N + file_link_button.setFont(new java.awt.Font("Ubuntu", 1, 16)); // NOI18N file_link_button.setText("Copy file link"); file_link_button.setEnabled(false); file_link_button.addActionListener(new java.awt.event.ActionListener() { @@ -228,7 +228,7 @@ public final class UploadView extends javax.swing.JPanel implements Transference .addComponent(progress_pbar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() .addComponent(speed_label, javax.swing.GroupLayout.PREFERRED_SIZE, 340, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 106, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 121, Short.MAX_VALUE) .addComponent(pause_button)) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addComponent(close_button)