Author: remi
Date: 2008-08-27 10:37:57 +0200 (Wed, 27 Aug 2008)
New Revision: 1600
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/images/copyButton2Enable.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/copyButton2Pressed.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/createButton2Enable.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/createButton2Pressed.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/deleteButton2Enable.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/deleteButton2Pressed.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/pasteButton2Enable.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/pasteButton2Pressed.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/playButton2Enable.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/playButton2Pressed.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/stopButton2Enable.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/stopButton2Pressed.png
Removed:
software_suite_v2/software/tools/attitunesStudio/trunk/images/actionButton1Enable.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/actionButton1Pressed.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/actionButton2Enable.png
software_suite_v2/software/tools/attitunesStudio/trunk/images/actionButton2Pressed.PNG
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTSButton.java
Log:
Skin improvement
Deleted:
software_suite_v2/software/tools/attitunesStudio/trunk/images/actionButton1Enable.png
===================================================================
(Binary files differ)
Deleted:
software_suite_v2/software/tools/attitunesStudio/trunk/images/actionButton1Pressed.png
===================================================================
(Binary files differ)
Deleted:
software_suite_v2/software/tools/attitunesStudio/trunk/images/actionButton2Enable.png
===================================================================
(Binary files differ)
Deleted:
software_suite_v2/software/tools/attitunesStudio/trunk/images/actionButton2Pressed.PNG
===================================================================
(Binary files differ)
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/images/copyButton2Enable.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/tools/attitunesStudio/trunk/images/copyButton2Enable.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/images/copyButton2Pressed.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/tools/attitunesStudio/trunk/images/copyButton2Pressed.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/images/createButton2Enable.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/tools/attitunesStudio/trunk/images/createButton2Enable.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/images/createButton2Pressed.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/tools/attitunesStudio/trunk/images/createButton2Pressed.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/images/deleteButton2Enable.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/tools/attitunesStudio/trunk/images/deleteButton2Enable.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/images/deleteButton2Pressed.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/tools/attitunesStudio/trunk/images/deleteButton2Pressed.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/images/pasteButton2Enable.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/tools/attitunesStudio/trunk/images/pasteButton2Enable.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/images/pasteButton2Pressed.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/tools/attitunesStudio/trunk/images/pasteButton2Pressed.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/images/playButton2Enable.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/tools/attitunesStudio/trunk/images/playButton2Enable.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/images/playButton2Pressed.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/tools/attitunesStudio/trunk/images/playButton2Pressed.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/images/stopButton2Enable.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/tools/attitunesStudio/trunk/images/stopButton2Enable.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/images/stopButton2Pressed.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/tools/attitunesStudio/trunk/images/stopButton2Pressed.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
===================================================================
--- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
2008-08-26 17:17:14 UTC (rev 1599)
+++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
2008-08-27 08:37:57 UTC (rev 1600)
@@ -147,7 +147,6 @@
attBlockViewer.events.register(ATTConfig.EVENT_BLOCK_DRAG_STOPPED, this,
"onBlockDragStopped"); //$NON-NLS-1$
attBlockViewer.events.register(ATTConfig.EVENT_ATTITUNE_LOADED, this,
"onAttituneLoaded"); //$NON-NLS-1$
attBlockViewer.events.register(ATTConfig.EVENT_ATTITUNE_SAVED, this,
"onAttituneSaved"); //$NON-NLS-1$
- //attBlockViewer.repaint();
/* Main viewer commander */
jPanelBlock = new JPanel();
@@ -164,76 +163,87 @@
GridBagLayout jPanelBlockLayout = new GridBagLayout();
jPanelBlockLayout.rowWeights = new double[] {0.1};
jPanelBlockLayout.rowHeights = new int[] {7};
- jPanelBlockLayout.columnWeights = new double[] {0.1,
0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1};
- jPanelBlockLayout.columnWidths = new int[] {7, 7, 7, 7,
7, 7, 7, 7, 7};
+ jPanelBlockLayout.columnWeights = new double[] {0.1,
0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
0.1, 0.1};
+ jPanelBlockLayout.columnWidths = new int[] {3, 40, 3,
40, 52, 80, 9, 80, 9, 80, 9, 80, 52, 22, 3, 22, 3, 22, 3};
jPanelBlock.setLayout(jPanelBlockLayout);
/* Play button */
- //playButton = new
ATTSButton(ATTMessages.getString("MainFrame.62"), Color.BLACK,
"/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
- playButton = new
JButton(ATTMessages.getString("MainFrame.62")); //$NON-NLS-1$ //$NON-NLS-2$
- //playButton.setPressedIcon(new
ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$
+ playButton = new ATTSButton("/playButton2Enable.png");
//$NON-NLS-1$ //$NON-NLS-2$
+ playButton.setPressedIcon(new
ImageIcon(getClass().getResource("/playButton2Pressed.png"))); //$NON-NLS-1$
+ playButton.setRolloverIcon(new
ImageIcon(getClass().getResource("/playButton2Pressed.png")));
+
playButton.setToolTipText(ATTMessages.getString("MainFrame.62"));
playButton.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent evt)
{
onPlayButtonPressed(evt);
}
});
- jPanelBlock.add(playButton, new GridBagConstraints(0,
0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new
Insets(0, 0, 0, 0), 0, 0));
+ jPanelBlock.add(playButton, new GridBagConstraints(1,
0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new
Insets(0, 0, 0, 0), 0, 0));
/* Stop button */
- stopButton = new
JButton(ATTMessages.getString("MainFrame.65")); //$NON-NLS-1$ //$NON-NLS-2$
- //stopButton.setPressedIcon(new
ImageIcon(getClass().getResource("/actionButton2Pressed.PNG"))); //$NON-NLS-1$
+ stopButton = new ATTSButton("/stopButton2Enable.png");
//$NON-NLS-1$ //$NON-NLS-2$
+ stopButton.setPressedIcon(new
ImageIcon(getClass().getResource("/stopButton2Pressed.png"))); //$NON-NLS-1$
+ stopButton.setRolloverIcon(new
ImageIcon(getClass().getResource("/stopButton2Pressed.png")));
+
stopButton.setToolTipText(ATTMessages.getString("MainFrame.65"));
stopButton.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent evt)
{
onStopButtonPressed(evt);
}
});
- jPanelBlock.add(stopButton, new GridBagConstraints(1,
0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new
Insets(0, 0, 0, 0), 0, 0));
+ jPanelBlock.add(stopButton, new GridBagConstraints(3,
0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new
Insets(0, 0, 0, 0), 0, 0));
/* Create button */
- createButton = new
JButton(ATTMessages.getString("MainFrame.50")); //$NON-NLS-1$ //$NON-NLS-2$
- //createButton.setPressedIcon(new
ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$
+ createButton = new
ATTSButton("/createButton2Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
+ createButton.setPressedIcon(new
ImageIcon(getClass().getResource("/createButton2Pressed.png"))); //$NON-NLS-1$
+ createButton.setRolloverIcon(new
ImageIcon(getClass().getResource("/createButton2Pressed.png")));
+
createButton.setToolTipText(ATTMessages.getString("MainFrame.50"));
createButton.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent evt)
{
onCreateButtonPressed(evt);
}
});
- jPanelBlock.add(createButton, new GridBagConstraints(2,
0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new
Insets(0, 0, 0, 0), 0, 0));
+ jPanelBlock.add(createButton, new GridBagConstraints(5,
0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new
Insets(0, 0, 0, 0), 0, 0));
/* Delete button */
- deleteButton = new
JButton(ATTMessages.getString("MainFrame.53")); //$NON-NLS-1$ //$NON-NLS-2$
- //deleteButton.setPressedIcon(new
ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$
+ deleteButton = new
ATTSButton("/deleteButton2Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
+ deleteButton.setPressedIcon(new
ImageIcon(getClass().getResource("/deleteButton2Pressed.png"))); //$NON-NLS-1$
+ deleteButton.setRolloverIcon(new
ImageIcon(getClass().getResource("/deleteButton2Pressed.png")));
+
deleteButton.setToolTipText(ATTMessages.getString("MainFrame.53"));
deleteButton.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent evt)
{
onDeleteButtonPressed(evt);
}
});
- jPanelBlock.add(deleteButton, new GridBagConstraints(3,
0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new
Insets(0, 0, 0, 0), 0, 0));
+ jPanelBlock.add(deleteButton, new GridBagConstraints(7,
0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new
Insets(0, 0, 0, 0), 0, 0));
/* Copy button */
- copyButton = new
JButton(ATTMessages.getString("MainFrame.56")); //$NON-NLS-1$ //$NON-NLS-2$
- //copyButton.setPressedIcon(new
ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$
+ copyButton = new ATTSButton("/copyButton2Enable.png");
//$NON-NLS-1$ //$NON-NLS-2$
+ copyButton.setPressedIcon(new
ImageIcon(getClass().getResource("/copyButton2Pressed.png"))); //$NON-NLS-1$
+ copyButton.setRolloverIcon(new
ImageIcon(getClass().getResource("/copyButton2Pressed.png")));
+
copyButton.setToolTipText(ATTMessages.getString("MainFrame.56"));
copyButton.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent evt)
{
onCopyButtonPressed(evt);
}
});
- jPanelBlock.add(copyButton, new GridBagConstraints(4,
0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new
Insets(0, 0, 0, 0), 0, 0));
+ jPanelBlock.add(copyButton, new GridBagConstraints(9,
0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new
Insets(0, 0, 0, 0), 0, 0));
/* Past button */
- pastButton = new
JButton(ATTMessages.getString("MainFrame.59")); //$NON-NLS-1$ //$NON-NLS-2$
- //pastButton.setPressedIcon(new
ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$
+ pastButton = new ATTSButton("/pasteButton2Enable.png");
//$NON-NLS-1$ //$NON-NLS-2$
+ pastButton.setPressedIcon(new
ImageIcon(getClass().getResource("/pasteButton2Pressed.png"))); //$NON-NLS-1$
+ pastButton.setRolloverIcon(new
ImageIcon(getClass().getResource("/pasteButton2Pressed.png")));
+
pastButton.setToolTipText(ATTMessages.getString("MainFrame.59"));
pastButton.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent evt)
{
onPastButtonPressed(evt);
}
});
- jPanelBlock.add(pastButton, new GridBagConstraints(5,
0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new
Insets(0, 0, 0, 0), 0, 0));
+ jPanelBlock.add(pastButton, new GridBagConstraints(11,
0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new
Insets(0, 0, 0, 0), 0, 0));
/* Zoom plus button */
zoomPlusButton = new ATTSButton("/zoomPlusButton.png");
//$NON-NLS-1$
@@ -244,7 +254,7 @@
onZoomPlusButtonPressed(evt);
}
});
- jPanelBlock.add(zoomPlusButton, new
GridBagConstraints(6, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ jPanelBlock.add(zoomPlusButton, new
GridBagConstraints(13, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
/* Zoom minus button */
zoomMinusButton = new
ATTSButton("/zoomMinusButton.png"); //$NON-NLS-1$
@@ -255,7 +265,7 @@
onZoomMinusButtonPressed(evt);
}
});
- jPanelBlock.add(zoomMinusButton, new
GridBagConstraints(7, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ jPanelBlock.add(zoomMinusButton, new
GridBagConstraints(15, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
/* Zoom full button */
zoomFullButton = new ATTSButton("/zoomFullButton.png");
//$NON-NLS-1$
@@ -266,7 +276,7 @@
onZoomFullButtonPressed(evt);
}
});
- jPanelBlock.add(zoomFullButton, new
GridBagConstraints(8, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+ jPanelBlock.add(zoomFullButton, new
GridBagConstraints(17, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
/* Show hide block configuration button */
jButtonShowHideBlockProperties = new
JButton(ATTMessages.getString("MainFrame.99"));
@@ -384,7 +394,7 @@
jPanelBlocConf.setPreferredSize(new
java.awt.Dimension(631, 168));
jPanelBlocConf.setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED));
jPanelConfLayout.rowWeights = new double[]
{0.1, 0.1, 0.1, 0.1, 0.1};
- jPanelConfLayout.rowHeights = new int[] {7, 7,
7, 7, 7};
+ jPanelConfLayout.rowHeights = new int[] {30,
30, 30, 30, 30};
jPanelConfLayout.columnWeights = new double[]
{0.0, 0.0, 0.0, 0.1, 0.0};
jPanelConfLayout.columnWidths = new int[] {7,
204, 7, 7, 7};
jPanelBlocConf.setLayout(jPanelConfLayout);
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTSButton.java
===================================================================
---
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTSButton.java
2008-08-26 17:17:14 UTC (rev 1599)
+++
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTSButton.java
2008-08-27 08:37:57 UTC (rev 1600)
@@ -1,59 +1,31 @@
package com.tuxisalive.attitunes.visual;
-import java.awt.Graphics;
-import java.awt.Color;
-import java.awt.Font;
-
import javax.swing.JButton;
import javax.swing.ImageIcon;
-import java.awt.Insets;
public class ATTSButton extends JButton
{
private static final long serialVersionUID = -7330496787912310116L;
private ImageIcon enabledIcon;
- private Graphics g;
- public ATTSButton(String label, Color fontColor, String baseIcon)
+ public ATTSButton(String baseIcon)
{
super();
- this.setText(label);
- this.setFont(new Font("SansSerif", Font.PLAIN, 11));
-
+
try
{
enabledIcon = new
ImageIcon(getClass().getResource(baseIcon));
} catch(Exception e) {}
- this.setIcon(enabledIcon);
- this.setPressedIcon(enabledIcon);
- this.setRolloverIcon(enabledIcon);
- this.setSelectedIcon(enabledIcon);
- this.setRolloverSelectedIcon(enabledIcon);
- this.setDisabledIcon(enabledIcon);
- this.setDisabledSelectedIcon(enabledIcon);
- setMargin(new Insets(0, 0, 0, 0));
+ this.setFocusable(false);
- float iWidth = (float)enabledIcon.getImage().getWidth(null);
- float tWidth =
(float)this.getFontMetrics(this.getFont()).getStringBounds(this.getText(),
g).getWidth();
- int textGap = -(int)(iWidth - ((iWidth - tWidth) / 2.0));
-
- this.setForeground(fontColor);
-
- setIconTextGap(textGap);
- setBorderPainted(false);
setBorder(null);
+
+ this.setIcon(enabledIcon);
+ this.setSelectedIcon(enabledIcon);
+ this.setDisabledIcon(enabledIcon);
+ this.setDisabledSelectedIcon(enabledIcon);
}
-
- public ATTSButton(String baseIcon)
- {
- this("", Color.BLACK, baseIcon);
- }
-
- public void setPressedIcon(String iconPath)
- {
- super.setPressedIcon(new
ImageIcon(getClass().getResource(iconPath).getPath()));
- }
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
