Attachment #10788 for bug #34536

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 34536
Collapse All | Expand All




LBL_Next=Next
#Optional value for font size. 
#NOI18N
##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
#Optional value for font style setting. 
#NOI18N
Next_Button_Font_Style=0

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

Lines 43-50 Link Here

(-)src/org/netbeans/modules/welcome/ContentPanel.java (-2 / +2 lines)
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));	46	// setMinimumSize(new java.awt.Dimension(300, 300));
47	setPreferredSize(new java.awt.Dimension(300, 300));	47	// setPreferredSize(new java.awt.Dimension(300, 300));
48	jEditorPane1.setEditable(false);	48	jEditorPane1.setEditable(false);
49	page = "welcome.html"; // NOI18N	49	page = "welcome.html"; // NOI18N
50	if(System.getProperty("java.vm.version").startsWith("1.3")){	50	if(System.getProperty("java.vm.version").startsWith("1.3")){

Lines 37-45 Link Here

(-)src/org/netbeans/modules/welcome/ControlLabel.form (-3 lines)
37	<SubComponents>	37	<SubComponents>
38	<Component class="javax.swing.JLabel" name="text">	38	<Component class="javax.swing.JLabel" name="text">
39	<Properties>	39	<Properties>
40	<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
41	<Font name="Dialog" size="10" style="1"/>
42	</Property>
43	<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">	40	<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
44	<Color blue="ff" green="ff" id="white" palette="1" red="ff" type="palette"/>	41	<Color blue="ff" green="ff" id="white" palette="1" red="ff" type="palette"/>
45	</Property>	42	</Property>

Lines 47-53 Link Here

(-)src/org/netbeans/modules/welcome/ControlLabel.java (-3 / +2 lines)
47	labelPanel.setLayout(new java.awt.GridBagLayout());	47	labelPanel.setLayout(new java.awt.GridBagLayout());
48		48
49	labelPanel.setBackground(new java.awt.Color(0, 0, 153));	49	labelPanel.setBackground(new java.awt.Color(0, 0, 153));
50	text.setFont(new java.awt.Font("Dialog", 1, 10));
51	text.setForeground(java.awt.Color.white);	50	text.setForeground(java.awt.Color.white);
52	gridBagConstraints = new java.awt.GridBagConstraints();	51	gridBagConstraints = new java.awt.GridBagConstraints();
53	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;	52	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
Lines 69-78 Link Here
69	}	68	}
70		69
71	// Variables declaration - do not modify//GEN-BEGIN:variables	70	// Variables declaration - do not modify//GEN-BEGIN:variables
72	private javax.swing.JLabel line;
73	private javax.swing.JPanel jPanel1;	71	private javax.swing.JPanel jPanel1;
74	private javax.swing.JLabel text;
75	private javax.swing.JPanel labelPanel;	72	private javax.swing.JPanel labelPanel;
		73	private javax.swing.JLabel line;
		74	private javax.swing.JLabel text;
76	// End of variables declaration//GEN-END:variables	75	// End of variables declaration//GEN-END:variables
77		76
78	}	77	}




        <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">

    </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>

    </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>




    /** Creates new form ControlPanel */
    public ControlPanel() {
        initComponents();
     /*   Font f= tipPanel1.getTextFont();
        tipLBL.setFont(f);
        customizingLBL.setFont(f);
        helpLBL.setFont(f);*/
        
    }
    

        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;

        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;

        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;

Lines 23-28 Link Here

(-)src/org/netbeans/modules/welcome/TipPanel.java (-1 / +3 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.html.HTMLEditorKit;
26		27
27	import org.openide.*;	28	import org.openide.*;
28	import org.openide.ErrorManager;	29	import org.openide.ErrorManager;
Lines 64-70 Link Here
64	tipsBrowser = new WelcomeEditor();	65	tipsBrowser = new WelcomeEditor();
65	tipsBrowser.setEditable(false);	66	tipsBrowser.setEditable(false);
66	tipsBrowser.setBackground(new Color(231,236,251));	67	tipsBrowser.setBackground(new Color(231,236,251));
67	tipsBrowser.setEditorKit(new TipHtmlEditorKit());	68	//tipsBrowser.setEditorKit(new TipHtmlEditorKit());
		69	tipsBrowser.setEditorKit(new HTMLEditorKit());
68	tipsBrowser.setBorder(new EmptyBorder(2,4,2,2));	70	tipsBrowser.setBorder(new EmptyBorder(2,4,2,2));
69	tipsBrowser.setSize(148,180);	71	tipsBrowser.setSize(148,180);
70	tipsBrowser.setPreferredSize(new Dimension(148,180));	72	tipsBrowser.setPreferredSize(new Dimension(148,180));




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();
        JComponent panel = null;
        try{
            panel =(JComponent)Class.forName(NbBundle.getMessage(WelcomeComponent.class,"CLASS_content_panel")).newInstance();

            return;
        if(panel instanceof org.netbeans.modules.welcome.ContentPanel){
            //JPanel panel = new ContentPanel();
           try{
            if(System.getProperty("os.name").indexOf("Windows") != -1){             //NOI18N
                   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{
                   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);
            } 
        }        
        panel.setMinimumSize(new Dimension(width,height));
        panel.setPreferredSize(new Dimension(width,height)); 
        JScrollPane scroll = new JScrollPane(panel);        
        setCloseOperation(TopComponent.CLOSE_EACH);
        add(scroll);
        try{

Return to bug 34536

Lines 95-106 Link Here

(-)src/org/netbeans/modules/welcome/ControlPanel.form (-12 lines)
95	<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">	95	<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
96	<Color blue="b5" green="cf" id="text" palette="3" red="e7" type="palette"/>	96	<Color blue="b5" green="cf" id="text" palette="3" red="e7" type="palette"/>
97	</Property>	97	</Property>
98	<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
99	<Dimension value="[142, 90]"/>
100	</Property>
101	<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
102	<Dimension value="[142, 90]"/>
103	</Property>
104	</Properties>	98	</Properties>
105	<Constraints>	99	<Constraints>
106	<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">
Lines 114-122 Link Here
114	</Container>	108	</Container>
115	<Component class="javax.swing.JLabel" name="update">	109	<Component class="javax.swing.JLabel" name="update">
116	<Properties>	110	<Properties>
117	<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
118	<Font name="Dialog" size="10" style="0"/>
119	</Property>
120	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">	111	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
121	<ResourceString bundle="org/netbeans/modules/welcome/Bundle.properties" key="LBL_update" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>	112	<ResourceString bundle="org/netbeans/modules/welcome/Bundle.properties" key="LBL_update" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
122	</Property>	113	</Property>
Lines 129-137 Link Here
129	</Component>	120	</Component>
130	<Component class="javax.swing.JLabel" name="setup">	121	<Component class="javax.swing.JLabel" name="setup">
131	<Properties>	122	<Properties>
132	<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
133	<Font name="Dialog" size="10" style="0"/>
134	</Property>
135	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">	123	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
136	<ResourceString bundle="org/netbeans/modules/welcome/Bundle.properties" key="LBL_setup" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>	124	<ResourceString bundle="org/netbeans/modules/welcome/Bundle.properties" key="LBL_setup" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
137	</Property>	125	</Property>

Lines 70-79 Link Here

(-)src/org/netbeans/modules/welcome/Bundle.properties (-2 / +12 lines)
70	LBL_Next=Next	70	LBL_Next=Next
71	#Optional value for font size.	71	#Optional value for font size.
72	#NOI18N	72	#NOI18N
73	Next_Button_Font_Size=10	73	##Next_Button_Font_Size=10
74	#Optional value for font name setting. If this key is not defined in bundle then default font type is used.	74	#Optional value for font name setting. If this key is not defined in bundle then default font type is used.
75	#Suggestion: Leave the value of this key empty for multibyte locales.	75	#Suggestion: Leave the value of this key empty for multibyte locales.
76	Next_Button_Font_Name=Lucida Sans	76	#Next_Button_Font_Name=Lucida Sans
77	#Optional value for font style setting.	77	#Optional value for font style setting.
78	#NOI18N	78	#NOI18N
79	Next_Button_Font_Style=0	79	Next_Button_Font_Style=0
Lines 87-89 Link Here
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
		95	#Set preferred size to content panel for platforms other than win
		96	Content_panel_width=640
		97
		98	#set preferred size to content panel for no-win platforms
		99	Content_panel_height=589

Lines 23-32 Link Here

(-)src/org/netbeans/modules/welcome/ControlPanel.java (-6 / +2 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	/* Font f= tipPanel1.getTextFont();
27	tipLBL.setFont(f);	27	tipLBL.setFont(f);
28	customizingLBL.setFont(f);	28	customizingLBL.setFont(f);
29	helpLBL.setFont(f);	29	helpLBL.setFont(f);*/
30		30
31	}	31	}
32		32
Lines 108-115 Link Here
108	helpPanel1.setLayout(null);	108	helpPanel1.setLayout(null);
109		109
110	helpPanel1.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));	110	helpPanel1.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text"));
111	helpPanel1.setMinimumSize(new java.awt.Dimension(142, 90));
112	helpPanel1.setPreferredSize(new java.awt.Dimension(142, 90));
113	gridBagConstraints = new java.awt.GridBagConstraints();	111	gridBagConstraints = new java.awt.GridBagConstraints();
114	gridBagConstraints.gridx = 0;	112	gridBagConstraints.gridx = 0;
115	gridBagConstraints.gridy = 4;	113	gridBagConstraints.gridy = 4;
Lines 118-124 Link Here
118	gridBagConstraints.insets = new java.awt.Insets(0, 7, 0, 9);	116	gridBagConstraints.insets = new java.awt.Insets(0, 7, 0, 9);
119	add(helpPanel1, gridBagConstraints);	117	add(helpPanel1, gridBagConstraints);
120		118
121	update.setFont(new java.awt.Font("Dialog", 0, 10));
122	update.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("LBL_update"));	119	update.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("LBL_update"));
123	gridBagConstraints = new java.awt.GridBagConstraints();	120	gridBagConstraints = new java.awt.GridBagConstraints();
124	gridBagConstraints.gridx = 1;	121	gridBagConstraints.gridx = 1;
Lines 127-133 Link Here
127	gridBagConstraints.insets = new java.awt.Insets(6, 6, 0, 0);	124	gridBagConstraints.insets = new java.awt.Insets(6, 6, 0, 0);
128	add(update, gridBagConstraints);	125	add(update, gridBagConstraints);
129		126
130	setup.setFont(new java.awt.Font("Dialog", 0, 10));
131	setup.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("LBL_setup"));	127	setup.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("LBL_setup"));
132	gridBagConstraints = new java.awt.GridBagConstraints();	128	gridBagConstraints = new java.awt.GridBagConstraints();
133	gridBagConstraints.gridx = 1;	129	gridBagConstraints.gridx = 1;

Lines 32-43 Link Here

(-)src/org/netbeans/modules/welcome/WelcomeComponent.java (-6 / +13 lines)
32	class WelcomeComponent extends TopComponent{	32	class WelcomeComponent extends TopComponent{
33	static final long serialVersionUID=6021472310161712674L;	33	static final long serialVersionUID=6021472310161712674L;
34	private static WelcomeComponent component = null;	34	private static WelcomeComponent component = null;
		35	private int width, height;
35		36
36	private WelcomeComponent(){	37	private WelcomeComponent(){
37	putClientProperty("PersistenceType", "OnlyOpened");	38	putClientProperty("PersistenceType", "OnlyOpened");
38	setLayout(new BorderLayout());	39	setLayout(new BorderLayout());
39	setName(NbBundle.getMessage(WelcomeComponent.class, "LBL_Tab_Title")); //NOI18N	40	setName(NbBundle.getMessage(WelcomeComponent.class, "LBL_Tab_Title")); //NOI18N
40	JScrollPane scroll = new JScrollPane();	41	//JScrollPane scroll = new JScrollPane();
41	JComponent panel = null;	42	JComponent panel = null;
42	try{	43	try{
43	panel =(JComponent)Class.forName(NbBundle.getMessage(WelcomeComponent.class,"CLASS_content_panel")).newInstance();	44	panel =(JComponent)Class.forName(NbBundle.getMessage(WelcomeComponent.class,"CLASS_content_panel")).newInstance();
Lines 48-62 Link Here
48	return;	49	return;
49	if(panel instanceof org.netbeans.modules.welcome.ContentPanel){	50	if(panel instanceof org.netbeans.modules.welcome.ContentPanel){
50	//JPanel panel = new ContentPanel();	51	//JPanel panel = new ContentPanel();
		52	try{
51	if(System.getProperty("os.name").indexOf("Windows") != -1){ //NOI18N	53	if(System.getProperty("os.name").indexOf("Windows") != -1){ //NOI18N
52	panel.setMinimumSize(new Dimension(620, 579));	54	width = new Integer(NbBundle.getMessage(WelcomeComponent.class,"Win_Content_panel_width")).intValue();
53	panel.setPreferredSize(new Dimension(620, 579));	55	height = new Integer (NbBundle.getMessage(WelcomeComponent.class,"Win_Content_panel_height")).intValue();
54	}else{	56	}else{
55	panel.setMinimumSize(new Dimension(640, 589));	57	width = new Integer(NbBundle.getMessage(WelcomeComponent.class,"Content_panel_width")).intValue();
56	panel.setPreferredSize(new Dimension(640, 589));	58	height = new Integer(NbBundle.getMessage(WelcomeComponent.class,"Content_panel_height")).intValue();
		59	}
		60	}catch(NumberFormatException ep){
		61	ErrorManager.getDefault().notify(ep);
57	}	62	}
58	}	63	}
59	scroll.setViewportView(panel);	64	panel.setMinimumSize(new Dimension(width,height));
		65	panel.setPreferredSize(new Dimension(width,height));
		66	JScrollPane scroll = new JScrollPane(panel);
60	setCloseOperation(TopComponent.CLOSE_EACH);	67	setCloseOperation(TopComponent.CLOSE_EACH);
61	add(scroll);	68	add(scroll);
62	try{	69	try{