skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Mask the generated password by default, provide a check box to unmask it.

Browse Source
This commit is contained in:
Maarten Billemont 2014-12-31 14:46:44 -05:00
parent bea6ac5e68
commit e9094097a2
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/PasswordFrame.java
View File

@ -4,7 +4,6 @@ import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.util.concurrent.*; import com.google.common.util.concurrent.*;
import com.lyndir.lhunath.opal.system.logging.Logger;
import com.lyndir.masterpassword.*; import com.lyndir.masterpassword.*;
import com.lyndir.masterpassword.util.Components; import com.lyndir.masterpassword.util.Components;
import java.awt.*; import java.awt.*;
@ -27,8 +26,11 @@ public class PasswordFrame extends JFrame implements DocumentListener {
private final JButton siteAddButton; private final JButton siteAddButton;
private final JComboBox<MPSiteType> siteTypeField; private final JComboBox<MPSiteType> siteTypeField;
private final JSpinner siteCounterField; private final JSpinner siteCounterField;
private final JTextField passwordField; private final JPasswordField passwordField;
private final JLabel tipLabel; private final JLabel tipLabel;
private final JCheckBox maskPasswordField;
private final char passwordEchoChar;
private final Font passwordEchoFont;
private boolean updatingUI; private boolean updatingUI;
private Site currentSite; private Site currentSite;
@ -150,19 +152,34 @@ public class PasswordFrame extends JFrame implements DocumentListener {
} }
} ); } );
// Mask
maskPasswordField = new JCheckBox();
maskPasswordField.setFont( Res.exoRegular().deriveFont( 12f ) );
maskPasswordField.setAlignmentX( Component.CENTER_ALIGNMENT );
maskPasswordField.setText( "Hide Password" );
maskPasswordField.setSelected( true );
maskPasswordField.addItemListener( new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
updateMask();
}
} );
// Password // Password
passwordField = new JTextField( " " ); passwordField = new JPasswordField();
passwordField.setFont( Res.sourceCodeProBlack().deriveFont( 40f ) );
passwordField.setHorizontalAlignment( JTextField.CENTER ); passwordField.setHorizontalAlignment( JTextField.CENTER );
passwordField.setAlignmentX( Component.CENTER_ALIGNMENT ); passwordField.setAlignmentX( Component.CENTER_ALIGNMENT );
passwordField.setEditable( false ); passwordField.setEditable( false );
passwordEchoChar = passwordField.getEchoChar();
passwordEchoFont = passwordField.getFont().deriveFont( 40f );
updateMask();
// Tip // Tip
tipLabel = new JLabel( " ", JLabel.CENTER ); tipLabel = new JLabel( " ", JLabel.CENTER );
tipLabel.setFont( Res.exoRegular().deriveFont( 9f ) ); tipLabel.setFont( Res.exoRegular().deriveFont( 9f ) );
tipLabel.setAlignmentX( Component.CENTER_ALIGNMENT ); tipLabel.setAlignmentX( Component.CENTER_ALIGNMENT );
add( Components.boxLayout( BoxLayout.PAGE_AXIS, passwordField, tipLabel ), BorderLayout.SOUTH ); add( Components.boxLayout( BoxLayout.PAGE_AXIS, maskPasswordField, passwordField, tipLabel ), BorderLayout.SOUTH );
pack(); pack();
setMinimumSize( getSize() ); setMinimumSize( getSize() );
@ -173,6 +190,11 @@ public class PasswordFrame extends JFrame implements DocumentListener {
setLocationRelativeTo( null ); setLocationRelativeTo( null );
} }
private void updateMask() {
passwordField.setEchoChar( maskPasswordField.isSelected()? passwordEchoChar: (char) 0 );
passwordField.setFont( maskPasswordField.isSelected()? passwordEchoFont: Res.sourceCodeProBlack().deriveFont( 40f ) );
}
@Nonnull @Nonnull
private ListenableFuture<String> updatePassword() { private ListenableFuture<String> updatePassword() {
@ -180,8 +202,8 @@ public class PasswordFrame extends JFrame implements DocumentListener {
if (updatingUI) if (updatingUI)
return Futures.immediateCancelledFuture(); return Futures.immediateCancelledFuture();
if (siteNameQuery == null || siteNameQuery.isEmpty() || !user.hasKey()) { if (siteNameQuery == null || siteNameQuery.isEmpty() || !user.hasKey()) {
passwordField.setText( null );
tipLabel.setText( null ); tipLabel.setText( null );
passwordField.setText( null );
return Futures.immediateCancelledFuture(); return Futures.immediateCancelledFuture();
} }