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

(-)src/org/netbeans/modules/welcome/Bundle.properties (+6 lines)
Lines 77-79 Link Here
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
80
81
Customizing_LBL=Customizing
82
83
Help_LBL=Help
84
85
TipLBL=Tip
(-)src/org/netbeans/modules/welcome/ControlPanel.form (-28 / +22 lines)
Lines 20-61 Link Here
20
20
21
  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
21
  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
22
  <SubComponents>
22
  <SubComponents>
23
    <Component class="javax.swing.JLabel" name="custLBL">
23
    <Container class="org.netbeans.modules.welcome.ControlLabel" name="customizingLBL">
24
      <Properties>
24
      <Properties>
25
        <Property name="icon" type="javax.swing.Icon" editor="org.openide.explorer.propertysheet.editors.IconEditor">
25
        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
26
          <Image iconType="3" name="/org/netbeans/modules/welcome/pages/images/customizing.gif"/>
26
          <Dimension value="[162, 17]"/>
27
        </Property>
28
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
29
          <ResourceString bundle="org/netbeans/modules/welcome/Bundle.properties" key="Customizing_LBL" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
27
        </Property>
30
        </Property>
28
      </Properties>
31
      </Properties>
29
      <Constraints>
32
      <Constraints>
30
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
33
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
31
          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="2" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="24" insetsLeft="0" insetsBottom="12" insetsRight="8" anchor="10" weightX="0.0" weightY="0.0"/>
34
          <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"/>
32
        </Constraint>
35
        </Constraint>
33
      </Constraints>
36
      </Constraints>
34
    </Component>
37
    </Container>
35
    <Component class="javax.swing.JLabel" name="helpLBL">
38
    <Container class="org.netbeans.modules.welcome.ControlLabel" name="helpLBL">
36
      <Properties>
39
      <Properties>
37
        <Property name="icon" type="javax.swing.Icon" editor="org.openide.explorer.propertysheet.editors.IconEditor">
40
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
38
          <Image iconType="3" name="/org/netbeans/modules/welcome/pages/images/help.gif"/>
41
          <ResourceString bundle="org/netbeans/modules/welcome/Bundle.properties" key="Help_LBL" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
39
        </Property>
42
        </Property>
40
      </Properties>
43
      </Properties>
41
      <Constraints>
44
      <Constraints>
42
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
45
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
43
          <GridBagConstraints gridX="0" gridY="3" gridWidth="2" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="12" insetsRight="8" anchor="10" weightX="0.0" weightY="0.0"/>
46
          <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"/>
44
        </Constraint>
47
        </Constraint>
45
      </Constraints>
48
      </Constraints>
46
    </Component>
49
    </Container>
47
    <Component class="javax.swing.JLabel" name="tipLBL">
50
    <Container class="org.netbeans.modules.welcome.ControlLabel" name="tipLBL">
48
      <Properties>
51
      <Properties>
49
        <Property name="icon" type="javax.swing.Icon" editor="org.openide.explorer.propertysheet.editors.IconEditor">
52
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
50
          <Image iconType="3" name="/org/netbeans/modules/welcome/pages/images/tip.gif"/>
53
          <ResourceString bundle="org/netbeans/modules/welcome/Bundle.properties" key="TipLBL" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
51
        </Property>
54
        </Property>
52
      </Properties>
55
      </Properties>
53
      <Constraints>
56
      <Constraints>
54
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
57
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
55
          <GridBagConstraints gridX="0" gridY="5" gridWidth="2" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="0" insetsRight="8" anchor="10" weightX="0.0" weightY="0.0"/>
58
          <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"/>
56
        </Constraint>
59
        </Constraint>
57
      </Constraints>
60
      </Constraints>
58
    </Component>
61
    </Container>
59
    <Container class="org.netbeans.modules.welcome.SetupButton" name="setupButton1">
62
    <Container class="org.netbeans.modules.welcome.SetupButton" name="setupButton1">
60
      <Constraints>
63
      <Constraints>
61
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
64
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
Lines 81-95 Link Here
81
    <Container class="org.netbeans.modules.welcome.HelpPanel" name="helpPanel1">
84
    <Container class="org.netbeans.modules.welcome.HelpPanel" name="helpPanel1">
82
      <Properties>
85
      <Properties>
83
        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
86
        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
84
          <Dimension value="[142, 80]"/>
87
          <Dimension value="[142, 90]"/>
85
        </Property>
88
        </Property>
86
        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
89
        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
87
          <Dimension value="[142, 80]"/>
90
          <Dimension value="[142, 90]"/>
88
        </Property>
91
        </Property>
89
      </Properties>
92
      </Properties>
90
      <Constraints>
93
      <Constraints>
91
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
94
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
92
          <GridBagConstraints gridX="0" gridY="4" gridWidth="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="0" insetsRight="8" anchor="10" weightX="0.0" weightY="0.0"/>
95
          <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"/>
93
        </Constraint>
96
        </Constraint>
94
      </Constraints>
97
      </Constraints>
95
98
Lines 135-156 Link Here
135
      </Properties>
138
      </Properties>
136
      <Constraints>
139
      <Constraints>
137
        <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">
138
          <GridBagConstraints gridX="0" gridY="7" gridWidth="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="1.0"/>
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"/>
139
        </Constraint>
142
        </Constraint>
140
      </Constraints>
143
      </Constraints>
141
144
142
      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
145
      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
143
      <SubComponents>
146
      <SubComponents>
144
        <Container class="org.netbeans.modules.welcome.TipPanel" name="tipPanel1">
147
        <Container class="org.netbeans.modules.welcome.TipPanel" name="tipPanel1">
145
          <Properties>
146
            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
147
              <Dimension value="[160, 203]"/>
148
            </Property>
149
          </Properties>
150
151
          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
152
            <Property name="useNullLayout" type="boolean" value="true"/>
153
          </Layout>
154
        </Container>
148
        </Container>
155
      </SubComponents>
149
      </SubComponents>
156
    </Container>
150
    </Container>
(-)src/org/netbeans/modules/welcome/ControlPanel.java (-23 / +35 lines)
Lines 13-18 Link Here
13
13
14
package org.netbeans.modules.welcome;
14
package org.netbeans.modules.welcome;
15
15
16
import java.awt.Font;
16
/**
17
/**
17
 *
18
 *
18
 * @author  Richard Gregor
19
 * @author  Richard Gregor
Lines 22-27 Link Here
22
    /** Creates new form ControlPanel */
23
    /** Creates new form ControlPanel */
23
    public ControlPanel() {
24
    public ControlPanel() {
24
        initComponents();
25
        initComponents();
26
        Font f= tipPanel1.getTextFont();
27
        tipLBL.setFont(f);
28
        customizingLBL.setFont(f);
29
        helpLBL.setFont(f);
30
        
25
    }
31
    }
26
    
32
    
27
    /** This method is called from within the constructor to
33
    /** This method is called from within the constructor to
Lines 33-41 Link Here
33
        java.awt.GridBagConstraints gridBagConstraints;
39
        java.awt.GridBagConstraints gridBagConstraints;
34
40
35
        helpPanel2 = new org.netbeans.modules.welcome.HelpPanel();
41
        helpPanel2 = new org.netbeans.modules.welcome.HelpPanel();
36
        custLBL = new javax.swing.JLabel();
42
        customizingLBL = new org.netbeans.modules.welcome.ControlLabel();
37
        helpLBL = new javax.swing.JLabel();
43
        helpLBL = new org.netbeans.modules.welcome.ControlLabel();
38
        tipLBL = new javax.swing.JLabel();
44
        tipLBL = new org.netbeans.modules.welcome.ControlLabel();
39
        setupButton1 = new org.netbeans.modules.welcome.SetupButton();
45
        setupButton1 = new org.netbeans.modules.welcome.SetupButton();
40
        updateButton1 = new org.netbeans.modules.welcome.UpdateButton();
46
        updateButton1 = new org.netbeans.modules.welcome.UpdateButton();
41
        helpPanel1 = new org.netbeans.modules.welcome.HelpPanel();
47
        helpPanel1 = new org.netbeans.modules.welcome.HelpPanel();
Lines 49-74 Link Here
49
        setLayout(new java.awt.GridBagLayout());
55
        setLayout(new java.awt.GridBagLayout());
50
56
51
        setBackground(new java.awt.Color(255, 255, 255));
57
        setBackground(new java.awt.Color(255, 255, 255));
52
        custLBL.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/welcome/pages/images/customizing.gif")));
58
59
        customizingLBL.setPreferredSize(new java.awt.Dimension(162, 17));
60
        customizingLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("Customizing_LBL"));
53
        gridBagConstraints = new java.awt.GridBagConstraints();
61
        gridBagConstraints = new java.awt.GridBagConstraints();
62
        gridBagConstraints.gridx = 0;
63
        gridBagConstraints.gridy = 0;
54
        gridBagConstraints.gridwidth = 2;
64
        gridBagConstraints.gridwidth = 2;
55
        gridBagConstraints.insets = new java.awt.Insets(24, 0, 12, 8);
65
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
56
        add(custLBL, gridBagConstraints);
66
        gridBagConstraints.insets = new java.awt.Insets(24, 0, 12, 14);
67
        add(customizingLBL, gridBagConstraints);
57
68
58
        helpLBL.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/welcome/pages/images/help.gif")));
69
        helpLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("Help_LBL"));
59
        gridBagConstraints = new java.awt.GridBagConstraints();
70
        gridBagConstraints = new java.awt.GridBagConstraints();
60
        gridBagConstraints.gridx = 0;
71
        gridBagConstraints.gridx = 0;
61
        gridBagConstraints.gridy = 3;
72
        gridBagConstraints.gridy = 3;
62
        gridBagConstraints.gridwidth = 2;
73
        gridBagConstraints.gridwidth = 2;
63
        gridBagConstraints.insets = new java.awt.Insets(12, 0, 12, 8);
74
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
75
        gridBagConstraints.insets = new java.awt.Insets(10, 0, 6, 14);
64
        add(helpLBL, gridBagConstraints);
76
        add(helpLBL, gridBagConstraints);
65
77
66
        tipLBL.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/welcome/pages/images/tip.gif")));
78
        tipLBL.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("TipLBL"));
67
        gridBagConstraints = new java.awt.GridBagConstraints();
79
        gridBagConstraints = new java.awt.GridBagConstraints();
68
        gridBagConstraints.gridx = 0;
80
        gridBagConstraints.gridx = 0;
69
        gridBagConstraints.gridy = 5;
81
        gridBagConstraints.gridy = 5;
70
        gridBagConstraints.gridwidth = 2;
82
        gridBagConstraints.gridwidth = 2;
71
        gridBagConstraints.insets = new java.awt.Insets(12, 0, 0, 8);
83
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
84
        gridBagConstraints.insets = new java.awt.Insets(6, 0, 6, 14);
72
        add(tipLBL, gridBagConstraints);
85
        add(tipLBL, gridBagConstraints);
73
86
74
        setupButton1.setLayout(null);
87
        setupButton1.setLayout(null);
Lines 91-104 Link Here
91
104
92
        helpPanel1.setLayout(null);
105
        helpPanel1.setLayout(null);
93
106
94
        helpPanel1.setMinimumSize(new java.awt.Dimension(142, 80));
107
        helpPanel1.setMinimumSize(new java.awt.Dimension(142, 90));
95
        helpPanel1.setPreferredSize(new java.awt.Dimension(142, 80));
108
        helpPanel1.setPreferredSize(new java.awt.Dimension(142, 90));
96
        gridBagConstraints = new java.awt.GridBagConstraints();
109
        gridBagConstraints = new java.awt.GridBagConstraints();
97
        gridBagConstraints.gridx = 0;
110
        gridBagConstraints.gridx = 0;
98
        gridBagConstraints.gridy = 4;
111
        gridBagConstraints.gridy = 4;
99
        gridBagConstraints.gridwidth = 2;
112
        gridBagConstraints.gridwidth = 2;
100
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
113
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
101
        gridBagConstraints.insets = new java.awt.Insets(0, 8, 0, 8);
114
        gridBagConstraints.insets = new java.awt.Insets(0, 7, 0, 9);
102
        add(helpPanel1, gridBagConstraints);
115
        add(helpPanel1, gridBagConstraints);
103
116
104
        update.setFont(new java.awt.Font("Dialog", 0, 10));
117
        update.setFont(new java.awt.Font("Dialog", 0, 10));
Lines 121-132 Link Here
121
134
122
        jPanel1.setBackground(new java.awt.Color(255, 255, 255));
135
        jPanel1.setBackground(new java.awt.Color(255, 255, 255));
123
136
124
        tipPanel1.setPreferredSize(new java.awt.Dimension(160, 203));
125
        jPanel1.add(tipPanel1);
137
        jPanel1.add(tipPanel1);
126
138
127
        gridBagConstraints = new java.awt.GridBagConstraints();
139
        gridBagConstraints = new java.awt.GridBagConstraints();
128
        gridBagConstraints.gridx = 0;
140
        gridBagConstraints.gridx = 0;
129
        gridBagConstraints.gridy = 7;
141
        gridBagConstraints.gridy = 6;
130
        gridBagConstraints.gridwidth = 2;
142
        gridBagConstraints.gridwidth = 2;
131
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
143
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
132
        gridBagConstraints.weighty = 1.0;
144
        gridBagConstraints.weighty = 1.0;
Lines 136-152 Link Here
136
    
148
    
137
    
149
    
138
    // Variables declaration - do not modify//GEN-BEGIN:variables
150
    // Variables declaration - do not modify//GEN-BEGIN:variables
139
    private javax.swing.JLabel setup;
151
    private org.netbeans.modules.welcome.SetupButton setupButton1;
140
    private javax.swing.JPanel jPanel1;
152
    private javax.swing.JLabel update;
141
    private org.netbeans.modules.welcome.UpdateButton updateButton1;
142
    private javax.swing.JLabel helpLBL;
143
    private org.netbeans.modules.welcome.TipPanel tipPanel1;
153
    private org.netbeans.modules.welcome.TipPanel tipPanel1;
144
    private javax.swing.JLabel custLBL;
154
    private org.netbeans.modules.welcome.UpdateButton updateButton1;
145
    private javax.swing.JLabel tipLBL;
155
    private org.netbeans.modules.welcome.ControlLabel tipLBL;
156
    private org.netbeans.modules.welcome.ControlLabel customizingLBL;
157
    private org.netbeans.modules.welcome.ControlLabel helpLBL;
158
    private javax.swing.JLabel setup;
146
    private org.netbeans.modules.welcome.HelpPanel helpPanel2;
159
    private org.netbeans.modules.welcome.HelpPanel helpPanel2;
160
    private javax.swing.JPanel jPanel1;
147
    private org.netbeans.modules.welcome.HelpPanel helpPanel1;
161
    private org.netbeans.modules.welcome.HelpPanel helpPanel1;
148
    private javax.swing.JLabel update;
149
    private org.netbeans.modules.welcome.SetupButton setupButton1;
150
    // End of variables declaration//GEN-END:variables
162
    // End of variables declaration//GEN-END:variables
151
    
163
    
152
}
164
}
(-)src/org/netbeans/modules/welcome/TipPanel.java (-2 / +7 lines)
Lines 49-54 Link Here
49
    private WelcomeEditor tipsBrowser;
49
    private WelcomeEditor tipsBrowser;
50
    private JScrollPane scroll;
50
    private JScrollPane scroll;
51
    private int index;
51
    private int index;
52
    private Font font;
52
    /**
53
    /**
53
     * Where the tips are located.
54
     * Where the tips are located.
54
     */
55
     */
Lines 102-109 Link Here
102
            fontName = nextB.getFont().getFontName();
103
            fontName = nextB.getFont().getFontName();
103
        if(fontStyle == -1)
104
        if(fontStyle == -1)
104
            fontStyle = nextB.getFont().getStyle();
105
            fontStyle = nextB.getFont().getStyle();
105
        
106
        font = new java.awt.Font(fontName, fontStyle, size);
106
        nextB.setFont(new java.awt.Font(fontName, fontStyle, size));// NOI18N
107
        nextB.setFont(font);// NOI18N
107
        nextB.addActionListener(new ActionListener(){
108
        nextB.addActionListener(new ActionListener(){
108
            public void actionPerformed(ActionEvent e){
109
            public void actionPerformed(ActionEvent e){
109
                setNext();
110
                setNext();
Lines 183-188 Link Here
183
        else
184
        else
184
            index ++;
185
            index ++;
185
        showTip(index);
186
        showTip(index);
187
    }
188
    
189
    public Font getTextFont(){
190
        return font;
186
    }
191
    }
187
    
192
    
188
    /**
193
    /**

Return to bug 27030