? welcome34536.diff
? src/org/netbeans/modules/welcome/OptionTest.java
? src/org/netbeans/modules/welcome/OptionTest.form
? src/org/netbeans/modules/welcome/welcome.diff
? src/org/netbeans/modules/welcome/MLPanel.java
? src/org/netbeans/modules/welcome/MLPanel.form
Index: src/org/netbeans/modules/welcome/Bundle.properties
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/Bundle.properties,v
retrieving revision 1.21
diff -u -b -B -r1.21 Bundle.properties
--- src/org/netbeans/modules/welcome/Bundle.properties	11 Mar 2003 11:14:05 -0000	1.21
+++ src/org/netbeans/modules/welcome/Bundle.properties	24 Jun 2003 15:08:30 -0000
@@ -70,10 +70,10 @@
 LBL_Next=Next
 #Optional value for font size. 
 #NOI18N
-Next_Button_Font_Size=10
+##Next_Button_Font_Size=10
 #Optional value for font name setting. If this key is not defined in bundle then default font type is used. 
 #Suggestion: Leave the value of this key empty for multibyte locales.
-Next_Button_Font_Name=Lucida Sans
+#Next_Button_Font_Name=Lucida Sans
 #Optional value for font style setting. 
 #NOI18N
 Next_Button_Font_Style=0
@@ -87,3 +87,13 @@
 CLASS_content_panel=org.netbeans.modules.welcome.ContentPanel
 
 LBL_WelcomeMode=Welcome
+#Sets preferred size for content panel for win platforms
+Win_Content_panel_width=620
+#Sets the preferred size of content panel for win platforms
+Win_Content_panel_height=579
+
+#Set preferred size to content panel for platforms other than win
+Content_panel_width=640
+
+#set preferred size to content panel for no-win platforms
+Content_panel_height=589
Index: src/org/netbeans/modules/welcome/ContentPanel.java
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ContentPanel.java,v
retrieving revision 1.15
diff -u -b -B -r1.15 ContentPanel.java
--- src/org/netbeans/modules/welcome/ContentPanel.java	20 Jun 2003 07:28:21 -0000	1.15
+++ src/org/netbeans/modules/welcome/ContentPanel.java	24 Jun 2003 15:08:30 -0000
@@ -43,8 +43,8 @@
         TipPanel tipPanel = new TipPanel();
         setLayout(new BorderLayout());
         jEditorPane1 = new WelcomeEditor();
-        setMinimumSize(new java.awt.Dimension(300, 300));
-        setPreferredSize(new java.awt.Dimension(300, 300));
+      //  setMinimumSize(new java.awt.Dimension(300, 300));
+      //  setPreferredSize(new java.awt.Dimension(300, 300));
         jEditorPane1.setEditable(false);
         page = "welcome.html";   // NOI18N
         if(System.getProperty("java.vm.version").startsWith("1.3")){
Index: src/org/netbeans/modules/welcome/ControlLabel.form
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ControlLabel.form,v
retrieving revision 1.1
diff -u -b -B -r1.1 ControlLabel.form
--- src/org/netbeans/modules/welcome/ControlLabel.form	2 Jan 2003 14:02:02 -0000	1.1
+++ src/org/netbeans/modules/welcome/ControlLabel.form	24 Jun 2003 15:08:30 -0000
@@ -37,9 +37,6 @@
       <SubComponents>
         <Component class="javax.swing.JLabel" name="text">
           <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Dialog" size="10" style="1"/>
-            </Property>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="ff" green="ff" id="white" palette="1" red="ff" type="palette"/>
             </Property>
Index: src/org/netbeans/modules/welcome/ControlLabel.java
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ControlLabel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ControlLabel.java
--- src/org/netbeans/modules/welcome/ControlLabel.java	27 Feb 2003 23:42:33 -0000	1.2
+++ src/org/netbeans/modules/welcome/ControlLabel.java	24 Jun 2003 15:08:30 -0000
@@ -47,7 +47,6 @@
         labelPanel.setLayout(new java.awt.GridBagLayout());
 
         labelPanel.setBackground(new java.awt.Color(0, 0, 153));
-        text.setFont(new java.awt.Font("Dialog", 1, 10));
         text.setForeground(java.awt.Color.white);
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
@@ -69,10 +68,10 @@
     }
         
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JLabel line;
     private javax.swing.JPanel jPanel1;
-    private javax.swing.JLabel text;
     private javax.swing.JPanel labelPanel;
+    private javax.swing.JLabel line;
+    private javax.swing.JLabel text;
     // End of variables declaration//GEN-END:variables
     
 }
Index: src/org/netbeans/modules/welcome/ControlPanel.form
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.form,v
retrieving revision 1.3
diff -u -b -B -r1.3 ControlPanel.form
--- src/org/netbeans/modules/welcome/ControlPanel.form	20 Jun 2003 07:28:22 -0000	1.3
+++ src/org/netbeans/modules/welcome/ControlPanel.form	24 Jun 2003 15:08:30 -0000
@@ -95,12 +95,6 @@
         <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
           <Color blue="b5" green="cf" id="text" palette="3" red="e7" type="palette"/>
         </Property>
-        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[142, 90]"/>
-        </Property>
-        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <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">
@@ -114,9 +108,6 @@
     </Container>
     <Component class="javax.swing.JLabel" name="update">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Dialog" size="10" style="0"/>
-        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/welcome/Bundle.properties" key="LBL_update" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
         </Property>
@@ -129,9 +120,6 @@
     </Component>
     <Component class="javax.swing.JLabel" name="setup">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Dialog" size="10" style="0"/>
-        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/welcome/Bundle.properties" key="LBL_setup" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
         </Property>
Index: src/org/netbeans/modules/welcome/ControlPanel.java
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 ControlPanel.java
--- src/org/netbeans/modules/welcome/ControlPanel.java	20 Jun 2003 07:28:22 -0000	1.4
+++ src/org/netbeans/modules/welcome/ControlPanel.java	24 Jun 2003 15:08:30 -0000
@@ -23,10 +23,10 @@
     /** Creates new form ControlPanel */
     public ControlPanel() {
         initComponents();
-        Font f= tipPanel1.getTextFont();
+     /*   Font f= tipPanel1.getTextFont();
         tipLBL.setFont(f);
         customizingLBL.setFont(f);
-        helpLBL.setFont(f);
+        helpLBL.setFont(f);*/
         
     }
     
@@ -108,8 +108,6 @@
         helpPanel1.setLayout(null);
 
         helpPanel1.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));
-        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;
@@ -118,7 +116,6 @@
         gridBagConstraints.insets = new java.awt.Insets(0, 7, 0, 9);
         add(helpPanel1, gridBagConstraints);
 
-        update.setFont(new java.awt.Font("Dialog", 0, 10));
         update.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("LBL_update"));
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 1;
@@ -127,7 +124,6 @@
         gridBagConstraints.insets = new java.awt.Insets(6, 6, 0, 0);
         add(update, gridBagConstraints);
 
-        setup.setFont(new java.awt.Font("Dialog", 0, 10));
         setup.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("LBL_setup"));
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 1;
Index: src/org/netbeans/modules/welcome/TipPanel.java
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/TipPanel.java,v
retrieving revision 1.20
diff -u -b -B -r1.20 TipPanel.java
--- src/org/netbeans/modules/welcome/TipPanel.java	20 Jun 2003 07:28:22 -0000	1.20
+++ src/org/netbeans/modules/welcome/TipPanel.java	24 Jun 2003 15:08:30 -0000
@@ -23,6 +23,7 @@
 import java.io.*;
 import java.beans.*;
 import javax.accessibility.*;
+import javax.swing.text.html.HTMLEditorKit;
 
 import org.openide.*;
 import org.openide.ErrorManager;
@@ -64,7 +65,8 @@
         tipsBrowser = new WelcomeEditor();
         tipsBrowser.setEditable(false);
         tipsBrowser.setBackground(new Color(231,236,251));
-        tipsBrowser.setEditorKit(new TipHtmlEditorKit());
+        //tipsBrowser.setEditorKit(new TipHtmlEditorKit());
+        tipsBrowser.setEditorKit(new HTMLEditorKit());
         tipsBrowser.setBorder(new EmptyBorder(2,4,2,2));
         tipsBrowser.setSize(148,180);
         tipsBrowser.setPreferredSize(new Dimension(148,180));
Index: src/org/netbeans/modules/welcome/WelcomeComponent.java
===================================================================
RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/WelcomeComponent.java,v
retrieving revision 1.19
diff -u -b -B -r1.19 WelcomeComponent.java
--- src/org/netbeans/modules/welcome/WelcomeComponent.java	7 Mar 2003 17:48:29 -0000	1.19
+++ src/org/netbeans/modules/welcome/WelcomeComponent.java	24 Jun 2003 15:08:30 -0000
@@ -32,12 +32,13 @@
 class WelcomeComponent extends TopComponent{
     static final long serialVersionUID=6021472310161712674L;
     private static WelcomeComponent component = null;
+    private int width, height;
     
     private WelcomeComponent(){
         putClientProperty("PersistenceType", "OnlyOpened");
         setLayout(new BorderLayout());
         setName(NbBundle.getMessage(WelcomeComponent.class, "LBL_Tab_Title"));   //NOI18N     
-        JScrollPane scroll = new JScrollPane();
+        //JScrollPane scroll = new JScrollPane();
         JComponent panel = null;
         try{
             panel =(JComponent)Class.forName(NbBundle.getMessage(WelcomeComponent.class,"CLASS_content_panel")).newInstance();
@@ -48,15 +49,21 @@
             return;
         if(panel instanceof org.netbeans.modules.welcome.ContentPanel){
             //JPanel panel = new ContentPanel();
+           try{
             if(System.getProperty("os.name").indexOf("Windows") != -1){             //NOI18N
-                panel.setMinimumSize(new Dimension(620, 579));
-                panel.setPreferredSize(new Dimension(620, 579));
+                   width = new Integer(NbBundle.getMessage(WelcomeComponent.class,"Win_Content_panel_width")).intValue();
+                   height = new Integer (NbBundle.getMessage(WelcomeComponent.class,"Win_Content_panel_height")).intValue();
             }else{
-                panel.setMinimumSize(new Dimension(640, 589));
-                panel.setPreferredSize(new Dimension(640, 589));
+                   width = new Integer(NbBundle.getMessage(WelcomeComponent.class,"Content_panel_width")).intValue();
+                   height = new Integer(NbBundle.getMessage(WelcomeComponent.class,"Content_panel_height")).intValue();                   
+               }
+           }catch(NumberFormatException ep){
+               ErrorManager.getDefault().notify(ep);
             } 
         }        
-        scroll.setViewportView(panel);
+        panel.setMinimumSize(new Dimension(width,height));
+        panel.setPreferredSize(new Dimension(width,height)); 
+        JScrollPane scroll = new JScrollPane(panel);        
         setCloseOperation(TopComponent.CLOSE_EACH);
         add(scroll);
         try{