Small changes to UI

committer: Jonathan Bernard <jdbernard@jdbernard-desktop.(none)>
This commit is contained in:
Jonathan Bernard 2008-09-09 15:03:19 -05:00
parent 5798774181
commit 2b850b9586
3 changed files with 28 additions and 68 deletions

View File

@ -101,11 +101,8 @@
<Insets value="[0, 0, 0, 0]"/>
</Property>
<Property name="name" type="java.lang.String" value="exitButton" noResource="true"/>
<Property name="rolloverIcon" type="javax.swing.Icon" resourceKey="exitButton.rolloverIcon"/>
</Properties>
<Events>
<EventHandler event="mouseEntered" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="exitButtonMouseEntered"/>
<EventHandler event="mouseExited" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="exitButtonMouseExited"/>
</Events>
</Component>
<Component class="javax.swing.JTextField" name="taskTextField">
<Properties>
@ -171,21 +168,11 @@
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[0, 0, 0, 0]"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[16, 16]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[16, 16]"/>
</Property>
<Property name="name" type="java.lang.String" value="optionsButton" noResource="true"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[16, 16]"/>
</Property>
<Property name="rolloverIcon" type="javax.swing.Icon" resourceKey="optionsButton.rolloverIcon"/>
</Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="optionsButtonMouseClicked"/>
<EventHandler event="mouseEntered" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="optionsButtonMouseEntered"/>
<EventHandler event="mouseExited" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="optionsButtonMouseExited"/>
</Events>
</Component>
<Component class="javax.swing.JToggleButton" name="notesButton">

View File

@ -129,14 +129,7 @@ public class TimeStamperView extends FrameView implements MouseMotionListener {
exitButton.setHideActionText(true);
exitButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
exitButton.setName("exitButton"); // NOI18N
exitButton.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseEntered(java.awt.event.MouseEvent evt) {
exitButtonMouseEntered(evt);
}
public void mouseExited(java.awt.event.MouseEvent evt) {
exitButtonMouseExited(evt);
}
});
exitButton.setRolloverIcon(resourceMap.getIcon("exitButton.rolloverIcon")); // NOI18N
taskTextField.setFont(taskTextField.getFont().deriveFont(taskTextField.getFont().getStyle() | java.awt.Font.BOLD));
taskTextField.setText(resourceMap.getString("taskTextField.text")); // NOI18N
@ -170,20 +163,12 @@ public class TimeStamperView extends FrameView implements MouseMotionListener {
optionsButton.setHideActionText(true);
optionsButton.setIconTextGap(0);
optionsButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
optionsButton.setMaximumSize(new java.awt.Dimension(16, 16));
optionsButton.setMinimumSize(new java.awt.Dimension(16, 16));
optionsButton.setName("optionsButton"); // NOI18N
optionsButton.setPreferredSize(new java.awt.Dimension(16, 16));
optionsButton.setRolloverIcon(resourceMap.getIcon("optionsButton.rolloverIcon")); // NOI18N
optionsButton.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) {
optionsButtonMouseClicked(evt);
}
public void mouseEntered(java.awt.event.MouseEvent evt) {
optionsButtonMouseEntered(evt);
}
public void mouseExited(java.awt.event.MouseEvent evt) {
optionsButtonMouseExited(evt);
}
});
notesButton.setAction(actionMap.get("editNotes")); // NOI18N
@ -209,7 +194,7 @@ public class TimeStamperView extends FrameView implements MouseMotionListener {
.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)
.addComponent(optionsButton)
.addComponent(notesButton))
.addGap(0, 0, 0)
.addComponent(exitButton))
@ -219,7 +204,7 @@ public class TimeStamperView extends FrameView implements MouseMotionListener {
.addGroup(mainPanelLayout.createSequentialGroup()
.addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(exitButton, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(optionsButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(optionsButton)
.addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(currentTaskLabel)
.addComponent(startTimeLabel)))
@ -252,42 +237,26 @@ public class TimeStamperView extends FrameView implements MouseMotionListener {
setComponent(mainPanel);
}// </editor-fold>//GEN-END:initComponents
private void taskTextFieldKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_taskTextFieldKeyReleased
if (evt.getKeyCode() == KeyEvent.VK_ENTER) {
Timeline t = ((TimeStamperApp) getApplication()).getActiveTimeline();
Date d = new Date();
t.addMarker(d, taskTextField.getText(), "No comments.");
startTimeLabel.setText(Timeline.shortFormat.format(d));
taskTextField.setFont(boldTaskFont);
mostRecentTask = d;
} else {
taskTextField.setFont(thinTaskFont);
}
}//GEN-LAST:event_taskTextFieldKeyReleased
private void taskTextFieldKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_taskTextFieldKeyReleased
if (evt.getKeyCode() == KeyEvent.VK_ENTER) {
Timeline t = ((TimeStamperApp) getApplication()).getActiveTimeline();
Date d = new Date();
t.addMarker(d, taskTextField.getText(), "No comments.");
startTimeLabel.setText(Timeline.shortFormat.format(d));
taskTextField.setFont(boldTaskFont);
mostRecentTask = d;
} else {
taskTextField.setFont(thinTaskFont);
}
}//GEN-LAST:event_taskTextFieldKeyReleased
private void exitButtonMouseEntered(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_exitButtonMouseEntered
exitButton.setIcon(getResourceMap().getIcon("exitButton.hover.icon"));
}//GEN-LAST:event_exitButtonMouseEntered
private void mainPanelMousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_mainPanelMousePressed
mousePressRelativeToFrame = evt.getPoint();
}//GEN-LAST:event_mainPanelMousePressed
private void exitButtonMouseExited(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_exitButtonMouseExited
exitButton.setIcon(getResourceMap().getIcon("exitButton.icon"));
}//GEN-LAST:event_exitButtonMouseExited
private void optionsButtonMouseEntered(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_optionsButtonMouseEntered
optionsButton.setIcon(getResourceMap().getIcon("optionsButton.hover.icon"));//GEN-LAST:event_optionsButtonMouseEntered
}
private void optionsButtonMouseExited(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_optionsButtonMouseExited
optionsButton.setIcon(getResourceMap().getIcon("optionsButton.icon"));//GEN-LAST:event_optionsButtonMouseExited
}
private void mainPanelMousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_mainPanelMousePressed
mousePressRelativeToFrame = evt.getPoint();
}//GEN-LAST:event_mainPanelMousePressed
private void optionsButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_optionsButtonMouseClicked
optionsMenu.show(evt.getComponent(), evt.getX(), evt.getY());
}//GEN-LAST:event_optionsButtonMouseClicked
private void optionsButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_optionsButtonMouseClicked
optionsMenu.show(evt.getComponent(), evt.getX(), evt.getY());
}//GEN-LAST:event_optionsButtonMouseClicked
@Action
public void editNotes() {

View File

@ -45,3 +45,7 @@ exit.Action.smallIcon=/jdbernard/timestamper/resources/icons/16-em-cross.png
exit.Action.shortDescription=Close the application.
exit.Action.icon=/jdbernard/timestamper/resources/icons/16-em-cross.png
notesButton2.text=jToggleButton1
#NOI18N
optionsButton.rolloverIcon=icons/16-tool-a-hover.png
#NOI18N
exitButton.rolloverIcon=icons/16-em-cross-hover.png