diff --git a/resources/config/defaults.properties b/resources/config/defaults.properties index a30aa327c..5372ca44a 100644 --- a/resources/config/defaults.properties +++ b/resources/config/defaults.properties @@ -17,6 +17,8 @@ titleFontSize=14 isLookAndFeelDecorated=false isToolBarExteneded=false aboutLogoFontSize=14 +aboutWindowTextIndent=180 +splashScreenTextIndent=190 defaultGroupName= preferredAccountWizard= tabOverlap=10 diff --git a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java index 904d75300..91b7959c2 100644 --- a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java +++ b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java @@ -18,6 +18,10 @@ public class AboutWindow extends JDialog implements HyperlinkListener, ActionListener, ExportedWindow { + private static final int DEFAULT_TEXT_INDENT + = BrandingActivator.getResources() + .getSettingsInt("aboutWindowTextIndent"); + public AboutWindow(Frame owner) { super(owner); @@ -67,7 +71,8 @@ public AboutWindow(Frame owner) logoArea.setEditable(false); logoArea.setPreferredSize(new Dimension(100, 20)); logoArea.setAlignmentX(Component.RIGHT_ALIGNMENT); - logoArea.setBorder(BorderFactory.createEmptyBorder(30, 180, 0, 0)); + logoArea.setBorder(BorderFactory + .createEmptyBorder(30, DEFAULT_TEXT_INDENT, 0, 0)); StyledHTMLEditorPane rightsArea = new StyledHTMLEditorPane(); rightsArea.setContentType("text/html"); @@ -78,7 +83,8 @@ public AboutWindow(Frame owner) rightsArea.setPreferredSize(new Dimension(50, 20)); rightsArea - .setBorder(BorderFactory.createEmptyBorder(0, 180, 0, 0)); + .setBorder(BorderFactory + .createEmptyBorder(0, DEFAULT_TEXT_INDENT, 0, 0)); rightsArea.setOpaque(false); rightsArea.setEditable(false); rightsArea.setAlignmentX(Component.RIGHT_ALIGNMENT); @@ -92,7 +98,7 @@ public AboutWindow(Frame owner) licenseArea.setPreferredSize(new Dimension(50, 20)); licenseArea.setBorder( - BorderFactory.createEmptyBorder(10, 180, 0, 0)); + BorderFactory.createEmptyBorder(10, DEFAULT_TEXT_INDENT, 0, 0)); licenseArea.setOpaque(false); licenseArea.setEditable(false); licenseArea.setAlignmentX(Component.RIGHT_ALIGNMENT); diff --git a/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java b/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java index ef79836ed..8f2438979 100644 --- a/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java +++ b/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java @@ -16,6 +16,10 @@ public class WelcomeWindow extends JDialog { + private static final int DEFAULT_TEXT_INDENT + = BrandingActivator.getResources() + .getSettingsInt("splashScreenTextIndent"); + private WindowBackground mainPanel = new WindowBackground(); private JLabel titleLabel @@ -44,7 +48,8 @@ public class WelcomeWindow extends JDialog public WelcomeWindow() { this.setTitle( - BrandingActivator.getResources().getSettingsString("applicationName")); + BrandingActivator.getResources() + .getSettingsString("applicationName")); this.setModal(false); this.setUndecorated(true); @@ -77,7 +82,8 @@ public WelcomeWindow() this.logoArea.setEditable(false); this.logoArea.setPreferredSize(new Dimension(100, 20)); this.logoArea.setAlignmentX(Component.RIGHT_ALIGNMENT); - this.logoArea.setBorder(BorderFactory.createEmptyBorder(20, 190, 0, 0)); + this.logoArea.setBorder(BorderFactory + .createEmptyBorder(20, DEFAULT_TEXT_INDENT, 0, 0)); this.rightsArea.setContentType("text/html"); this.rightsArea.appendToEnd(BrandingActivator.getResources().getI18NString( @@ -90,7 +96,8 @@ public WelcomeWindow() this.rightsArea.setPreferredSize(new Dimension(50, 50)); this.rightsArea - .setBorder(BorderFactory.createEmptyBorder(0, 190, 0, 0)); + .setBorder(BorderFactory + .createEmptyBorder(0, DEFAULT_TEXT_INDENT, 0, 0)); this.rightsArea.setOpaque(false); this.rightsArea.setEditable(false); this.rightsArea.setAlignmentX(Component.RIGHT_ALIGNMENT); @@ -105,7 +112,7 @@ public WelcomeWindow() this.licenseArea.setPreferredSize(new Dimension(50, 20)); this.licenseArea.setBorder(BorderFactory - .createEmptyBorder(0, 190, 0, 0)); + .createEmptyBorder(0, DEFAULT_TEXT_INDENT, 0, 0)); this.licenseArea.setOpaque(false); this.licenseArea.setEditable(false); this.licenseArea.setAlignmentX(Component.RIGHT_ALIGNMENT);