Attachment #10881 for bug #34714

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 34714
Collapse All | Expand All




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

LBL_GettingStarted=Getting Started Using the IDE
Content_panel_width=640

#set preferred size to content panel for no-win platforms
Content_panel_height=589




    private String page = null;
    
    public ContentPanel() {        
        bundle = NbBundle.getBundle(ContentPanel.class);
        TipPanel tipPanel = new TipPanel();
        setLayout(new BorderLayout());
        jEditorPane1 = new WelcomeEditor();
      //  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")){

        }
        try{
            URL url = new URL("nbresloc:/org/netbeans/modules/welcome/pages/"+page);
            jEditorPane1.setEditorKit(WelcomeHTMLEditorKit.getInstance());
            jEditorPane1.setPage(url);
        }catch(Exception e){
            ErrorManager.getDefault().notify(e);
        }
        ControlPanel ctrlPanel = new ControlPanel();
        TitleLabel title = new TitleLabel();
        title.setText(bundle.getString("LBL_GettingStarted")); //NOI18N  
        add(new Line(),BorderLayout.NORTH);
        JPanel editorPanel = new JPanel(new BorderLayout());
        editorPanel.add(title,BorderLayout.NORTH);
        editorPanel.add(jEditorPane1,BorderLayout.CENTER);
        //add(jEditorPane1,BorderLayout.CENTER);
        add(editorPanel, BorderLayout.CENTER);
        add(ctrlPanel,BorderLayout.EAST);
        initListeners();
        Color bg = UIManager.getColor("text"); //NOI18N
        if (bg == null) {
            bg = Color.white;
        }
        setBackground (bg); //NOI18N
    }

Lines 13-18 Link Here

(-)src/org/netbeans/modules/welcome/ControlLabel.java (+3 lines)
13		13
14	package org.netbeans.modules.welcome;	14	package org.netbeans.modules.welcome;
15		15
		16	import java.awt.Font;
		17
16	/**	18	/**
17	*	19	*
18	* @author Richard Gregor	20	* @author Richard Gregor
Lines 23-28 Link Here
23	public ControlLabel() {	25	public ControlLabel() {
24	initComponents();	26	initComponents();
25	line.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("EditorPane.background"));	27	line.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("EditorPane.background"));
		28	text.setFont(text.getFont().deriveFont(Font.BOLD));
26	}	29	}
27		30
28	/** This method is called from within the constructor to	31	/** This method is called from within the constructor to




      </Properties>
      <Constraints>
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
          <GridBagConstraints gridX="1" 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.01"/>
        </Constraint>
      </Constraints>
    </Container>

      </Properties>
      <Constraints>
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
          <GridBagConstraints gridX="1" 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>
    </Container>

      </Properties>
      <Constraints>
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
          <GridBagConstraints gridX="1" 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>
    </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">
          <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
        </Constraint>
      </Constraints>


    <Container class="org.netbeans.modules.welcome.UpdateButton" name="updateButton1">
      <Constraints>
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
          <GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
        </Constraint>
      </Constraints>


      </Properties>
      <Constraints>
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
          <GridBagConstraints gridX="1" 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>


      </Properties>
      <Constraints>
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
          <GridBagConstraints gridX="2" gridY="2" gridWidth="1" gridHeight="1" fill="3" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="6" insetsBottom="0" insetsRight="14" anchor="17" weightX="0.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </Component>

      </Properties>
      <Constraints>
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
          <GridBagConstraints gridX="2" gridY="1" gridWidth="1" gridHeight="1" fill="3" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="6" insetsBottom="0" insetsRight="14" anchor="17" weightX="0.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </Component>

      </Properties>
      <Constraints>
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
          <GridBagConstraints gridX="1" 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="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
              <Dimension value="[148, 230]"/>
            </Property>
            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
              <Dimension value="[148, 230]"/>
            </Property>
          </Properties>
        </Container>
      </SubComponents>
    </Container>




    /** Creates new form ControlPanel */
    public ControlPanel() {
        initComponents();
	javax.swing.JPanel line = new javax.swing.JPanel(new java.awt.GridBagLayout());
        line.setBackground(new java.awt.Color(0, 0, 153));
        line.setMinimumSize(new java.awt.Dimension(2, 10));
        line.setPreferredSize(new java.awt.Dimension(2, 10));
        java.awt.GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 0;
        gridBagConstraints.gridy = 0;
        gridBagConstraints.gridheight = 7;
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
        int gap = (int)Math.round((line.getFont().getSize() - 11)*0.6+19); 
        gridBagConstraints.insets = new java.awt.Insets(gap, 0, 5, 0);
        add(line, gridBagConstraints);
        
    }
    

        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 = 1;
        gridBagConstraints.gridy = 0;
        gridBagConstraints.gridwidth = 2;
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
        gridBagConstraints.weighty = 0.01;
        gridBagConstraints.insets = new java.awt.Insets(24, 0, 12, 14);
        add(customizingLBL, gridBagConstraints);

        helpLBL.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));
        helpLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("Help_LBL"));
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 3;
        gridBagConstraints.gridwidth = 2;
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;

        tipLBL.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));
        tipLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("TipLBL"));
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 5;
        gridBagConstraints.gridwidth = 2;
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;

        setupButton1.setLayout(null);

        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 1;
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
        gridBagConstraints.insets = new java.awt.Insets(0, 8, 0, 0);
        add(setupButton1, gridBagConstraints);

        updateButton1.setLayout(null);

        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 2;
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
        gridBagConstraints.insets = new java.awt.Insets(6, 8, 0, 0);
        add(updateButton1, gridBagConstraints);


        helpPanel1.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 4;
        gridBagConstraints.gridwidth = 2;
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;


        update.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("LBL_update"));
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 2;
        gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        gridBagConstraints.insets = new java.awt.Insets(6, 6, 0, 14);
        add(update, gridBagConstraints);

        setup.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("LBL_setup"));
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 1;
        gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        gridBagConstraints.insets = new java.awt.Insets(0, 6, 0, 14);
        add(setup, gridBagConstraints);

        jPanel1.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));

        tipPanel1.setMinimumSize(new java.awt.Dimension(148, 230));
        tipPanel1.setPreferredSize(new java.awt.Dimension(148, 230));
        jPanel1.add(tipPanel1);

        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 6;
        gridBagConstraints.gridwidth = 2;
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;

Lines 38-44 Link Here

(-)src/org/netbeans/modules/welcome/HelpPanel.java (-1 / +1 lines)
38	super();	38	super();
39	bundle = NbBundle.getBundle(HelpPanel.class);	39	bundle = NbBundle.getBundle(HelpPanel.class);
40	setEditable(false);	40	setEditable(false);
41	setEditorKit(new javax.swing.text.html.HTMLEditorKit());	41	setEditorKit(WelcomeHTMLEditorKit.getInstance());
42	try{	42	try{
43	URL pageURL = new URL("nbresloc:/org/netbeans/modules/welcome/pages/Help.html"); // NOI18N	43	URL pageURL = new URL("nbresloc:/org/netbeans/modules/welcome/pages/Help.html"); // NOI18N
44	setPage(pageURL);	44	setPage(pageURL);




<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.0" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
  <Properties>
    <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
      <Color blue="ff" green="ff" id="EditorPane.background" palette="3" red="ff" type="palette"/>
    </Property>
  </Properties>

  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
  <SubComponents>
    <Container class="javax.swing.JPanel" name="line">
      <Properties>
        <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
          <Color blue="ff" green="ff" red="ff" type="rgb"/>
        </Property>
        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
          <Dimension value="[10, 2]"/>
        </Property>
        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
          <Dimension value="[10, 2]"/>
        </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="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="12" insetsBottom="0" insetsRight="6" anchor="10" weightX="0.9" weightY="0.0"/>
        </Constraint>
      </Constraints>

      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
      <SubComponents>
        <Container class="javax.swing.JPanel" name="jPanel1">
          <Properties>
            <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
              <Color blue="ff" green="99" red="66" type="rgb"/>
            </Property>
            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
              <Dimension value="[10, 1]"/>
            </Property>
            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
              <Dimension value="[10, 1]"/>
            </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="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="15" weightX="1.0" weightY="0.0"/>
            </Constraint>
          </Constraints>

          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
        </Container>
      </SubComponents>
    </Container>
  </SubComponents>
</Form>




/*
 *                 Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License
 * Version 1.0 (the "License"). You may not use this file except in
 * compliance with the License. A copy of the License is available at
 * http://www.sun.com/
 *
 * The Original Code is NetBeans. The Initial Developer of the Original
 * Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.modules.welcome;
import java.awt.Font;

/**
 *
 * @author  Richard Gregor
 */
public class Line extends javax.swing.JPanel {
    
    /** Creates new form ControlLabel */
    public Line() {
        initComponents();
        line.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("EditorPane.background"));       
    }
    
    /** This method is called from within the constructor to
     * initialize the form.
     * WARNING: Do NOT modify this code. The content of this method is
     * always regenerated by the Form Editor.
     */
    private void initComponents() {//GEN-BEGIN:initComponents
        java.awt.GridBagConstraints gridBagConstraints;

        line = new javax.swing.JPanel();
        jPanel1 = new javax.swing.JPanel();

        setLayout(new java.awt.GridBagLayout());

        setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("EditorPane.background"));
        line.setLayout(new java.awt.GridBagLayout());

        line.setBackground(new java.awt.Color(255, 255, 255));
        line.setMinimumSize(new java.awt.Dimension(10, 2));
        line.setPreferredSize(new java.awt.Dimension(10, 2));
        jPanel1.setBackground(new java.awt.Color(102, 153, 255));
        jPanel1.setMinimumSize(new java.awt.Dimension(10, 1));
        jPanel1.setPreferredSize(new java.awt.Dimension(10, 1));
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTH;
        gridBagConstraints.weightx = 1.0;
        line.add(jPanel1, gridBagConstraints);

        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.9;
        gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 6);
        add(line, gridBagConstraints);

    }//GEN-END:initComponents
 
    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JPanel jPanel1;
    private javax.swing.JPanel line;
    // End of variables declaration//GEN-END:variables
    
}




import java.io.*;
import java.beans.*;
import javax.accessibility.*;
import javax.swing.text.Style;
import javax.swing.text.html.HTMLEditorKit;

import org.openide.*;

        tipsBrowser = new WelcomeEditor();
        tipsBrowser.setEditable(false);
        tipsBrowser.setBackground(new Color(231,236,251));
        tipsBrowser.setEditorKit(WelcomeHTMLEditorKit.getInstance());
        //tipsBrowser.setEditorKit(new HTMLEditorKit());
        tipsBrowser.setBorder(new EmptyBorder(2,4,2,2));
       // tipsBrowser.setSize(148,180);
       // tipsBrowser.setPreferredSize(new Dimension(148,180));
        findTips();
        showTip(getTipIndex());
        scroll.setViewportView(tipsBrowser);
        //scroll.setSize(148,180);
        //scroll.setPreferredSize(new Dimension(108,180));
        scroll.setVerticalScrollBarPolicy(scroll.VERTICAL_SCROLLBAR_AS_NEEDED);
        add(scroll,BorderLayout.CENTER);
        JButton nextB = new JButton(NbBundle.getMessage(TipPanel.class, "LBL_Next"));// NOI18N

        return font;
    }
    
    /**
     * Own editor kit which will render elements according to
     * default.css and additional tips.css
     */
    private class TipHtmlEditorKit extends HTMLEditorKit{
        private StyleSheet defaultStyles = null;
        
        public TipHtmlEditorKit(){
            super();
            StyleSheet s = new StyleSheet();
            s.addStyleSheet(super.getStyleSheet());
            s.importStyleSheet(getClass().getResource("tip.css")); //NOI18N
            setStyleSheet(s);
        }
        
        public void setStyleSheet(StyleSheet s){
            defaultStyles = s;
        }
        
        public StyleSheet getStyleSheet() {
            return defaultStyles;
        }
        
    }
    
}




<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.0" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
  <Properties>
    <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
      <Color blue="ff" green="ff" id="EditorPane.background" palette="3" red="ff" type="palette"/>
    </Property>
  </Properties>

  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
  <SubComponents>
    <Container class="javax.swing.JPanel" name="labelPanel">
      <Properties>
        <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
          <Color blue="99" green="0" red="0" type="rgb"/>
        </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="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="12" insetsBottom="0" insetsRight="0" anchor="11" weightX="0.95" weightY="0.0"/>
        </Constraint>
      </Constraints>

      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
      <SubComponents>
        <Component class="javax.swing.JLabel" name="text">
          <Properties>
            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
              <Color blue="ff" green="ff" red="ff" type="rgb"/>
            </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="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="12" insetsBottom="0" insetsRight="12" anchor="10" weightX="0.0" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Container class="javax.swing.JPanel" name="jPanel2">
          <Properties>
            <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
              <Color blue="99" green="0" red="0" type="rgb"/>
            </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="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/>
            </Constraint>
          </Constraints>

          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
        </Container>
      </SubComponents>
    </Container>
    <Container class="javax.swing.JPanel" name="line">
      <Properties>
        <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
          <Color blue="ff" green="ff" red="ff" type="rgb"/>
        </Property>
        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
          <Dimension value="[10, 2]"/>
        </Property>
        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
          <Dimension value="[10, 2]"/>
        </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="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.05" weightY="0.0"/>
        </Constraint>
      </Constraints>

      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
      <SubComponents>
        <Container class="javax.swing.JPanel" name="jPanel1">
          <Properties>
            <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
              <Color blue="99" green="0" red="0" type="rgb"/>
            </Property>
            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
              <Dimension value="[10, 2]"/>
            </Property>
            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
              <Dimension value="[10, 2]"/>
            </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="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="15" weightX="1.0" weightY="0.0"/>
            </Constraint>
          </Constraints>

          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
        </Container>
      </SubComponents>
    </Container>
  </SubComponents>
</Form>




/*
 *                 Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License
 * Version 1.0 (the "License"). You may not use this file except in
 * compliance with the License. A copy of the License is available at
 * http://www.sun.com/
 *
 * The Original Code is NetBeans. The Initial Developer of the Original
 * Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.modules.welcome;
import java.awt.Font;

/**
 *
 * @author  Richard Gregor
 */
public class TitleLabel extends javax.swing.JPanel {
    
    /** Creates new form ControlLabel */
    public TitleLabel() {
        initComponents();
        line.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("EditorPane.background"));
        text.setFont(text.getFont().deriveFont(Font.BOLD));
    }
    
    /** This method is called from within the constructor to
     * initialize the form.
     * WARNING: Do NOT modify this code. The content of this method is
     * always regenerated by the Form Editor.
     */
    private void initComponents() {//GEN-BEGIN:initComponents
        java.awt.GridBagConstraints gridBagConstraints;

        labelPanel = new javax.swing.JPanel();
        text = new javax.swing.JLabel();
        jPanel2 = new javax.swing.JPanel();
        line = new javax.swing.JPanel();
        jPanel1 = new javax.swing.JPanel();

        setLayout(new java.awt.GridBagLayout());

        setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("EditorPane.background"));
        labelPanel.setLayout(new java.awt.GridBagLayout());

        labelPanel.setBackground(new java.awt.Color(0, 0, 153));
        text.setForeground(new java.awt.Color(255, 255, 255));
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.insets = new java.awt.Insets(0, 12, 0, 12);
        labelPanel.add(text, gridBagConstraints);

        jPanel2.setBackground(new java.awt.Color(0, 0, 153));
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 1.0;
        labelPanel.add(jPanel2, gridBagConstraints);

        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 0;
        gridBagConstraints.gridy = 0;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 0);
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH;
        gridBagConstraints.weightx = 0.95;
        add(labelPanel, gridBagConstraints);

        line.setLayout(new java.awt.GridBagLayout());

        line.setBackground(new java.awt.Color(255, 255, 255));
        line.setMinimumSize(new java.awt.Dimension(10, 2));
        line.setPreferredSize(new java.awt.Dimension(10, 2));
        jPanel1.setBackground(new java.awt.Color(0, 0, 153));
        jPanel1.setMinimumSize(new java.awt.Dimension(10, 2));
        jPanel1.setPreferredSize(new java.awt.Dimension(10, 2));
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTH;
        gridBagConstraints.weightx = 1.0;
        line.add(jPanel1, gridBagConstraints);

        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 0;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.insets = new java.awt.Insets(12, 0, 0, 0);
        gridBagConstraints.weightx = 0.05;
        add(line, gridBagConstraints);

    }//GEN-END:initComponents
    
    public void setText(String lbl){
        text.setText(lbl);
    }
        
    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JPanel jPanel1;
    private javax.swing.JPanel jPanel2;
    private javax.swing.JPanel labelPanel;
    private javax.swing.JPanel line;
    private javax.swing.JLabel text;
    // End of variables declaration//GEN-END:variables
    
}

Lines 47-53 Link Here

(-)src/org/netbeans/modules/welcome/WelcomeComponent.java (-2 / +2 lines)
47	}	47	}
48	if(panel == null)	48	if(panel == null)
49	return;	49	return;
50	if(panel instanceof org.netbeans.modules.welcome.ContentPanel){	50	/* if(panel instanceof org.netbeans.modules.welcome.ContentPanel){
51	//JPanel panel = new ContentPanel();	51	//JPanel panel = new ContentPanel();
52	try{	52	try{
53	if(System.getProperty("os.name").indexOf("Windows") != -1){ //NOI18N	53	if(System.getProperty("os.name").indexOf("Windows") != -1){ //NOI18N
Lines 62-68 Link Here
62	}	62	}
63	}	63	}
64	panel.setMinimumSize(new Dimension(width,height));	64	panel.setMinimumSize(new Dimension(width,height));
65	panel.setPreferredSize(new Dimension(width,height));	65	panel.setPreferredSize(new Dimension(width,height)); */
66	JScrollPane scroll = new JScrollPane(panel);	66	JScrollPane scroll = new JScrollPane(panel);
67	setCloseOperation(TopComponent.CLOSE_EACH);	67	setCloseOperation(TopComponent.CLOSE_EACH);
68	add(scroll);	68	add(scroll);




/*
 *                 Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License
 * Version 1.0 (the "License"). You may not use this file except in
 * compliance with the License. A copy of the License is available at
 * http://www.sun.com/
 *
 * The Original Code is NetBeans. The Initial Developer of the Original
 * Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
 * Microsystems, Inc. All Rights Reserved.
 */
package org.netbeans.modules.welcome;

import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import javax.swing.JEditorPane;
import javax.swing.JLabel;
import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.StyleSheet;

import org.openide.ErrorManager;

/**
 * Editor Kit
 *
 * @author  Richard Gregor
 */

class WelcomeHTMLEditorKit extends HTMLEditorKit {    
    private static WelcomeHTMLEditorKit kit = null;
    
    private WelcomeHTMLEditorKit(){
        super();
        StyleSheet s = new StyleSheet();
        s.addStyleSheet(super.getStyleSheet());
        URL url = null;
        try{
            url = createStyleSheet();
        }catch(MalformedURLException e){
            ErrorManager.getDefault().notify(e);
        }
        s.importStyleSheet(url);
        setStyleSheet(s);
    }
    
    public static WelcomeHTMLEditorKit getInstance(){
        if(kit == null)
            kit = new WelcomeHTMLEditorKit();
        return kit;
    }
    
    public static URL createStyleSheet() throws MalformedURLException{
        File tmpCss = null;
        int fontsize = new JLabel().getFont().getSize();        
        String fontFamily = new JLabel().getFont().getFamily();
        try{
            tmpCss = File.createTempFile("welcome","css");
            FileWriter fw = new FileWriter(tmpCss);
            fw.write("body {font-size: "+fontsize+";\n font-family: "+fontFamily+"}\n p {font-size: "+fontsize+"}\n code {font-size: "+fontsize+"}");
            fw.close();
        }catch(IOException e){
            ErrorManager.getDefault().notify(e);
        }
        tmpCss.deleteOnExit();
        return tmpCss.toURL();
    }
    
    
}






<head>
                       
  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<!--  <style type="text/css">
     body {
       font-size:11pt;
       font-family: LucidaSans Roman, Arial, Helvetica;
     }     
   </style> -->
  <title>Help</title>
</head>
 <body>




<html>
<head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">   
<!--   <style type="text/css">
     table {
       font-size:11pt; 
       font-family: LucidaSans Roman, Arial, Helvetica; 
     }     
     
   </style>-->
</head>
<body>
<!--nbsp; -->
<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >
<!--<tr>
<td colspan='4' background="line.gif" height='1'></td>

</tr>-->
<!--
<tr>
<td COLSPAN="2" BGCOLOR="#000099" NOSAVE valign="center"><b><font color="#FFFFFF">&nbsp;Getting
Started Using the IDE</font></b></td>

<td COLSPAN='2'><img src='horizontal.gif' ></td>
</tr>-->

<tr>
<td>&nbsp;</td>

<td>&nbsp;</td>

<td>&nbsp;</td>
<!--<td background='vertical.gif'></td> -->

</tr>

<tr NOSAVE>
<!--<td ALIGN=LEFT VALIGN=TOP WIDTH="30%" NOSAVE>-->
<td ALIGN=LEFT VALIGN=TOP WIDTH="290" >
<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >
<tr NOSAVE>
<td NOSAVE>&nbsp;</td>
<td NOSAVE></td>
<td COLSPAN="2" BGCOLOR="#3366FF" NOSAVE><b><font color="#FFFFFF">&nbsp;Opening
a File&nbsp;</font></b></td>
<td></td>
</tr>


<td ALIGN=CENTER VALIGN=TOP NOSAVE></td>
<td NOSAVE>&nbsp;</td>
</tr>

<tr>
<td></td>
<td ALIGN=LEFTT VALIGN=TOP width='30'><object
classid='org.netbeans.modules.welcome.MountButton'></object></td>
<td ALIGN=CENTER VALIGN=TOP NOSAVE><img SRC="point.gif" height=14
width=15></td>
<td COLSPAN="2">Open a file by <b>double-clicking</b> its icon in the Filesystems tab
of the Explorer.<br></td>
<td></td>
</tr>
-->

<tr>
<td>&nbsp;</td>
<td><a
href="http://button:8080/foo#org.netbeans.modules.welcome.MountButton"><img border="0"
src="mount.gif"></a>&nbsp;&nbsp;</td>

<td><b>Navigate</b> to the directory you want to mount and select that
directory.<br></td>
</tr>

<tr>
<td></td>
<td></td>
<td ALIGN=CENTER VALIGN=TOP NOSAVE><img SRC="point.gif" height=14 width=15></td>
<td>Open a file by <b>double-clicking</b> its icon.<br></td>
</tr>
-->
<tr>
<td></td>
<td></td>

</table>
</td>

<!--<td ALIGN=LEFT VALIGN=TOP WIDTH="25%" NOSAVE>-->
<td ALIGN=LEFT VALIGN=TOP WIDTH=290 NOSAVE>
<table BORDER=0 CELLSPACING=5 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >

<tr NOSAVE>
<td NOSAVE></td>
<td NOSAVE>&nbsp;</td>
<td COLSPAN="2" BGCOLOR="#3366FF" NOSAVE><b><font color="#FFFFFF">&nbsp;Creating
a File or Object&nbsp;</font></b></td>
<td></td>
</tr>


</table>
</td>

<td></td>
<!--<td ALIGN=LEFT VALIGN=TOP WIDTH="18" height='440' background='vertical.gif'
NOSAVE></td>-->


</tr>




<html>
<head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">   
   <style type="text/css">
     table {
       font-size:11pt; 
       font-family: LucidaSans Roman, Arial, Helvetica; 
     }     
     
   </style>
</head>
<body>
<!--nbsp; -->
<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >
<!--<tr NOSAVE>
<td colspan='4' background="line.gif" height='1'></td>
</tr>
<tr NOSAVE>

Started Using the IDE</font></b></td>

<td background='arch.gif' ></td>
</tr>-->

<tr>
<td>&nbsp;</td>

<td>&nbsp;</td>

<td>&nbsp;</td>
<!--<td background='vertical.gif'></td> -->

</tr>

<tr NOSAVE>
<!--<td ALIGN=LEFT VALIGN=TOP WIDTH="30%" NOSAVE>-->
<td ALIGN=LEFT VALIGN=TOP WIDTH="290" >
<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >
<tr NOSAVE>
<td NOSAVE>&nbsp;</td>

</table>
</td>

<!--<td ALIGN=LEFT VALIGN=TOP WIDTH="25%" NOSAVE>-->
<td ALIGN=LEFT VALIGN=TOP WIDTH=290 NOSAVE>
<table BORDER=0 CELLSPACING=5 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >

<tr NOSAVE>

</table>
</td>

<td></td>
<!--<td ALIGN=LEFT VALIGN=TOP WIDTH="18" height='440' background='vertical.gif'
NOSAVE></td>-->


</tr>




<html>
<head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">   
   <style type="text/css">
     table {
       font-size:11pt; 
       font-family: LucidaSans Roman, Arial, Helvetica; 
     }     
     
   </style>
</head>
<body>
<!--nbsp; -->
<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >
<!--<tr NOSAVE>
<td colspan='4' background="line.gif" height='1'></td>
</tr>
<tr NOSAVE>

Started Using the IDE</font></b></td>

<td background='arch.gif' ></td>
</tr>-->

<tr>
<td>&nbsp;</td>

<td>&nbsp;</td>

<td>&nbsp;</td>
<!--<td background='vertical.gif'></td>-->

</tr>

<tr NOSAVE>
<!--<td ALIGN=LEFT VALIGN=TOP WIDTH="30%" NOSAVE>-->
<td ALIGN=LEFT VALIGN=TOP WIDTH="290" >
<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >
<tr NOSAVE>
<td NOSAVE>&nbsp;</td>

</table>
</td>

<!--<td ALIGN=LEFT VALIGN=TOP WIDTH="25%" NOSAVE>-->
<td ALIGN=LEFT VALIGN=TOP WIDTH=290 >
<table BORDER=0 CELLSPACING=5 CELLPADDING=0 COLS=4 WIDTH="100%" >

<tr NOSAVE>
<td NOSAVE></td>
<td NOSAVE>&nbsp;</td>
<td COLSPAN="2" BGCOLOR="#3366FF" NOSAVE><b><font color="#FFFFFF">&nbsp;Creating
a File or Object&nbsp;</font></b></td>
<td></td>
</tr>


</table>
</td>

<td></td>
<!--<td ALIGN=LEFT VALIGN=TOP WIDTH="18" height='440' background='vertical.gif'
NOSAVE></td>-->


</tr>

Return to bug 34714

Lines 87-99 Link Here

(-)src/org/netbeans/modules/welcome/Bundle.properties (-9 / +1 lines)
87	CLASS_content_panel=org.netbeans.modules.welcome.ContentPanel	87	CLASS_content_panel=org.netbeans.modules.welcome.ContentPanel
88		88
89	LBL_WelcomeMode=Welcome	89	LBL_WelcomeMode=Welcome
90	#Sets preferred size for content panel for win platforms
91	Win_Content_panel_width=620
92	#Sets the preferred size of content panel for win platforms
93	Win_Content_panel_height=579
94		90
95	#Set preferred size to content panel for platforms other than win	91	LBL_GettingStarted=Getting Started Using the IDE
96	Content_panel_width=640
97
98	#set preferred size to content panel for no-win platforms
99	Content_panel_height=589

Lines 39-50 Link Here

(-)src/org/netbeans/modules/welcome/ContentPanel.java (-6 / +11 lines)
39	private String page = null;	39	private String page = null;
40		40
41	public ContentPanel() {	41	public ContentPanel() {
42	bundle = NbBundle.getBundle(HelpPanel.class);	42	bundle = NbBundle.getBundle(ContentPanel.class);
43	TipPanel tipPanel = new TipPanel();	43	TipPanel tipPanel = new TipPanel();
44	setLayout(new BorderLayout());	44	setLayout(new BorderLayout());
45	jEditorPane1 = new WelcomeEditor();	45	jEditorPane1 = new WelcomeEditor();
46	// setMinimumSize(new java.awt.Dimension(300, 300));
47	// setPreferredSize(new java.awt.Dimension(300, 300));
48	jEditorPane1.setEditable(false);	46	jEditorPane1.setEditable(false);
49	page = "welcome.html"; // NOI18N	47	page = "welcome.html"; // NOI18N
50	if(System.getProperty("java.vm.version").startsWith("1.3")){	48	if(System.getProperty("java.vm.version").startsWith("1.3")){
Lines 56-73 Link Here
56	}	54	}
57	try{	55	try{
58	URL url = new URL("nbresloc:/org/netbeans/modules/welcome/pages/"+page);	56	URL url = new URL("nbresloc:/org/netbeans/modules/welcome/pages/"+page);
59	jEditorPane1.setEditorKit(new javax.swing.text.html.HTMLEditorKit());	57	jEditorPane1.setEditorKit(WelcomeHTMLEditorKit.getInstance());
60	jEditorPane1.setPage(url);	58	jEditorPane1.setPage(url);
61	}catch(Exception e){	59	}catch(Exception e){
62	ErrorManager.getDefault().notify(e);	60	ErrorManager.getDefault().notify(e);
63	}	61	}
64	ControlPanel ctrlPanel = new ControlPanel();	62	ControlPanel ctrlPanel = new ControlPanel();
65	add(jEditorPane1,BorderLayout.CENTER);	63	TitleLabel title = new TitleLabel();
		64	title.setText(bundle.getString("LBL_GettingStarted")); //NOI18N
		65	add(new Line(),BorderLayout.NORTH);
		66	JPanel editorPanel = new JPanel(new BorderLayout());
		67	editorPanel.add(title,BorderLayout.NORTH);
		68	editorPanel.add(jEditorPane1,BorderLayout.CENTER);
		69	//add(jEditorPane1,BorderLayout.CENTER);
		70	add(editorPanel, BorderLayout.CENTER);
66	add(ctrlPanel,BorderLayout.EAST);	71	add(ctrlPanel,BorderLayout.EAST);
67	initListeners();	72	initListeners();
68	Color bg = UIManager.getColor("text"); //NOI18N	73	Color bg = UIManager.getColor("text"); //NOI18N
69	if (bg == null) {	74	if (bg == null) {
70	bg = Color.WHITE;	75	bg = Color.white;
71	}	76	}
72	setBackground (bg); //NOI18N	77	setBackground (bg); //NOI18N
73	}	78	}

Lines 34-40 Link Here

(-)src/org/netbeans/modules/welcome/ControlPanel.form (-9 / +17 lines)
34	</Properties>	34	</Properties>
35	<Constraints>	35	<Constraints>
36	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	36	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
37	<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"/>	37	<GridBagConstraints gridX="1" 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.01"/>
38	</Constraint>	38	</Constraint>
39	</Constraints>	39	</Constraints>
40	</Container>	40	</Container>
Lines 49-55 Link Here
49	</Properties>	49	</Properties>
50	<Constraints>	50	<Constraints>
51	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	51	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
52	<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"/>	52	<GridBagConstraints gridX="1" 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"/>
53	</Constraint>	53	</Constraint>
54	</Constraints>	54	</Constraints>
55	</Container>	55	</Container>
Lines 64-77 Link Here
64	</Properties>	64	</Properties>
65	<Constraints>	65	<Constraints>
66	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	66	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
67	<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"/>	67	<GridBagConstraints gridX="1" 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"/>
68	</Constraint>	68	</Constraint>
69	</Constraints>	69	</Constraints>
70	</Container>	70	</Container>
71	<Container class="org.netbeans.modules.welcome.SetupButton" name="setupButton1">	71	<Container class="org.netbeans.modules.welcome.SetupButton" name="setupButton1">
72	<Constraints>	72	<Constraints>
73	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	73	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
74	<GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>	74	<GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
75	</Constraint>	75	</Constraint>
76	</Constraints>	76	</Constraints>
77		77
Lines 82-88 Link Here
82	<Container class="org.netbeans.modules.welcome.UpdateButton" name="updateButton1">	82	<Container class="org.netbeans.modules.welcome.UpdateButton" name="updateButton1">
83	<Constraints>	83	<Constraints>
84	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	84	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
85	<GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>	85	<GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
86	</Constraint>	86	</Constraint>
87	</Constraints>	87	</Constraints>
88		88
Lines 98-104 Link Here
98	</Properties>	98	</Properties>
99	<Constraints>	99	<Constraints>
100	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	100	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
101	<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"/>	101	<GridBagConstraints gridX="1" 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"/>
102	</Constraint>	102	</Constraint>
103	</Constraints>	103	</Constraints>
104		104
Lines 114-120 Link Here
114	</Properties>	114	</Properties>
115	<Constraints>	115	<Constraints>
116	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	116	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
117	<GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="6" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>	117	<GridBagConstraints gridX="2" gridY="2" gridWidth="1" gridHeight="1" fill="3" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="6" insetsBottom="0" insetsRight="14" anchor="17" weightX="0.0" weightY="0.0"/>
118	</Constraint>	118	</Constraint>
119	</Constraints>	119	</Constraints>
120	</Component>	120	</Component>
Lines 126-132 Link Here
126	</Properties>	126	</Properties>
127	<Constraints>	127	<Constraints>
128	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	128	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
129	<GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="6" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>	129	<GridBagConstraints gridX="2" gridY="1" gridWidth="1" gridHeight="1" fill="3" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="6" insetsBottom="0" insetsRight="14" anchor="17" weightX="0.0" weightY="0.0"/>
130	</Constraint>	130	</Constraint>
131	</Constraints>	131	</Constraints>
132	</Component>	132	</Component>
Lines 138-150 Link Here
138	</Properties>	138	</Properties>
139	<Constraints>	139	<Constraints>
140	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	140	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
141	<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"/>	141	<GridBagConstraints gridX="1" 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"/>
142	</Constraint>	142	</Constraint>
143	</Constraints>	143	</Constraints>
144		144
145	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>	145	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
146	<SubComponents>	146	<SubComponents>
147	<Container class="org.netbeans.modules.welcome.TipPanel" name="tipPanel1">	147	<Container class="org.netbeans.modules.welcome.TipPanel" name="tipPanel1">
		148	<Properties>
		149	<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
		150	<Dimension value="[148, 230]"/>
		151	</Property>
		152	<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
		153	<Dimension value="[148, 230]"/>
		154	</Property>
		155	</Properties>
148	</Container>	156	</Container>
149	</SubComponents>	157	</SubComponents>
150	</Container>	158	</Container>

Lines 23-32 Link Here

(-)src/org/netbeans/modules/welcome/ControlPanel.java (-15 / +30 lines)
23	/** Creates new form ControlPanel */	23	/** Creates new form ControlPanel */
24	public ControlPanel() {	24	public ControlPanel() {
25	initComponents();	25	initComponents();
26	/* Font f= tipPanel1.getTextFont();	26	javax.swing.JPanel line = new javax.swing.JPanel(new java.awt.GridBagLayout());
27	tipLBL.setFont(f);	27	line.setBackground(new java.awt.Color(0, 0, 153));
28	customizingLBL.setFont(f);	28	line.setMinimumSize(new java.awt.Dimension(2, 10));
29	helpLBL.setFont(f);*/	29	line.setPreferredSize(new java.awt.Dimension(2, 10));
		30	java.awt.GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();
		31	gridBagConstraints.gridx = 0;
		32	gridBagConstraints.gridy = 0;
		33	gridBagConstraints.gridheight = 7;
		34	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
		35	int gap = (int)Math.round((line.getFont().getSize() - 11)*0.6+19);
		36	gridBagConstraints.insets = new java.awt.Insets(gap, 0, 5, 0);
		37	add(line, gridBagConstraints);
30		38
31	}	39	}
32		40
Lines 60-76 Link Here
60	customizingLBL.setPreferredSize(new java.awt.Dimension(162, 17));	68	customizingLBL.setPreferredSize(new java.awt.Dimension(162, 17));
61	customizingLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("Customizing_LBL"));	69	customizingLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("Customizing_LBL"));
62	gridBagConstraints = new java.awt.GridBagConstraints();	70	gridBagConstraints = new java.awt.GridBagConstraints();
63	gridBagConstraints.gridx = 0;	71	gridBagConstraints.gridx = 1;
64	gridBagConstraints.gridy = 0;	72	gridBagConstraints.gridy = 0;
65	gridBagConstraints.gridwidth = 2;	73	gridBagConstraints.gridwidth = 2;
66	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;	74	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
		75	gridBagConstraints.weighty = 0.01;
67	gridBagConstraints.insets = new java.awt.Insets(24, 0, 12, 14);	76	gridBagConstraints.insets = new java.awt.Insets(24, 0, 12, 14);
68	add(customizingLBL, gridBagConstraints);	77	add(customizingLBL, gridBagConstraints);
69		78
70	helpLBL.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));	79	helpLBL.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));
71	helpLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("Help_LBL"));	80	helpLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("Help_LBL"));
72	gridBagConstraints = new java.awt.GridBagConstraints();	81	gridBagConstraints = new java.awt.GridBagConstraints();
73	gridBagConstraints.gridx = 0;	82	gridBagConstraints.gridx = 1;
74	gridBagConstraints.gridy = 3;	83	gridBagConstraints.gridy = 3;
75	gridBagConstraints.gridwidth = 2;	84	gridBagConstraints.gridwidth = 2;
76	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;	85	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
Lines 80-86 Link Here
80	tipLBL.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));	89	tipLBL.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));
81	tipLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("TipLBL"));	90	tipLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("TipLBL"));
82	gridBagConstraints = new java.awt.GridBagConstraints();	91	gridBagConstraints = new java.awt.GridBagConstraints();
83	gridBagConstraints.gridx = 0;	92	gridBagConstraints.gridx = 1;
84	gridBagConstraints.gridy = 5;	93	gridBagConstraints.gridy = 5;
85	gridBagConstraints.gridwidth = 2;	94	gridBagConstraints.gridwidth = 2;
86	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;	95	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
Lines 90-97 Link Here
90	setupButton1.setLayout(null);	99	setupButton1.setLayout(null);
91		100
92	gridBagConstraints = new java.awt.GridBagConstraints();	101	gridBagConstraints = new java.awt.GridBagConstraints();
93	gridBagConstraints.gridx = 0;	102	gridBagConstraints.gridx = 1;
94	gridBagConstraints.gridy = 1;	103	gridBagConstraints.gridy = 1;
		104	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
95	gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;	105	gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
96	gridBagConstraints.insets = new java.awt.Insets(0, 8, 0, 0);	106	gridBagConstraints.insets = new java.awt.Insets(0, 8, 0, 0);
97	add(setupButton1, gridBagConstraints);	107	add(setupButton1, gridBagConstraints);
Lines 99-106 Link Here
99	updateButton1.setLayout(null);	109	updateButton1.setLayout(null);
100		110
101	gridBagConstraints = new java.awt.GridBagConstraints();	111	gridBagConstraints = new java.awt.GridBagConstraints();
102	gridBagConstraints.gridx = 0;	112	gridBagConstraints.gridx = 1;
103	gridBagConstraints.gridy = 2;	113	gridBagConstraints.gridy = 2;
		114	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
104	gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;	115	gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
105	gridBagConstraints.insets = new java.awt.Insets(6, 8, 0, 0);	116	gridBagConstraints.insets = new java.awt.Insets(6, 8, 0, 0);
106	add(updateButton1, gridBagConstraints);	117	add(updateButton1, gridBagConstraints);
Lines 109-115 Link Here
109		120
110	helpPanel1.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));	121	helpPanel1.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));
111	gridBagConstraints = new java.awt.GridBagConstraints();	122	gridBagConstraints = new java.awt.GridBagConstraints();
112	gridBagConstraints.gridx = 0;	123	gridBagConstraints.gridx = 1;
113	gridBagConstraints.gridy = 4;	124	gridBagConstraints.gridy = 4;
114	gridBagConstraints.gridwidth = 2;	125	gridBagConstraints.gridwidth = 2;
115	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;	126	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
Lines 118-143 Link Here
118		129
119	update.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("LBL_update"));	130	update.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("LBL_update"));
120	gridBagConstraints = new java.awt.GridBagConstraints();	131	gridBagConstraints = new java.awt.GridBagConstraints();
121	gridBagConstraints.gridx = 1;	132	gridBagConstraints.gridx = 2;
122	gridBagConstraints.gridy = 2;	133	gridBagConstraints.gridy = 2;
		134	gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL;
123	gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;	135	gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
124	gridBagConstraints.insets = new java.awt.Insets(6, 6, 0, 0);	136	gridBagConstraints.insets = new java.awt.Insets(6, 6, 0, 14);
125	add(update, gridBagConstraints);	137	add(update, gridBagConstraints);
126		138
127	setup.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("LBL_setup"));	139	setup.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("LBL_setup"));
128	gridBagConstraints = new java.awt.GridBagConstraints();	140	gridBagConstraints = new java.awt.GridBagConstraints();
129	gridBagConstraints.gridx = 1;	141	gridBagConstraints.gridx = 2;
130	gridBagConstraints.gridy = 1;	142	gridBagConstraints.gridy = 1;
		143	gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL;
131	gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;	144	gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
132	gridBagConstraints.insets = new java.awt.Insets(0, 6, 0, 0);	145	gridBagConstraints.insets = new java.awt.Insets(0, 6, 0, 14);
133	add(setup, gridBagConstraints);	146	add(setup, gridBagConstraints);
134		147
135	jPanel1.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));	148	jPanel1.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));
136		149
		150	tipPanel1.setMinimumSize(new java.awt.Dimension(148, 230));
		151	tipPanel1.setPreferredSize(new java.awt.Dimension(148, 230));
137	jPanel1.add(tipPanel1);	152	jPanel1.add(tipPanel1);
138		153
139	gridBagConstraints = new java.awt.GridBagConstraints();	154	gridBagConstraints = new java.awt.GridBagConstraints();
140	gridBagConstraints.gridx = 0;	155	gridBagConstraints.gridx = 1;
141	gridBagConstraints.gridy = 6;	156	gridBagConstraints.gridy = 6;
142	gridBagConstraints.gridwidth = 2;	157	gridBagConstraints.gridwidth = 2;
143	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;	158	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;

Added Link Here

(-)src/org/netbeans/modules/welcome/Line.form (+55 lines)
1	<?xml version="1.0" encoding="UTF-8" ?>
2
3	<Form version="1.0" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<Properties>
5	<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
6	<Color blue="ff" green="ff" id="EditorPane.background" palette="3" red="ff" type="palette"/>
7	</Property>
8	</Properties>
9
10	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
11	<SubComponents>
12	<Container class="javax.swing.JPanel" name="line">
13	<Properties>
14	<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
15	<Color blue="ff" green="ff" red="ff" type="rgb"/>
16	</Property>
17	<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
18	<Dimension value="[10, 2]"/>
19	</Property>
20	<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
21	<Dimension value="[10, 2]"/>
22	</Property>
23	</Properties>
24	<Constraints>
25	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
26	<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="12" insetsBottom="0" insetsRight="6" anchor="10" weightX="0.9" weightY="0.0"/>
27	</Constraint>
28	</Constraints>
29
30	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
31	<SubComponents>
32	<Container class="javax.swing.JPanel" name="jPanel1">
33	<Properties>
34	<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
35	<Color blue="ff" green="99" red="66" type="rgb"/>
36	</Property>
37	<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
38	<Dimension value="[10, 1]"/>
39	</Property>
40	<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
41	<Dimension value="[10, 1]"/>
42	</Property>
43	</Properties>
44	<Constraints>
45	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
46	<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="15" weightX="1.0" weightY="0.0"/>
47	</Constraint>
48	</Constraints>
49
50	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
51	</Container>
52	</SubComponents>
53	</Container>
54	</SubComponents>
55	</Form>

Added Link Here

(-)src/org/netbeans/modules/welcome/Line.java (+70 lines)
1	/*
2	* Sun Public License Notice
3	*
4	* The contents of this file are subject to the Sun Public License
5	* Version 1.0 (the "License"). You may not use this file except in
6	* compliance with the License. A copy of the License is available at
7	* http://www.sun.com/
8	*
9	* The Original Code is NetBeans. The Initial Developer of the Original
10	* Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
11	* Microsystems, Inc. All Rights Reserved.
12	*/
13
14	package org.netbeans.modules.welcome;
15	import java.awt.Font;
16
17	/**
18	*
19	* @author Richard Gregor
20	*/
21	public class Line extends javax.swing.JPanel {
22
23	/** Creates new form ControlLabel */
24	public Line() {
25	initComponents();
26	line.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("EditorPane.background"));
27	}
28
29	/** This method is called from within the constructor to
30	* initialize the form.
31	* WARNING: Do NOT modify this code. The content of this method is
32	* always regenerated by the Form Editor.
33	*/
34	private void initComponents() {//GEN-BEGIN:initComponents
35	java.awt.GridBagConstraints gridBagConstraints;
36
37	line = new javax.swing.JPanel();
38	jPanel1 = new javax.swing.JPanel();
39
40	setLayout(new java.awt.GridBagLayout());
41
42	setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("EditorPane.background"));
43	line.setLayout(new java.awt.GridBagLayout());
44
45	line.setBackground(new java.awt.Color(255, 255, 255));
46	line.setMinimumSize(new java.awt.Dimension(10, 2));
47	line.setPreferredSize(new java.awt.Dimension(10, 2));
48	jPanel1.setBackground(new java.awt.Color(102, 153, 255));
49	jPanel1.setMinimumSize(new java.awt.Dimension(10, 1));
50	jPanel1.setPreferredSize(new java.awt.Dimension(10, 1));
51	gridBagConstraints = new java.awt.GridBagConstraints();
52	gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
53	gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTH;
54	gridBagConstraints.weightx = 1.0;
55	line.add(jPanel1, gridBagConstraints);
56
57	gridBagConstraints = new java.awt.GridBagConstraints();
58	gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
59	gridBagConstraints.weightx = 0.9;
60	gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 6);
61	add(line, gridBagConstraints);
62
63	}//GEN-END:initComponents
64
65	// Variables declaration - do not modify//GEN-BEGIN:variables
66	private javax.swing.JPanel jPanel1;
67	private javax.swing.JPanel line;
68	// End of variables declaration//GEN-END:variables
69
70	}

Lines 23-28 Link Here

(-)src/org/netbeans/modules/welcome/TipPanel.java (-30 / +7 lines)
23	import java.io.*;	23	import java.io.*;
24	import java.beans.*;	24	import java.beans.*;
25	import javax.accessibility.*;	25	import javax.accessibility.*;
		26	import javax.swing.text.Style;
26	import javax.swing.text.html.HTMLEditorKit;	27	import javax.swing.text.html.HTMLEditorKit;
27		28
28	import org.openide.*;	29	import org.openide.*;
Lines 65-80 Link Here
65	tipsBrowser = new WelcomeEditor();	66	tipsBrowser = new WelcomeEditor();
66	tipsBrowser.setEditable(false);	67	tipsBrowser.setEditable(false);
67	tipsBrowser.setBackground(new Color(231,236,251));	68	tipsBrowser.setBackground(new Color(231,236,251));
68	//tipsBrowser.setEditorKit(new TipHtmlEditorKit());	69	tipsBrowser.setEditorKit(WelcomeHTMLEditorKit.getInstance());
69	tipsBrowser.setEditorKit(new HTMLEditorKit());	70	//tipsBrowser.setEditorKit(new HTMLEditorKit());
70	tipsBrowser.setBorder(new EmptyBorder(2,4,2,2));	71	tipsBrowser.setBorder(new EmptyBorder(2,4,2,2));
71	tipsBrowser.setSize(148,180);	72	// tipsBrowser.setSize(148,180);
72	tipsBrowser.setPreferredSize(new Dimension(148,180));	73	// tipsBrowser.setPreferredSize(new Dimension(148,180));
73	findTips();	74	findTips();
74	showTip(getTipIndex());	75	showTip(getTipIndex());
75	scroll.setViewportView(tipsBrowser);	76	scroll.setViewportView(tipsBrowser);
76	scroll.setSize(148,180);	77	//scroll.setSize(148,180);
77	scroll.setPreferredSize(new Dimension(148,180));	78	//scroll.setPreferredSize(new Dimension(108,180));
78	scroll.setVerticalScrollBarPolicy(scroll.VERTICAL_SCROLLBAR_AS_NEEDED);	79	scroll.setVerticalScrollBarPolicy(scroll.VERTICAL_SCROLLBAR_AS_NEEDED);
79	add(scroll,BorderLayout.CENTER);	80	add(scroll,BorderLayout.CENTER);
80	JButton nextB = new JButton(NbBundle.getMessage(TipPanel.class, "LBL_Next"));// NOI18N	81	JButton nextB = new JButton(NbBundle.getMessage(TipPanel.class, "LBL_Next"));// NOI18N
Lines 191-219 Link Here
191	return font;	192	return font;
192	}	193	}
193		194
194	/**
195	* Own editor kit which will render elements according to
196	* default.css and additional tips.css
197	*/
198	private class TipHtmlEditorKit extends HTMLEditorKit{
199	private StyleSheet defaultStyles = null;
200
201	public TipHtmlEditorKit(){
202	super();
203	StyleSheet s = new StyleSheet();
204	s.addStyleSheet(super.getStyleSheet());
205	s.importStyleSheet(getClass().getResource("tip.css")); //NOI18N
206	setStyleSheet(s);
207	}
208
209	public void setStyleSheet(StyleSheet s){
210	defaultStyles = s;
211	}
212
213	public StyleSheet getStyleSheet() {
214	return defaultStyles;
215	}
216
217	}
218		195
219	}	196	}

Added Link Here

(-)src/org/netbeans/modules/welcome/TitleLabel.form (+97 lines)
1	<?xml version="1.0" encoding="UTF-8" ?>
2
3	<Form version="1.0" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<Properties>
5	<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
6	<Color blue="ff" green="ff" id="EditorPane.background" palette="3" red="ff" type="palette"/>
7	</Property>
8	</Properties>
9
10	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
11	<SubComponents>
12	<Container class="javax.swing.JPanel" name="labelPanel">
13	<Properties>
14	<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
15	<Color blue="99" green="0" red="0" type="rgb"/>
16	</Property>
17	</Properties>
18	<Constraints>
19	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
20	<GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="12" insetsBottom="0" insetsRight="0" anchor="11" weightX="0.95" weightY="0.0"/>
21	</Constraint>
22	</Constraints>
23
24	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
25	<SubComponents>
26	<Component class="javax.swing.JLabel" name="text">
27	<Properties>
28	<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
29	<Color blue="ff" green="ff" red="ff" type="rgb"/>
30	</Property>
31	</Properties>
32	<Constraints>
33	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
34	<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="12" insetsBottom="0" insetsRight="12" anchor="10" weightX="0.0" weightY="0.0"/>
35	</Constraint>
36	</Constraints>
37	</Component>
38	<Container class="javax.swing.JPanel" name="jPanel2">
39	<Properties>
40	<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
41	<Color blue="99" green="0" red="0" type="rgb"/>
42	</Property>
43	</Properties>
44	<Constraints>
45	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
46	<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/>
47	</Constraint>
48	</Constraints>
49
50	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
51	</Container>
52	</SubComponents>
53	</Container>
54	<Container class="javax.swing.JPanel" name="line">
55	<Properties>
56	<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
57	<Color blue="ff" green="ff" red="ff" type="rgb"/>
58	</Property>
59	<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
60	<Dimension value="[10, 2]"/>
61	</Property>
62	<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
63	<Dimension value="[10, 2]"/>
64	</Property>
65	</Properties>
66	<Constraints>
67	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
68	<GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.05" weightY="0.0"/>
69	</Constraint>
70	</Constraints>
71
72	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
73	<SubComponents>
74	<Container class="javax.swing.JPanel" name="jPanel1">
75	<Properties>
76	<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
77	<Color blue="99" green="0" red="0" type="rgb"/>
78	</Property>
79	<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
80	<Dimension value="[10, 2]"/>
81	</Property>
82	<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
83	<Dimension value="[10, 2]"/>
84	</Property>
85	</Properties>
86	<Constraints>
87	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
88	<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="15" weightX="1.0" weightY="0.0"/>
89	</Constraint>
90	</Constraints>
91
92	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
93	</Container>
94	</SubComponents>
95	</Container>
96	</SubComponents>
97	</Form>

Lines 3-14 Link Here

(-)src/org/netbeans/modules/welcome/pages/Help.html (-2 / +2 lines)
3	<head>	3	<head>
4		4
5	<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">	5	<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
6	<style type="text/css">	6	<!-- <style type="text/css">
7	body {	7	body {
8	font-size:11pt;	8	font-size:11pt;
9	font-family: LucidaSans Roman, Arial, Helvetica;	9	font-family: LucidaSans Roman, Arial, Helvetica;
10	}	10	}
11	</style>	11	</style> -->
12	<title>Help</title>	12	<title>Help</title>
13	</head>	13	</head>
14	<body>	14	<body>

Lines 16-59 Link Here

(-)src/org/netbeans/modules/welcome/pages/welcome.html (-35 / +24 lines)
16	<html>	16	<html>
17	<head>	17	<head>
18	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">	18	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
19	<style type="text/css">	19	<!-- <style type="text/css">
20	table {	20	table {
21	font-size:11pt;	21	font-size:11pt;
22	font-family: LucidaSans Roman, Arial, Helvetica;	22	font-family: LucidaSans Roman, Arial, Helvetica;
23	}	23	}
24		24
25	</style>	25	</style>-->
26	</head>	26	</head>
27	<body>	27	<body>
28	<!--nbsp; -->	28	<!--nbsp; -->
29	<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >	29	<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >
30	<tr NOSAVE>	30	<!--<tr>
31	<td colspan='4' background="line.gif" height='1'></td>	31	<td colspan='4' background="line.gif" height='1'></td>
32	</tr>	32
33	<tr NOSAVE>	33	</tr>-->
34	<td COLSPAN="2" BGCOLOR="#000099" NOSAVE valign="center"><b><font color="#FFFFFF"><FONT size='12pt'> Getting	34	<!--
		35	<tr>
		36	<td COLSPAN="2" BGCOLOR="#000099" NOSAVE valign="center"><b><font color="#FFFFFF"> Getting
35	Started Using the IDE</font></b></td>	37	Started Using the IDE</font></b></td>
36		38
37	<td background='arch.gif' ></td>	39	<td COLSPAN='2'><img src='horizontal.gif' ></td>
38	</tr>	40	</tr>-->
39		41
40	<tr>	42	<tr>
41	<td> </td>	43	<td> </td>
42		44
43	<td> </td>	45	<td> </td>
44		46
45	<td background='vertical.gif'></td>	47	<td> </td>
		48	<!--<td background='vertical.gif'></td> -->
46		49
47	</tr>	50	</tr>
48		51
49	<tr NOSAVE>	52	<tr NOSAVE>
50	<td ALIGN=LEFT VALIGN=TOP WIDTH="30%" NOSAVE>	53	<!--<td ALIGN=LEFT VALIGN=TOP WIDTH="30%" NOSAVE>-->
		54	<td ALIGN=LEFT VALIGN=TOP WIDTH="290" >
51	<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >	55	<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >
52	<tr NOSAVE>	56	<tr NOSAVE>
53	<td NOSAVE> </td>	57	<td NOSAVE> </td>
54	<td NOSAVE></td>	58	<td NOSAVE></td>
55	<td COLSPAN="2" BGCOLOR="#3366FF" NOSAVE><b><font color="#FFFFFF"> Opening	59	<td COLSPAN="2" BGCOLOR="#3366FF" NOSAVE><b><font color="#FFFFFF"> Opening
56	a File</font></b></td>	60	a File </font></b></td>
57	<td></td>	61	<td></td>
58	</tr>	62	</tr>
59		63
Lines 63-83 Link Here
63	<td ALIGN=CENTER VALIGN=TOP NOSAVE></td>	67	<td ALIGN=CENTER VALIGN=TOP NOSAVE></td>
64	<td NOSAVE> </td>	68	<td NOSAVE> </td>
65	</tr>	69	</tr>
66	<!--	70
67	<tr>
68	<td></td>
69	<td ALIGN=LEFTT VALIGN=TOP width='30'><object
70	classid='org.netbeans.modules.welcome.MountButton'></object></td>
71	<td ALIGN=CENTER VALIGN=TOP NOSAVE><img SRC="point.gif" height=14
72	width=15></td>
73	<td COLSPAN="2">Open a file by <b>double-clicking</b> its icon in the Filesystems tab
74	of the Explorer.<br></td>
75	<td></td>
76	</tr>
77	-->
78		71
79	<tr>	72	<tr>
80	<td></td>	73	<td> </td>
81	<td><a	74	<td><a
82	href="http://button:8080/foo#org.netbeans.modules.welcome.MountButton"><img border="0"	75	href="http://button:8080/foo#org.netbeans.modules.welcome.MountButton"><img border="0"
83	src="mount.gif"></a>  </td>	76	src="mount.gif"></a>  </td>
Lines 115-128 Link Here
115	<td><b>Navigate</b> to the directory you want to mount and select that	108	<td><b>Navigate</b> to the directory you want to mount and select that
116	directory.<br></td>	109	directory.<br></td>
117	</tr>	110	</tr>
118	<!--	111
119	<tr>
120	<td></td>
121	<td></td>
122	<td ALIGN=CENTER VALIGN=TOP NOSAVE><img SRC="point.gif" height=14 width=15></td>
123	<td>Open a file by <b>double-clicking</b> its icon.<br></td>
124	</tr>
125	-->
126	<tr>	112	<tr>
127	<td></td>	113	<td></td>
128	<td></td>	114	<td></td>
Lines 167-180 Link Here
167	</table>	153	</table>
168	</td>	154	</td>
169		155
170	<td ALIGN=LEFT VALIGN=TOP WIDTH="25%" NOSAVE>	156	<!--<td ALIGN=LEFT VALIGN=TOP WIDTH="25%" NOSAVE>-->
		157	<td ALIGN=LEFT VALIGN=TOP WIDTH=290 NOSAVE>
171	<table BORDER=0 CELLSPACING=5 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >	158	<table BORDER=0 CELLSPACING=5 CELLPADDING=0 COLS=4 WIDTH="100%" NOSAVE >
172		159
173	<tr NOSAVE>	160	<tr NOSAVE>
174	<td NOSAVE></td>	161	<td NOSAVE></td>
175	<td NOSAVE> </td>	162	<td NOSAVE> </td>
176	<td COLSPAN="2" BGCOLOR="#3366FF" NOSAVE><b><font color="#FFFFFF"> Creating	163	<td COLSPAN="2" BGCOLOR="#3366FF" NOSAVE><b><font color="#FFFFFF"> Creating
177	a File or Object</font></b></td>	164	a File or Object </font></b></td>
178	<td></td>	165	<td></td>
179	</tr>	166	</tr>
180		167
Lines 255-261 Link Here
255	</table>	242	</table>
256	</td>	243	</td>
257		244
258	<td ALIGN=LEFT VALIGN=TOP WIDTH="18" height='440' background='vertical.gif' NOSAVE></td>	245	<td></td>
		246	<!--<td ALIGN=LEFT VALIGN=TOP WIDTH="18" height='440' background='vertical.gif'
		247	NOSAVE></td>-->
259		248
260		249
261	</tr>	250	</tr>