git-svn-id: https://svn.coded.pt/svn/SIPRP@1318 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/SIPRPSoft/properties/1-development/app.properties

@@ -18,3 +18,5 @@ app.resources.j2se.initial-heap-size=256m
 app.resources.j2se.version=1.6.0+
 
 shst.prestador.omissao.id=35
+
+app.icon.path=logo/icon.png

trunk/SIPRPSoft/properties/2-testing/app.properties

@@ -28,6 +28,8 @@ jnlp.information.title=SIPRPSoft
 
 shst.prestador.omissao.id=35
 
+app.icon.path=logo/icon.png
+
 #app.ws.dest.package=com.evolute.test-project.stubs
 #app.ws.wsdl.url=https://www.evolute.pt/test-project/test-endpoint?wsdl
 #app.ws.wsdl.url.protocol=https

trunk/SIPRPSoft/properties/3-production/app.properties

@@ -27,6 +27,9 @@ jnlp.information.title=SIPRPSoft
 
 shst.prestador.omissao.id=35
 
+app.icon.path=logo/icon.png
+
+
 #app.ws.dest.package=com.evolute.test-project.stubs
 #app.ws.wsdl.url=https://www.evolute.pt/test-project/test-endpoint?wsdl
 #app.ws.wsdl.url.protocol=https

trunk/SIPRPSoft/properties/4-WebApps/app.properties

@@ -28,6 +28,8 @@ jnlp.information.title=SIPRPSoft
 
 shst.prestador.omissao.id=35
 
+app.icon.path=logo/icon.png
+
 #app.ws.dest.package=com.evolute.test-project.stubs
 #app.ws.wsdl.url=https://www.evolute.pt/test-project/test-endpoint?wsdl
 #app.ws.wsdl.url.protocol=https

trunk/SIPRPSoft/src/siprp/Main.java

@@ -26,16 +26,17 @@ import siprp.companydataloaders.SIPRPDataLoader;
 import siprp.companydataloaders.SIPRPPropertiesLoader;
 import siprp.initializer.SIPRPUIInitializer;
 import siprp.lembretes.LembretesDemon;
-import siprp.ui.SIPRPIcon;
 import siprp.update.UpdateList;
 
 import com.evolute.module.updater.Updater;
 import com.evolute.project.ProjectTools;
+import com.evolute.properties.EvoPropertyKey;
 import com.evolute.utils.Singleton;
 import com.evolute.utils.db.DBException;
 import com.evolute.utils.db.DBManager;
 import com.evolute.utils.db.JDBCManager;
 import com.evolute.utils.db.keyretrievers.JDBCAutoKeyRetriever;
+import com.evolute.utils.image.EvoImage;
 import com.evolute.utils.jdbc.DBStatementExecuter;
 import com.evolute.utils.jdbc.StatementExecuterFactory;
 import com.evolute.utils.sql.Insert;
@@ -94,7 +95,13 @@ public class Main implements com.evolute.utils.ui.window.Connector
 				(String)Singleton.getInstance( SingletonConstants.LOCAL_USER ), 
 				(String)Singleton.getInstance( SingletonConstants.LOCAL_PASSWORD ), avisos, false );
 		loginWindow.setTitle( (String) Singleton.getInstance( SingletonConstants.SOFTWARE_NAME ) );
-		loginWindow.setIconImage( SIPRPIcon.LOGO.getImage() );
+		
+		String iconPath = ( String ) Singleton.getInstance( EvoPropertyKey.APP.ICON_PATH );
+		if ( iconPath != null && ! "".equals( iconPath.trim() ) )
+		{
+			loginWindow.setIconImage( new EvoImage( iconPath ).getImage() );
+		}
+		
 		loginWindow.getButtOK().setEnabled( false );
 		JPanel left = loginWindow.getLeftPanel();
 		left.setBackground( Color.white );

trunk/SIPRPSoft/src/siprp/ui/SIPRPEditorWindow.java

@@ -9,19 +9,18 @@ public class SIPRPEditorWindow extends EditorWindow
 	public SIPRPEditorWindow() throws Exception
 	{
 		super();
+		centerLater();
 	}
 	
 	public SIPRPEditorWindow( boolean[][] permittedActions ) throws Exception
 	{
 		super( permittedActions );
-		setIconImage( SIPRPIcon.LOGO.getImage() );
 		centerLater();
 	}
 	
 	public SIPRPEditorWindow( int[][] permittedActions ) throws Exception
 	{
 		super( permittedActions );
-		setIconImage( SIPRPIcon.LOGO.getImage() );
 		centerLater();
 	}
 	

trunk/SIPRPSoft/src/siprp/ui/SIPRPFrame.java

@@ -14,7 +14,6 @@ public class SIPRPFrame extends EvoFrame
 	public SIPRPFrame( String title )
 	{
 		super( title );
-		setIconImage( SIPRPIcon.LOGO.getImage() );
 		centerLater();
 	}
 	

trunk/SIPRPSoft/src/siprp/ui/SIPRPIcon.java

@@ -1,12 +1,9 @@
 package siprp.ui;
 
-import com.evolute.utils.image.EvoImage;
 
 
 
 public class SIPRPIcon 
 {
 	
-	public static final EvoImage LOGO = new EvoImage( "logo/icon.png" );
-	
 }

trunk/SIPRPSoft/src/siprp/ui/SIPRPTabbedWindow.java

@@ -12,7 +12,6 @@ public class SIPRPTabbedWindow extends TabbedWindow
 		throws Exception
 	{
 		super( upperPanel, tabNames, activeActions );
-		setIconImage( SIPRPIcon.LOGO.getImage() );
 		centerLater();
 	}
 	
@@ -20,7 +19,6 @@ public class SIPRPTabbedWindow extends TabbedWindow
 		throws Exception
 	{
 		super( upperPanel, tabNames, weight, activeActions );
-		setIconImage( SIPRPIcon.LOGO.getImage() );
 		centerLater();
 	}
 	
@@ -28,7 +26,6 @@ public class SIPRPTabbedWindow extends TabbedWindow
 		throws Exception
 	{
 		super( upperPanel, tabNames, weight, activeActions );
-		setIconImage( SIPRPIcon.LOGO.getImage() );
 		centerLater();
 	}