? 27030_trunk1.diff
? 27030_trunk2.diff
? src/org/netbeans/modules/welcome/ControlLabel.java
? src/org/netbeans/modules/welcome/ControlLabel.form
? src/org/netbeans/modules/welcome/pages/horizontalLBL.gif
Index: src/org/netbeans/modules/welcome/Bundle.properties
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/Bundle.properties,v
retrieving revision 1.18
diff -u -B -b -r1.18 Bundle.properties
--- src/org/netbeans/modules/welcome/Bundle.properties	3 Nov 2002 01:59:08 -0000	1.18
+++ src/org/netbeans/modules/welcome/Bundle.properties	2 Jan 2003 13:56:40 -0000
@@ -77,3 +77,9 @@
 #Optional value for font style setting. 
 #NOI18N
 Next_Button_Font_Style=0
+
+Customizing_LBL=Customizing
+
+Help_LBL=Help
+
+TipLBL=Tip
Index: src/org/netbeans/modules/welcome/ControlPanel.form
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.form,v
retrieving revision 1.1
diff -u -B -b -r1.1 ControlPanel.form
--- src/org/netbeans/modules/welcome/ControlPanel.form	4 Jun 2002 08:50:16 -0000	1.1
+++ src/org/netbeans/modules/welcome/ControlPanel.form	2 Jan 2003 13:56:40 -0000
@@ -20,42 +20,45 @@
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
   <SubComponents>
-    <Component class="javax.swing.JLabel" name="custLBL">
+    <Container class="org.netbeans.modules.welcome.ControlLabel" name="customizingLBL">
       <Properties>
-        <Property name="icon" type="javax.swing.Icon" editor="org.openide.explorer.propertysheet.editors.IconEditor">
-          <Image iconType="3" name="/org/netbeans/modules/welcome/pages/images/customizing.gif"/>
+        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[162, 17]"/>
+        </Property>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/welcome/Bundle.properties" key="Customizing_LBL" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="2" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="24" insetsLeft="0" insetsBottom="12" insetsRight="8" anchor="10" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="0" gridY="0" gridWidth="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="24" insetsLeft="0" insetsBottom="12" insetsRight="14" anchor="10" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
-    </Component>
-    <Component class="javax.swing.JLabel" name="helpLBL">
+    </Container>
+    <Container class="org.netbeans.modules.welcome.ControlLabel" name="helpLBL">
       <Properties>
-        <Property name="icon" type="javax.swing.Icon" editor="org.openide.explorer.propertysheet.editors.IconEditor">
-          <Image iconType="3" name="/org/netbeans/modules/welcome/pages/images/help.gif"/>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/welcome/Bundle.properties" key="Help_LBL" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="0" gridY="3" gridWidth="2" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="12" insetsRight="8" anchor="10" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="0" gridY="3" gridWidth="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="10" insetsLeft="0" insetsBottom="6" insetsRight="14" anchor="10" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
-    </Component>
-    <Component class="javax.swing.JLabel" name="tipLBL">
+    </Container>
+    <Container class="org.netbeans.modules.welcome.ControlLabel" name="tipLBL">
       <Properties>
-        <Property name="icon" type="javax.swing.Icon" editor="org.openide.explorer.propertysheet.editors.IconEditor">
-          <Image iconType="3" name="/org/netbeans/modules/welcome/pages/images/tip.gif"/>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/welcome/Bundle.properties" key="TipLBL" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="0" gridY="5" gridWidth="2" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="0" insetsRight="8" anchor="10" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="0" gridY="5" gridWidth="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="0" insetsBottom="6" insetsRight="14" anchor="10" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
-    </Component>
+    </Container>
     <Container class="org.netbeans.modules.welcome.SetupButton" name="setupButton1">
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -81,15 +84,15 @@
     <Container class="org.netbeans.modules.welcome.HelpPanel" name="helpPanel1">
       <Properties>
         <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[142, 80]"/>
+          <Dimension value="[142, 90]"/>
         </Property>
         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[142, 80]"/>
+          <Dimension value="[142, 90]"/>
         </Property>
       </Properties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="0" gridY="4" gridWidth="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="0" insetsRight="8" anchor="10" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="0" gridY="4" gridWidth="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="7" insetsBottom="0" insetsRight="9" anchor="10" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
 
@@ -135,22 +138,13 @@
       </Properties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="0" gridY="7" gridWidth="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="1.0"/>
+          <GridBagConstraints gridX="0" gridY="6" gridWidth="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="1.0"/>
         </Constraint>
       </Constraints>
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
       <SubComponents>
         <Container class="org.netbeans.modules.welcome.TipPanel" name="tipPanel1">
-          <Properties>
-            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[160, 203]"/>
-            </Property>
-          </Properties>
-
-          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-            <Property name="useNullLayout" type="boolean" value="true"/>
-          </Layout>
         </Container>
       </SubComponents>
     </Container>
Index: src/org/netbeans/modules/welcome/ControlPanel.java
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.java,v
retrieving revision 1.1
diff -u -B -b -r1.1 ControlPanel.java
--- src/org/netbeans/modules/welcome/ControlPanel.java	4 Jun 2002 08:50:20 -0000	1.1
+++ src/org/netbeans/modules/welcome/ControlPanel.java	2 Jan 2003 13:56:40 -0000
@@ -13,6 +13,7 @@
 
 package org.netbeans.modules.welcome;
 
+import java.awt.Font;
 /**
  *
  * @author  Richard Gregor
@@ -22,6 +23,11 @@
     /** Creates new form ControlPanel */
     public ControlPanel() {
         initComponents();
+        Font f= tipPanel1.getTextFont();
+        tipLBL.setFont(f);
+        customizingLBL.setFont(f);
+        helpLBL.setFont(f);
+        
     }
     
     /** This method is called from within the constructor to
@@ -33,9 +39,9 @@
         java.awt.GridBagConstraints gridBagConstraints;
 
         helpPanel2 = new org.netbeans.modules.welcome.HelpPanel();
-        custLBL = new javax.swing.JLabel();
-        helpLBL = new javax.swing.JLabel();
-        tipLBL = new javax.swing.JLabel();
+        customizingLBL = new org.netbeans.modules.welcome.ControlLabel();
+        helpLBL = new org.netbeans.modules.welcome.ControlLabel();
+        tipLBL = new org.netbeans.modules.welcome.ControlLabel();
         setupButton1 = new org.netbeans.modules.welcome.SetupButton();
         updateButton1 = new org.netbeans.modules.welcome.UpdateButton();
         helpPanel1 = new org.netbeans.modules.welcome.HelpPanel();
@@ -49,26 +55,33 @@
         setLayout(new java.awt.GridBagLayout());
 
         setBackground(new java.awt.Color(255, 255, 255));
-        custLBL.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/welcome/pages/images/customizing.gif")));
+
+        customizingLBL.setPreferredSize(new java.awt.Dimension(162, 17));
+        customizingLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("Customizing_LBL"));
         gridBagConstraints = new java.awt.GridBagConstraints();
+        gridBagConstraints.gridx = 0;
+        gridBagConstraints.gridy = 0;
         gridBagConstraints.gridwidth = 2;
-        gridBagConstraints.insets = new java.awt.Insets(24, 0, 12, 8);
-        add(custLBL, gridBagConstraints);
+        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+        gridBagConstraints.insets = new java.awt.Insets(24, 0, 12, 14);
+        add(customizingLBL, gridBagConstraints);
 
-        helpLBL.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/welcome/pages/images/help.gif")));
+        helpLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("Help_LBL"));
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 3;
         gridBagConstraints.gridwidth = 2;
-        gridBagConstraints.insets = new java.awt.Insets(12, 0, 12, 8);
+        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+        gridBagConstraints.insets = new java.awt.Insets(10, 0, 6, 14);
         add(helpLBL, gridBagConstraints);
 
-        tipLBL.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/welcome/pages/images/tip.gif")));
+        tipLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("TipLBL"));
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 5;
         gridBagConstraints.gridwidth = 2;
-        gridBagConstraints.insets = new java.awt.Insets(12, 0, 0, 8);
+        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+        gridBagConstraints.insets = new java.awt.Insets(6, 0, 6, 14);
         add(tipLBL, gridBagConstraints);
 
         setupButton1.setLayout(null);
@@ -91,14 +104,14 @@
 
         helpPanel1.setLayout(null);
 
-        helpPanel1.setMinimumSize(new java.awt.Dimension(142, 80));
-        helpPanel1.setPreferredSize(new java.awt.Dimension(142, 80));
+        helpPanel1.setMinimumSize(new java.awt.Dimension(142, 90));
+        helpPanel1.setPreferredSize(new java.awt.Dimension(142, 90));
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 4;
         gridBagConstraints.gridwidth = 2;
         gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
-        gridBagConstraints.insets = new java.awt.Insets(0, 8, 0, 8);
+        gridBagConstraints.insets = new java.awt.Insets(0, 7, 0, 9);
         add(helpPanel1, gridBagConstraints);
 
         update.setFont(new java.awt.Font("Dialog", 0, 10));
@@ -121,12 +134,11 @@
 
         jPanel1.setBackground(new java.awt.Color(255, 255, 255));
 
-        tipPanel1.setPreferredSize(new java.awt.Dimension(160, 203));
         jPanel1.add(tipPanel1);
 
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
-        gridBagConstraints.gridy = 7;
+        gridBagConstraints.gridy = 6;
         gridBagConstraints.gridwidth = 2;
         gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
         gridBagConstraints.weighty = 1.0;
@@ -136,17 +148,17 @@
     
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JLabel setup;
-    private javax.swing.JPanel jPanel1;
-    private org.netbeans.modules.welcome.UpdateButton updateButton1;
-    private javax.swing.JLabel helpLBL;
+    private org.netbeans.modules.welcome.SetupButton setupButton1;
+    private javax.swing.JLabel update;
     private org.netbeans.modules.welcome.TipPanel tipPanel1;
-    private javax.swing.JLabel custLBL;
-    private javax.swing.JLabel tipLBL;
+    private org.netbeans.modules.welcome.UpdateButton updateButton1;
+    private org.netbeans.modules.welcome.ControlLabel tipLBL;
+    private org.netbeans.modules.welcome.ControlLabel customizingLBL;
+    private org.netbeans.modules.welcome.ControlLabel helpLBL;
+    private javax.swing.JLabel setup;
     private org.netbeans.modules.welcome.HelpPanel helpPanel2;
+    private javax.swing.JPanel jPanel1;
     private org.netbeans.modules.welcome.HelpPanel helpPanel1;
-    private javax.swing.JLabel update;
-    private org.netbeans.modules.welcome.SetupButton setupButton1;
     // End of variables declaration//GEN-END:variables
     
 }
Index: src/org/netbeans/modules/welcome/TipPanel.java
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/TipPanel.java,v
retrieving revision 1.16
diff -u -B -b -r1.16 TipPanel.java
--- src/org/netbeans/modules/welcome/TipPanel.java	1 Oct 2002 07:49:17 -0000	1.16
+++ src/org/netbeans/modules/welcome/TipPanel.java	2 Jan 2003 13:56:40 -0000
@@ -49,6 +49,7 @@
     private WelcomeEditor tipsBrowser;
     private JScrollPane scroll;
     private int index;
+    private Font font;
     /**
      * Where the tips are located.
      */
@@ -102,8 +103,8 @@
             fontName = nextB.getFont().getFontName();
         if(fontStyle == -1)
             fontStyle = nextB.getFont().getStyle();
-        
-        nextB.setFont(new java.awt.Font(fontName, fontStyle, size));// NOI18N
+        font = new java.awt.Font(fontName, fontStyle, size);
+        nextB.setFont(font);// NOI18N
         nextB.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e){
                 setNext();
@@ -183,6 +184,10 @@
         else
             index ++;
         showTip(index);
+    }
+    
+    public Font getTextFont(){
+        return font;
     }
     
     /**