-Proxy pass hidden (TODO: encrypt on disk)
This commit is contained in:
tonikelope 2016-11-11 14:15:26 +01:00
parent 491ced6892
commit 81077e8713
2 changed files with 52 additions and 36 deletions

View File

@ -456,7 +456,7 @@
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="mega_accounts_scrollpane" alignment="0" pref="918" max="32767" attributes="0"/>
<Component id="mega_accounts_scrollpane" alignment="0" max="32767" attributes="0"/>
<Component id="elc_accounts_scrollpane" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Component id="delete_all_accounts_button" min="-2" max="-2" attributes="0"/>
@ -620,7 +620,7 @@
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="ff" green="ff" red="ff" type="rgb"/>
</Property>
<Property name="text" type="java.lang.String" value="Unlock"/>
<Property name="text" type="java.lang.String" value="Unlock accounts"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="unlock_accounts_buttonActionPerformed"/>
@ -700,8 +700,8 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="proxy_panel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="proxy_panel" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@ -728,13 +728,19 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="32767" attributes="0"/>
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="proxy_auth_panel" min="-2" max="-2" attributes="0"/>
<Component id="use_proxy_checkbox" min="-2" max="-2" attributes="0"/>
<Component id="proxy_warning_label" alignment="0" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<Component id="proxy_host_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="proxy_host_textfield" min="-2" pref="300" max="-2" attributes="0"/>
@ -742,11 +748,15 @@
<Component id="proxy_port_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="proxy_port_textfield" min="-2" pref="90" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Component id="proxy_auth_panel" alignment="0" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
@ -852,7 +862,7 @@
<Component id="proxy_user_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="proxy_user_textfield" min="-2" pref="280" max="-2" attributes="0"/>
<EmptySpace pref="28" max="32767" attributes="0"/>
<EmptySpace pref="26" max="32767" attributes="0"/>
<Component id="proxy_pass_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="proxy_pass_textfield" min="-2" pref="280" max="-2" attributes="0"/>

View File

@ -805,7 +805,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.setForeground(new java.awt.Color(255, 255, 255));
unlock_accounts_button.setText("Unlock");
unlock_accounts_button.setText("Unlock accounts");
unlock_accounts_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
unlock_accounts_buttonActionPerformed(evt);
@ -864,7 +864,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addGroup(accounts_panelLayout.createSequentialGroup()
.addContainerGap()
.addGroup(accounts_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(mega_accounts_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 918, Short.MAX_VALUE)
.addComponent(mega_accounts_scrollpane)
.addComponent(elc_accounts_scrollpane)
.addGroup(accounts_panelLayout.createSequentialGroup()
.addComponent(delete_all_accounts_button)
@ -981,7 +981,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addComponent(proxy_user_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(proxy_user_textfield, javax.swing.GroupLayout.PREFERRED_SIZE, 280, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 28, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 26, Short.MAX_VALUE)
.addComponent(proxy_pass_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(proxy_pass_textfield, javax.swing.GroupLayout.PREFERRED_SIZE, 280, javax.swing.GroupLayout.PREFERRED_SIZE)
@ -1002,21 +1002,27 @@ public final class SettingsDialog extends javax.swing.JDialog {
proxy_panel.setLayout(proxy_panelLayout);
proxy_panelLayout.setHorizontalGroup(
proxy_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, proxy_panelLayout.createSequentialGroup()
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(proxy_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(proxy_auth_panel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(use_proxy_checkbox)
.addComponent(proxy_warning_label)
.addGroup(proxy_panelLayout.createSequentialGroup()
.addContainerGap()
.addGroup(proxy_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(proxy_panelLayout.createSequentialGroup()
.addGroup(proxy_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(use_proxy_checkbox)
.addComponent(proxy_warning_label))
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(proxy_panelLayout.createSequentialGroup()
.addGroup(proxy_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, proxy_panelLayout.createSequentialGroup()
.addComponent(proxy_host_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(proxy_host_textfield, javax.swing.GroupLayout.PREFERRED_SIZE, 300, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(proxy_port_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(proxy_port_textfield, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addContainerGap())
.addComponent(proxy_port_textfield, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, Short.MAX_VALUE))
.addComponent(proxy_auth_panel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())))
);
proxy_panelLayout.setVerticalGroup(
proxy_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@ -1042,8 +1048,8 @@ public final class SettingsDialog extends javax.swing.JDialog {
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap()
.addComponent(proxy_panel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addComponent(proxy_panel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addContainerGap())
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)