no message

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

trunk/siprp/Main.java

@@ -37,10 +37,15 @@ public class Main implements Connector
 	public static void main( String args[] )
 		throws Exception
 	{
-		Singleton.setInstance( SingletonConstants.COMPANY_NAME, "Centro Clínico Avenida" );
-		Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_evo.jpg" );
-		Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.FALSE );
-		Singleton.setInstance( SingletonConstants.DB_NAME, "shst" );
+//		Singleton.setInstance( SingletonConstants.COMPANY_NAME, "Centro Clínico Avenida" );
+//		Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_evo.jpg" );
+//		Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.FALSE );
+//		Singleton.setInstance( SingletonConstants.DB_NAME, "shst" );
+		
+		Singleton.setInstance( SingletonConstants.COMPANY_NAME, "SIPRP - Sociedade Ib\u00e9rica de Preven\u00e7\u00e3o de Riscos Profissionais" );
+		Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_combo.jpg" );
+		Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.TRUE );
+		Singleton.setInstance( SingletonConstants.DB_NAME, "siprp" );
 		
 		dbase = (String)Singleton.getInstance( SingletonConstants.DB_NAME );
 /*		Calendar cal = Calendar.getInstance();
@@ -78,10 +83,10 @@ public class Main implements Connector
 		avisos = new AvisosPanel();
 		String logoFileName = ( String ) Singleton.getInstance( SingletonConstants.COMPANY_LOGO );
 		LoginWindow loginWindow = new LoginWindow( new Main(), /*"logo"+File.separator +*/ logoFileName,//"logo"+File.separator + "logo_w400.jpg", 
-				new String[] { "SHSTSoft" }, 
+				new String[] { "SIPRPSoft" }, 
 				new String[] { "Vers\u00E3o 2.0", "(EVOLUTE 2004)" }, "",
 				"root", "UNIXLuvsU", avisos, false );
-		loginWindow.setTitle( "SHSTSoft" );
+		loginWindow.setTitle( "SIPRPSoft" );
 		JPanel left = loginWindow.getLeftPanel();
 		left.setBackground( Color.white );
 		loginWindow.show();
@@ -97,7 +102,8 @@ public class Main implements Connector
 			if( server == null )
 			{
 				//server = "192.168.1.191";
-				server = "ws_fpalma";
+				server = "192.168.0.110";
+//				server = "ws_fpalma";
 			}
 			String url = "jdbc:mysql://" + server + "/" + dbase;
 //			System.out.println( "url: " + url + " user: " + user + " ps: " + passwd );

trunk/siprp/ficha/ExamePDF.java

@@ -133,14 +133,23 @@ public class ExamePDF {
 		Process proc;
 		if( System.getProperty( "os.name" ).startsWith( "Windows" ) )
 		{
+//System.out.println( "cmd.exe /c \"" + System.getProperty( "user.home" ) +  System.getProperty( "file.separator" ) + "report_ficha.pdf\"" );
 			proc = Runtime.getRuntime().exec( "cmd.exe /c \"" + System.getProperty( "user.home" ) +  System.getProperty( "file.separator" ) + "report_ficha.pdf\"" );
+			proc.waitFor();
+			new File( System.getProperty( "user.home" ) +  System.getProperty( "file.separator" ) + "report_ficha.pdf" ).delete();
 		}
 		else
 		{
-			proc = Runtime.getRuntime().exec( "open \"" + System.getProperty( "user.home" ) +  System.getProperty( "file.separator" ) + "report_ficha.pdf\"" );
+//System.out.println( "/usr/bin/open \"" + System.getProperty( "user.home" ) +  System.getProperty( "file.separator" ) + "report_ficha.pdf\"" );
+			try{
+			proc = Runtime.getRuntime().exec( new String[]{"/usr/bin/open",  "" + System.getProperty( "user.home" ) +  System.getProperty( "file.separator" ) + "report_ficha.pdf" } );
+			}
+			catch( Exception ex )
+			{
+				ex.printStackTrace();
+			}
+//			proc = Runtime.getRuntime().exec( "/usr/bin/open \"/Users/Shared/teste.pdf.pdf\"" );
 		}
-		proc.waitFor();
-		new File( System.getProperty( "user.home" ) +  System.getProperty( "file.separator" ) + "report_ficha.pdf" ).delete();
 	}
 	
 	public byte[] createPDF( Hashtable values )
@@ -392,6 +401,7 @@ public class ExamePDF {
 		//p.add( new Chunk( ( indent ? "      " : "" ) + ( char )( checked? 110: 111) + " ", FONT_ZAPFDINGBATS ) );
 		//System.out.println( "FAMILY: " + FONT_WINGDINGS.getFamilyname() );
 		p.add( new Chunk( ( indent ? "   " : "" ) + ( char )( checked? 0xfe: 0xa8), FONT_WINGDINGS ) );
+//		p.add( new Chunk( ( indent ? "   " : "" ) + ( char )( checked? 'X': '_'), FONT_WINGDINGS ) );
 		p.add( new Chunk( text, FONT_NORMAL ) );
 		return p;
 	}