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

(-)core/libsrc/org/netbeans/lib/terminalemulator/Term.java (-3 / +4 lines)
Lines 1533-1539 Link Here
1533
	custom_color[6] = Color.black;
1533
	custom_color[6] = Color.black;
1534
	custom_color[7] = Color.black;
1534
	custom_color[7] = Color.black;
1535
1535
1536
	setFont(new Font("Monospaced", Font.PLAIN, 12));	// NOI18N
1536
	setFont(new Font("Monospaced", Font.PLAIN,                                      // NOI18N
1537
                ((Font)UIManager.getDefaults().get("TextArea.font")).getSize() + 1));	// NOI18N
1537
	BorderLayout layout = new BorderLayout();
1538
	BorderLayout layout = new BorderLayout();
1538
	setLayout(layout);
1539
	setLayout(layout);
1539
	screen = new Screen(this,
1540
	screen = new Screen(this,
Lines 1933-1939 Link Here
1933
		repaint(false);
1934
		repaint(false);
1934
	    } 
1935
	    } 
1935
	} );
1936
	} );
1936
    }
1937
    }    
1937
1938
1938
1939
1939
    /*
1940
    /*
Lines 4502-4508 Link Here
4502
	ckEventDispatchThread();
4503
	ckEventDispatchThread();
4503
	// OLD NPE-x synchronized(this)
4504
	// OLD NPE-x synchronized(this)
4504
	{
4505
	{
4505
	    st.firstx += n * st.rows;
4506
	    st.firstx += n * st.rows;
4506
	    if (st.firstx + st.rows > buf.nlines)
4507
	    if (st.firstx + st.rows > buf.nlines)
4507
		st.firstx = buf.nlines - st.rows;
4508
		st.firstx = buf.nlines - st.rows;
4508
	}
4509
	}
(-)core/src/org/netbeans/core/NotifyException.java (-1 / +1 lines)
Lines 90-96 Link Here
90
         */
90
         */
91
        output = new JEditorPane();
91
        output = new JEditorPane();
92
        output.setEditable(false);
92
        output.setEditable(false);
93
        output.setFont(new Font("Monospaced", Font.PLAIN, 12)); // NOI18N
93
        output.setFont(new Font("Monospaced", Font.PLAIN, output.getFont().getSize() + 1)); // NOI18N
94
        output.setForeground(UIManager.getColor("Label.foreground")); // NOI18N
94
        output.setForeground(UIManager.getColor("Label.foreground")); // NOI18N
95
        output.setBackground(UIManager.getColor("Label.background")); // NOI18N
95
        output.setBackground(UIManager.getColor("Label.background")); // NOI18N
96
96
(-)core/src/org/netbeans/core/Splash.java (-1 / +1 lines)
Lines 249-255 Link Here
249
            {
249
            {
250
                draw_bar = false;
250
                draw_bar = false;
251
            }
251
            }
252
            int size = 12;
252
            int size = ((Font)UIManager.getDefaults().get("Label.font")).getSize() + 1; // NOI18N
253
            try {
253
            try {
254
                String sizeStr = bundle.getString("SplashRunningTextFontSize");
254
                String sizeStr = bundle.getString("SplashRunningTextFontSize");
255
                size = Integer.parseInt(sizeStr);
255
                size = Integer.parseInt(sizeStr);
(-)core/src/org/netbeans/core/ui/WelcomePanel.form (-11 / +5 lines)
Lines 62-70 Link Here
62
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
62
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
63
              <ResourceString bundle="org/netbeans/core/ui/Bundle.properties" key="LABEL_WelcomeHTMLPages" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
63
              <ResourceString bundle="org/netbeans/core/ui/Bundle.properties" key="LABEL_WelcomeHTMLPages" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
64
            </Property>
64
            </Property>
65
            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
66
              <Color blue="0" green="0" id="black" palette="0" red="0" type="palette"/>
67
            </Property>
68
            <Property name="requestFocusEnabled" type="boolean" value="false"/>
65
            <Property name="requestFocusEnabled" type="boolean" value="false"/>
69
          </Properties>
66
          </Properties>
70
          <AuxValues>
67
          <AuxValues>
Lines 156-164 Link Here
156
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
153
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
157
              <ResourceString bundle="org/netbeans/core/ui/Bundle.properties" key="LABEL_WelcomeTipPages" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
154
              <ResourceString bundle="org/netbeans/core/ui/Bundle.properties" key="LABEL_WelcomeTipPages" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
158
            </Property>
155
            </Property>
159
            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
160
              <Color blue="0" green="0" id="black" palette="0" red="0" type="palette"/>
161
            </Property>
162
            <Property name="horizontalAlignment" type="int" value="2"/>
156
            <Property name="horizontalAlignment" type="int" value="2"/>
163
            <Property name="requestFocusEnabled" type="boolean" value="false"/>
157
            <Property name="requestFocusEnabled" type="boolean" value="false"/>
164
          </Properties>
158
          </Properties>
Lines 256-270 Link Here
256
            <Component class="javax.swing.JEditorPane" name="tipsBrowser">
250
            <Component class="javax.swing.JEditorPane" name="tipsBrowser">
257
              <Properties>
251
              <Properties>
258
                <Property name="editable" type="boolean" value="false"/>
252
                <Property name="editable" type="boolean" value="false"/>
259
                <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
253
                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
260
                  <Font name="Dialog" size="11" style="0"/>
254
                  <Connection code="new Font(&quot;Dialog&quot;, Font.PLAIN, tipsBrowser.getFont().getSize())" type="code"/>
255
                </Property>
256
                <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
257
                  <Connection component="showOnStartupCheckBox" type="bean"/>
261
                </Property>
258
                </Property>
262
                <Property name="requestFocusEnabled" type="boolean" value="false"/>
259
                <Property name="requestFocusEnabled" type="boolean" value="false"/>
263
                <Property name="editorKit" type="javax.swing.text.EditorKit" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
260
                <Property name="editorKit" type="javax.swing.text.EditorKit" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
264
                  <Connection code="new javax.swing.text.html.HTMLEditorKit ()" type="code"/>
261
                  <Connection code="new javax.swing.text.html.HTMLEditorKit ()" type="code"/>
265
                </Property>
266
                <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
267
                  <Connection component="showOnStartupCheckBox" type="bean"/>
268
                </Property>
262
                </Property>
269
              </Properties>
263
              </Properties>
270
            </Component>
264
            </Component>
(-)core/src/org/netbeans/core/ui/WelcomePanel.java (-12 / +10 lines)
Lines 208-214 Link Here
208
208
209
        jLabelHtmlTitle.setLabelFor(buttonSetPanel);
209
        jLabelHtmlTitle.setLabelFor(buttonSetPanel);
210
        jLabelHtmlTitle.setText(bundle.getString("LABEL_WelcomeHTMLPages"));
210
        jLabelHtmlTitle.setText(bundle.getString("LABEL_WelcomeHTMLPages"));
211
        jLabelHtmlTitle.setForeground(java.awt.Color.black);
212
        jLabelHtmlTitle.setRequestFocusEnabled(false);
211
        jLabelHtmlTitle.setRequestFocusEnabled(false);
213
        gridBagConstraints = new java.awt.GridBagConstraints();
212
        gridBagConstraints = new java.awt.GridBagConstraints();
214
        gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
213
        gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
Lines 247-255 Link Here
247
        gridBagConstraints.gridx = 0;
246
        gridBagConstraints.gridx = 0;
248
        gridBagConstraints.gridy = 0;
247
        gridBagConstraints.gridy = 0;
249
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
248
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
250
        gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 12);
251
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
249
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
252
        gridBagConstraints.weightx = 1.0;
250
        gridBagConstraints.weightx = 1.0;
251
        gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 12);
253
        jPanelButton.add(showOnStartupCheckBox, gridBagConstraints);
252
        jPanelButton.add(showOnStartupCheckBox, gridBagConstraints);
254
253
255
        closeButton.setText(bundle.getString("CTL_CLOSE"));
254
        closeButton.setText(bundle.getString("CTL_CLOSE"));
Lines 269-275 Link Here
269
        jPanelTip.setRequestFocusEnabled(false);
268
        jPanelTip.setRequestFocusEnabled(false);
270
        jLabelTipTitle.setLabelFor(tipsBrowser);
269
        jLabelTipTitle.setLabelFor(tipsBrowser);
271
        jLabelTipTitle.setText(bundle.getString("LABEL_WelcomeTipPages"));
270
        jLabelTipTitle.setText(bundle.getString("LABEL_WelcomeTipPages"));
272
        jLabelTipTitle.setForeground(java.awt.Color.black);
273
        jLabelTipTitle.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
271
        jLabelTipTitle.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
274
        jLabelTipTitle.setRequestFocusEnabled(false);
272
        jLabelTipTitle.setRequestFocusEnabled(false);
275
        gridBagConstraints = new java.awt.GridBagConstraints();
273
        gridBagConstraints = new java.awt.GridBagConstraints();
Lines 330-339 Link Here
330
328
331
        tipsScrollPane.setPreferredSize(new java.awt.Dimension(420, 120));
329
        tipsScrollPane.setPreferredSize(new java.awt.Dimension(420, 120));
332
        tipsBrowser.setEditable(false);
330
        tipsBrowser.setEditable(false);
333
        tipsBrowser.setFont(new java.awt.Font("Dialog", 0, 11));
331
        tipsBrowser.setFont(new Font("Dialog", Font.PLAIN, tipsBrowser.getFont().getSize()));
332
        tipsBrowser.setNextFocusableComponent(showOnStartupCheckBox);
334
        tipsBrowser.setRequestFocusEnabled(false);
333
        tipsBrowser.setRequestFocusEnabled(false);
335
        tipsBrowser.setEditorKit(new javax.swing.text.html.HTMLEditorKit ());
334
        tipsBrowser.setEditorKit(new javax.swing.text.html.HTMLEditorKit ());
336
        tipsBrowser.setNextFocusableComponent(showOnStartupCheckBox);
337
        tipsScrollPane.setViewportView(tipsBrowser);
335
        tipsScrollPane.setViewportView(tipsBrowser);
338
336
339
        gridBagConstraints = new java.awt.GridBagConstraints();
337
        gridBagConstraints = new java.awt.GridBagConstraints();
Lines 366-386 Link Here
366
364
367
365
368
    // Variables declaration - do not modify//GEN-BEGIN:variables
366
    // Variables declaration - do not modify//GEN-BEGIN:variables
369
    private javax.swing.JPanel jPanelButton;
367
    private javax.swing.JPanel buttonSetPanel;
370
    private javax.swing.JCheckBox showOnStartupCheckBox;
371
    private javax.swing.JButton closeButton;
368
    private javax.swing.JButton closeButton;
372
    private javax.swing.JEditorPane contextBrowser;
369
    private javax.swing.JEditorPane contextBrowser;
373
    private javax.swing.JButton nextTipButton;
370
    private javax.swing.JScrollPane contextBrowserScroll;
371
    private javax.swing.JLabel jLabelHtmlTitle;
374
    private javax.swing.JLabel jLabelTipTitle;
372
    private javax.swing.JLabel jLabelTipTitle;
375
    private javax.swing.JEditorPane tipsBrowser;
373
    private javax.swing.JPanel jPanelButton;
376
    private javax.swing.JPanel buttonSetPanel;
377
    private javax.swing.JPanel jPanelHtml;
374
    private javax.swing.JPanel jPanelHtml;
378
    private javax.swing.JPanel jPanelTip;
375
    private javax.swing.JPanel jPanelTip;
379
    private javax.swing.JLabel jLabelHtmlTitle;
380
    private javax.swing.JPanel jPanelTipButton;
376
    private javax.swing.JPanel jPanelTipButton;
377
    private javax.swing.JButton nextTipButton;
381
    private javax.swing.JButton prevTipButton;
378
    private javax.swing.JButton prevTipButton;
379
    private javax.swing.JCheckBox showOnStartupCheckBox;
380
    private javax.swing.JEditorPane tipsBrowser;
382
    private javax.swing.JScrollPane tipsScrollPane;
381
    private javax.swing.JScrollPane tipsScrollPane;
383
    private javax.swing.JScrollPane contextBrowserScroll;
384
    // End of variables declaration//GEN-END:variables
382
    // End of variables declaration//GEN-END:variables
385
383
386
    javax.swing.JButton getCloseButton() {
384
    javax.swing.JButton getCloseButton() {

Return to bug 33667