From 5798774181b8b202ef351678e952953c78b2b8d6 Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jdbernard@gmail.com>
Date: Wed, 3 Sep 2008 22:18:44 -0500
Subject: [PATCH] Final changes before 1.3 and versioning work. Notes text area
 wraps words.

committer: Jonathan Bernard <jdbernard@gmail.com>
---
 nbproject/private/private.properties                 |  4 ++--
 nbproject/project.properties                         |  2 +-
 src/jdbernard/timestamper/NotesDialog.form           |  7 +++++++
 src/jdbernard/timestamper/NotesDialog.java           |  5 ++++-
 src/jdbernard/timestamper/TimeStamperApp.java        |  2 +-
 src/jdbernard/timestamper/TimeStamperView.form       | 12 ++++++++----
 src/jdbernard/timestamper/TimeStamperView.java       |  8 +++++---
 .../timestamper/resources/TimeStamperApp.properties  |  2 +-
 8 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
index 222ae47..965073e 100755
--- a/nbproject/private/private.properties
+++ b/nbproject/private/private.properties
@@ -1,2 +1,2 @@
-jaxws.endorsed.dir=C:\\Program Files\\NetBeans 6.1\\java2\\modules\\ext\\jaxws21\\api
-user.properties.file=C:\\Documents and Settings\\jbernard\\.netbeans\\6.1\\build.properties
+jaxws.endorsed.dir=/usr/local/netbeans-6.1/java2/modules/ext/jaxws21/api
+user.properties.file=/home/jdbernard/.netbeans/6.1/build.properties
diff --git a/nbproject/project.properties b/nbproject/project.properties
index d044691..bee9559 100755
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -2,7 +2,7 @@ application.desc=A simple java desktop application based on Swing Application Fr
 application.homepage=http://appframework.dev.java.net
 application.title=Basic Application Example
 application.vendor=Sun Microsystems Inc.
-application.version=1.2
+application.version=1.3
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
diff --git a/src/jdbernard/timestamper/NotesDialog.form b/src/jdbernard/timestamper/NotesDialog.form
index 5b9aee2..520a194 100755
--- a/src/jdbernard/timestamper/NotesDialog.form
+++ b/src/jdbernard/timestamper/NotesDialog.form
@@ -81,7 +81,14 @@
             <Component class="javax.swing.JTextArea" name="notesTextArea">
               <Properties>
                 <Property name="columns" type="int" value="20"/>
+                <Property name="font" type="java.awt.Font" noResource="true" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="notesTextArea" italic="false" property="font" relativeSize="true" size="-2"/>
+                  </FontInfo>
+                </Property>
+                <Property name="lineWrap" type="boolean" value="true"/>
                 <Property name="rows" type="int" value="5"/>
+                <Property name="wrapStyleWord" type="boolean" value="true"/>
                 <Property name="name" type="java.lang.String" value="notesTextArea" noResource="true"/>
               </Properties>
               <Events>
diff --git a/src/jdbernard/timestamper/NotesDialog.java b/src/jdbernard/timestamper/NotesDialog.java
index 2775349..b31f797 100755
--- a/src/jdbernard/timestamper/NotesDialog.java
+++ b/src/jdbernard/timestamper/NotesDialog.java
@@ -26,7 +26,7 @@ public class NotesDialog extends JDialog implements MouseMotionListener {
         super(parent.getFrame(), modal);
         initComponents();
 
-        setSize(300, 200);
+        setSize(325, 200);
         thinNotesFont = notesTextArea.getFont().deriveFont(Font.PLAIN);
         boldNotesFont = notesTextArea.getFont().deriveFont(Font.BOLD);
 
@@ -74,7 +74,10 @@ public class NotesDialog extends JDialog implements MouseMotionListener {
         notesScollPane.setName("notesScollPane"); // NOI18N
 
         notesTextArea.setColumns(20);
+        notesTextArea.setFont(notesTextArea.getFont().deriveFont((notesTextArea.getFont().getStyle() & ~java.awt.Font.ITALIC) & ~java.awt.Font.BOLD, notesTextArea.getFont().getSize()-2));
+        notesTextArea.setLineWrap(true);
         notesTextArea.setRows(5);
+        notesTextArea.setWrapStyleWord(true);
         notesTextArea.setName("notesTextArea"); // NOI18N
         notesTextArea.addKeyListener(new java.awt.event.KeyAdapter() {
             public void keyReleased(java.awt.event.KeyEvent evt) {
diff --git a/src/jdbernard/timestamper/TimeStamperApp.java b/src/jdbernard/timestamper/TimeStamperApp.java
index a18f460..b79a7fc 100755
--- a/src/jdbernard/timestamper/TimeStamperApp.java
+++ b/src/jdbernard/timestamper/TimeStamperApp.java
@@ -88,7 +88,7 @@ implements Application.ExitListener {
      */
     @Override protected void startup() {
         show(new TimeStamperView(this));
-        getMainFrame().setSize(300, 60);
+        getMainFrame().setSize(325, 60);
         getApplication().addExitListener(this);
     }
 
diff --git a/src/jdbernard/timestamper/TimeStamperView.form b/src/jdbernard/timestamper/TimeStamperView.form
index ecf7949..12331a9 100755
--- a/src/jdbernard/timestamper/TimeStamperView.form
+++ b/src/jdbernard/timestamper/TimeStamperView.form
@@ -26,15 +26,15 @@
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Group type="102" alignment="0" attributes="0">
                           <Component id="totalTimeNow" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace pref="29" max="32767" attributes="0"/>
+                          <EmptySpace pref="23" max="32767" attributes="0"/>
                           <Component id="currentTimeLabel" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <Group type="102" alignment="1" attributes="0">
                           <Component id="currentTaskLabel" min="-2" max="-2" attributes="1"/>
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="startTimeLabel" pref="87" max="32767" attributes="1"/>
+                          <Component id="startTimeLabel" pref="95" max="32767" attributes="1"/>
                       </Group>
-                      <Component id="taskTextField" alignment="0" pref="246" max="32767" attributes="1"/>
+                      <Component id="taskTextField" alignment="0" pref="266" max="32767" attributes="1"/>
                   </Group>
                   <EmptySpace min="-2" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="1" attributes="0">
@@ -160,6 +160,10 @@
         <Component class="javax.swing.JButton" name="optionsButton">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" resourceKey="optionsButton.icon"/>
+            <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+              <Border info="null"/>
+            </Property>
+            <Property name="borderPainted" type="boolean" value="false"/>
             <Property name="contentAreaFilled" type="boolean" value="false"/>
             <Property name="focusPainted" type="boolean" value="false"/>
             <Property name="hideActionText" type="boolean" value="true"/>
@@ -248,6 +252,6 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,83,0,0,1,47"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,118,0,0,1,76"/>
   </AuxValues>
 </Form>
diff --git a/src/jdbernard/timestamper/TimeStamperView.java b/src/jdbernard/timestamper/TimeStamperView.java
index 063ddbe..fa594ac 100755
--- a/src/jdbernard/timestamper/TimeStamperView.java
+++ b/src/jdbernard/timestamper/TimeStamperView.java
@@ -163,6 +163,8 @@ public class TimeStamperView extends FrameView implements MouseMotionListener {
         currentTimeLabel.setName("currentTimeLabel"); // NOI18N
 
         optionsButton.setIcon(resourceMap.getIcon("optionsButton.icon")); // NOI18N
+        optionsButton.setBorder(null);
+        optionsButton.setBorderPainted(false);
         optionsButton.setContentAreaFilled(false);
         optionsButton.setFocusPainted(false);
         optionsButton.setHideActionText(true);
@@ -198,13 +200,13 @@ public class TimeStamperView extends FrameView implements MouseMotionListener {
                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(mainPanelLayout.createSequentialGroup()
                         .addComponent(totalTimeNow)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 29, Short.MAX_VALUE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 23, Short.MAX_VALUE)
                         .addComponent(currentTimeLabel))
                     .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
                         .addComponent(currentTaskLabel)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(startTimeLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 87, Short.MAX_VALUE))
-                    .addComponent(taskTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 246, Short.MAX_VALUE))
+                        .addComponent(startTimeLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 95, Short.MAX_VALUE))
+                    .addComponent(taskTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 266, Short.MAX_VALUE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
                     .addComponent(optionsButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
diff --git a/src/jdbernard/timestamper/resources/TimeStamperApp.properties b/src/jdbernard/timestamper/resources/TimeStamperApp.properties
index cfe52ad..814b225 100755
--- a/src/jdbernard/timestamper/resources/TimeStamperApp.properties
+++ b/src/jdbernard/timestamper/resources/TimeStamperApp.properties
@@ -2,7 +2,7 @@
 
 Application.name = TimeStamper
 Application.title = TimeStamper
-Application.version = 1.2
+Application.version = 1.3
 Application.vendor = Jonathan Bernard
 Application.homepage =
 Application.description = A simple Java desktop application based on Swing Application Framework.