skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Site toolbar buttons should toggle on site, not result.

Browse Source
This commit is contained in:
Maarten Billemont
2021-02-08 14:21:52 -05:00
parent 913208255e
commit 83fa6c39bc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -901,6 +901,12 @@ public class UserContentPanel extends JPanel implements State.Listener, MPUser.L
private void showSiteItem(@Nullable final MPQuery.Result<? extends MPSite<?>> item) { private void showSiteItem(@Nullable final MPQuery.Result<? extends MPSite<?>> item) {
MPSite<?> site = (item != null)? item.getValue(): null; MPSite<?> site = (item != null)? item.getValue(): null;
Res.ui( getSiteResult( site, showLogin ), result -> { Res.ui( getSiteResult( site, showLogin ), result -> {
settingsButton.setEnabled( site != null );
questionsButton.setEnabled( site != null );
editButton.setEnabled( site != null );
keyButton.setEnabled( site != null );
deleteButton.setEnabled( site != null );
if (!showLogin && (site != null)) if (!showLogin && (site != null))
resultLabel.setText( (result != null)? strf( "Your password for %s:", site.getSiteName() ): " " ); resultLabel.setText( (result != null)? strf( "Your password for %s:", site.getSiteName() ): " " );
else if (showLogin && (site != null)) else if (showLogin && (site != null))
@@ -912,11 +918,6 @@ public class UserContentPanel extends JPanel implements State.Listener, MPUser.L
resultField.setText( EACH_CHARACTER.matcher( result ).replaceAll( "•" ) ); resultField.setText( EACH_CHARACTER.matcher( result ).replaceAll( "•" ) );
else else
resultField.setText( result ); resultField.setText( result );
settingsButton.setEnabled( result != null );
questionsButton.setEnabled( result != null );
editButton.setEnabled( result != null );
keyButton.setEnabled( result != null );
deleteButton.setEnabled( result != null );
} ); } );
} }