Revision 39065

View differences:

branches/v2_0_0_prep/applications/appgvSIG/config/about.htm
6 6
<p>
7 7
A Geographic Information System (GIS) for desktop environments<br>
8 8
<br>
9
Version: %(version)<br>
10
Build: %(build)<br>
9
Version: %(version) %(state)<br>
11 10
Java version: %(java.version)<br/>
12 11
&copy; Copyright gvSIG Association. All rights reserved.<br>
13 12
<br>
branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/About.java
59 59
import org.gvsig.about.AboutManager;
60 60
import org.gvsig.andami.IconThemeHelper;
61 61
import org.gvsig.andami.PluginServices;
62
import org.gvsig.andami.PluginsLocator;
63
import org.gvsig.andami.PluginsManager;
62 64
import org.gvsig.andami.plugins.Extension;
63 65
import org.gvsig.andami.ui.mdiManager.IWindow;
64 66
import org.gvsig.andami.ui.mdiManager.WindowInfo;
65 67
import org.gvsig.app.ApplicationLocator;
66 68
import org.gvsig.app.ApplicationManager;
69
import org.gvsig.installer.lib.api.PackageInfo;
67 70

  
68 71

  
69 72

  
......
100 103
	
101 104
	public void postInitialize() {
102 105
		super.postInitialize();
106
		
107
		PluginsManager pmanager = PluginsLocator.getManager();
108
		
103 109
		ApplicationManager application = ApplicationLocator.getManager();
104 110
		
105
		Version version = application.getVersion();
111
		PackageInfo pinfo = pmanager.getPackageInfo(About.class);
112
		
106 113
		AboutManager about = application.getAbout();
107 114
		
108 115
        about.setProject("gvSIG desktop", getResource("about.htm"),
109 116
            getResource("images/gvsig-icon16x16.png"));
110
		about.getProject().set("build",version.getBuildId());
111
		about.getProject().set("version",version.getFormat());
117
        about.getProject().set("version", pinfo.getVersion().toString());
118
        about.getProject().set("state", pinfo.getState());
112 119
        about.getProject().set("java.version",
113 120
            System.getProperty("java.version"));
114 121
		
branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/Version.java
95 95
    }
96 96

  
97 97
    public String getLongFormat() {
98
        return getFormat() + " (Build " + getBuildId() + ")";
98
        return version.toString(); 
99 99
    }
100 100
    
101 101
    public org.gvsig.installer.lib.api.Version asInstallerVersion() {
branches/v2_0_0_prep/applications/appgvSIG/pom.xml
369 369
        <build-dir>${basedir}/../build</build-dir>
370 370
        <eclipse.project.name>appgvSIG</eclipse.project.name>
371 371
        <package.info.state>beta1</package.info.state>
372
        <!--
373
        <package.info.gvSIGVersion>${project.version}</package.info.gvSIGVersion>
374
        -->
375

  
372 376
        
373 377
        <!-- alpha-devel -->
374 378

  
branches/v2_0_0_prep/applications/appgvSIG/resources/theme/andami-theme.xml
4 4
			<Splash
5 5
				path="splash.png"
6 6
				timer="10000"
7
				x="300" y="50"
7
				x="225" y="50"
8 8
				fontsize="16" color="80,170,240"
9
				version="${package.info.gvSIGVersion}.${buildNumber}"/>
9
				version="${package.info.gvSIGVersion}.${buildNumber} ${package.info.state}"/>
10 10
		</SplashImages>		
11 11
		<!-- 
12 12
		<BackgroundImage path="gvsig-icon16x16.png"/>
......
14 14
		<WallpaperType value="CENTERED"/>
15 15
		<Icon path="gvsig-icon16x16.png"/>
16 16
	</ApplicationImages>
17
	<ApplicationName value="gvSIG ${package.info.gvSIGVersion}.${buildNumber}"/>
17
	<ApplicationName value="gvSIG ${package.info.gvSIGVersion}.${buildNumber} ${package.info.state}"/>
18 18
</AndamiProperties>

Also available in: Unified diff