Ajustes - alteracao do isolamento de janelas - pode ter ficado incompativel com o mac-os

EvoUMLPlugin/src/CurioAddIn.lpi

@@ -159,8 +159,9 @@
           </Other>
         </CompilerOptions>
       </Item4>
-      <SharedMatrixOptions Count="1">
+      <SharedMatrixOptions Count="2">
         <Item1 ID="311574553573" Modes="Dev Darwin Cocoa X64" Type="IDEMacro" MacroName="LCLWidgetType" Value="cocoa"/>
+        <Item2 ID="280556421411" Value="-gw2"/>
       </SharedMatrixOptions>
     </BuildModes>
     <PublishOptions>
@@ -180,28 +181,31 @@
         </Mode0>
       </Modes>
     </RunParams>
-    <RequiredPackages Count="7">
+    <RequiredPackages Count="8">
       <Item1>
-        <PackageName Value="CurioApplication"/>
+        <PackageName Value="LazUtils"/>
       </Item1>
       <Item2>
-        <PackageName Value="Curio"/>
+        <PackageName Value="CurioApplication"/>
       </Item2>
       <Item3>
-        <PackageName Value="CurioPersistence"/>
+        <PackageName Value="Curio"/>
       </Item3>
       <Item4>
-        <PackageName Value="CurioModeling"/>
+        <PackageName Value="CurioPersistence"/>
       </Item4>
       <Item5>
-        <PackageName Value="evoumlintf"/>
+        <PackageName Value="CurioModeling"/>
       </Item5>
       <Item6>
-        <PackageName Value="SynEdit"/>
+        <PackageName Value="evoumlintf"/>
       </Item6>
       <Item7>
-        <PackageName Value="LCL"/>
+        <PackageName Value="SynEdit"/>
       </Item7>
+      <Item8>
+        <PackageName Value="LCL"/>
+      </Item8>
     </RequiredPackages>
     <Units Count="33">
       <Unit0>
@@ -215,7 +219,9 @@
       <Unit2>
         <Filename Value="Mostra_Processamento.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="FMostra_Processamento"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit2>
       <Unit3>
         <Filename Value="InstantCode\InstantClasses.pas"/>
@@ -397,6 +403,7 @@
         <Filename Value="itumainform.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="itMainForm"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ituMainForm"/>
       </Unit32>

EvoUMLPlugin/src/DelphiAddInObj.pas

@@ -52,7 +52,7 @@ implementation
 
 uses
   InstantCode, SysUtils, Mostra_Processamento, utuStateMachine, fCodeGen, Controls, Forms,
-  fModelMappingsGenerationOptions, fXSDEditor, ituDataBaseLogin, formMemo,
+  fModelMappingsGenerationOptions, fXSDEditor, ituDataBaseLogin, formMemo, Interfacebase,
   cxuCadastroClasse, cxuCadastroCasoDeUso, ituCadastrarDefinicao, ituCadastrarFormulario,
   utuMessage, uCadastroCasoDeUso, uCadastroClasse, ituServiceParameters, ituExplorerV2,
   Registry, uRTFEditor, ituXSDExplorer, ituExportUnits, ituOQLExplorerV2, cxuCadastroDefinicaoClasse;
@@ -114,7 +114,7 @@ class function TDelphiAddInObj.GetServiceSession: cxSession;
 var lServiceParamDialog: TitServiceParameters;
     lReg: TRegistry;
 begin
-  lServiceParamDialog := TitServiceParameters.Create(nil);
+  lServiceParamDialog := TitServiceParameters.Create(Application);
   try
     lReg := TRegistry.Create;
     try
@@ -197,7 +197,7 @@ begin
   lMetaModelGenOpt.CheckDBTableNameLength := true;
 
   /////////////////////////////////////////////////////////////////////////
-  lModelMappingsOptionsForm := TModelMappingsGenerationOptions.Create(nil);
+  lModelMappingsOptionsForm := TModelMappingsGenerationOptions.Create(Application);
   try
     if lModelMappingsOptionsForm.ShowModal = mrok then
     begin
@@ -241,7 +241,7 @@ begin
       finally
         lUtilitario.Free;
       end;
-             
+
       application.MessageBox(PAnsiChar('File ' + lModelMappingsOptions.FileName + ' was generated.'), 'Staruml', MB_OK + MB_ICONINFORMATION);
     finally
       lProgress.Free;
@@ -313,18 +313,14 @@ begin
   lMetaModelGenOpt.CheckDBAttributeNameLength := true;
   lMetaModelGenOpt.CheckDBTableNameLength := true;
   
-  lCodeGen := TCodeGen.Create(nil);
+  Application.CreateForm(TCodeGen, lCodeGen);
+  lUtilitario := TUtil.Create;
   try
-    lUtilitario := TUtil.Create;
-    try
-      lUtilitario.AlimentarMetamodel(lMetaModelGenOpt, nil);
-      lCodeGen.Util := lUtilitario;
-      lCodeGen.ShowModal;
-    finally
-      lUtilitario.Free;
-    end;
+    lUtilitario.AlimentarMetamodel(lMetaModelGenOpt, nil);
+    lCodeGen.Util := lUtilitario;
+    lCodeGen.ShowModal;
   finally
-    lCodeGen.Free;
+    lUtilitario.Free;
   end;
 end;
 
@@ -410,7 +406,7 @@ begin
     if lModel.QueryInterface(IUMLClass, lUMLClasAux) = S_OK then
     begin
       lUtilitario.AlimentarMetamodel(lMetaModelGenOpt, nil);
-      lPreview := TPreviewClassCode.Create(nil);
+      lPreview := TPreviewClassCode.Create(Application);
       try
 //        inserir preview para oracle
         lPreview.mem_ClassPascal.Lines.Text := lUtilitario.GerarClassPreview_Pascal(lModel as IUMLClass);
@@ -427,7 +423,7 @@ begin
       if lModel.QueryInterface(IUMLAssociation, lUMLAssociationAux) = S_OK then
       begin
         lUtilitario.AlimentarMetamodel(lMetaModelGenOpt, nil);
-        lPreview := TPreviewClassCode.Create(nil);
+        lPreview := TPreviewClassCode.Create(Application);
         try
           lPreview.mem_ClassSQL.Lines.Text := lUtilitario.GerarSQLPreview(lModel);
           lPreview.mem_ClassOracle.Lines.Text := lUtilitario.GerarSQLPreview(lModel, dbvOracle);
@@ -704,7 +700,7 @@ begin
           gStarUMLApp.SelectInModelExplorer(lCadCasoDeUso.UseCase);
 
       finally
-        if assigned(lCadCasoDeUso) then lCadCasoDeUso.Free;
+        lCadCasoDeUso.Free;
       end;
     finally
       lCadastroCasoUsoUC.Free;
@@ -721,11 +717,11 @@ begin
   lModel := gStarUMLApp.SelectionManager.GetSelectedModelAt(0);
   if lModel.QueryInterface(IUMLTransition, lUMLTransitionAux) = S_OK then
   begin
-    lXSDEditor := TXSDEdit.Create(nil);
+    lXSDEditor := TXSDEdit.Create(Application);
     try
       lXSDEditor.Transition := lModel as IUMLTransition;
       lXSDEditor.ShowModal;
-    except
+    finally
       FreeAndNil(lXSDEditor);
     end;
   end

EvoUMLPlugin/src/Mostra_Processamento.dfm

@@ -11,7 +11,7 @@ object FMostra_Processamento: TFMostra_Processamento
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Position = poScreenCenter
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.2.4.0'
   object pnlMensagem: TPanel
     Left = 0
     Height = 27

EvoUMLPlugin/src/Mostra_Processamento.pas

@@ -69,7 +69,7 @@ end;
 
 constructor TFShowProgressForm.create(piMsg: string; piPosition, piTotal: integer);
 begin
-  fFormProgress := TFMostra_Processamento.Create(nil);
+  fFormProgress := TFMostra_Processamento.Create(Application);
   fFormProgress.pgbBarraDeProgresso.Max := piTotal;
   fFormProgress.pgbBarraDeProgresso.Position := piPosition;
   fFormProgress.pnlMensagem.Caption := piMsg;

EvoUMLPlugin/src/acuObjectExplorer.pas

@@ -260,6 +260,7 @@ begin
           lNode.ImageIndex := 8;
           lEnumerator.MoveNext;
         end;
+        Node.Text := Node.Text + ' (ITENS:' + IntToStr(Node.Count) + ')';
       end;
     finally
       Node.Owner.EndUpdate;

EvoUMLPlugin/src/cxuCadastroCasoDeUso.pas

@@ -28,15 +28,11 @@ var lRequestMessage: mxRequestMessage;
     lResponseMessage: mxAnswerMessage;
 begin
   lRequestMessage := self.NewRequest('RM_OBTEM_CONTEXTO', piField);
+  lResponseMessage := self.Session.SendRequest(lRequestMessage);
   try
-    lResponseMessage := self.Session.SendRequest(lRequestMessage);
-    try
-      if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
-    finally
-      lResponseMessage.free;
-    end;
+    if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
   finally
-    lRequestMessage.Free;
+   lResponseMessage.free;
   end;
 end;
 
@@ -45,15 +41,11 @@ var lRequestMessage: mxRequestMessage;
     lResponseMessage: mxAnswerMessage;
 begin
   lRequestMessage := self.NewRequest('RM_SALVA_OBJETO', piField);
+  lResponseMessage := self.Session.SendRequest(lRequestMessage);
   try
-    lResponseMessage := self.Session.SendRequest(lRequestMessage);
-    try
-      if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
-    finally
-      lResponseMessage.free;
-    end;
+    if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
   finally
-    lRequestMessage.Free;
+    lResponseMessage.free;
   end;
 end;
 
@@ -62,15 +54,11 @@ var lRequestMessage: mxRequestMessage;
     lResponseMessage: mxAnswerMessage;
 begin
   lRequestMessage := self.NewRequest('RM_EXCLUI_OBJETO', piField);
+  lResponseMessage := self.Session.SendRequest(lRequestMessage);
   try
-    lResponseMessage := self.Session.SendRequest(lRequestMessage);
-    try
-      if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
-    finally
-      lResponseMessage.free;
-    end;
+    if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
   finally
-    lRequestMessage.Free;
+    lResponseMessage.free;
   end;
 end;
 
@@ -79,15 +67,11 @@ var lRequestMessage: mxRequestMessage;
     lResponseMessage: mxAnswerMessage;
 begin
   lRequestMessage := self.NewRequest('RM_INCLUI_OBJETO', piField);
+  lResponseMessage := self.Session.SendRequest(lRequestMessage);
   try
-    lResponseMessage := self.Session.SendRequest(lRequestMessage);
-    try
-      if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
-    finally
-      lResponseMessage.free;
-    end;
+    if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
   finally
-    lRequestMessage.Free;
+    lResponseMessage.free;
   end;
 end;
 
@@ -96,15 +80,11 @@ var lRequestMessage: mxRequestMessage;
     lResponseMessage: mxAnswerMessage;
 begin
   lRequestMessage := self.NewRequest('RM_CONSULTA_OBJETO', piField);
+  lResponseMessage := self.Session.SendRequest(lRequestMessage);
   try
-    lResponseMessage := self.Session.SendRequest(lRequestMessage);
-    try
-      if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
-    finally
-      lResponseMessage.free;
-    end;
+    if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
   finally
-    lRequestMessage.Free;
+    lResponseMessage.free;
   end;
 end;
 
@@ -113,15 +93,11 @@ var lRequestMessage: mxRequestMessage;
     lResponseMessage: mxAnswerMessage;
 begin
   lRequestMessage := self.NewRequest('RM_EDITA_OBJETO', piField);
+  lResponseMessage := self.Session.SendRequest(lRequestMessage);
   try
-    lResponseMessage := self.Session.SendRequest(lRequestMessage);
-    try
-      if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
-    finally
-      lResponseMessage.free;
-    end;
+    if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
   finally
-    lRequestMessage.Free;
+    lResponseMessage.free;
   end;
 end;
 

EvoUMLPlugin/src/cxuCadastroDefinicaoClasse.pas

@@ -27,15 +27,11 @@ var lRequestMessage: mxRequestMessage;
     lResponseMessage: mxAnswerMessage;
 begin
   lRequestMessage := self.NewRequest('RM_OBTER_CONTEXTO', piField);
+  lResponseMessage := self.Session.SendRequest(lRequestMessage);
   try
-    lResponseMessage := self.Session.SendRequest(lRequestMessage);
-    try
-      if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
-    finally
-      lResponseMessage.free;
-    end;
+    if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
   finally
-    lRequestMessage.Free;
+    lResponseMessage.free;
   end;
 end;
 
@@ -44,15 +40,11 @@ var lRequestMessage: mxRequestMessage;
     lResponseMessage: mxAnswerMessage;
 begin
   lRequestMessage := self.NewRequest('RM_SALVAR', piField);
+  lResponseMessage := self.Session.SendRequest(lRequestMessage);
   try
-    lResponseMessage := self.Session.SendRequest(lRequestMessage);
-    try
-      if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
-    finally
-      lResponseMessage.free;
-    end;
+    if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
   finally
-    lRequestMessage.Free;
+    lResponseMessage.free;
   end;
 end;
 
@@ -61,15 +53,11 @@ var lRequestMessage: mxRequestMessage;
     lResponseMessage: mxAnswerMessage;
 begin
   lRequestMessage := self.NewRequest('RM_EXCLUIR', piField);
+  lResponseMessage := self.Session.SendRequest(lRequestMessage);
   try
-    lResponseMessage := self.Session.SendRequest(lRequestMessage);
-    try
-      if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
-    finally
-      lResponseMessage.free;
-    end;
+    if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
   finally
-    lRequestMessage.Free;
+    lResponseMessage.free;
   end;
 end;
 
@@ -78,15 +66,11 @@ var lRequestMessage: mxRequestMessage;
     lResponseMessage: mxAnswerMessage;
 begin
   lRequestMessage := self.NewRequest('RM_INCLUIR', piField);
+ lResponseMessage := self.Session.SendRequest(lRequestMessage);
   try
-    lResponseMessage := self.Session.SendRequest(lRequestMessage);
-    try
-      if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
-    finally
-      lResponseMessage.free;
-    end;
+    if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
   finally
-    lRequestMessage.Free;
+    lResponseMessage.free;
   end;
 end;
 
@@ -95,15 +79,11 @@ var lRequestMessage: mxRequestMessage;
     lResponseMessage: mxAnswerMessage;
 begin
   lRequestMessage := self.NewRequest('RM_CONSULTA_OBJETO', piField);
+  lResponseMessage := self.Session.SendRequest(lRequestMessage);
   try
-    lResponseMessage := self.Session.SendRequest(lRequestMessage);
-    try
-      if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
-    finally
-      lResponseMessage.free;
-    end;
+    if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
   finally
-    lRequestMessage.Free;
+    lResponseMessage.free;
   end;
 end;
 
@@ -112,15 +92,11 @@ var lRequestMessage: mxRequestMessage;
     lResponseMessage: mxAnswerMessage;
 begin
   lRequestMessage := self.NewRequest('RM_EDITA_OBJETO', piField);
+  lResponseMessage := self.Session.SendRequest(lRequestMessage);
   try
-    lResponseMessage := self.Session.SendRequest(lRequestMessage);
-    try
-      if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
-    finally
-      lResponseMessage.free;
-    end;
+    if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
   finally
-    lRequestMessage.Free;
+    lResponseMessage.free;
   end;
 end;
 

EvoUMLPlugin/src/fCodeGen.dfm

@@ -11,9 +11,11 @@ object CodeGen: TCodeGen
   Font.Height = -11
   Font.Name = 'Tahoma'
   KeyPreview = True
+  OnClose = FormClose
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '2.0.10.0'
+  ShowInTaskBar = stAlways
+  LCLVersion = '2.2.4.0'
   object PageControl1: TPageControl
     Left = 0
     Height = 616
@@ -4526,6 +4528,7 @@ object CodeGen: TCodeGen
     Enabled = False
     CompilerMode = pcmObjFPC
     NestedComments = True
+    TypeHelpers = False
     Left = 710
     Top = 137
   end

EvoUMLPlugin/src/fCodeGen.pas

@@ -98,6 +98,7 @@ type
     Panel14: TPanel;
     Panel15: TPanel;
     SpeedButton8: TSpeedButton;
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormShow(Sender: TObject);
     procedure lvUseCasesChange(Sender: TObject; Item: TListItem;
       Change: TItemChange);
@@ -160,6 +161,10 @@ begin
   end;
 end;
 
+procedure TCodeGen.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+end;
+
 procedure TCodeGen.ShowCodePreview(piUseCase: acUseCaseTicket);
 var lTransitions: acObjectList;
     lItem: TListItem;

EvoUMLPlugin/src/fModelMappingsGenerationOptions.pas

@@ -43,6 +43,7 @@ type
     rdCSharp: TRadioButton;
     rdJava: TRadioButton;
     procedure dlbDirectoryGetImageIndex(Sender: TObject; Node: TTreeNode);
+    procedure dlbDirectoryGetSelectedIndex(Sender: TObject; Node: TTreeNode);
     procedure FormShow(Sender: TObject);
     procedure BitBtn1Click(Sender: TObject);
     procedure edtFileNameChange(Sender: TObject);
@@ -153,6 +154,11 @@ begin
   Node.ImageIndex := 0;
 end;
 
+procedure TModelMappingsGenerationOptions.dlbDirectoryGetSelectedIndex(Sender: TObject; Node: TTreeNode);
+begin
+  Node.SelectedIndex := 0;
+end;
+
 procedure TModelMappingsGenerationOptions.GetParameters;
 var lReg: TRegistry;
 begin
@@ -164,9 +170,17 @@ begin
     ckbIgnoreXSD.Checked := StrToBoolDef(lReg.ReadString('MODELMAPPINGS_IGNORE_XSD_SCHEMA'), false);
 
     if lReg.ReadString('MODELMAPPINGS_OUTPUT_DIRECTORY') <> '' then
-      dlbDirectory.Path := lReg.ReadString('MODELMAPPINGS_OUTPUT_DIRECTORY')
+    begin
+      dlbDirectory.Path := lReg.ReadString('MODELMAPPINGS_OUTPUT_DIRECTORY');
+      ckbDefault.Checked := false;
+      BitBtn3.Enabled := true;
+    end
     else
+    begin
       dlbDirectory.Path := ExtractFilePath(gStarUMLApp.ProjectManager.FileName);
+      ckbDefault.Checked := true;
+      BitBtn3.Enabled := false;
+    end;
 
     if lReg.ReadString('MODELMAPPINGS_FILENAME') <> '' then
       edtFileName.Text := lReg.ReadString('MODELMAPPINGS_FILENAME')

EvoUMLPlugin/src/fXSDEditor.dfm

@@ -14,6 +14,8 @@ object XSDEdit: TXSDEdit
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poDesktopCenter
+  ShowInTaskBar = stAlways
+  LCLVersion = '2.2.4.0'
   object pnlTransition: TPanel
     Left = 0
     Height = 23
@@ -362,13 +364,13 @@ object XSDEdit: TXSDEdit
     OnChanging = pgcPrincipalChanging
     object tbsXSDIn: TTabSheet
       Caption = 'XSD In'
-      ClientHeight = 420
-      ClientWidth = 695
+      ClientHeight = 433
+      ClientWidth = 693
       object memXSDIn: TMemo
         Left = 0
-        Height = 420
+        Height = 433
         Top = 0
-        Width = 695
+        Width = 693
         Align = alClient
         Font.CharSet = ANSI_CHARSET
         Font.Color = clWindowText
@@ -382,14 +384,14 @@ object XSDEdit: TXSDEdit
     end
     object tbsXSDOut: TTabSheet
       Caption = 'XSD Out'
-      ClientHeight = 420
-      ClientWidth = 695
+      ClientHeight = 433
+      ClientWidth = 693
       ImageIndex = 1
       object memXSDOut: TMemo
         Left = 0
-        Height = 420
+        Height = 433
         Top = 0
-        Width = 695
+        Width = 693
         Align = alClient
         Font.CharSet = ANSI_CHARSET
         Font.Color = clWindowText

EvoUMLPlugin/src/formMemo.dfm

 object PreviewClassCode: TPreviewClassCode
-  Left = 2149
+  Left = 100
   Height = 580
   Top = 247
   Width = 803
@@ -10,9 +10,9 @@ object PreviewClassCode: TPreviewClassCode
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
-  KeyPreview = True
   Position = poScreenCenter
-  LCLVersion = '2.0.2.0'
+  ShowInTaskBar = stAlways
+  LCLVersion = '2.2.4.0'
   object Panel2: TPanel
     Left = 0
     Height = 580
@@ -75,9 +75,15 @@ object PreviewClassCode: TPreviewClassCode
               Top = 0
               Width = 785
               Align = alClient
+              Font.Height = -13
+              Font.Name = 'Courier New'
+              Font.Pitch = fpFixed
+              Font.Quality = fqNonAntialiased
+              ParentColor = False
+              ParentFont = False
               TabOrder = 0
               BorderStyle = bsNone
-              Gutter.Width = 29
+              Gutter.Width = 33
               Gutter.MouseActions = <>
               RightGutter.Width = 0
               RightGutter.MouseActions = <>
@@ -541,7 +547,7 @@ object PreviewClassCode: TPreviewClassCode
                   MouseActions = <>
                 end
                 object SynGutterLineNumber1: TSynGutterLineNumber
-                  Width = 23
+                  Width = 17
                   MouseActions = <>
                   MarkupInfo.Background = clBtnFace
                   MarkupInfo.Foreground = clNone
@@ -584,9 +590,15 @@ object PreviewClassCode: TPreviewClassCode
               Top = 0
               Width = 785
               Align = alClient
+              Font.Height = -13
+              Font.Name = 'Courier New'
+              Font.Pitch = fpFixed
+              Font.Quality = fqNonAntialiased
+              ParentColor = False
+              ParentFont = False
               TabOrder = 0
               BorderStyle = bsNone
-              Gutter.Width = 29
+              Gutter.Width = 33
               Gutter.MouseActions = <>
               RightGutter.Width = 0
               RightGutter.MouseActions = <>
@@ -1050,7 +1062,7 @@ object PreviewClassCode: TPreviewClassCode
                   MouseActions = <>
                 end
                 object SynGutterLineNumber1: TSynGutterLineNumber
-                  Width = 23
+                  Width = 17
                   MouseActions = <>
                   MarkupInfo.Background = clBtnFace
                   MarkupInfo.Foreground = clNone
@@ -1093,9 +1105,15 @@ object PreviewClassCode: TPreviewClassCode
               Top = 0
               Width = 785
               Align = alClient
+              Font.Height = -13
+              Font.Name = 'Courier New'
+              Font.Pitch = fpFixed
+              Font.Quality = fqNonAntialiased
+              ParentColor = False
+              ParentFont = False
               TabOrder = 0
               BorderStyle = bsNone
-              Gutter.Width = 29
+              Gutter.Width = 33
               Gutter.MouseActions = <>
               RightGutter.Width = 0
               RightGutter.MouseActions = <>
@@ -1559,7 +1577,7 @@ object PreviewClassCode: TPreviewClassCode
                   MouseActions = <>
                 end
                 object SynGutterLineNumber1: TSynGutterLineNumber
-                  Width = 23
+                  Width = 17
                   MouseActions = <>
                   MarkupInfo.Background = clBtnFace
                   MarkupInfo.Foreground = clNone
@@ -1615,9 +1633,15 @@ object PreviewClassCode: TPreviewClassCode
                   Top = 0
                   Width = 777
                   Align = alClient
+                  Font.Height = -13
+                  Font.Name = 'Courier New'
+                  Font.Pitch = fpFixed
+                  Font.Quality = fqNonAntialiased
+                  ParentColor = False
+                  ParentFont = False
                   TabOrder = 0
                   BorderStyle = bsNone
-                  Gutter.Width = 29
+                  Gutter.Width = 33
                   Gutter.MouseActions = <>
                   RightGutter.Width = 0
                   RightGutter.MouseActions = <>
@@ -2081,7 +2105,7 @@ object PreviewClassCode: TPreviewClassCode
                       MouseActions = <>
                     end
                     object SynGutterLineNumber1: TSynGutterLineNumber
-                      Width = 23
+                      Width = 17
                       MouseActions = <>
                       MarkupInfo.Background = clBtnFace
                       MarkupInfo.Foreground = clNone
@@ -2124,9 +2148,15 @@ object PreviewClassCode: TPreviewClassCode
                   Top = 0
                   Width = 777
                   Align = alClient
+                  Font.Height = -13
+                  Font.Name = 'Courier New'
+                  Font.Pitch = fpFixed
+                  Font.Quality = fqNonAntialiased
+                  ParentColor = False
+                  ParentFont = False
                   TabOrder = 0
                   BorderStyle = bsNone
-                  Gutter.Width = 29
+                  Gutter.Width = 33
                   Gutter.MouseActions = <>
                   RightGutter.Width = 0
                   RightGutter.MouseActions = <>
@@ -2590,7 +2620,7 @@ object PreviewClassCode: TPreviewClassCode
                       MouseActions = <>
                     end
                     object SynGutterLineNumber1: TSynGutterLineNumber
-                      Width = 23
+                      Width = 17
                       MouseActions = <>
                       MarkupInfo.Background = clBtnFace
                       MarkupInfo.Foreground = clNone
@@ -2632,33 +2662,34 @@ object PreviewClassCode: TPreviewClassCode
     Enabled = False
     CompilerMode = pcmObjFPC
     NestedComments = True
-    left = 383
-    top = 19
+    TypeHelpers = False
+    Left = 383
+    Top = 19
   end
   object SynJavaSyn1: TSynJavaSyn
     DefaultFilter = 'Java Files (*.java)|*.java'
     Enabled = False
-    left = 503
-    top = 19
+    Left = 503
+    Top = 19
   end
   object SynSQLSyn1: TSynSQLSyn
     DefaultFilter = 'SQL Files (*.sql)|*.sql'
     Enabled = False
     SQLDialect = sqlMSSQL2K
-    left = 589
-    top = 19
+    Left = 589
+    Top = 19
   end
   object SynCppSyn1: TSynCppSyn
     DefaultFilter = 'C++ Files (*.c,*.cpp,*.h,*.hpp,*.hh)|*.c;*.cpp;*.h;*.hpp;*.hh'
     Enabled = False
-    left = 688
-    top = 32
+    Left = 688
+    Top = 32
   end
   object SynSQLSyn2: TSynSQLSyn
     DefaultFilter = 'SQL Files (*.sql)|*.sql'
     Enabled = False
     SQLDialect = sqlOracle
-    left = 589
-    top = 85
+    Left = 589
+    Top = 85
   end
 end

EvoUMLPlugin/src/formMemo.pas

@@ -52,7 +52,7 @@ var SaveDialog1: TSaveDialog;
     lsNGUFile: String;
     myFile : TextFile;
 begin
-  SaveDialog1 := TSaveDialog.Create(nil);
+  SaveDialog1 := TSaveDialog.Create(Application);
   try
     if SaveDialog1.Execute then
     begin

EvoUMLPlugin/src/ituCadastrarDefinicao.lfm

@@ -5,7 +5,8 @@ object itCadastrarDefinicao: TitCadastrarDefinicao
   Width = 817
   ClientHeight = 323
   ClientWidth = 817
-  LCLVersion = '2.1.0.0'
+  ShowInTaskBar = stAlways
+  LCLVersion = '2.2.4.0'
   object pnPrincipal: TPanel
     Left = 0
     Height = 312

EvoUMLPlugin/src/ituCadastrarFormulario.pas

@@ -215,23 +215,31 @@ end;
 procedure TitCadastrarFormulario.FillListViewClassData(piClass: acClassTicket);
 var
   lRelationName: string;
+  lClass: acClassTicket;
   i: Integer;
 begin
-  for i := 0 to piClass.Attributes.Count - 1 do
+  lClass := piClass;
+  while assigned(lClass) do
   begin
-    AdicionarCampo(piClass.Attributes[i]);
-  end;
+    for i := 0 to piClass.Attributes.Count - 1 do
+    begin
+      AdicionarCampo(piClass.Attributes[i]);
+    end;
 
-  for i := 0 to piClass.RelationTicketsIn.Count - 1 do
-  begin
-    lRelationName := acRelationTicket(piClass.RelationTicketsIn.Objects[i]).DestinationPropertyName;
-    if lRelationName <> '' then AdicionarCampo(lRelationName);
-  end;
+    for i := 0 to piClass.RelationTicketsIn.Count - 1 do
+    begin
+      lRelationName := acRelationTicket(piClass.RelationTicketsIn.Objects[i]).DestinationPropertyName;
+      if lRelationName <> '' then AdicionarCampo(lRelationName);
+    end;
+
+    for i := 0 to piClass.RelationTicketsOut.Count - 1 do
+    begin
+      lRelationName := acRelationTicket(piClass.RelationTicketsOut.Objects[i]).OriginPropertyName;
+      if lRelationName <> '' then AdicionarCampo(lRelationName);
+    end;
+
+    lClass := lClass.ParentClassTicket;
 
-  for i := 0 to piClass.RelationTicketsOut.Count - 1 do
-  begin
-    lRelationName := acRelationTicket(piClass.RelationTicketsOut.Objects[i]).OriginPropertyName;
-    if lRelationName <> '' then AdicionarCampo(lRelationName);
   end;
 end;
 

EvoUMLPlugin/src/ituExplorerV2.pas

@@ -32,16 +32,6 @@ const
 
 type
 
-  TDLLDialog = class(TForm)
-  protected
-    procedure CreateParams(var Params: TCreateParams); override;
-  public
-    procedure BtnShowMessageClick(Sender: TObject);
-    constructor Create(aOwner: TComponent); override;
-  public
-    ParentFormHandle: HWND;
-  end;
-
   { TExplorerV2 }
 
   TExplorerV2 = class(TForm)
@@ -153,8 +143,6 @@ type
     procedure MontarModelExploreHieraquia(Sender: TObject; Node: TTreeNode);
     procedure SetMetaModel(const Value: acMetaModel);
     procedure ResizeColumns(piListView: TListView);
-    function GetStringEntreParenteses(piString : string) : string;
-    function GetNumeroDeStringOID (piString : string) : string;
     function GetClassTicket(piBloco,piPropertyName : string):acClassTicket;
     procedure CopiaTextoObjeto (piObjeto : TTreeNode);
     function BuscaParcial(piSubstring,piTexto :string;piretirarEspaco : boolean = true): boolean;
@@ -184,7 +172,6 @@ type
     function IsExepressaoValida(piOpEve: TFaOpenEvent;piTexto : string; piTemPalavraAntes : Boolean = false):boolean;
     function GetPrevWordPosValida(piSynEdit: TSynEdit) :TPoint;
    protected
-    procedure CreateParams(var Params : TCreateParams); override;
     function Connect : acPersistenceSession;
 
   public
@@ -354,7 +341,7 @@ begin
                     begin
                       lField := utField(lEnum.Current);
                       lListItem := lvXMLListResult.Items.Add;
-                      lEnumAtt := lField.GetAttibutesEnumerator;
+                      lEnumAtt := lField.GetAttributesEnumerator;
                       try
                         lFirstItemFlag := true;
                         while not lEnumAtt.EOL do
@@ -560,7 +547,7 @@ var
 begin
   lModalResult := mrOk;
   Result := Nil;
-  lDataBaseLogin := TDataBaseLogin.Create(Self);
+  lDataBaseLogin := TDataBaseLogin.Create(Screen.ActiveForm);
   try
     lDataBaseLogin.ProjectFileName := ExtractFileName(fUtil.StarUMLApp.ProjectManager.FileName);
     while (lModalResult = mrOk) and (not Assigned(Result)) do
@@ -593,7 +580,7 @@ begin
       if fConnectionString <> '' then
       begin
         try
-          Result := PersistenceManager.OpenSession(fMetaModelPersistenceMap, fConnectionString);
+          Result := PersistenceManager.OpenSession(fMetaModelPersistenceMap, fConnectionString, acIsolationLevel.acILReadUncommitted);
           (Result.Repository as acRepositorySQL).SQLDialect := fSQLDialect;
 
           if actResultsPanel.Checked then actResultsPanel.Execute;
@@ -628,10 +615,28 @@ end;
 
 procedure TExplorerV2.CopiaTextoObjeto(piObjeto: TTreeNode);
 var
-  lString : string;
+  lString : UTF8String;
 begin
-  lString := piObjeto.Text;
-  lString := GetNumeroDeStringOID(GetStringEntreParenteses(lString));
+  if (TObject(piObjeto.Data) is acPersistentObject) then
+  begin
+    lString := acPersistentObject(piObjeto.Data).IDO.AsString;
+  end
+  else if (TObject(piObjeto.Data) is acRelationPartnerShip) then
+  begin
+    if Assigned(acRelationPartnerShip(piObjeto.Data).PartnerOID)
+      then lString := acRelationPartnerShip(piObjeto.Data).PartnerOID.AsString
+      else if Assigned(acRelationPartnerShip(piObjeto.Data).Partner)
+             then lString := acRelationPartnerShip(piObjeto.Data).Partner.IDO.AsString
+             else lString := 'null';
+  end
+  else if (TObject(piObjeto.Data) is acAttribute) then
+  begin
+    if acAttribute(piObjeto.Data).IsNull
+      then lString := 'null'
+      else lString := acAttribute(piObjeto.Data).AsString;
+  end
+  else lString := '';
+
   if lString <> '' then
     Clipbrd.Clipboard.AsText := lString;
 end;
@@ -1648,14 +1653,6 @@ begin
 
 end;
 
-procedure TExplorerV2.CreateParams(var Params: TCreateParams);
-begin
-  inherited CreateParams(Params);
-  {$IFDEF LCLWin32}
-//  Params.WndParent := 0;
-  {$ENDIF}
-end;
-
 procedure TExplorerV2.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   Action := caFree;
@@ -2136,46 +2133,6 @@ begin
   pcResults.ActivePageIndex := 1;
 end;
 
-function TExplorerV2.GetNumeroDeStringOID(piString: string): string;
-var
-  lString : string;
-  lEnum : Integer;
-begin
-  lString := '';
-  // Verifica se a string tem mais que 4 caracteres
-  if  Length(piString) > 4  then
-  begin
-    // Extrai os 4 primeiros caracteres da string
-    for lEnum := 1 to 4  do
-    begin
-      lString := Concat(lString,piString[lEnum])
-    end;
-    // Se a string comear com OID: esses 4 primeiro caracteres sero excludos
-    if lString = 'OID:' then
-    begin
-      lString := '';
-      for lEnum := 5 to Length(piString)  do
-      begin
-        lString := Concat(lString,piString[lEnum])
-      end;
-    end
-    // Caso contrrio copia-se a string toda
-    else
-    begin
-      lString := '';
-      for lEnum := 1 to Length(piString)  do
-      begin
-        lString := Concat(lString,piString[lEnum])
-      end;
-    end;
-  end
-  else
-  begin
-    lString := piString;
-  end;
-  Result := lString;  
-end;
-
 function TExplorerV2.GetClassTicket(piBloco, piPropertyName: string
 	 ): acClassTicket;
 var lEnumerator: acEnumerator;
@@ -2193,31 +2150,6 @@ begin
     lEnumerator.Free;
   end;
 end;
-
-function TExplorerV2.GetStringEntreParenteses(piString: string): string;
-var
-  lString : string;
-  lEnum : Integer;
-  flagDadosDesejados : Boolean;
-begin
-  flagDadosDesejados := False;
-  lString := '';
-  for lEnum := 1 to Length(piString)  do
-  begin
-    // Fim dos dados entre parenteses
-    if piString[lEnum] = ')' then
-      flagDadosDesejados := False;
-    if flagDadosDesejados then
-    begin
-      lString := Concat(lString,piString[lEnum])
-    end;
-    // Inicio dos dados entre parenteses
-    if piString[lEnum] = '(' then
-      flagDadosDesejados := True;
-  end;
-  Result := lString;
-end;
-
 procedure TExplorerV2.memOQLQuery2DragDrop(Sender, Source: TObject; X,Y: Integer);
     function IsRoot(piNode: TTreeNode): Boolean;
     begin
@@ -2449,42 +2381,4 @@ begin
   XMLQuery.Checked := True;
 end;
 
-{ TDLLDialog }
-
-constructor TDLLDialog.Create(aOwner: TComponent);
-var
-  BtnShowMessage: TButton;
-  edt: TEdit;
-begin
-  inherited CreateNew(aOwner);
-
-  Caption := 'This form is in a DLL !!!';
-  Position := poWorkAreaCenter;
-  Width := 200;
-  Height := 100;
-
-  BtnShowMessage := TButton.Create(Self);
-  BtnShowMessage.Parent := Self;
-  BtnShowMessage.Caption := 'Show message';
-  BtnShowMessage.AutoSize := True;
-  BtnShowMessage.OnClick := BtnShowMessageClick;
-  edt := TEdit.Create(Self);
-  edt.Parent := Self;
-
-end;
-
-procedure TDLLDialog.BtnShowMessageClick(Sender: TObject);
-begin
-  ShowMessage('Hello from DLL!');
-end;
-
-procedure TDLLDialog.CreateParams(var Params: TCreateParams);
-begin
-  inherited CreateParams(Params);
-
-  {$IFDEF LCLWin32}
-  Params.WndParent := ParentFormHandle;
-  {$ENDIF}
-end;
-
 end.

EvoUMLPlugin/src/ituExportUnits.dfm

@@ -10,7 +10,8 @@ object ExportUnits: TExportUnits
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
-  LCLVersion = '2.1.0.0'
+  ShowInTaskBar = stAlways
+  LCLVersion = '2.2.4.0'
   object pnl2: TPanel
     Left = 0
     Height = 36

EvoUMLPlugin/src/ituOQLExplorerV2.dfm

@@ -11650,11 +11650,14 @@ object OQLExplorerV2: TOQLExplorerV2
                   Caption = 'OQL Name'
                   Width = 74
                 end>
+              HideSelection = False
+              ReadOnly = True
               ScrollBars = ssAutoBoth
               SmallImages = ilOQLState
               TabOrder = 0
               ViewStyle = vsReport
               OnChange = lvOQLListChange
+              OnSelectItem = lvOQLListSelectItem
             end
             object memError: TMemo
               Left = 0

EvoUMLPlugin/src/ituOQLExplorerV2.pas

@@ -75,23 +75,21 @@ type
     procedure FormResize(Sender: TObject);
     procedure lvOQLListChange(Sender: TObject; Item: TListItem;Change: TItemChange);
     procedure aNewFileExecute(Sender: TObject);
+    procedure lvOQLListSelectItem(Sender: TObject; Item: TListItem;
+      Selected: Boolean);
     procedure splVerticalCanResize(Sender: TObject; var NewSize: Integer; var Accept: Boolean);
 
-  protected
-    procedure CreateParams(var Params : TCreateParams); override;
-
   private
     { Private declarations }
     fFlagFormClosing : Boolean; // Impede que as OQLs sejam inutilmente verificados ao fechar o form
     fExplorer: TExplorerV2;
     fOQLList: utOQLFile;
-    fLastItem: TListItem;
     function GerarUnitOQL(piXMLFileName: String): string;
-    procedure InterfaceToSelectedOQL;
+    procedure InterfaceToSelectedOQL(piItem: TListItem);
     function GetQueryType ( piExplorer : TExplorerV2 ) : Integer;
     function ValidaQuery(piQuery: string; piOQLType: integer): string;
     procedure SetQueryType (piType: integer);
-    procedure SelectedOQLToInterface;
+    procedure SelectedOQLToInterface(piItem: TListItem);
     procedure UpdateOQLList;
   public
     { Public declarations }
@@ -122,13 +120,11 @@ begin
 
     lvOQLList.Selected.Delete;
     lOQL.Delete;
-    fLastItem := Nil;
     if lvOQLList.Items.Count > 0 then
       if li - 1 >= 0 then
         lvOQLList.Selected := lvOQLList.Items[li-1]
       else
         lvOQLList.Selected := lvOQLList.Items[0];
-      SelectedOQLToInterface;
   end;
 end;
 
@@ -139,7 +135,7 @@ begin
     ShowMessage('You need to save before exporting.')
   else
   begin
-    InterfaceToSelectedOQL;
+    lvOQLList.Selected := Nil;
     fOQLList.Save;
     Screen.Cursor := crHourGlass;
     try
@@ -514,12 +510,19 @@ begin
   end;
 end;
 
+procedure TOQLExplorerV2.lvOQLListSelectItem(Sender: TObject; Item: TListItem; Selected: Boolean);
+begin
+  if not Selected
+//    then if assigned(fLastItem) and (fLastItem <> Item)
+    then InterfaceToSelectedOQL(Item)
+    else SelectedOQLToInterface(Item);
+end;
+
 procedure TOQLExplorerV2.aNewOQLExecute(Sender: TObject);
 var lListItem: TListItem;
     lOQL: utOQL;
     lCont: integer;
 begin
-  InterfaceToSelectedOQL;
   lCont := 1;
   while fOQLList.OQLExists('_NEW_OQL_' + inttostr(lCont)) do
     Inc(lCont);
@@ -531,7 +534,6 @@ begin
   lListItem.ImageIndex := 2;
   lListItem.SubItems.Add('No OQL query');
   lvOQLList.Selected := lListItem;
-  SelectedOQLToInterface;
   edtName.SetFocus;
   edtName.SelectAll;
 end;
@@ -539,7 +541,7 @@ end;
 procedure TOQLExplorerV2.aSaveFileExecute(Sender: TObject);
 var lFileName: string;
 begin
-  InterfaceToSelectedOQL;
+  lvOQLList.Selected := Nil;
   lFileName := fOQLList.FileName;
   try
     if lFileName = '' then
@@ -578,12 +580,6 @@ begin
   fExplorer.Show;
 end;
 
-procedure TOQLExplorerV2.CreateParams(var Params: TCreateParams);
-begin
-  inherited CreateParams(Params);
-//  Params.ExStyle   := Params.ExStyle or WS_EX_APPWINDOW;
-end;
-
 procedure TOQLExplorerV2.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   fFlagFormClosing := True;
@@ -634,13 +630,13 @@ begin
     Result := __XMLQuery;
 end;
 
-procedure TOQLExplorerV2.InterfaceToSelectedOQL;
+procedure TOQLExplorerV2.InterfaceToSelectedOQL(piItem: TListItem);
 var lOQL: utOQL;
     lErro: string;
 begin
-  if Assigned(fLastItem) and Assigned(fExplorer.SynEditOQL) then
+  if Assigned(piItem) and Assigned(fExplorer.SynEditOQL) then
   begin
-    lOQL := utOQL(fLastItem.Data);
+    lOQL := utOQL(piItem.Data);
     lOQL.ID := edtName.Text;
     lOQL.Description := edtDescription.Text;
     lOQL.Query := fExplorer.SynEditOQL.Text;
@@ -653,39 +649,36 @@ begin
     if lErro = '' then
     begin
       if lOQL.OQLType = 1
-        then fLastItem.ImageIndex := 1
-        else fLastItem.ImageIndex := 0;
+        then piItem.ImageIndex := 1
+        else piItem.ImageIndex := 0;
     end
     else
-      fLastItem.ImageIndex := 2;
-    fLastItem.Caption := edtName.Text;
-    fLastItem.SubItems[0] := lErro;
+      piItem.ImageIndex := 2;
+    piItem.Caption := edtName.Text;
+    piItem.SubItems[0] := lErro;
+    memError.Text := '';
   end;
 end;
 
 procedure TOQLExplorerV2.lvOQLListChange(Sender: TObject; Item: TListItem; Change: TItemChange);
 begin
-  if assigned(fLastItem) and (fLastItem <> Item) then InterfaceToSelectedOQL;
-  SelectedOQLToInterface;
 end;
 
-procedure TOQLExplorerV2.SelectedOQLToInterface;
+procedure TOQLExplorerV2.SelectedOQLToInterface(piItem: TListItem);
 var lOQL: utOQL;
 begin
   edtName.Text := '';
   edtDescription.Text := '';
   fExplorer.SynEditOQL.Text := '';
-  if Assigned(lvOQLList.Selected) and Assigned( fExplorer.SynEditOQL) then
+  if Assigned(piItem) and Assigned( fExplorer.SynEditOQL) then
   begin
-    fLastItem := lvOQLList.Selected;
-    lOQL := utOQL(lvOQLList.Selected.Data);
+    lOQL := utOQL(piItem.Data);
     edtName.Text := lOQL.ID;
     edtDescription.Text := lOQL.Description;
     fExplorer.SynEditOQL.Text := lOQL.Query;
-    memError.Text := lvOQLList.Selected.SubItems[0];
+    memError.Text := piItem.SubItems[0];
     SetQueryType(lOQL.OQLType);
-  end
-  else fLastItem := Nil;
+  end;
   lvOQLList.Column[0].Caption := 'OQL''s (' + IntToStr(fOQLList.Count) + ')';
 end;
 
@@ -740,7 +733,6 @@ begin
   if lvOQLList.Items.Count > 0 then
   begin
     lvOQLList.ItemIndex := 0;
-    SelectedOQLToInterface;
   end;
 end;
 

EvoUMLPlugin/src/ituOQLParams.dfm

@@ -13,6 +13,8 @@ object OQLParams: TOQLParams
   Font.Name = 'Tahoma'
   OnClose = FormClose
   Position = poDesktopCenter
+  ShowInTaskBar = stAlways
+  LCLVersion = '2.2.4.0'
   object Panel1: TPanel
     Left = 0
     Height = 214

EvoUMLPlugin/src/ituServiceParameters.dfm

@@ -9,7 +9,8 @@ object itServiceParameters: TitServiceParameters
   ClientWidth = 314
   ParentFont = True
   Position = poScreenCenter
-  LCLVersion = '2.1.0.0'
+  ShowInTaskBar = stAlways
+  LCLVersion = '2.2.4.0'
   object Panel2: TPanel
     Left = 0
     Height = 284

EvoUMLPlugin/src/ituXSDExplorer.dfm

@@ -11,7 +11,8 @@ object XSDExplorer: TXSDExplorer
   Font.Name = 'Tahoma'
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '2.0.0.4'
+  ShowInTaskBar = stAlways
+  LCLVersion = '2.2.4.0'
   WindowState = wsMaximized
   object Panel1: TPanel
     Left = 0
@@ -617,12 +618,12 @@ object XSDExplorer: TXSDExplorer
           end
           object tbsTriggers: TTabSheet
             Caption = 'Triggers'
-            ClientHeight = 0
-            ClientWidth = 0
+            ClientHeight = 400
+            ClientWidth = 694
             ImageIndex = 1
             object trvStates: TTreeView
               Left = 0
-              Height = 361
+              Height = 365
               Top = 35
               Width = 694
               Align = alClient
@@ -715,8 +716,8 @@ object XSDExplorer: TXSDExplorer
     end
   end
   object alMain: TActionList
-    left = 664
-    top = 8
+    Left = 664
+    Top = 8
     object actNewXSD: TAction
       Caption = 'New XSD'
       OnExecute = actNewXSDExecute
@@ -745,80 +746,39 @@ object XSDExplorer: TXSDExplorer
     end
   end
   object imgOQLState: TImageList
-    left = 760
-    top = 8
+    Left = 760
+    Top = 8
     Bitmap = {
-      4C69020000001000000010000000000000000000000000000000000000000000
-      00001DA435FF139923FF139923FF139923FF139923FF138C2AFF000000000000
-      0000000000000000000000000000000000000000000000000000139923FF1399
-      23FF98E1B5FFBDEED4FFA7E7C4FF90E0B1FF78D99FFF49C779FF1B9D3DFF1B9D
-      3DFF0000000000000000000000000000000000000000139923FF6ACC88FFD0F4
-      E3FF9AE1B6FF50C77AFF38BD67FF2CBA5DFF30BB60FF2FBC5DFF23BC4FFF11A3
-      30FF06620FFF000000000000000000000000139923FF56C573FFC5F0D8FF66CF
-      8CFF20B452FF23B554FFAAE6C0FF96DEB1FF19B148FF13AC3CFF12AA34FF0FB0
-      2DFF0A991FFF036B0AFF0000000000000000139923FFAAE7C5FF68D08EFF16AF
-      48FF1BB14CFF39BF68FFF4FCF7FFFFFFFFFF84D99EFF11AA32FF0EA729FF0BA4
-      20FF09AF1CFF036B0AFF0000000006780EFF4CBD69FF83DDA7FF22B655FF1CB2
-      4EFF22B554FF22B554FF55CA7FFFE1F6E9FFFFFFFFFF88D99DFF10AB2FFF0CA6
-      27FF06A716FF038C0AFF014603FF06780EFF54C57AFF44C674FF52C77DFF57CA
-      81FF56CA80FF57CA81FF49C573FF79D592FFFAFEFAFFFFFFFFFF97DDA5FF1AAD
-      33FF07A518FF039D0CFF014603FF087412FF3EBD69FF2ABA5CFFFFFFFFFFFFFF
-      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCFEFCFFFFFFFFFFFFFFFFFFAAE3
-      B0FF03A00CFF039F0CFF025205FF06680DFF21B151FF1EB751FFBFEDCFFFBAEA
-      C6FFB7E9C2FFB8EAC5FFB5E9C2FFB7E9C1FFF6FCF7FFFFFFFFFFEEFAEFFF54C5
-      5EFF03A00CFF039F0CFF014A04FF035706FF17A341FF18B54AFF11AB34FF06A0
-      11FF039E0CFF049F0DFF039E0CFF74D07DFFFCFEFCFFF3FBF4FF3EBC48FF039E
-      0CFF03A10CFF03960AFF014203FF035706FF0D8223FF17B641FF0EA92DFF05A0
-      13FF049F0DFF07A011FF82D589FFFFFFFFFFF4FCF6FF40BC4AFF039E0CFF039E
-      0CFF03A50CFF037B08FF014203FF00000000044F09FF10AC30FF0DAB28FF09A4
-      1CFF039E0FFF16AA20FFD5F2D8FFE9F8EAFF48C052FF039E0CFF039E0CFF039F
-      0CFF03A70CFF024C04FF0000000000000000044F09FF066B11FF0AAB1FFF07A4
-      15FF049E0DFF029D0AFF039D0AFF039E0CFF039E0CFF039E0CFF03A00CFF03A7
-      0CFF026A06FF024C04FF000000000000000000000000034F09FF036509FF04A3
-      0DFF03A60CFF03A00BFF029E0AFF039F0CFF03A00CFF03A50CFF03A60CFF0269
-      06FF013402FF0000000000000000000000000000000000000000014503FF0145
-      03FF037808FF039C0BFF039F0CFF039F0CFF039D0CFF027E09FF014D04FF014D
-      04FF000000000000000000000000000000000000000000000000000000000000
-      0000013002FF014103FF025104FF025104FF014303FF013302FF000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000030FFFF0030FFFF00000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000030FFFF0030FFFF0030FFFF000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000030FFFF0030FFFF0030FFFF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000030FFFF000000000000000000000000000000000030FFFF0030FFFF0030
-      FFFF0000000000000000000000000000000000000000000000000030FFFF0030
-      FFFF0000000000000000000000000000000000000000000000000030FFFF0030
-      EFFF0030FFFF000000000000000000000000000000000030FFFF0030FFFF0000
-      0000000000000000000000000000000000000000000000000000000000000030
-      F7FF0030EFFF0030EFFF00000000000000000030F7FF0030FFFF000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000030DEFF0030EFFF0030EFFF0030EFFF0030F7FF00000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000030E7FF0030E7FF0030EFFF0000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000030DEFF0030E7FF0030E7FF0030EFFF0030DEFF00000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000030
-      DEFF0030DEFF0030DEFF000000000030DEFF0030DEFF0030DEFF000000000000
-      000000000000000000000000000000000000000000000030EFFF0030DEFF0030
-      DEFF0030DEFF000000000000000000000000000000000030DEFF0030DEFF0000
-      0000000000000000000000000000000000000030DEFF0030DEFF0030DEFF0030
-      DEFF0000000000000000000000000000000000000000000000000030DEFF0030
-      DEFF000000000000000000000000000000000030DEFF0030DEFF0030DEFF0000
-      0000000000000000000000000000000000000000000000000000000000000030
-      DEFF0030DEFF0000000000000000000000000030DEFF0030DEFF000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000030DEFF0030DEFF00000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000030DEFF0030DEFF
+      4C7A020000001000000010000000EA0200000000000078DABD935D48935118C7
+      DD7BE6AB9B9B3A25B5B432775149E248838292EC8B299639FCB8C988A0F2E332
+      2FD4B00FEBC24022BAB08C36174E479BA18BA661132D9A82047A91A0178E4448
+      26E4A286860DFF9DF7DDDA9CE9360D7AE0CF79CF799FDFFF39CF399CB0B0BF63
+      A7EE10E25BE5FE6A4E475890F893FB64C68C81854FD0CF7DC0C3CF26D44EB521
+      6FA40EC9EA63BC3662AB3E3661DC398BA733BD383F528FC303D770A0BF1C8AB7
+      9790692987DC520859BB02ECE518AC654BADD761FD3689AB63CD487DAD82DC5C
+      0CC39721B4D84CD86E5222BEEB28E20CD988E9C980B8753748B518AB79C39C15
+      15E30F90D0AD44B2A90047062BE0742D818B7B531AC80C0711ADDF8F285D2A44
+      DD295E9EAD8D46C14025EE4EEB91D65B829457E790466B732A19BD8599453BEF
+      D134A546AC311392CEBD60F50920CD6208CE10707CB1B51EA7866BA01A6940D9
+      E81D948EDEE6C73CDA53DDC4232CAF2CF31E8FA73BB0E36516223A9240D4129E
+      8FAC89430EAD9FDE7F011B856BC5E5FD36CCF6806825206D1230AA70B01552EC
+      311561575F1106BF8EA17F7E187DF6F778336F85998E7DF67758F49CC3C2B283
+      EEF5A29717E40B41CA5824B6E722C99C0F99311BAC5606A29140D826E5C79AF1
+      06BEFE8F5F4EE45894FC1A794ED542FB3F41785EDA2847626F2EA25F64205C1B
+      CFB311D4A771E23E5FD7E95AC4714BBE9BE5D441752392E7B93B10168A10DBA5
+      80D4B80F221DBD1B4D0C120CA998F83E09FBCF792887543E96EE9BE869EF0542
+      EFFD733C5B2D83D8B81B11BA6D106AA460D4627AC6621FC749EB61AB583F9E0B
+      423DC8151184EDB4EF4E2E370A8C46ECAEA7F5EC99AE33952C04D9CCBA6F4070
+      9A8013A98D047916E56639D1BB666E8A20382BE415EC1D0A140C04B9044C9190
+      97E024F5CD6282725B0A05C0EB5FF9FFE9B15E5E281E21FD7720A07FD0BD2D79
+      3C1CF05FDBC4F9286C3E0F5E4B9B3F5BC51CDC726C81B5C18FE7E69B626D3E66
+      ED7C43CE8180B9813C567381EA04F30EA5CFF5F24265B79A1FC0E337A1B35A41
     }
   end
   object ppmTriggers: TPopupMenu
     OnPopup = ppmTriggersPopup
-    left = 528
-    top = 8
+    Left = 528
+    Top = 8
     object miClear: TMenuItem
       Caption = 'Clear'
       OnClick = miClearClick

EvoUMLPlugin/src/itumainform.lfm

@@ -8,11 +8,11 @@ object itMainForm: TitMainForm
   Caption = 'Curio EvoUML Plugin'
   Color = clGradientActiveCaption
   FormStyle = fsSystemStayOnTop
+  OnCreate = FormCreate
   Position = poScreenCenter
   ShowInTaskBar = stNever
   LCLVersion = '2.2.4.0'
   object Timer1: TTimer
-    Interval = 4000
     OnTimer = Timer1Timer
     Left = 16
     Top = 16

EvoUMLPlugin/src/itumainform.pas

@@ -18,8 +18,8 @@ type
 
   TitMainForm = class(TForm)
     Timer1: TTimer;
+    procedure FormCreate(Sender: TObject);
     procedure Timer1Timer(Sender: TObject);
-  private
 
   protected
     procedure Finalize(var Msg: TLMessage); message WM_FINALIZE;
@@ -46,8 +46,8 @@ implementation
 
 {$R *.lfm}
 
-uses Win32Int, Win32Proc, LazUTF8, Windows, ituExplorerV2, ituOQLExplorerV2,
-     DelphiAddInObj, StarUMLintf, IntegracaoDelphiSUML, ActiveX;
+uses Win32Int, Win32Proc, Windows, ActiveX,
+     LazUTF8, DelphiAddInObj, StarUMLintf, IntegracaoDelphiSUML;
 
 procedure CreateAppHandle;
 var
@@ -71,8 +71,12 @@ end;
 
 procedure TitMainForm.Timer1Timer(Sender: TObject);
 begin
+  timer1.Enabled := false;
   itMainForm.Hide;
-  timer1.OnTimer:=nil;
+end;
+
+procedure TitMainForm.FormCreate(Sender: TObject);
+begin
 end;
 
 procedure TitMainForm.Finalize(var Msg: TLMessage);
@@ -97,8 +101,9 @@ end;
 
 procedure TDLLThread.Execute;
 begin
-  CoInitializeEx(nil, COINIT_SPEED_OVER_MEMORY);
+  CoInitialize(nil);
   StarUMLApplication.GetInterface(IID_IStarUMLApplication, gStarUMLApp);
+  Application.ExceptionDialog := aedOkMessageBox;
   Application.Initialize;
   CreateAppHandle;
   Application.CreateForm(TitMainForm, itMainForm);

EvoUMLPlugin/src/uCadastroCasoDeUso.dfm

@@ -8,7 +8,8 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
   ClientHeight = 456
   ClientWidth = 782
   Position = poScreenCenter
-  LCLVersion = '2.0.0.4'
+  ShowInTaskBar = stAlways
+  LCLVersion = '2.2.4.0'
   object pnPrincipal: TPanel
     Left = 0
     Height = 316
@@ -22,9 +23,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
     TabOrder = 0
     object lblNome: TLabel
       Left = 8
-      Height = 14
+      Height = 13
       Top = 88
-      Width = 31
+      Width = 32
       Caption = 'Nome'
       Font.Color = clWindowText
       Font.Height = -11
@@ -35,9 +36,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
     end
     object lblCodigo: TLabel
       Left = 8
-      Height = 14
+      Height = 13
       Top = 6
-      Width = 39
+      Width = 38
       Caption = 'Código'
       Font.Color = clWindowText
       Font.Height = -11
@@ -48,7 +49,7 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
     end
     object lblDescricao: TLabel
       Left = 8
-      Height = 14
+      Height = 13
       Top = 140
       Width = 55
       Caption = 'Descrição'
@@ -61,9 +62,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
     end
     object lblEntidade: TLabel
       Left = 8
-      Height = 14
+      Height = 13
       Top = 251
-      Width = 50
+      Width = 49
       Caption = 'Entidade'
       Font.Color = clWindowText
       Font.Height = -11
@@ -74,9 +75,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
     end
     object lblCategoria: TLabel
       Left = 8
-      Height = 14
+      Height = 13
       Top = 193
-      Width = 56
+      Width = 55
       Caption = 'Categoria'
       Font.Color = clWindowText
       Font.Height = -11
@@ -87,18 +88,18 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
     end
     object lblValorCodigo: TLabel
       Left = 8
-      Height = 19
+      Height = 15
       Top = 24
-      Width = 61
+      Width = 53
       Caption = '<código>'
       Layout = tlCenter
       ParentColor = False
     end
     object Label1: TLabel
       Left = 304
-      Height = 14
+      Height = 13
       Top = 6
-      Width = 65
+      Width = 62
       Caption = 'Operações'
       Font.Color = clWindowText
       Font.Height = -11
@@ -109,9 +110,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
     end
     object Label2: TLabel
       Left = 538
-      Height = 14
+      Height = 13
       Top = 6
-      Width = 56
+      Width = 51
       Caption = 'Sistemas'
       Font.Color = clWindowText
       Font.Height = -11
@@ -122,29 +123,29 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
     end
     object edtNome: TEdit
       Left = 8
-      Height = 31
+      Height = 23
       Top = 103
       Width = 289
       TabOrder = 0
     end
     object cbxEntidade: TComboBox
       Left = 8
-      Height = 37
+      Height = 23
       Top = 270
       Width = 289
       AutoDropDown = True
-      ItemHeight = 0
+      ItemHeight = 15
       Sorted = True
       Style = csDropDownList
       TabOrder = 3
     end
     object cbxCategoria: TComboBox
       Left = 8
-      Height = 37
+      Height = 23
       Top = 212
       Width = 289
       AutoDropDown = True
-      ItemHeight = 0
+      ItemHeight = 15
       Sorted = True
       Style = csDropDownList
       TabOrder = 2
@@ -158,10 +159,13 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
       Checkboxes = True
       Columns = <      
         item
+          AutoSize = True
           Caption = 'Sistemas'
-          Width = 230
+          Width = 10
         end>
+      ParentShowHint = False
       ScrollBars = ssAutoBoth
+      ShowHint = True
       SortType = stText
       TabOrder = 5
     end
@@ -174,16 +178,19 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
       Checkboxes = True
       Columns = <      
         item
+          AutoSize = True
           Caption = 'Operações'
-          Width = 222
+          Width = 10
         end>
+      ParentShowHint = False
       ScrollBars = ssAutoBoth
+      ShowHint = True
       SortType = stText
       TabOrder = 4
     end
     object edtDescricao: TEdit
       Left = 8
-      Height = 31
+      Height = 23
       Top = 155
       Width = 289
       TabOrder = 1
@@ -195,7 +202,7 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
       Width = 71
       Caption = 'Ícone'
       ClientHeight = 70
-      ClientWidth = 69
+      ClientWidth = 67
       TabOrder = 6
       object Label5: TLabel
         Left = 17
@@ -237,7 +244,7 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
     TabOrder = 1
     object Label3: TLabel
       Left = 225
-      Height = 14
+      Height = 13
       Top = 13
       Width = 202
       Caption = 'Destino para criação do caso de uso'
@@ -302,7 +309,7 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
     end
     object edtPackage: TEdit
       Left = 225
-      Height = 29
+      Height = 23
       Top = 29
       Width = 393
       Color = 15461355
@@ -311,16 +318,16 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
     end
     object edtUseCaseName: TEdit
       Left = 8
-      Height = 29
+      Height = 23
       Top = 29
       Width = 198
       TabOrder = 1
     end
     object Label4: TLabel
       Left = 8
-      Height = 14
+      Height = 13
       Top = 13
-      Width = 191
+      Width = 193
       Caption = 'Nome no StarUML (case sensitive)'
       Font.Color = clWindowText
       Font.Height = -11

EvoUMLPlugin/src/uCadastroCasoDeUso.pas

@@ -7,10 +7,10 @@ unit uCadastroCasoDeUso;
 interface
 
 uses
-  LCLIntf, LCLType, LMessages, StarUMLintf,
-  Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  LCLIntf, LCLType, StarUMLintf,
+  SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, ExtCtrls, StdCtrls, ComCtrls, utuMessage, uCadastroCasoDeUsoIcones, acuObject, cxuCadastroCasoDeUso,
-  Buttons, cxuSession;
+  Buttons;
 
 type
 
@@ -79,9 +79,6 @@ uses IntegracaoDelphiSUML;
 
 {$R *.dfm}
 
-type
-  CP1252String = type AnsiString(1252);
-
 constructor TCadastroCasoDeUso.Create(Sender: TComponent; piCadatroCasoDeUso: cxCadatroCasoDeUso; piUseCase: IUMLUseCase);
 begin
   inherited Create(sender);
@@ -114,7 +111,6 @@ begin
   //Retorna do caso de uso os atributos da classe
   FreeAndNil(FContextField);
   FContextField := utField.Create;
-
   lRequestField := utField.Create;
   fcxCadastroCasoDeUso.rmObtemContexto(lRequestField, FContextField);
   SendToInterface(FContextField);
@@ -196,8 +192,7 @@ var lFieldCategorias, lFieldCategoria,
     lMemoryStream: TMemoryStream;
     lListItem: TListItem;
     lIDO: integer;
-    I,T: integer;
-    s: CP1252String;
+    I: integer;
 begin
   inherited;
     //CATEGORIAS
@@ -225,7 +220,6 @@ begin
       while not lEnum.EOL do
       begin
         lFieldEntidade := utField(lEnum.Current);
-        s :=  lFieldEntidade.AttributeByName('nome').AsString;
         cbxEntidade.AddItem(lFieldEntidade.AttributeByName('nome').AsString, lFieldEntidade.AttributeByName('ido'));
         lEnum.MoveNext;
       end;

EvoUMLPlugin/src/uCadastroCasoDeUsoIcones.dfm

@@ -10,7 +10,8 @@ object CadastroCasoDeUsoIcones: TCadastroCasoDeUsoIcones
   Font.Height = -11
   Font.Name = 'Tahoma'
   Position = poScreenCenter
-  LCLVersion = '2.0.0.4'
+  ShowInTaskBar = stAlways
+  LCLVersion = '2.2.4.0'
   object Panel2: TPanel
     Left = 0
     Height = 357
@@ -79,7 +80,7 @@ object CadastroCasoDeUsoIcones: TCadastroCasoDeUsoIcones
     Height = 32
     Scaled = True
     Width = 32
-    left = 440
-    top = 56
+    Left = 440
+    Top = 56
   end
 end

EvoUMLPlugin/src/uCadastroClasse.dfm

@@ -8,7 +8,8 @@ object CadastroClasse: TCadastroClasse
   ClientHeight = 345
   ClientWidth = 504
   Position = poScreenCenter
-  LCLVersion = '2.0.0.4'
+  ShowInTaskBar = stAlways
+  LCLVersion = '2.2.4.0'
   object Panel1: TPanel
     Left = 0
     Height = 345
@@ -37,9 +38,9 @@ object CadastroClasse: TCadastroClasse
         TabOrder = 0
         object Label4: TLabel
           Left = 8
-          Height = 14
+          Height = 13
           Top = 5
-          Width = 153
+          Width = 155
           Caption = 'Nome da classe no StarUML'
           Font.Color = clWindowText
           Font.Height = -11
@@ -50,7 +51,7 @@ object CadastroClasse: TCadastroClasse
         end
         object edtNomeStarUML: TEdit
           Left = 8
-          Height = 29
+          Height = 23
           Top = 21
           Width = 184
           TabOrder = 0
@@ -63,34 +64,34 @@ object CadastroClasse: TCadastroClasse
         Width = 270
         Caption = 'DB Mappings'
         ClientHeight = 83
-        ClientWidth = 268
+        ClientWidth = 266
         TabOrder = 1
         object Label1: TLabel
           Left = 6
-          Height = 19
+          Height = 15
           Top = 14
-          Width = 41
+          Width = 30
           Caption = 'Table:'
           ParentColor = False
         end
         object Label2: TLabel
           Left = 0
-          Height = 19
+          Height = 15
           Top = 47
-          Width = 51
+          Width = 38
           Caption = 'DBIDO:'
           ParentColor = False
         end
         object edtDBTableName: TEdit
           Left = 46
-          Height = 29
+          Height = 23
           Top = 8
           Width = 210
           TabOrder = 0
         end
         object edtDBIDO: TEdit
           Left = 46
-          Height = 29
+          Height = 23
           Top = 41
           Width = 210
           TabOrder = 1
@@ -108,7 +109,7 @@ object CadastroClasse: TCadastroClasse
       TabOrder = 1
       object Label3: TLabel
         Left = 7
-        Height = 14
+        Height = 13
         Top = 8
         Width = 171
         Caption = 'Destino para criação da classe'
@@ -173,7 +174,7 @@ object CadastroClasse: TCadastroClasse
       end
       object edtPackage: TEdit
         Left = 7
-        Height = 29
+        Height = 23
         Top = 23
         Width = 321
         Color = 15461355
@@ -192,9 +193,9 @@ object CadastroClasse: TCadastroClasse
       TabOrder = 0
       object lblNome: TLabel
         Left = 97
-        Height = 14
+        Height = 13
         Top = 13
-        Width = 124
+        Width = 125
         Caption = 'Nome (case sensitive)'
         Font.Color = clWindowText
         Font.Height = -11
@@ -205,17 +206,17 @@ object CadastroClasse: TCadastroClasse
       end
       object lblValorCodigo: TLabel
         Left = 9
-        Height = 19
+        Height = 15
         Top = 32
-        Width = 97
+        Width = 78
         Caption = 'lblValorCodigo'
         ParentColor = False
       end
       object lblCodigo: TLabel
         Left = 9
-        Height = 14
+        Height = 13
         Top = 13
-        Width = 39
+        Width = 38
         Caption = 'Código'
         Font.Color = clWindowText
         Font.Height = -11
@@ -226,7 +227,7 @@ object CadastroClasse: TCadastroClasse
       end
       object edtNome: TEdit
         Left = 96
-        Height = 29
+        Height = 23
         Top = 32
         Width = 390
         OnChange = edtNomeChange

EvoUMLPlugin/src/uDBAttributeParameters.dfm

 object fDBAttributeParameters: TfDBAttributeParameters
-  Left = 2174
+  Left = 100
   Height = 380
   Top = 341
   Width = 348
@@ -14,7 +14,8 @@ object fDBAttributeParameters: TfDBAttributeParameters
   KeyPreview = True
   OnShow = FormShow
   Position = poDesktopCenter
-  LCLVersion = '2.0.2.0'
+  ShowInTaskBar = stAlways
+  LCLVersion = '2.2.4.0'
   object pnlError: TPanel
     Left = 0
     Height = 27