Index: src/org/netbeans/modules/welcome/Bundle.properties =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/Bundle.properties,v retrieving revision 1.22 diff -u -b -B -r1.22 Bundle.properties --- src/org/netbeans/modules/welcome/Bundle.properties 24 Jun 2003 15:32:12 -0000 1.22 +++ src/org/netbeans/modules/welcome/Bundle.properties 8 Jul 2003 07:26:43 -0000 @@ -87,13 +87,5 @@ 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 +LBL_GettingStarted=Getting Started Using the IDE Index: src/org/netbeans/modules/welcome/ContentPanel.java =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ContentPanel.java,v retrieving revision 1.16 diff -u -b -B -r1.16 ContentPanel.java --- src/org/netbeans/modules/welcome/ContentPanel.java 24 Jun 2003 15:32:12 -0000 1.16 +++ src/org/netbeans/modules/welcome/ContentPanel.java 8 Jul 2003 07:26:43 -0000 @@ -39,12 +39,10 @@ private String page = null; public ContentPanel() { - bundle = NbBundle.getBundle(HelpPanel.class); + 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")){ @@ -56,18 +54,25 @@ } try{ URL url = new URL("nbresloc:/org/netbeans/modules/welcome/pages/"+page); - jEditorPane1.setEditorKit(new javax.swing.text.html.HTMLEditorKit()); + jEditorPane1.setEditorKit(WelcomeHTMLEditorKit.getInstance()); jEditorPane1.setPage(url); }catch(Exception e){ ErrorManager.getDefault().notify(e); } ControlPanel ctrlPanel = new ControlPanel(); - add(jEditorPane1,BorderLayout.CENTER); + 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; + bg = Color.white; } setBackground (bg); //NOI18N } Index: src/org/netbeans/modules/welcome/ControlLabel.java =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ControlLabel.java,v retrieving revision 1.3 diff -u -b -B -r1.3 ControlLabel.java --- src/org/netbeans/modules/welcome/ControlLabel.java 24 Jun 2003 15:32:12 -0000 1.3 +++ src/org/netbeans/modules/welcome/ControlLabel.java 8 Jul 2003 07:26:43 -0000 @@ -13,6 +13,8 @@ package org.netbeans.modules.welcome; +import java.awt.Font; + /** * * @author Richard Gregor @@ -23,6 +25,7 @@ public ControlLabel() { 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 Index: src/org/netbeans/modules/welcome/ControlPanel.form =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.form,v retrieving revision 1.4 diff -u -b -B -r1.4 ControlPanel.form --- src/org/netbeans/modules/welcome/ControlPanel.form 24 Jun 2003 15:32:12 -0000 1.4 +++ src/org/netbeans/modules/welcome/ControlPanel.form 8 Jul 2003 07:26:43 -0000 @@ -34,7 +34,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -64,14 +64,14 @@ - + - + @@ -82,7 +82,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -138,13 +138,21 @@ - + + + + + + + + + Index: src/org/netbeans/modules/welcome/ControlPanel.java =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/ControlPanel.java,v retrieving revision 1.5 diff -u -b -B -r1.5 ControlPanel.java --- src/org/netbeans/modules/welcome/ControlPanel.java 24 Jun 2003 15:32:13 -0000 1.5 +++ src/org/netbeans/modules/welcome/ControlPanel.java 8 Jul 2003 07:26:43 -0000 @@ -23,10 +23,18 @@ /** Creates new form ControlPanel */ public ControlPanel() { initComponents(); - /* Font f= tipPanel1.getTextFont(); - tipLBL.setFont(f); - customizingLBL.setFont(f); - helpLBL.setFont(f);*/ + 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); } @@ -60,17 +68,18 @@ 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 = 0; + 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 = 0; + gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 3; gridBagConstraints.gridwidth = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; @@ -80,7 +89,7 @@ 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; + gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 5; gridBagConstraints.gridwidth = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; @@ -90,8 +99,9 @@ setupButton1.setLayout(null); gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; + 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); @@ -99,8 +109,9 @@ updateButton1.setLayout(null); gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; + 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); @@ -109,7 +120,7 @@ helpPanel1.setBackground((java.awt.Color) javax.swing.UIManager.getDefaults().get("text")); gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; + gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 4; gridBagConstraints.gridwidth = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; @@ -118,26 +129,30 @@ update.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/welcome/Bundle").getString("LBL_update")); gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 1; + 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, 0); + 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 = 1; + 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, 0); + 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 = 0; + gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 6; gridBagConstraints.gridwidth = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; Index: src/org/netbeans/modules/welcome/HelpPanel.java =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/HelpPanel.java,v retrieving revision 1.10 diff -u -b -B -r1.10 HelpPanel.java --- src/org/netbeans/modules/welcome/HelpPanel.java 27 Feb 2003 23:42:33 -0000 1.10 +++ src/org/netbeans/modules/welcome/HelpPanel.java 8 Jul 2003 07:26:43 -0000 @@ -38,7 +38,7 @@ super(); bundle = NbBundle.getBundle(HelpPanel.class); setEditable(false); - setEditorKit(new javax.swing.text.html.HTMLEditorKit()); + setEditorKit(WelcomeHTMLEditorKit.getInstance()); try{ URL pageURL = new URL("nbresloc:/org/netbeans/modules/welcome/pages/Help.html"); // NOI18N setPage(pageURL); Index: src/org/netbeans/modules/welcome/Line.form =================================================================== RCS file: src/org/netbeans/modules/welcome/Line.form diff -N src/org/netbeans/modules/welcome/Line.form --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/netbeans/modules/welcome/Line.form 8 Jul 2003 07:26:43 -0000 @@ -0,0 +1,55 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/org/netbeans/modules/welcome/Line.java =================================================================== RCS file: src/org/netbeans/modules/welcome/Line.java diff -N src/org/netbeans/modules/welcome/Line.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/netbeans/modules/welcome/Line.java 8 Jul 2003 07:26:43 -0000 @@ -0,0 +1,70 @@ +/* + * 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 + +} Index: src/org/netbeans/modules/welcome/TipPanel.java =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/TipPanel.java,v retrieving revision 1.22 diff -u -b -B -r1.22 TipPanel.java --- src/org/netbeans/modules/welcome/TipPanel.java 26 Jun 2003 11:38:23 -0000 1.22 +++ src/org/netbeans/modules/welcome/TipPanel.java 8 Jul 2003 07:26:43 -0000 @@ -23,6 +23,7 @@ import java.io.*; import java.beans.*; import javax.accessibility.*; +import javax.swing.text.Style; import javax.swing.text.html.HTMLEditorKit; import org.openide.*; @@ -65,16 +66,16 @@ tipsBrowser = new WelcomeEditor(); tipsBrowser.setEditable(false); tipsBrowser.setBackground(new Color(231,236,251)); - //tipsBrowser.setEditorKit(new TipHtmlEditorKit()); - tipsBrowser.setEditorKit(new HTMLEditorKit()); + 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)); + // tipsBrowser.setSize(148,180); + // tipsBrowser.setPreferredSize(new Dimension(148,180)); findTips(); showTip(getTipIndex()); scroll.setViewportView(tipsBrowser); - scroll.setSize(148,180); - scroll.setPreferredSize(new Dimension(148,180)); + //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 @@ -191,29 +192,5 @@ 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; - } - - } } Index: src/org/netbeans/modules/welcome/TitleLabel.form =================================================================== RCS file: src/org/netbeans/modules/welcome/TitleLabel.form diff -N src/org/netbeans/modules/welcome/TitleLabel.form --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/netbeans/modules/welcome/TitleLabel.form 8 Jul 2003 07:26:43 -0000 @@ -0,0 +1,97 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/org/netbeans/modules/welcome/TitleLabel.java =================================================================== RCS file: src/org/netbeans/modules/welcome/TitleLabel.java diff -N src/org/netbeans/modules/welcome/TitleLabel.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/netbeans/modules/welcome/TitleLabel.java 8 Jul 2003 07:26:43 -0000 @@ -0,0 +1,106 @@ +/* + * 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 + +} Index: src/org/netbeans/modules/welcome/WelcomeComponent.java =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/WelcomeComponent.java,v retrieving revision 1.20 diff -u -b -B -r1.20 WelcomeComponent.java --- src/org/netbeans/modules/welcome/WelcomeComponent.java 24 Jun 2003 15:32:13 -0000 1.20 +++ src/org/netbeans/modules/welcome/WelcomeComponent.java 8 Jul 2003 07:26:43 -0000 @@ -47,7 +47,7 @@ } if(panel == null) return; - if(panel instanceof org.netbeans.modules.welcome.ContentPanel){ + /* if(panel instanceof org.netbeans.modules.welcome.ContentPanel){ //JPanel panel = new ContentPanel(); try{ if(System.getProperty("os.name").indexOf("Windows") != -1){ //NOI18N @@ -62,7 +62,7 @@ } } panel.setMinimumSize(new Dimension(width,height)); - panel.setPreferredSize(new Dimension(width,height)); + panel.setPreferredSize(new Dimension(width,height)); */ JScrollPane scroll = new JScrollPane(panel); setCloseOperation(TopComponent.CLOSE_EACH); add(scroll); Index: src/org/netbeans/modules/welcome/WelcomeHTMLEditorKit.java =================================================================== RCS file: src/org/netbeans/modules/welcome/WelcomeHTMLEditorKit.java diff -N src/org/netbeans/modules/welcome/WelcomeHTMLEditorKit.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/netbeans/modules/welcome/WelcomeHTMLEditorKit.java 8 Jul 2003 07:26:43 -0000 @@ -0,0 +1,75 @@ +/* + * 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(); + } + + +} + + Index: src/org/netbeans/modules/welcome/pages/Help.html =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/pages/Help.html,v retrieving revision 1.5 diff -u -b -B -r1.5 Help.html --- src/org/netbeans/modules/welcome/pages/Help.html 12 Feb 2003 09:25:02 -0000 1.5 +++ src/org/netbeans/modules/welcome/pages/Help.html 8 Jul 2003 07:26:43 -0000 @@ -3,12 +3,12 @@ - + --> Help Index: src/org/netbeans/modules/welcome/pages/welcome.html =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/pages/welcome.html,v retrieving revision 1.13 diff -u -b -B -r1.13 welcome.html --- src/org/netbeans/modules/welcome/pages/welcome.html 10 Mar 2003 21:48:45 -0000 1.13 +++ src/org/netbeans/modules/welcome/pages/welcome.html 8 Jul 2003 07:26:43 -0000 @@ -16,44 +16,48 @@ - + --> - + + - + + - - - + + Index: src/org/netbeans/modules/welcome/pages/welcome_1_3.html =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/pages/welcome_1_3.html,v retrieving revision 1.11 diff -u -b -B -r1.11 welcome_1_3.html --- src/org/netbeans/modules/welcome/pages/welcome_1_3.html 18 Aug 2002 22:07:31 -0000 1.11 +++ src/org/netbeans/modules/welcome/pages/welcome_1_3.html 8 Jul 2003 07:26:43 -0000 @@ -16,18 +16,11 @@ -
    
+ + +a File  @@ -63,21 +67,10 @@ - + - + @@ -115,14 +108,7 @@ - + @@ -167,14 +153,15 @@
   Opening -a File
 
    Navigate to the directory you want to mount and select that directory.
+ + +a File or Object  @@ -255,7 +242,9 @@
   Creating -a File or Object
- + - + + - - - + + Index: src/org/netbeans/modules/welcome/pages/welcome_1_3_lin.html =================================================================== RCS file: /cvs/ui/welcome/src/org/netbeans/modules/welcome/pages/welcome_1_3_lin.html,v retrieving revision 1.2 diff -u -b -B -r1.2 welcome_1_3_lin.html --- src/org/netbeans/modules/welcome/pages/welcome_1_3_lin.html 18 Aug 2002 22:07:31 -0000 1.2 +++ src/org/netbeans/modules/welcome/pages/welcome_1_3_lin.html 8 Jul 2003 07:26:43 -0000 @@ -16,18 +16,12 @@ -
    
+ + @@ -167,7 +162,8 @@
 
 + + @@ -255,7 +251,9 @@
- + - + + - -
    
+ + @@ -148,14 +144,15 @@
 
 - + + - + +
+ +a File or Object  @@ -236,7 +233,9 @@
   Creating -a File or Object