From 94f4f842743255565e879e2288425188605e2a1e Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Wed, 27 Sep 2006 17:26:25 +0000 Subject: [PATCH] icon for authorization dialogs --- .../AuthorizationRequestedDialog.java | 15 ++++++++++++--- .../AuthorizationResponseDialog.java | 14 +++++++++++--- .../RequestAuthorizationDialog.java | 14 +++++++++++--- .../impl/gui/resources/common/padlock.gif | Bin 0 -> 3094 bytes .../communicator/impl/gui/utils/ImageLoader.java | 8 ++++++++ .../impl/gui/utils/images.properties | 2 ++ 6 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 src/net/java/sip/communicator/impl/gui/resources/common/padlock.gif diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java index 93ff784e8..0b4c8523a 100644 --- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java @@ -38,10 +38,15 @@ public class AuthorizationRequestedDialog extends JDialog private JPanel buttonsPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); - private JPanel northPanel = new JPanel(new GridLayout(0, 1)); + private JPanel northPanel = new JPanel(new BorderLayout()); + + private JPanel titlePanel = new JPanel(new GridLayout(0, 1)); private JLabel titleLabel = new JLabel(); + private JLabel iconLabel = new JLabel(new ImageIcon( + ImageLoader.getImage(ImageLoader.AUTHORIZATION_ICON))); + private JButton acceptButton = new JButton(Messages.getString("accept")); @@ -86,9 +91,13 @@ public AuthorizationRequestedDialog(Contact contact, this.infoTextArea.setLineWrap(true); this.infoTextArea.setWrapStyleWord(true); this.infoTextArea.setOpaque(false); + this.infoTextArea.setEditable(false); + + this.titlePanel.add(titleLabel); + this.titlePanel.add(infoTextArea); - this.northPanel.add(titleLabel); - this.northPanel.add(infoTextArea); + this.northPanel.add(iconLabel, BorderLayout.WEST); + this.northPanel.add(titlePanel, BorderLayout.CENTER); this.requestScrollPane.setBorder(BorderFactory.createCompoundBorder( BorderFactory.createEmptyBorder(3, 3, 3, 3), diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java index 435c3f2cb..b5b4a25e3 100644 --- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java @@ -31,7 +31,12 @@ public class AuthorizationResponseDialog extends JDialog private JPanel mainPanel = new JPanel(new BorderLayout(10, 10)); - private JPanel northPanel = new JPanel(new GridLayout(0, 1)); + private JPanel northPanel = new JPanel(new BorderLayout()); + + private JLabel iconLabel = new JLabel(new ImageIcon( + ImageLoader.getImage(ImageLoader.AUTHORIZATION_ICON))); + + private JPanel titlePanel = new JPanel(new GridLayout(0, 1)); private JLabel titleLabel = new JLabel(); @@ -87,8 +92,11 @@ else if(responseCode.equals(AuthorizationResponse.REJECT)) { this.infoTextArea.setEditable(false); this.infoTextArea.setOpaque(false); - this.northPanel.add(titleLabel); - this.northPanel.add(infoTextArea); + this.titlePanel.add(titleLabel); + this.titlePanel.add(infoTextArea); + + this.northPanel.add(iconLabel, BorderLayout.WEST); + this.northPanel.add(titlePanel, BorderLayout.CENTER); this.okButton.requestFocus(); this.okButton.setName("ok"); diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java index 6c43ebecb..86746692b 100644 --- a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java @@ -42,7 +42,12 @@ public class RequestAuthorizationDialog private JPanel mainPanel = new JPanel(new BorderLayout(10, 10)); - private JPanel northPanel = new JPanel(new GridLayout(0, 1)); + private JPanel northPanel = new JPanel(new BorderLayout()); + + private JPanel titlePanel = new JPanel(new GridLayout(0, 1)); + + private JLabel iconLabel = new JLabel(new ImageIcon( + ImageLoader.getImage(ImageLoader.AUTHORIZATION_ICON))); private JLabel titleLabel = new JLabel(); @@ -88,8 +93,11 @@ public RequestAuthorizationDialog(Contact contact, this.infoTextArea.setWrapStyleWord(true); this.infoTextArea.setEditable(false); - this.northPanel.add(titleLabel); - this.northPanel.add(infoTextArea); + this.titlePanel.add(titleLabel); + this.titlePanel.add(infoTextArea); + + this.northPanel.add(iconLabel, BorderLayout.WEST); + this.northPanel.add(titlePanel, BorderLayout.CENTER); this.requestButton.setName("request"); this.cancelButton.setName("cancel"); diff --git a/src/net/java/sip/communicator/impl/gui/resources/common/padlock.gif b/src/net/java/sip/communicator/impl/gui/resources/common/padlock.gif new file mode 100644 index 0000000000000000000000000000000000000000..adaabafe8394a57f7e29f4207efe38f864a1bdee GIT binary patch literal 3094 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 literal 0 HcmV?d00001 diff --git a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java index 75e326f0c..e51ba6abc 100644 --- a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java +++ b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java @@ -369,6 +369,14 @@ public class ImageLoader { */ public static final ImageID BROWSER_ICON = new ImageID("BROWSER_ICON"); + + /** + * The image used for decoration of all windows concerning the process of + * authorization. + */ + public static final ImageID AUTHORIZATION_ICON + = new ImageID("AUTHORIZATION_ICON"); + // ///////////////////// Edit Text Toolbar icons ////////////////////////// diff --git a/src/net/java/sip/communicator/impl/gui/utils/images.properties b/src/net/java/sip/communicator/impl/gui/utils/images.properties index 60bec0d28..60189ff7c 100644 --- a/src/net/java/sip/communicator/impl/gui/utils/images.properties +++ b/src/net/java/sip/communicator/impl/gui/utils/images.properties @@ -169,3 +169,5 @@ ADD_CONTACT_WIZARD_ICON=net/java/sip/communicator/impl/gui/resources/common/addC RENAME_DIALOG_ICON=net/java/sip/communicator/impl/gui/resources/common/renameDialogIcon.png BROWSER_ICON=net/java/sip/communicator/impl/gui/resources/common/browser16x16.png + +AUTHORIZATION_ICON=net/java/sip/communicator/impl/gui/resources/common/padlock.gif