Commit 1c46e551 authored by Sandro Camata Santana's avatar Sandro Camata Santana

Ajustes

parent 7b8e54f3
...@@ -10,28 +10,32 @@ ...@@ -10,28 +10,32 @@
</HEADER> </HEADER>
<BODY> <BODY>
<MAINMENU> <MAINMENU>
<MAINITEM index="7" base="NEW_TOP" caption="Curio" beginGroup="TRUE"> <MAINITEM index="6" base="NEW_TOP" caption="Curio" beginGroup="TRUE">
<MAINITEM caption="Generate RegisterModelMappings" actionId="1" /> <MAINITEM caption="Generate RegisterModelMappings" actionId="1" />
<MAINITEM caption="Code Generator" actionId="6" beginGroup="TRUE"/> <MAINITEM caption="Code Generator" actionId="6" beginGroup="TRUE"/>
<MAINITEM caption="Quick OQL" actionId="18" beginGroup="TRUE"/> <MAINITEM caption="Quick OQL" actionId="18" beginGroup="TRUE"/>
<MAINITEM caption="OQL Studio" actionId="19" /> <MAINITEM caption="OQL Studio" actionId="19" />
<MAINITEM caption="Element documentation" actionId="12" beginGroup="TRUE"/> <!-- <MAINITEM caption="Element documentation" actionId="12" beginGroup="TRUE"/>
<MAINITEM caption="Convert ALL XSDs to Usecase XSD" actionId="14" beginGroup="TRUE"/> <MAINITEM caption="Convert ALL XSDs to Usecase XSD" actionId="14" beginGroup="TRUE"/>
<MAINITEM caption="Dynamo" actionId="20" beginGroup="TRUE"/> <MAINITEM caption="Dynamo" beginGroup="TRUE">
<MAINITEM caption="Manage Forms..." actionId="20"/>
</MAINITEM> -->
</MAINITEM> </MAINITEM>
<MAINITEM caption="Curio" beginGroup="TRUE" availableWhen="MODEL_SELECTED"> <MAINITEM caption="Curio" beginGroup="TRUE" availableWhen="MODEL_SELECTED">
<MAINITEM caption="Associations" beginGroup="TRUE"> <MAINITEM caption="Associations" beginGroup="TRUE">
<MAINITEM caption="Association code preview..." actionId="2" /> <MAINITEM caption="Association code preview..." actionId="2" />
</MAINITEM> </MAINITEM>
<MAINITEM caption="Classes" beginGroup="TRUE"> <MAINITEM caption="Classes" beginGroup="TRUE">
<MAINITEM caption="Insert class..." actionId="9" /> <MAINITEM caption="Insert class..." actionId="9" />
<MAINITEM caption="Edit selected class..." actionId="10"/> <MAINITEM caption="Edit selected class..." actionId="10"/>
<MAINITEM caption="Class code preview..." actionId="2" beginGroup="TRUE" /> <MAINITEM caption="Class code preview..." actionId="2" beginGroup="TRUE" />
</MAINITEM> </MAINITEM>
<!-- <MAINITEM caption="Transitions" > <!-- <MAINITEM caption="Transitions" >
<MAINITEM caption="XSD Editor..." actionId="7" /> <MAINITEM caption="XSD Editor..." actionId="7" />
</MAINITEM>--> </MAINITEM> -->
<MAINITEM caption="Usecases" beginGroup="TRUE"> <MAINITEM caption="Usecases" beginGroup="TRUE">
<MAINITEM caption="Insert usecase..." actionId="8" /> <MAINITEM caption="Insert usecase..." actionId="8" />
...@@ -53,6 +57,7 @@ ...@@ -53,6 +57,7 @@
<POPUPITEM caption="Associations" > <POPUPITEM caption="Associations" >
<POPUPITEM caption="Association code preview..." actionId="2" /> <POPUPITEM caption="Association code preview..." actionId="2" />
</POPUPITEM> </POPUPITEM>
<POPUPITEM caption="Classes" > <POPUPITEM caption="Classes" >
<POPUPITEM caption="Class code preview..." actionId="2" /> <POPUPITEM caption="Class code preview..." actionId="2" />
<POPUPITEM caption="Insert class..." actionId="9" beginGroup="TRUE" /> <POPUPITEM caption="Insert class..." actionId="9" beginGroup="TRUE" />
...@@ -61,13 +66,17 @@ ...@@ -61,13 +66,17 @@
<!-- <POPUPITEM caption="Transitions" > <!-- <POPUPITEM caption="Transitions" >
<POPUPITEM caption="XSD Editor..." actionId="7" /> <POPUPITEM caption="XSD Editor..." actionId="7" />
</POPUPITEM>--> </POPUPITEM> -->
<POPUPITEM caption="Usecases" > <POPUPITEM caption="Usecases" >
<POPUPITEM caption="Insert usecase..." actionId="8" /> <POPUPITEM caption="Insert usecase..." actionId="8" />
<POPUPITEM caption="Edit selected usecase..." actionId="11"/> <POPUPITEM caption="Edit selected usecase..." actionId="11"/>
<POPUPITEM caption="XSDs Editor..." actionId="13" beginGroup="TRUE" /> <POPUPITEM caption="XSDs Editor..." actionId="13" beginGroup="TRUE" />
</POPUPITEM> </POPUPITEM>
<POPUPITEM caption="Dynamo" >
<POPUPITEM caption="Manage Forms" actionId="20" />
</POPUPITEM>
</POPUPMENU> </POPUPMENU>
</BODY> </BODY>
</ADDINMENU> </ADDINMENU>
......
...@@ -29,10 +29,12 @@ uses ...@@ -29,10 +29,12 @@ uses
utuLinksManager, utuLinksManager,
utuLinkSock, utuLinkSock,
acuFramework, acuFramework,
acuSystem, acuSystemCurrentConfig,
acuApplicationLog, acuApplicationLog,
acuPersistenceLog,
acuQuerySQLODBC, acuQuerySQLODBC,
ituExplorerV2, ituExplorerV2,
acuAudit,
IntegracaoDelphiSUML in 'IntegracaoDelphiSUML.pas', IntegracaoDelphiSUML in 'IntegracaoDelphiSUML.pas',
Mostra_Processamento in 'Mostra_Processamento.pas' {FMostra_Processamento}, Mostra_Processamento in 'Mostra_Processamento.pas' {FMostra_Processamento},
InstantClasses in 'InstantCode\InstantClasses.pas', InstantClasses in 'InstantCode\InstantClasses.pas',
...@@ -60,20 +62,21 @@ begin ...@@ -60,20 +62,21 @@ begin
end; end;
{$ifend} {$ifend}
gSystemConfig := acSystem.Create(''); if not assigned(acApplicationLog.Instance) then acApplicationLog.Instance := acApplicationLog.Create;
if not assigned(gApplicationLog) then gApplicationLog := acApplicationLog.Create; if not assigned(acPersistenceManager.Instance) then acPersistenceManager.Instance := acPersistenceManager.Create;
if not assigned(gPersistenceManager) then gPersistenceManager := acPersistenceManager.Create; if not assigned(acPersistenceManager.Audit) then acPersistenceManager.Audit := acAudit.Create;
if not assigned(gAuditLog) then gAuditLog := acAuditLog.Create; if not Assigned(acPersistenceLog.Instance) then acPersistenceLog.Instance := acPersistenceLog.Create;
utuMessage.ChangeLocaleFormatSetting; if not Assigned(acSystemCurrentConfig.Instance) then acSystemCurrentConfig.Instance := acSystemCurrentConfig.Create;
gDefaultDatabaseDriver := typeOf(acDatabaseSQLODBC); mxMessage.ChangeLocaleFormatSetting;
acRepositorySQL.DefaultDatabaseDriver := typeOf(acDatabaseSQLODBC);
PersistenceManager.DefaultRepositoryClass := typeOf(acRepositorySQL); PersistenceManager.DefaultRepositoryClass := typeOf(acRepositorySQL);
PersistenceManager.RegisterClass(typeOf(acPersistentObject), acPersistentObjectClassFactory.Create); PersistenceManager.RegisterClass(typeOf(acPersistentObject), acPersistentObjectClassFactory.Create);
gSQLDialectManager := acSQLDialectManager.Create; if not Assigned(acSQLDialectManager.Instance) then acSQLDialectManager.Instance := acSQLDialectManager.Create;
gSQLDialectManager.RegisterSQLDialect('MS SQL Server', typeOf(acSQLDialectSQLServer), acSQLDialectSQLServerClassFactory.Create); acSQLDialectManager.Instance.RegisterSQLDialect('MS SQL Server', typeOf(acSQLDialectSQLServer), acSQLDialectSQLServerClassFactory.Create);
gSQLDialectManager.RegisterSQLDialect('Oracle', typeOf(acSQLDialectOracle), acSQLDialectOracleClassFactory.Create); acSQLDialectManager.Instance.RegisterSQLDialect('Oracle', typeOf(acSQLDialectOracle), acSQLDialectOracleClassFactory.Create);
gSQLDialectManager.RegisterSQLDialect('DB2', typeOf(acSQLDialectDB2), acSQLDialectDB2ClassFactory.Create); acSQLDialectManager.Instance.RegisterSQLDialect('DB2', typeOf(acSQLDialectDB2), acSQLDialectDB2ClassFactory.Create);
gLinksManager := utLinksManager.Create; if not Assigned(utLinksManager.Instance) then utLinksManager.Instance := utLinksManager.Create;
gLinksManager.RegisterLink('tcp/ip', typeOf(utLinkSock), utLinkSockClassFactory.Create); utLinksManager.Instance.RegisterLink('tcp/ip', typeOf(utLinkSock), utLinkSockClassFactory.Create);
{$IFDEF DARWIN} {$IFDEF DARWIN}
MainPool := Nil; MainPool := Nil;
......
...@@ -98,9 +98,6 @@ ...@@ -98,9 +98,6 @@
<TargetOS Value="win32"/> <TargetOS Value="win32"/>
</CodeGeneration> </CodeGeneration>
<Linking> <Linking>
<Debugging>
<DebugInfoType Value="dsDwarf2Set"/>
</Debugging>
<Options> <Options>
<Win32> <Win32>
<GraphicApplication Value="True"/> <GraphicApplication Value="True"/>
...@@ -171,23 +168,30 @@ ...@@ -171,23 +168,30 @@
</PublishOptions> </PublishOptions>
<RunParams> <RunParams>
<FormatVersion Value="2"/> <FormatVersion Value="2"/>
<Modes Count="0"/>
</RunParams> </RunParams>
<RequiredPackages Count="5"> <RequiredPackages Count="7">
<Item1> <Item1>
<PackageName Value="JvStdCtrlsLazR"/> <PackageName Value="CurioApplication"/>
</Item1> </Item1>
<Item2> <Item2>
<PackageName Value="evoumlintf"/> <PackageName Value="Curio"/>
</Item2> </Item2>
<Item3> <Item3>
<PackageName Value="curio"/> <PackageName Value="CurioPersistence"/>
</Item3> </Item3>
<Item4> <Item4>
<PackageName Value="SynEdit"/> <PackageName Value="CurioModeling"/>
</Item4> </Item4>
<Item5> <Item5>
<PackageName Value="LCL"/> <PackageName Value="evoumlintf"/>
</Item5> </Item5>
<Item6>
<PackageName Value="SynEdit"/>
</Item6>
<Item7>
<PackageName Value="LCL"/>
</Item7>
</RequiredPackages> </RequiredPackages>
<Units Count="32"> <Units Count="32">
<Unit0> <Unit0>
......
This diff is collapsed.
...@@ -6,8 +6,8 @@ interface ...@@ -6,8 +6,8 @@ interface
uses uses
LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics, LCLIntf, LCLType, LMessages, Messages, SysUtils, Variants, Classes, Graphics,
Controls, Forms, StdCtrls, Dialogs, JvExControls, ComCtrls, ExtCtrls, Buttons, Controls, Forms, StdCtrls, Dialogs, ComCtrls, ExtCtrls, Buttons,
MaskEdit, JvBaseEdits, JvCheckBox, utuMessage, Grids, ValEdit, StarUMLintf, MaskEdit, utuMessage, Grids, ValEdit, StarUMLintf,
cxuCadastroDefinicaoClasse, IntegracaoDelphiSUML, acuModel; cxuCadastroDefinicaoClasse, IntegracaoDelphiSUML, acuModel;
type type
...@@ -473,7 +473,7 @@ begin ...@@ -473,7 +473,7 @@ begin
end; end;
end; end;
lClass := fUtil.MetaModel.ClassTicketByCode[fClassCode] as acClassTicket; lClass := fUtil.MetaModel.GetClassTicketByCode(fClassCode) as acClassTicket;
FillListViewClassData(lClass); FillListViewClassData(lClass);
lvCampos.Selected := nil; lvCampos.Selected := nil;
lvCamposClick(nil); lvCamposClick(nil);
......
...@@ -13,7 +13,7 @@ object DataBaseLogin: TDataBaseLogin ...@@ -13,7 +13,7 @@ object DataBaseLogin: TDataBaseLogin
OnShow = FormShow OnShow = FormShow
ParentFont = True ParentFont = True
Position = poOwnerFormCenter Position = poOwnerFormCenter
LCLVersion = '2.0.2.0' LCLVersion = '2.1.0.0'
object GroupBox2: TGroupBox object GroupBox2: TGroupBox
Left = 8 Left = 8
Height = 216 Height = 216
......
...@@ -103,7 +103,7 @@ begin ...@@ -103,7 +103,7 @@ begin
GetUserDSNList(cbODBCD_DSN.Items); GetUserDSNList(cbODBCD_DSN.Items);
GetDriverList(cbODBCD_DRIVERS.Items); GetDriverList(cbODBCD_DRIVERS.Items);
for lObj in gSQLDialectManager.InstancedObjects do for lObj in acSQLDialectManager.Instance.InstancedObjects do
begin begin
cbDialect.AddItem(acFactoredObject(lObj).Ticket.Code, lObj); cbDialect.AddItem(acFactoredObject(lObj).Ticket.Code, lObj);
end; end;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment