Index: ui/welcome/src/org/netbeans/modules/welcome/ContentPanel.java =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ContentPanel.java,v retrieving revision 1.14 diff -u -r1.14 ContentPanel.java --- ui/welcome/src/org/netbeans/modules/welcome/ContentPanel.java 27 Feb 2003 23:42:33 -0000 1.14 +++ ui/welcome/src/org/netbeans/modules/welcome/ContentPanel.java 26 May 2003 11:36:51 -0000 @@ -65,7 +65,11 @@ add(jEditorPane1,BorderLayout.CENTER); add(ctrlPanel,BorderLayout.EAST); initListeners(); - + Color bg = UIManager.getColor("text"); //NOI18N + if (bg == null) { + bg = Color.WHITE; + } + setBackground (bg); //NOI18N } private void initListeners(){ Index: ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.form =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.form,v retrieving revision 1.2 diff -u -r1.2 ControlPanel.form --- ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.form 2 Jan 2003 14:02:03 -0000 1.2 +++ ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.form 26 May 2003 11:36:51 -0000 @@ -11,17 +11,20 @@ - + - + + + + @@ -37,6 +40,9 @@ + + + @@ -49,6 +55,9 @@ + + + @@ -83,6 +92,9 @@ + + + @@ -133,7 +145,7 @@ - + Index: ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.java =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.java,v retrieving revision 1.3 diff -u -r1.3 ControlPanel.java --- ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.java 27 Feb 2003 23:42:33 -0000 1.3 +++ ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.java 26 May 2003 11:36:51 -0000 @@ -54,8 +54,9 @@ setLayout(new java.awt.GridBagLayout()); - setBackground(new java.awt.Color(255, 255, 255)); + setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text")); + customizingLBL.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text")); 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(); @@ -66,6 +67,7 @@ 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 = 0; @@ -75,6 +77,7 @@ gridBagConstraints.insets = new java.awt.Insets(10, 0, 6, 14); add(helpLBL, gridBagConstraints); + 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 = 0; @@ -104,6 +107,7 @@ 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(); @@ -132,7 +136,7 @@ gridBagConstraints.insets = new java.awt.Insets(0, 6, 0, 0); add(setup, gridBagConstraints); - jPanel1.setBackground(new java.awt.Color(255, 255, 255)); + jPanel1.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text")); jPanel1.add(tipPanel1); @@ -148,17 +152,17 @@ // Variables declaration - do not modify//GEN-BEGIN:variables - private org.netbeans.modules.welcome.SetupButton setupButton1; - private javax.swing.JLabel update; - private org.netbeans.modules.welcome.TipPanel tipPanel1; - private org.netbeans.modules.welcome.UpdateButton updateButton1; - private org.netbeans.modules.welcome.ControlLabel tipLBL; private org.netbeans.modules.welcome.ControlLabel customizingLBL; private org.netbeans.modules.welcome.ControlLabel helpLBL; - private javax.swing.JLabel setup; + private org.netbeans.modules.welcome.HelpPanel helpPanel1; private org.netbeans.modules.welcome.HelpPanel helpPanel2; private javax.swing.JPanel jPanel1; - private org.netbeans.modules.welcome.HelpPanel helpPanel1; + private javax.swing.JLabel setup; + private org.netbeans.modules.welcome.SetupButton setupButton1; + private org.netbeans.modules.welcome.ControlLabel tipLBL; + private org.netbeans.modules.welcome.TipPanel tipPanel1; + private javax.swing.JLabel update; + private org.netbeans.modules.welcome.UpdateButton updateButton1; // End of variables declaration//GEN-END:variables } Index: ui/welcome/src/org/netbeans/modules/welcome/TipPanel.java =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/TipPanel.java,v retrieving revision 1.19 diff -u -r1.19 TipPanel.java --- ui/welcome/src/org/netbeans/modules/welcome/TipPanel.java 27 Feb 2003 23:42:34 -0000 1.19 +++ ui/welcome/src/org/netbeans/modules/welcome/TipPanel.java 26 May 2003 11:36:51 -0000 @@ -111,7 +111,7 @@ }); JPanel nextPanel = new JPanel(new BorderLayout()); nextPanel.add(nextB, BorderLayout.EAST); - nextPanel.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("EditorPane.background")); + nextPanel.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text")); add(nextPanel,BorderLayout.SOUTH); bundle = NbBundle.getBundle(HelpPanel.class); initAccessibility();