diff --git a/resources/application.properties b/resources/application.properties index f7b99eabb..8aa7a6d64 100644 --- a/resources/application.properties +++ b/resources/application.properties @@ -4,4 +4,5 @@ fontName=Verdana fontSize=12 titleFontSize=14 isLookAndFeelDecorated=false -isToolBarExteneded=false \ No newline at end of file +isToolBarExteneded=false +aboutLogoFontSize=14 \ No newline at end of file diff --git a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java index ee3f39525..7a68ac06f 100644 --- a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java +++ b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java @@ -28,7 +28,7 @@ public class AboutWindow extends JDialog implements HyperlinkListener, + System.getProperty("sip-communicator.version")); private JTextArea logoArea = new JTextArea( - "Open Source VoIP & Instant Messaging"); + Resources.getString("logoMessage")); private StyledHTMLEditorPane rightsArea = new StyledHTMLEditorPane(); @@ -66,7 +66,12 @@ public AboutWindow(Frame owner) this.versionLabel.setForeground(Constants.TITLE_COLOR); this.versionLabel.setAlignmentX(Component.RIGHT_ALIGNMENT); - this.logoArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 14)); + int logoAreaFontSize = new Integer( + BrandingResources.getApplicationString("aboutLogoFontSize")).intValue(); + + this.logoArea.setFont( + Constants.FONT.deriveFont(Font.BOLD, logoAreaFontSize)); + this.logoArea.setForeground(Constants.TITLE_COLOR); this.logoArea.setOpaque(false); this.logoArea.setLineWrap(true); diff --git a/src/net/java/sip/communicator/plugin/branding/Resources.java b/src/net/java/sip/communicator/plugin/branding/Resources.java index 19a7832ba..da0d2ba11 100644 --- a/src/net/java/sip/communicator/plugin/branding/Resources.java +++ b/src/net/java/sip/communicator/plugin/branding/Resources.java @@ -87,7 +87,7 @@ public static String getString(String key, String[] params) * * @param key The key of the string. * - * @return An internationalized string corresponding to the given key. + * @return an int RGB color corresponding to the given key. */ public static String getColor(String key) { diff --git a/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java b/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java index 24d63b786..382bbd555 100644 --- a/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java +++ b/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java @@ -54,8 +54,13 @@ public WelcomeWindow() this.versionLabel.setForeground(Constants.TITLE_COLOR); this.versionLabel.setAlignmentX(Component.RIGHT_ALIGNMENT); + int logoAreaFontSize = new Integer( + BrandingResources.getApplicationString("aboutLogoFontSize")) + .intValue(); + + this.logoArea.setFont( + Constants.FONT.deriveFont(Font.BOLD, logoAreaFontSize)); this.logoArea.setForeground(Constants.TITLE_COLOR); - this.logoArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12)); this.logoArea.setOpaque(false); this.logoArea.setLineWrap(true); this.logoArea.setWrapStyleWord(true); @@ -203,12 +208,8 @@ protected void paintComponent(Graphics g) g2.drawImage(bgImage, 0, 0, null); -// g2.setColor(new Color(255, 255, 255, 170)); -// -// g2.fillRect(0, 0, getWidth(), getHeight()); - g2.setColor(new Color(150, 150, 150)); - + g2.drawRoundRect(0, 0, getWidth() - 1, getHeight() - 1, 5, 5); } }