skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Java Client: Switch to keybinding for login display

Browse Source
This commit is contained in:
Michael Ziminsky (Z) 2018-12-25 12:01:40 -07:00
parent ee02a54257
commit 08df7a6c0c
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java
View File

@ -508,7 +508,7 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
} }
private final class AuthenticatedUserPanel extends JPanel implements KeyListener, MPUser.Listener, KeyEventDispatcher { private final class AuthenticatedUserPanel extends JPanel implements KeyListener, MPUser.Listener {
private final JButton userButton = Components.button( Res.icons().user(), event -> showUserPreferences(), private final JButton userButton = Components.button( Res.icons().user(), event -> showUserPreferences(),
"Show user preferences." ); "Show user preferences." );
@ -528,6 +528,7 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
private static final String USE_SITE_ACTION = "useSite"; private static final String USE_SITE_ACTION = "useSite";
private static final String CLEAR_SITE_ACTION = "clearSite"; private static final String CLEAR_SITE_ACTION = "clearSite";
private static final String DELETE_SITE_ACTION = "deleteSite"; private static final String DELETE_SITE_ACTION = "deleteSite";
private static final String SHOW_LOGIN_ACTION = "showLogin";
@Nonnull @Nonnull
private final MPUser<?> user; private final MPUser<?> user;
@ -595,17 +596,6 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
sitesModel = new CollectionListModel<MPQuery.Result<? extends MPSite<?>>>().selection( this::showSiteItem ), sitesModel = new CollectionListModel<MPQuery.Result<? extends MPSite<?>>>().selection( this::showSiteItem ),
this::getSiteDescription ) ) ); this::getSiteDescription ) ) );
final InputMap panelInputMap = getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
panelInputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), USE_SITE_ACTION);
panelInputMap.put(copyLoginKeyStroke, USE_SITE_ACTION);
getActionMap().put(USE_SITE_ACTION, new SimpleAction(this::useSite));
panelInputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), CLEAR_SITE_ACTION);
getActionMap().put(CLEAR_SITE_ACTION, new SimpleAction(e -> queryField.setText("")));
sitesList.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), DELETE_SITE_ACTION);
sitesList.getActionMap().put(DELETE_SITE_ACTION, deleteButton.getAction());
add( Components.strut() ); add( Components.strut() );
add( Components.label( strf( add( Components.label( strf(
@ -614,17 +604,26 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
InputEvent.getModifiersExText( copyLoginKeyStroke.getModifiers() ), InputEvent.getModifiersExText( copyLoginKeyStroke.getModifiers() ),
KeyEvent.getKeyText( copyLoginKeyStroke.getKeyCode() ) ) ) ); KeyEvent.getKeyText( copyLoginKeyStroke.getKeyCode() ) ) ) );
addHierarchyListener( e -> { final InputMap panelInputMap = getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
if (HierarchyEvent.DISPLAYABILITY_CHANGED == (e.getChangeFlags() & HierarchyEvent.DISPLAYABILITY_CHANGED)) { final ActionMap panelActionMap = getActionMap();
if (null != SwingUtilities.windowForComponent( this )) {
KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher( this ); // Copy login/password
user.addListener( this ); panelInputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), USE_SITE_ACTION);
} else { panelInputMap.put(copyLoginKeyStroke, USE_SITE_ACTION);
KeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventDispatcher( this ); panelActionMap.put(USE_SITE_ACTION, new SimpleAction(this::useSite));
user.removeListener( this );
} // Clear Site
} panelInputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), CLEAR_SITE_ACTION);
} ); panelActionMap.put(CLEAR_SITE_ACTION, new SimpleAction(e -> queryField.setText("")));
// Show Login
panelInputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_SHIFT, InputEvent.SHIFT_DOWN_MASK), SHOW_LOGIN_ACTION); // Press
panelInputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_SHIFT, 0, true), SHOW_LOGIN_ACTION); // Release
panelActionMap.put(SHOW_LOGIN_ACTION, new SimpleAction(e -> setShowLogin((e.getModifiers() & ActionEvent.SHIFT_MASK) != 0)));
// Delete Site
sitesList.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), DELETE_SITE_ACTION);
sitesList.getActionMap().put(DELETE_SITE_ACTION, deleteButton.getAction());
} }
public void showUserPreferences() { public void showUserPreferences() {
@ -1114,13 +1113,5 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
@Override @Override
public void onUserInvalidated(final MPUser<?> user) { public void onUserInvalidated(final MPUser<?> user) {
} }
@Override
public boolean dispatchKeyEvent(final KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_SHIFT)
setShowLogin( e.isShiftDown() );
return false;
}
} }
} }