skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Java Client: Separate user and application preferences

Browse Source
This commit is contained in:
Michael Ziminsky (Z) 2018-10-25 13:57:39 -07:00
parent 554c0129a2
commit 6f2dd84a31
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Res.java
View File

@ -165,6 +165,10 @@ public abstract class Res {
return icon( "media/icon_key.png" ); return icon( "media/icon_key.png" );
} }
public Icon prefs() {
return icon( "media/prefs.png" );
}
public Icon avatar(final int index) { public Icon avatar(final int index) {
return icon( strf( "media/avatar-%d.png", index % avatars() ) ); return icon( strf( "media/avatar-%d.png", index % avatars() ) );
} }

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

@ -55,6 +55,8 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
"Import a user from a backup file into Master Password." ); "Import a user from a backup file into Master Password." );
private final JButton helpButton = Components.button( Res.icons().help(), event -> showHelp(), private final JButton helpButton = Components.button( Res.icons().help(), event -> showHelp(),
"Show information on how to use Master Password." ); "Show information on how to use Master Password." );
private final JButton prefsButton = Components.button( Res.icons().prefs(), event -> showAppPreferences(),
"Show application preferences." );
private final JPanel userToolbar = Components.panel( BoxLayout.PAGE_AXIS ); private final JPanel userToolbar = Components.panel( BoxLayout.PAGE_AXIS );
private final JPanel siteToolbar = Components.panel( BoxLayout.PAGE_AXIS ); private final JPanel siteToolbar = Components.panel( BoxLayout.PAGE_AXIS );
@ -248,6 +250,17 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
"About Master Password", JOptionPane.INFORMATION_MESSAGE ); "About Master Password", JOptionPane.INFORMATION_MESSAGE );
} }
private void showAppPreferences() {
Component checkForUpdates = Components.checkBox("Check For Updates", MPGuiConfig.get().checkForUpdates(), MPGuiConfig.get()::setCheckForUpdates);
Component stayResident = Components.checkBox(strf("<html>Stay Resident (reactivate with <strong><code>%s+%s</code></strong>)",
InputEvent.getModifiersExText(MPGuiConstants.ui_hotkey.getModifiers()),
KeyEvent.getKeyText(MPGuiConstants.ui_hotkey.getKeyCode())),
MPGuiConfig.get().stayResident(), MPGuiConfig.get()::setStayResident);
Components.showDialog(this, "Application Preferences", new JOptionPane(Components.panel(BoxLayout.PAGE_AXIS, checkForUpdates, stayResident)));
}
private enum ContentMode { private enum ContentMode {
NO_USER, NO_USER,
AUTHENTICATE, AUTHENTICATE,
@ -274,6 +287,9 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
userToolbar.add( Box.createGlue() ); userToolbar.add( Box.createGlue() );
userToolbar.add( helpButton ); userToolbar.add( helpButton );
siteToolbar.add(Box.createGlue());
siteToolbar.add(prefsButton);
add( Box.createGlue() ); add( Box.createGlue() );
add( Components.heading( "Select a user to proceed." ) ); add( Components.heading( "Select a user to proceed." ) );
add( Box.createGlue() ); add( Box.createGlue() );
@ -312,6 +328,9 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
userToolbar.add( Box.createGlue() ); userToolbar.add( Box.createGlue() );
userToolbar.add( helpButton ); userToolbar.add( helpButton );
siteToolbar.add(Box.createGlue());
siteToolbar.add(prefsButton);
add( Components.heading( user.getFullName(), SwingConstants.CENTER ) ); add( Components.heading( user.getFullName(), SwingConstants.CENTER ) );
add( Components.strut() ); add( Components.strut() );
@ -512,6 +531,8 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
siteToolbar.add( editButton ); siteToolbar.add( editButton );
siteToolbar.add( keyButton ); siteToolbar.add( keyButton );
siteToolbar.add( deleteButton ); siteToolbar.add( deleteButton );
siteToolbar.add(Box.createGlue());
siteToolbar.add(prefsButton);
settingsButton.setEnabled( false ); settingsButton.setEnabled( false );
questionsButton.setEnabled( false ); questionsButton.setEnabled( false );
editButton.setEnabled( false ); editButton.setEnabled( false );
@ -586,16 +607,6 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
components.add( Components.checkBox( "Hide Passwords", components.add( Components.checkBox( "Hide Passwords",
user.getPreferences().isHidePasswords(), user.getPreferences()::setHidePasswords ) ); user.getPreferences().isHidePasswords(), user.getPreferences()::setHidePasswords ) );
components.add( new JSeparator() );
components.add( Components.checkBox( "Check For Updates",
MPGuiConfig.get().checkForUpdates(), MPGuiConfig.get()::setCheckForUpdates ) );
components.add( Components.checkBox( strf( "<html>Stay Resident (reactivate with <strong><code>%s+%s</code></strong>)",
InputEvent.getModifiersExText( MPGuiConstants.ui_hotkey.getModifiers() ),
KeyEvent.getKeyText( MPGuiConstants.ui_hotkey.getKeyCode() ) ),
MPGuiConfig.get().stayResident(), MPGuiConfig.get()::setStayResident ) );
Components.showDialog( this, user.getFullName(), new JOptionPane( Components.panel( Components.showDialog( this, user.getFullName(), new JOptionPane( Components.panel(
BoxLayout.PAGE_AXIS, components.build().toArray( new Component[0] ) ) ) ); BoxLayout.PAGE_AXIS, components.build().toArray( new Component[0] ) ) ) );
} }

BIN
platform-independent/java/gui/src/main/resources/media/prefs.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
platform-independent/java/gui/src/main/resources/media/prefs@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB