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 000000000..adaabafe8 Binary files /dev/null and b/src/net/java/sip/communicator/impl/gui/resources/common/padlock.gif differ 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