Author: [EMAIL PROTECTED]
Date: Tue Oct 7 08:17:49 2008
New Revision: 2751
Removed:
trunk/src/ca/sqlpower/architect/swingui/AboutPanel.java
Modified:
trunk/build.xml
trunk/src/ca/sqlpower/architect/swingui/action/AboutAction.java
Log:
Moved the Architect's AboutPanel into the SQL Power Library and made it a
more generic AboutPanel which can be used by any application. Also made it
base the version number off a properties file so that the application
version displayed in the About dialog can be set when the ant build runs.
This way nightly builds will actually state the actual nightly build
version in the About dialog.
Modified: trunk/build.xml
==============================================================================
--- trunk/build.xml (original)
+++ trunk/build.xml Tue Oct 7 08:17:49 2008
@@ -343,7 +343,7 @@
</target>
<!-- Compiles the application source files -->
- <target name="compile" depends="init,copyfiles, build.sqlpower.library,
copy.sqlpower.library">
+ <target name="compile" depends="init, copyfiles, build.sqlpower.library,
copy.sqlpower.library">
<javac srcdir="${src}" destdir="${build}"
classpathref="compile.classpath"
debug="true"/>
@@ -361,7 +361,7 @@
</target>
<!-- copies non-source files that need to be in the architect.jar. -->
- <target name="copyfiles" depends="init">
+ <target name="copyfiles" depends="init, architect.version.properties">
<mkdir dir="${build}/icons"/>
<copy todir="${build}/icons">
<fileset dir="src/icons">
@@ -381,6 +381,8 @@
</fileset>
</copy>
+ <copy file="${dist.dir}/architect.version.properties"
todir="${build}/ca/sqlpower/architect"/>
+
<!-- copies the template log4j config file into the build dir
-->
<copy tofile="${build}/log4j.properties"
file="src/log4j.properties.example"/>
Modified: trunk/src/ca/sqlpower/architect/swingui/action/AboutAction.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/action/AboutAction.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/action/AboutAction.java Tue
Oct 7 08:17:49 2008
@@ -25,11 +25,13 @@
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
import javax.swing.JDialog;
import javax.swing.JPanel;
-import ca.sqlpower.architect.swingui.AboutPanel;
+import ca.sqlpower.architect.ArchitectVersion;
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
+import ca.sqlpower.swingui.AboutPanel;
import ca.sqlpower.swingui.CommonCloseAction;
import ca.sqlpower.swingui.JDefaultButton;
import ca.sqlpower.swingui.SPSUtils;
@@ -48,7 +50,10 @@
Messages.getString("AboutAction.dialogTitle")); //$NON-NLS-1$
JPanel cp = new JPanel(new BorderLayout(12,12));
cp.setBorder(BorderFactory.createEmptyBorder(12,12,12,12));
- final AboutPanel aboutPanel = new AboutPanel();
+
+ ImageIcon imageIcon =
SPSUtils.createIcon("architect128", "Architect Logo");
+
+ final AboutPanel aboutPanel = new
AboutPanel(imageIcon, "Power*Architect", "ca/sqlpower/architect/architect.version.properties",
ArchitectVersion.APP_VERSION.toString());
cp.add(aboutPanel, BorderLayout.CENTER);
JPanel buttonPanel = new JPanel(new
FlowLayout(FlowLayout.RIGHT));
