diff --git a/trunk/SIPRPSoft/.classpath b/trunk/SIPRPSoft/.classpath
index 5789f842..ec09dd25 100644
--- a/trunk/SIPRPSoft/.classpath
+++ b/trunk/SIPRPSoft/.classpath
@@ -36,5 +36,6 @@
+
diff --git a/trunk/SIPRPSoft/lib/evolute.jar b/trunk/SIPRPSoft/lib/evolute.jar
index 17c4a395..7da39a60 100644
Binary files a/trunk/SIPRPSoft/lib/evolute.jar and b/trunk/SIPRPSoft/lib/evolute.jar differ
diff --git a/trunk/SIPRPSoft/lib/nimrodlf.jar b/trunk/SIPRPSoft/lib/nimrodlf.jar
new file mode 100644
index 00000000..3dcad2e7
Binary files /dev/null and b/trunk/SIPRPSoft/lib/nimrodlf.jar differ
diff --git a/trunk/SIPRPSoft/lib/shst.jar b/trunk/SIPRPSoft/lib/shst.jar
index 51cd85b6..8669a808 100644
Binary files a/trunk/SIPRPSoft/lib/shst.jar and b/trunk/SIPRPSoft/lib/shst.jar differ
diff --git a/trunk/SIPRPSoft/properties/version.properties b/trunk/SIPRPSoft/properties/version.properties
index d40b8e9e..eaa19aa8 100644
--- a/trunk/SIPRPSoft/properties/version.properties
+++ b/trunk/SIPRPSoft/properties/version.properties
@@ -1,6 +1,6 @@
#SIPRPSoft versioning file
#Fri Jun 25 17:32:18 WEST 2010
-major=0
+major=12
name=SIPRPSoft
minor=0
build=1
diff --git a/trunk/SIPRPSoft/src/siprp/Main.java b/trunk/SIPRPSoft/src/siprp/Main.java
index 80d794b8..3c8bd61c 100644
--- a/trunk/SIPRPSoft/src/siprp/Main.java
+++ b/trunk/SIPRPSoft/src/siprp/Main.java
@@ -32,11 +32,13 @@ import org.apache.cayenne.map.DataMap;
import siprp.clientes.AvisosPanel;
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.utils.Singleton;
import com.evolute.utils.db.DBException;
import com.evolute.utils.db.DBManager;
@@ -46,14 +48,12 @@ import com.evolute.utils.error.ErrorLogger;
import com.evolute.utils.jdbc.DBStatementExecuter;
import com.evolute.utils.jdbc.StatementExecuterFactory;
import com.evolute.utils.sql.Insert;
-import com.evolute.utils.sql.SQLQuery;
import com.evolute.utils.strings.UnicodeChecker;
import com.evolute.utils.ui.DialogException;
import com.evolute.utils.ui.window.LoginWindow;
public class Main implements com.evolute.utils.ui.window.Connector
{
- public final static String SHST_VERSION = "11.10.0";
private static String dbase;
private SIPRPTracker siprpTracker;
@@ -70,8 +70,7 @@ public class Main implements com.evolute.utils.ui.window.Connector
ESTADO_PROCESSO_BY_CODE.put( PROCESSO_CANCELADO_CODE, PROCESSO_CANCELADO_DESCRIPTION );
}
- public static void main( String args[] )
- throws Exception
+ public static void main( String args[] ) throws Exception
{
UIManager.put( "TextField.inactiveForeground", ColorUIResource.BLACK );
UIManager.put( "TextField.foreground", ColorUIResource.RED.darker() );
@@ -84,6 +83,8 @@ public class Main implements com.evolute.utils.ui.window.Connector
UIManager.put( "FormattedTextField.inactiveForeground", ColorUIResource.BLACK );
UIManager.put( "FormattedTextField.foreground", ColorUIResource.RED.darker() );
+
+ new SIPRPUIInitializer().doInit();
SIPRPPropertiesLoader.getInstance().load();
@@ -100,7 +101,7 @@ public class Main implements com.evolute.utils.ui.window.Connector
// new ClinicaAvenidaDataLoader().load();
// new IBookDataLoader().load();
- dbase = (String)Singleton.getInstance( SingletonConstants.LOCAL_DB_NAME );
+ dbase = (String) Singleton.getInstance( SingletonConstants.LOCAL_DB_NAME );
// dbase = "siprp_local3";
/* Calendar cal = Calendar.getInstance();
cal.set( 2004, 06, 14 );
@@ -111,7 +112,7 @@ public class Main implements com.evolute.utils.ui.window.Connector
else
{
*/ Insert.setDefaultKeyRetriever( JDBCAutoKeyRetriever.DEFAULT );
- String server = System.getProperty( "server.address" );
+// String server = System.getProperty( "server.address" );
// if( server == null )
// {
// server = "ws_fpalma";
@@ -138,17 +139,20 @@ public class Main implements com.evolute.utils.ui.window.Connector
String logoFileName = ( String ) Singleton.getInstance( SingletonConstants.COMPANY_LOGO );
loginWindow = new LoginWindow( new Main(), /*"logo"+File.separator +*/ logoFileName,//"logo"+File.separator + "logo_w400.jpg",
new String[] { (String) Singleton.getInstance( SingletonConstants.SOFTWARE_NAME ) },
- new String[] { "Vers\u00E3o " + SHST_VERSION, "(EVOLUTE 2004-2009)" }, "",
+ new String[] { "Vers\u00E3o " + ProjectTools.getInstance().getVersion(), "(EVOLUTE 2004-2010)" }, "",
(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() );
+ loginWindow.getButtOK().setEnabled( false );
JPanel left = loginWindow.getLeftPanel();
left.setBackground( Color.white );
// GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
+ loginWindow.setSize( 1024, 510 );
loginWindow.setExtendedState(loginWindow.getExtendedState() | LoginWindow.MAXIMIZED_BOTH);
loginWindow.setVisible( true );
- SwingUtilities.invokeLater( new Runnable(){
+ SwingUtilities.invokeLater( new Runnable()
+ {
public void run()
{
loginWindow.expandAll();
@@ -188,7 +192,7 @@ public class Main implements com.evolute.utils.ui.window.Connector
try
{
// run initialization SQL
- SQLQuery initQuery[] = new SQLQuery[] {};
+// SQLQuery initQuery[] = new SQLQuery[] {};
// String server = System.getProperty( "server.address" );
String server = null;
if( server == null )
diff --git a/trunk/SIPRPSoft/src/siprp/SHSTLogger.java b/trunk/SIPRPSoft/src/siprp/SHSTLogger.java
index 4b7f67a3..501594d8 100644
--- a/trunk/SIPRPSoft/src/siprp/SHSTLogger.java
+++ b/trunk/SIPRPSoft/src/siprp/SHSTLogger.java
@@ -6,6 +6,7 @@
package siprp;
+import com.evolute.project.ProjectTools;
import com.evolute.utils.Singleton;
import com.evolute.utils.db.DBManager;
import com.evolute.utils.db.Executer;
@@ -51,7 +52,7 @@ public class SHSTLogger implements Logger
private final String user = ( String )Singleton.getInstance( Singleton.USERNAME );
private final String ENV = "Java: " + java + " \nOS: " + os + " \nUser: " + user
+ "\n Software: " + ( String )Singleton.getInstance( SingletonConstants.SOFTWARE_NAME )
- + "\n Version: " + Main.SHST_VERSION;
+ + "\n Version: " + ProjectTools.getInstance().getVersion();
private final Executer executer;
/** Creates a new instance of SIPRPLogger */
diff --git a/trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java b/trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java
index 9ada0a17..7399cb45 100644
--- a/trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java
+++ b/trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java
@@ -160,9 +160,6 @@ public class ExamePanel extends JPanel
recomendacoesText.setWrapStyleWord( true );
recomendacoesText.setDocument( new MaximumLengthDocument( 300 ) );
recomendacoesScp.setViewportView( recomendacoesText );
- recomendacoesScp.setBorder( BorderFactory.createTitledBorder(
- BorderFactory.createEtchedBorder(),
- "Outras recomenda\u00e7\u00f5es" ) );
setLayout( new GridLayout( 1, 2 ) );
add( leftPanel );
@@ -243,8 +240,11 @@ public class ExamePanel extends JPanel
// JPanel recomendacoesOuterPanel = new JPanel();
// recomendacoesOuterPanel.setLayout( new GridLayout( 1, 1 ) );
// recomendacoesOuterPanel.add( recomendacoesScp );
- gridbag.setConstraints( recomendacoesScp, constraints );
- rightPanel.add( recomendacoesScp );
+ JPanel recomendacoesPanel = new JPanel();
+ gridbag.setConstraints( recomendacoesPanel, constraints );
+ recomendacoesPanel.add( recomendacoesScp );
+ recomendacoesPanel.setBorder( BorderFactory.createTitledBorder( "Outras recomenda\u00e7\u00f5es" ) );
+ rightPanel.add( recomendacoesPanel );
gridbag = new GridBagLayout();
resultadoOuterPanel.setLayout( gridbag );
diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/GestaoRelatorioWindow.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/GestaoRelatorioWindow.java
index 9f17d010..b654785c 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/GestaoRelatorioWindow.java
+++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/GestaoRelatorioWindow.java
@@ -16,7 +16,7 @@ import com.evolute.utils.tracker.TrackableWindow;
public class GestaoRelatorioWindow extends SIPRPFrame implements TrackableWindow
{
- public static final String TITLE = "Gest" + atilde + "o de Relat" + oacute + "rio de Higiene e Seguran" + ccedil + "a";
+ public static final String TITLE = "Gest" + atilde + "o de Relat" + oacute + "rio de H&S";
private static final Dimension SIZE = new Dimension( 1024, 700 );
diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioHigieneSegurancaWindow.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioHigieneSegurancaWindow.java
index 237ea22b..ce147c36 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioHigieneSegurancaWindow.java
+++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioHigieneSegurancaWindow.java
@@ -1,6 +1,5 @@
package siprp.higiene.relatorio;
-import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil;
import static com.evolute.utils.strings.UnicodeLatin1Map.oacute;
import info.clearthought.layout.TableLayout;
import info.clearthought.layout.TableLayoutConstraints;
@@ -41,7 +40,7 @@ public class RelatorioHigieneSegurancaWindow extends SIPRPFrame implements Track
public static final Color COLOR_MEDIDA_OK_SEL = new Color(160,190,255);
- public static final String TITLE = "Relat" + oacute + "rios de Higiene e Seguran" + ccedil + "a no Trabalho";
+ public static final String TITLE = "Relat" + oacute + "rios de H&S";
public static final Dimension SIZE = new Dimension( 1024, 700 );
diff --git a/trunk/SIPRPSoft/src/siprp/initializer/SIPRPUIInitializer.java b/trunk/SIPRPSoft/src/siprp/initializer/SIPRPUIInitializer.java
new file mode 100644
index 00000000..7bc03910
--- /dev/null
+++ b/trunk/SIPRPSoft/src/siprp/initializer/SIPRPUIInitializer.java
@@ -0,0 +1,38 @@
+package siprp.initializer;
+
+import java.awt.Color;
+
+import javax.swing.UIManager;
+
+import com.evolute.application.EvoAbstractAppInitializer;
+import com.nilo.plaf.nimrod.NimRODLookAndFeel;
+import com.nilo.plaf.nimrod.NimRODTheme;
+
+public class SIPRPUIInitializer extends EvoAbstractAppInitializer
+{
+
+ public SIPRPUIInitializer()
+ {
+ super( "UI", false, false, false );
+ }
+
+ @Override
+ public boolean doInit() throws Exception
+ {
+// NimRODTheme nt = new NimRODTheme();
+// nt.setPrimary1( new Color( 185,211,238 ) );
+// nt.setPrimary2( new Color( 159,182,205 ) );
+// nt.setPrimary3( new Color( 108,123,139 ) );
+//
+// nt.setSecondary( new Color( 230, 230, 230 ) );
+//// nt.setSecondary1( new Color( 210, 210, 210 ) );
+//// nt.setSecondary2( Color.pink );
+//// nt.setSecondary3( Color.pink );
+//
+// NimRODLookAndFeel NimRODLF = new NimRODLookAndFeel();
+// NimRODLookAndFeel.setCurrentTheme( nt);
+// UIManager.setLookAndFeel( NimRODLF );
+ return true;
+ }
+
+}