From c4a4c7f8ea44f1db74b56558a5dfa7e807ab9aa8 Mon Sep 17 00:00:00 2001 From: tonikelope Date: Sat, 13 Jan 2018 18:39:09 +0100 Subject: [PATCH] 2.82 --- src/megabasterd/SettingsDialog.form | 28 ++++++--- src/megabasterd/SettingsDialog.java | 56 +++++++++--------- .../icons/icons8-administrative-tools-30.png | Bin 0 -> 1351 bytes src/megabasterd/icons/icons8-customer-30.png | Bin 0 -> 624 bytes 4 files changed, 48 insertions(+), 36 deletions(-) create mode 100644 src/megabasterd/icons/icons8-administrative-tools-30.png create mode 100644 src/megabasterd/icons/icons8-customer-30.png diff --git a/src/megabasterd/SettingsDialog.form b/src/megabasterd/SettingsDialog.form index bec21550a..262083184 100644 --- a/src/megabasterd/SettingsDialog.form +++ b/src/megabasterd/SettingsDialog.form @@ -100,6 +100,9 @@ + + + @@ -118,7 +121,7 @@ - + @@ -547,6 +550,9 @@ + + + @@ -585,7 +591,7 @@ - + @@ -622,7 +628,7 @@ - + @@ -712,7 +718,7 @@ - + @@ -722,6 +728,9 @@ + + + @@ -781,7 +790,7 @@ - + @@ -790,7 +799,7 @@ - + @@ -982,11 +991,14 @@ - + + + + @@ -1042,7 +1054,7 @@ - + diff --git a/src/megabasterd/SettingsDialog.java b/src/megabasterd/SettingsDialog.java index 2ada954ad..9eb6302a1 100644 --- a/src/megabasterd/SettingsDialog.java +++ b/src/megabasterd/SettingsDialog.java @@ -562,7 +562,7 @@ public final class SettingsDialog extends javax.swing.JDialog { remove_elc_account_button = new javax.swing.JButton(); add_elc_account_button = new javax.swing.JButton(); jLabel1 = new javax.swing.JLabel(); - jPanel1 = new javax.swing.JPanel(); + advanced_panel = new javax.swing.JPanel(); proxy_panel = new javax.swing.JPanel(); proxy_host_label = new javax.swing.JLabel(); proxy_host_textfield = new javax.swing.JTextField(); @@ -869,11 +869,11 @@ public final class SettingsDialog extends javax.swing.JDialog { downloads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(downloads_panelLayout.createSequentialGroup() .addContainerGap() - .addComponent(downloads_scroll_pane, javax.swing.GroupLayout.DEFAULT_SIZE, 478, Short.MAX_VALUE) + .addComponent(downloads_scroll_pane, javax.swing.GroupLayout.DEFAULT_SIZE, 473, Short.MAX_VALUE) .addContainerGap()) ); - jTabbedPane1.addTab("Downloads", downloads_panel); + jTabbedPane1.addTab("Downloads", new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-download-from-ftp-30.png")), downloads_panel); // NOI18N default_slots_up_label.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N default_slots_up_label.setText("Default slots per file:"); @@ -913,7 +913,7 @@ public final class SettingsDialog extends javax.swing.JDialog { }); rec_upload_slots_label.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N - rec_upload_slots_label.setText("Note: MULTI-SLOT seems to be more robust against upload errors but it might be slower and consume more CPU/RAM."); + rec_upload_slots_label.setText("Note: MULTI-SLOT seems to be more robust against upload errors but it might consume more CPU/RAM."); javax.swing.GroupLayout uploads_panelLayout = new javax.swing.GroupLayout(uploads_panel); uploads_panel.setLayout(uploads_panelLayout); @@ -946,7 +946,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(limit_upload_speed_checkbox)) - .addGap(0, 111, Short.MAX_VALUE))) + .addGap(0, 214, Short.MAX_VALUE))) .addContainerGap()))) ); uploads_panelLayout.setVerticalGroup( @@ -974,10 +974,10 @@ 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(282, Short.MAX_VALUE)) + .addContainerGap(277, Short.MAX_VALUE)) ); - jTabbedPane1.addTab("Uploads", uploads_panel); + jTabbedPane1.addTab("Uploads", new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-upload-to-ftp-30.png")), uploads_panel); // NOI18N mega_accounts_table.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N mega_accounts_table.setModel(new javax.swing.table.DefaultTableModel( @@ -1148,7 +1148,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 137, Short.MAX_VALUE) + .addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 134, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(remove_mega_account_button) @@ -1156,7 +1156,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(elc_accounts_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(elc_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 136, Short.MAX_VALUE) + .addComponent(elc_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 134, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(remove_elc_account_button) @@ -1164,7 +1164,7 @@ public final class SettingsDialog extends javax.swing.JDialog { .addContainerGap()) ); - jTabbedPane1.addTab("Accounts", accounts_panel); + jTabbedPane1.addTab("Accounts", new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-customer-30.png")), accounts_panel); // NOI18N proxy_panel.setBorder(javax.swing.BorderFactory.createTitledBorder("Proxy settings")); @@ -1320,16 +1320,16 @@ public final class SettingsDialog extends javax.swing.JDialog { rec_zoom_label.setText("Note: restart required."); rec_zoom_label.setDoubleBuffered(true); - javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); - jPanel1.setLayout(jPanel1Layout); - jPanel1Layout.setHorizontalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() + javax.swing.GroupLayout advanced_panelLayout = new javax.swing.GroupLayout(advanced_panel); + advanced_panel.setLayout(advanced_panelLayout); + advanced_panelLayout.setHorizontalGroup( + advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(advanced_panelLayout.createSequentialGroup() .addContainerGap() - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() + .addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(advanced_panelLayout.createSequentialGroup() + .addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(advanced_panelLayout.createSequentialGroup() .addComponent(zoom_label) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(zoom_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) @@ -1338,21 +1338,21 @@ public final class SettingsDialog extends javax.swing.JDialog { .addComponent(proxy_panel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(jSeparator9) .addComponent(jSeparator11) - .addGroup(jPanel1Layout.createSequentialGroup() + .addGroup(advanced_panelLayout.createSequentialGroup() .addComponent(import_settings_button) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(export_settings_button))) .addContainerGap()) ); - jPanel1Layout.setVerticalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() + advanced_panelLayout.setVerticalGroup( + advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(advanced_panelLayout.createSequentialGroup() .addContainerGap() .addComponent(proxy_panel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(jSeparator9, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(5, 5, 5) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(zoom_label) .addComponent(zoom_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -1360,13 +1360,13 @@ public final class SettingsDialog extends javax.swing.JDialog { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(jSeparator11, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addGroup(advanced_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(import_settings_button) .addComponent(export_settings_button)) - .addContainerGap(165, Short.MAX_VALUE)) + .addContainerGap(160, Short.MAX_VALUE)) ); - jTabbedPane1.addTab("Advanced", jPanel1); + jTabbedPane1.addTab("Advanced", new javax.swing.ImageIcon(getClass().getResource("/megabasterd/icons/icons8-administrative-tools-30.png")), advanced_panel); // NOI18N status.setFont(new java.awt.Font("Dialog", 3, 14)); // NOI18N status.setForeground(new java.awt.Color(102, 102, 102)); @@ -2437,6 +2437,7 @@ public final class SettingsDialog extends javax.swing.JDialog { private javax.swing.JPanel accounts_panel; private javax.swing.JButton add_elc_account_button; private javax.swing.JButton add_mega_account_button; + private javax.swing.JPanel advanced_panel; private javax.swing.JButton cancel_button; private javax.swing.JButton change_download_dir_button; private javax.swing.JLabel default_dir_label; @@ -2455,7 +2456,6 @@ public final class SettingsDialog extends javax.swing.JDialog { private javax.swing.JButton export_settings_button; private javax.swing.JButton import_settings_button; private javax.swing.JLabel jLabel1; - private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel3; private javax.swing.JSeparator jSeparator1; private javax.swing.JSeparator jSeparator10; diff --git a/src/megabasterd/icons/icons8-administrative-tools-30.png b/src/megabasterd/icons/icons8-administrative-tools-30.png new file mode 100644 index 0000000000000000000000000000000000000000..4b8de8794238286654ac9f4e9fd4c07ae008cf07 GIT binary patch literal 1351 zcmV-N1-SZ&P)1K~zYI?Urk76jc<*|L4x`&Tb!cyDgFwTmi*uXp=KrVpXsEEAMA84Q88H*|>%u*^`iMB4Qb1DF5+`#mrF|K?;<&^apRt~)sE z^@=gNE;a#}0q|*uou5CjZClR+gB3-Qx@|dEnNbJ;L;^#LiqwIHgC#*^HA@l-sU0oN zP5FV|UQ0sam32F7Yf^zFqrvO-a`EHih(P6%WWmT$qu|QRw-C{NzA;%WmMm9Zz6hx* z)L;+*8k~{tm0qt`OBG}KjfE8cnt&U{rKQNq%1#xV93upZOGY3wI}1cu@9}uTefpaj z>$YzX6b&0*m*dP$vNL$UE_gC*VV5q^PynkL+!cFIf>2yCB9Jque1E!yT2j5pD=2s> z8LEG@aqWsv5=>nHs^8uG%|X`0ZzQM?0A$&oS<>G90)X%P0w*>Xl`mK^k%czbZqJxE zdd%43I8^8Qjq8>_1|l{~^4?dq3V=QF75RPLEzON?=zP@f;FD(E9j~~2VdZ*;{wY9^ z?S^A0Xh$k200hMC0~wklLU+5~W|MQ6u?9qIf+|G;+;e(;*96!zPyK+bxr7BoZ2`0tN~1o0Q&*BqLD}vgmoHe z1e4%b!BAq)exGqzWhQ1&m;ec)9>7^3p{wh5Zru^NUNne7WucI|4Sa8Bnf0Y_SGf~2 z!EU$qN)ok7617^be9MucBX-HM78Vl!B?MiK`A8DA+8s7EzHnnDF}<^?=9G}cGxw_2 zk2&PX+zqQ&_X0rOpW$x_v?Nu$sTd!Zm0C9deH^Ej%S|1nB_jd4vo;c9=55t>>HW>M zU+Owt2>jhuk~JXdHw2odTtx%rMh*I+t8W-eYa?3T|z``Wd(WM_$nFr$iy z5BGHYp9O#mf3)MszKhT_9s9SRM}xN$QB6-oz4!d4mgYuWYimWIw>KVB zFeDqx)=ol>%Yoldw;^~tVoaMJ3;@U6HLbcOJmKiB+Ua$>xBe2d_w)qZexDB=?bo5I zK>)y&CO>}t=?aJlKOSnp@k0&p-3;^(3;@U7ZXbZ8F?oDf?KuW6CE7xvC{7$|guD6- z&ivel1r_5^^oSGb^iY5H0D!=sF;J5=z}Wx*kB%I`DZstFiA!j&$?-8}u2 zae#!>C}exev2aHZGCpF literal 0 HcmV?d00001 diff --git a/src/megabasterd/icons/icons8-customer-30.png b/src/megabasterd/icons/icons8-customer-30.png new file mode 100644 index 0000000000000000000000000000000000000000..2a4a3ed1294ddfb1283b17b476926200122cf056 GIT binary patch literal 624 zcmV-$0+0QPP)wJ)4DLV?Jt0(DW_OxD= z_R$qfo@WKKlzsR|D1gdk7QZ~O#+fG8XWfTz@*ePGtPYXG()nZ|F4H!#qsIVc&2z>Q zXd@>jp$R#s%154LT9<&$u@fX{7BCl7@ zO&00~29Q%v=TPYY=BqrvB61yaditd~&uUz+(p`IPYYFcxcl+PSJaIYK$S&AvXSt7_t&P`;o)ofx_~c*g9p5#-><@Xfn727Z-Pz``2%Bju7CbVuuA&o zy&E96fTp+xE0h=I_Sit*Ac&g5=`c*qW4<;Zy0_u*He z4B+FX8UQVEin_17utnN3@Q$)B3ejt~({FDC$S=5$jmX_rtX2W2ER5%!ab{Kk0000< KMNUMnLSTZIn-C2E literal 0 HcmV?d00001