Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Besedin2008-04-30 21:08:34 +0000
committerOleg Besedin2008-04-30 21:08:34 +0000
commitf1024ee8b8c9e70fd29cfa5d83ac9569168e2404 (patch)
tree26b550863bb2adf4a2968e0e3ba3dab58554e01b /bundles/org.eclipse.equinox.security.ui
parent8001af16116c96edb2df5ecc4f034926b305b2b0 (diff)
downloadrt.equinox.bundles-f1024ee8b8c9e70fd29cfa5d83ac9569168e2404.tar.gz
rt.equinox.bundles-f1024ee8b8c9e70fd29cfa5d83ac9569168e2404.tar.xz
rt.equinox.bundles-f1024ee8b8c9e70fd29cfa5d83ac9569168e2404.zip
Bug 227293 Polish UIv20080430-1700
Diffstat (limited to 'bundles/org.eclipse.equinox.security.ui')
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/SecUIMessages.java1
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/messages.properties17
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java8
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java6
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java2
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java21
6 files changed, 39 insertions, 16 deletions
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/SecUIMessages.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/SecUIMessages.java
index 703d0be0a..07c03adfc 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/SecUIMessages.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/SecUIMessages.java
@@ -67,6 +67,7 @@ public class SecUIMessages extends NLS {
public static String saveButton;
public static String exportButton;
public static String locationButton;
+ public static String providerDescription;
// secure storage view
public static String generalTitle;
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/messages.properties b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/messages.properties
index f1fdb0aac..7fcc661d4 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/messages.properties
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/messages.properties
@@ -28,10 +28,10 @@ messageEmptyPassword = Password can not be empty
messageNoMatch = Password and confirmation characters did not match
labelPassword = &Password:
labelConfirm = &Confirm password:
-buttonLogin = Login
+buttonLogin = OK
buttonExit = Cancel
dialogTitle = Please enter the secure storage password.
-passwordChangeTitle = Please enter a new password for the secure storage.
+passwordChangeTitle = Please enter a new master password for the secure storage.
showPassword = &Show password
noDigestPassword = The message digest algorithm \"{0}\" is not available.
locationGroup = Storage location
@@ -42,9 +42,9 @@ exceptionDecode = Incorrect password or data is corrupted. Would you like to re-
## Properties pages
selectCipher = &Select encryption algorithm to use in new storages:
-changePasswordButton = &Change
-recoverPasswordButton = &Recover
-deleteButton = D&elete
+changePasswordButton = &Change...
+recoverPasswordButton = &Recover...
+deleteButton = D&elete...
logoutButton = &Logout All
providersTable = Providers:
enabledColumn = Enabled
@@ -58,9 +58,10 @@ postDeleteMsg = Storage deleted. It is highly recommended to restart this sessio
tabPassword = Password
tabAdvanced = Advanced
tabContents = Contents
-saveButton = &Save...
+saveButton = &Save
exportButton = &Export...
locationButton = S&torage location:
+providerDescription = The provider modules supply \'master\' passwords used to encrypt information.\nThe provider is selected based on the priority from the list of enabled providers.
## Secure storage view
generalTitle = Secure Storage
@@ -142,8 +143,8 @@ pswdRecoveryOptionTitle = Secure Storage
pswdRecoveryOptionMsg = A new password has been set up for the secure storage. Would you like to enable recovery of a lost password (this is optional)?
passwordRecoveryTitle = Password Recovery
passwordRecoveryTitleMsg = Please enter Question/Answer pairs.
-passwordMsg = Lost passwords can be recovered using \"Recover\" option on the Secure Storage preferences page.
-passwordRecoveryLabel = To be able to recover lost password in future, enter questions and answers below.\nAnswers are case-sensitive; treat answers as secondary passwords.\n
+passwordMsg = Lost passwords can be recovered using \'Recover\' option on the Secure Storage preference page.
+passwordRecoveryLabel = To be able to recover lost password in future, enter questions and answers above.\nAnswers are case-sensitive; treat answers as secondary passwords.\n
passwordErrMsg = Questions and answers can not be empty.
passwordGroup = Question {0}
passwordQuestion = &Question:
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java
index b35b6714a..ef6ad19e8 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java
@@ -67,10 +67,6 @@ public class ChallengeResponseDialog extends TitleAreaDialog {
setMessage(SecUIMessages.passwordMsg, IMessageProvider.INFORMATION);
- Label storyLabel = new Label(composite, SWT.LEFT);
- storyLabel.setText(SecUIMessages.passwordRecoveryLabel);
- storyLabel.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
-
for (int i = 0; i < size; i++) {
Group group = new Group(composite, SWT.NONE);
group.setText(NLS.bind(SecUIMessages.passwordGroup, Integer.toString(i + 1)));
@@ -96,6 +92,10 @@ public class ChallengeResponseDialog extends TitleAreaDialog {
});
}
+ Label storyLabel = new Label(composite, SWT.LEFT);
+ storyLabel.setText(SecUIMessages.passwordRecoveryLabel);
+ storyLabel.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
+
composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
GridLayoutFactory.swtDefaults().generateLayout(composite);
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java
index a13e33549..48f031e99 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java
@@ -39,9 +39,11 @@ public class StoragePreferencePage extends PreferencePage implements IWorkbenchP
Composite pageArea = new Composite(parent, SWT.NONE);
pageArea.setLayout(new RowLayout());
+ int minButtonWidth = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
+
final TabFolder folder = new TabFolder(parent, SWT.TOP);
- passwordTab = new TabPassword(folder, 0, getShell());
- contentsTab = new TabContents(folder, 1, getShell(), convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH));
+ passwordTab = new TabPassword(folder, 0, getShell(), minButtonWidth);
+ contentsTab = new TabContents(folder, 1, getShell(), minButtonWidth);
advancedTab = new TabAdvanced(folder, 2, getShell());
folder.setSelection(0);
folder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java
index 254f7203a..5d6271515 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java
@@ -63,7 +63,7 @@ public class TabContents implements ISecurePreferencesSelection, IDeleteListener
new Label(rightPane, SWT.NONE).setText(SecUIMessages.keysTable);
- Table tableOfValues = new Table(rightPane, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+ Table tableOfValues = new Table(rightPane, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
tableOfValues.setLinesVisible(true);
tableOfValues.setHeaderVisible(true);
tableOfValues.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java
index 9aece4fa6..64bfc01c2 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java
@@ -18,10 +18,12 @@ import org.eclipse.equinox.internal.security.storage.friends.*;
import org.eclipse.equinox.internal.security.ui.nls.SecUIMessages;
import org.eclipse.equinox.security.storage.ISecurePreferences;
import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.layout.LayoutConstants;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
+import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.*;
@@ -41,12 +43,19 @@ public class TabPassword {
protected boolean providerModified = false;
- public TabPassword(TabFolder folder, int index, final Shell shell) {
+ public TabPassword(TabFolder folder, int index, final Shell shell, int minButtonWidth) {
TabItem tab = new TabItem(folder, SWT.NONE, index);
tab.setText(SecUIMessages.tabPassword);
Composite page = new Composite(folder, SWT.NONE);
tab.setControl(page);
+ Composite topPart = new Composite(page, SWT.NONE);
+ GridData topData = new GridData(GridData.FILL, GridData.FILL, true, false);
+ topData.horizontalSpan = 2;
+ topPart.setLayoutData(topData);
+ topPart.setLayout(new GridLayout(2, false));
+ new Label(topPart, SWT.NONE).setText(SecUIMessages.providerDescription);
+
// Left side
Composite leftPart = new Composite(page, SWT.NONE);
leftPart.setLayout(new GridLayout());
@@ -106,6 +115,7 @@ public class TabPassword {
enableLogout();
}
});
+ setButtonSize(buttonChangePassword, minButtonWidth);
buttonRecoverPassword = new Button(rightPart, SWT.NONE);
buttonRecoverPassword.setText(SecUIMessages.recoverPasswordButton);
@@ -127,6 +137,7 @@ public class TabPassword {
enableLogout();
}
});
+ setButtonSize(buttonRecoverPassword, minButtonWidth);
enableButtons();
@@ -252,4 +263,12 @@ public class TabPassword {
buttonClearPassword.setEnabled(InternalExchangeUtils.isLoggedIn());
}
+ protected void setButtonSize(Button button, int minButtonWidth) {
+ Dialog.applyDialogFont(button);
+ GridData data = new GridData();
+ Point minButtonSize = button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+ data.widthHint = Math.max(minButtonWidth, minButtonSize.x);
+ button.setLayoutData(data);
+ }
+
}

Back to the top