sdeboy 2004/05/03 01:00:48
Modified: src/java/org/apache/log4j/chainsaw LogPanel.java
ChainsawToolBarAndMenus.java ChainsawAbout.java
src/java/org/apache/log4j/chainsaw/help tutorial.html
Log:
- Initial help-about content, with version, bug report/mailing list link,
attributions (feel free to change content or add attributions if I've forgotten to
include someone)
- Changed size of find text field
- minor change to tutorial
Revision Changes Path
1.69 +5 -3 logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanel.java
Index: LogPanel.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanel.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- LogPanel.java 2 May 2004 05:48:10 -0000 1.68
+++ LogPanel.java 3 May 2004 08:00:48 -0000 1.69
@@ -1782,15 +1782,17 @@
KeyStroke.getKeyStroke(KeyEvent.VK_F3, KeyEvent.SHIFT_MASK),
undockedFindPreviousAction.getValue(Action.NAME));
- Dimension findSize = new Dimension(132, 28);
- Dimension findPanelSize = new Dimension(144, 28);
+ Dimension findSize = new Dimension(170, 22);
+ Dimension findPanelSize = new Dimension(175, 30);
findPanel.setPreferredSize(findPanelSize);
findPanel.setMaximumSize(findPanelSize);
findPanel.setMinimumSize(findPanelSize);
findField.setPreferredSize(findSize);
findField.setMaximumSize(findSize);
findField.setMinimumSize(findSize);
-
+ findPanel.setAlignmentY(Component.CENTER_ALIGNMENT);
+ findField.setAlignmentY(Component.CENTER_ALIGNMENT);
+
toolbar.add(findPanel);
toolbar.add(undockedFindNextButton);
toolbar.add(undockedFindPreviousButton);
1.41 +12 -11
logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
Index: ChainsawToolBarAndMenus.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ChainsawToolBarAndMenus.java 1 May 2004 09:18:48 -0000 1.40
+++ ChainsawToolBarAndMenus.java 3 May 2004 08:00:48 -0000 1.41
@@ -16,23 +16,16 @@
package org.apache.log4j.chainsaw;
-import org.apache.log4j.chainsaw.filter.FilterModel;
-import org.apache.log4j.chainsaw.help.HelpManager;
-import org.apache.log4j.chainsaw.icons.ChainsawIcons;
-import org.apache.log4j.chainsaw.receivers.ReceiversHelper;
-import org.apache.log4j.rule.ExpressionRuleContext;
-
import java.awt.BorderLayout;
+import java.awt.Component;
import java.awt.Dimension;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
-
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -60,6 +53,12 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+import org.apache.log4j.chainsaw.filter.FilterModel;
+import org.apache.log4j.chainsaw.help.HelpManager;
+import org.apache.log4j.chainsaw.icons.ChainsawIcons;
+import org.apache.log4j.chainsaw.receivers.ReceiversHelper;
+import org.apache.log4j.rule.ExpressionRuleContext;
+
/**
* Encapsulates the full Toolbar, and menus and all the actions that can be
performed from it.
@@ -132,15 +131,17 @@
findPanel = new JPanel();
- Dimension findSize = new Dimension(132, 28);
- Dimension findPanelSize = new Dimension(144, 28);
+ Dimension findSize = new Dimension(170, 22);
+ Dimension findPanelSize = new Dimension(175, 30);
findPanel.setPreferredSize(findPanelSize);
findPanel.setMaximumSize(findPanelSize);
findPanel.setMinimumSize(findPanelSize);
findField.setPreferredSize(findSize);
findField.setMaximumSize(findSize);
findField.setMinimumSize(findSize);
-
+ findPanel.setAlignmentY(Component.CENTER_ALIGNMENT);
+ findField.setAlignmentY(Component.CENTER_ALIGNMENT);
+
toggleDetailPaneAction = createToggleDetailPaneAction();
createMenuBar();
createToolbar();
1.3 +22 -7
logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawAbout.java
Index: ChainsawAbout.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawAbout.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChainsawAbout.java 27 Feb 2004 16:47:29 -0000 1.2
+++ ChainsawAbout.java 3 May 2004 08:00:48 -0000 1.3
@@ -20,12 +20,13 @@
*/
package org.apache.log4j.chainsaw;
-import org.apache.log4j.chainsaw.icons.ChainsawIcons;
-
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -36,6 +37,8 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
+import org.apache.log4j.chainsaw.icons.ChainsawIcons;
+
/**
* A simple About box telling people stuff about this project
@@ -60,17 +63,29 @@
c.gridx = 0;
c.gridy = 0;
- JLabel info =
- new JLabel("TODO");
-// TODO insert the appropriate text
- panel.add(info, c);
+ final JLabel info =
+ new JLabel("<html>Chainsaw 2.0alpha<p><p>" +
"Brought to you by the Log4J team:<p>" +
"<b>http://logging.apache.org/log4j</b><p><p>" +
+ "Bug report, mailing list and wiki information:<p>" +
"<b>http://logging.apache.org/site/bugreport.html</b><p><p>" +
+ "<b>Contributors:</b><ul><li>Scott Deboy <[EMAIL
PROTECTED]></li><li>Paul Smith <[EMAIL PROTECTED]></li><li>Ceki
Gülcü <[EMAIL PROTECTED]></li></ul></html>");
+
+ JButton button = new JButton("Copy bug report link to clipboard");
+ button.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent event) {
+ Toolkit tk = getToolkit();
+ Clipboard cb = tk.getSystemClipboard();
+ cb.setContents(new
StringSelection("http://logging.apache.org/site/bugreport.html";), null);
+ }});
+ panel.add(info, c);
JLabel title = new JLabel(ChainsawIcons.ICON_LOG4J);
c.gridy = 1;
- panel.add(title, c);
+ panel.add(button, c);
c.gridy = 2;
+ panel.add(title, c);
+
+ c.gridy = 3;
c.anchor = GridBagConstraints.EAST;
JButton closeButton = new JButton("Close");
1.10 +2 -3
logging-log4j/src/java/org/apache/log4j/chainsaw/help/tutorial.html
Index: tutorial.html
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/help/tutorial.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tutorial.html 2 May 2004 17:42:34 -0000 1.9
+++ tutorial.html 3 May 2004 08:00:48 -0000 1.10
@@ -5,12 +5,11 @@
</HEAD>
<BODY>
+<p>Welcome to the Chainsaw v2 Tutorial. Here you will learn how to effectively
utilise the many features of Chainsaw.</p>
+</p>
<p><a href="#expressions">Expressions</a>
<p><a href="#color_filter">Color filters</a>
<p><a href="#display_filter">Display filters</a>
-
-<p>Welcome to the Chainsaw v2 Tutorial. Here you will learn how to effectively
utilise the many features of Chainsaw.</p>
-</p>
<h2>Conventions</h2>
<p>To assist you, the following documentation conventions will be used</p>
<ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
