Ajustes layout

EvoUMLPlugin/src/fCodeGen.pas

@@ -14,8 +14,9 @@ uses
 {$ENDIF}
   Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, SynEdit,
   SynHighlighterJava, SynHighlighterPas, SynHighlighterSQL, SynHighlighterMulti,
-  SynHighlighterAny, Dialogs, StdCtrls, ExtCtrls, ComCtrls, acuframework,
-  IntegracaoDelphiSUML, Buttons, utuStateMachine, acuContainers, acuModel;
+  SynHighlighterAny, SynHighlighterCpp, SynHighlighterXML, Dialogs, StdCtrls,
+  ExtCtrls, ComCtrls, acuframework, IntegracaoDelphiSUML, Buttons,
+  utuStateMachine, acuContainers, acuModel;
 
 
 const cServer = 0; cClient = 1;
@@ -26,10 +27,20 @@ type
   { TCodeGen }
 
   TCodeGen = class(TForm)
+    memCode: TSynEdit;
+    memXSDIn: TSynEdit;
+    memXSDOut: TSynEdit;
+    memSQLServer: TSynEdit;
+    memSQLOracle: TSynEdit;
+    memSQLDB2: TSynEdit;
     PageControl1: TPageControl;
+    SynCppSyn1: TSynCppSyn;
     SynFreePascalSyn1: TSynFreePascalSyn;
     SynJavaSyn1: TSynJavaSyn;
     SynSQLSyn1: TSynSQLSyn;
+    SynSQLSyn2: TSynSQLSyn;
+    SynSQLSyn3: TSynSQLSyn;
+    SynXMLSyn1: TSynXMLSyn;
     TabSheet1: TTabSheet;
     Panel3: TPanel;
     Panel2: TPanel;
@@ -42,14 +53,11 @@ type
     TabSheet2: TTabSheet;
     Panel5: TPanel;
     Panel6: TPanel;
-    memCode: TSynEdit;
     TabSheet3: TTabSheet;
     lvXSD: TListView;
     PageControl3: TPageControl;
     TabSheet4: TTabSheet;
     TabSheet5: TTabSheet;
-    memXSDIn: TSynEdit;
-    memXSDOut: TSynEdit;
     TabSheet6: TTabSheet;
     General: TPageControl;
     TabSheet7: TTabSheet;
@@ -75,18 +83,15 @@ type
     Panel7: TPanel;
     Panel8: TPanel;
     SpeedButton4: TSpeedButton;
-    memSQLServer: TSynEdit;
     Panel11: TPanel;
     Panel12: TPanel;
     SpeedButton7: TSpeedButton;
-    memSQLOracle: TSynEdit;
     Panel13: TPanel;
     Label2: TLabel;
     TabSheet11: TTabSheet;
     Panel14: TPanel;
     Panel15: TPanel;
     SpeedButton8: TSpeedButton;
-    memSQLDB2: TSynEdit;
     procedure FormShow(Sender: TObject);
     procedure lvUseCasesChange(Sender: TObject; Item: TListItem;
       Change: TItemChange);
@@ -404,7 +409,7 @@ begin
     cDelphi:
       begin
         FileExtension := '.pas';
-//        memCode.Highlighter := hlPascal;
+        memCode.Highlighter := SynFreePascalSyn1;
         case rdgType.ItemIndex of
           cServer: result := Util.GerarUseCaseServerPreview_Pascal;
           cClient: result := nil;
@@ -414,7 +419,7 @@ begin
     cJava:
       begin
         FileExtension := '.java';
-//        memCode.Highlighter := hlJava;
+        memCode.Highlighter := SynJavaSyn1;
         case rdgType.ItemIndex of
           cServer: result := nil;
           cClient: result := Util.GerarUseCaseClientPreview_Java;
@@ -423,7 +428,7 @@ begin
     cCCharp:
     begin
       FileExtension := '.cs';
-//      memCode.Highlighter := hlCSharp;
+      memCode.Highlighter := SynCppSyn1;
       case rdgType.ItemIndex of
         cServer: result := nil;
         cClient: result := Util.GerarUseCaseClientPreview_DotNet;

EvoUMLPlugin/src/formMemo.dfm

@@ -1123,7 +1123,7 @@ object PreviewClassCode: TPreviewClassCode
               Gutter.MouseActions = <>
               RightGutter.Width = 0
               RightGutter.MouseActions = <>
-              Highlighter = SynFreePascalSyn1
+              Highlighter = SynCppSyn1
               Keystrokes = <              
                 item
                   Command = ecUp
@@ -2170,7 +2170,7 @@ object PreviewClassCode: TPreviewClassCode
                   Gutter.MouseActions = <>
                   RightGutter.Width = 0
                   RightGutter.MouseActions = <>
-                  Highlighter = SynSQLSyn1
+                  Highlighter = SynSQLSyn2
                   Keystrokes = <                  
                     item
                       Command = ecUp
@@ -2684,8 +2684,21 @@ object PreviewClassCode: TPreviewClassCode
   object SynSQLSyn1: TSynSQLSyn
     DefaultFilter = 'SQL Files (*.sql)|*.sql'
     Enabled = False
-    SQLDialect = sqlSybase
+    SQLDialect = sqlMSSQL2K
     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
+  end
+  object SynSQLSyn2: TSynSQLSyn
+    DefaultFilter = 'SQL Files (*.sql)|*.sql'
+    Enabled = False
+    SQLDialect = sqlOracle
+    left = 589
+    top = 85
+  end
 end

EvoUMLPlugin/src/formMemo.pas

@@ -5,7 +5,7 @@ interface
 uses
   Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs,
   StdCtrls, ExtCtrls, ComCtrls, SynEdit, SynHighlighterPas, SynHighlighterJava,
-  SynHighlighterSQL;
+  SynHighlighterSQL, SynHighlighterCpp;
 
 type
 
@@ -21,9 +21,11 @@ type
     mem_ClassCSharp: TSynEdit;
     mem_ClassSQL: TSynEdit;
     mem_ClassOracle: TSynEdit;
+    SynCppSyn1: TSynCppSyn;
     SynFreePascalSyn1: TSynFreePascalSyn;
     SynJavaSyn1: TSynJavaSyn;
     SynSQLSyn1: TSynSQLSyn;
+    SynSQLSyn2: TSynSQLSyn;
     TabSheet1: TTabSheet;
     pgc_ClassCode: TPageControl;
     TabSheet3: TTabSheet;

EvoUMLPlugin/src/ituOQLExplorerV2.pas

@@ -14,13 +14,16 @@ uses
 {$ENDIF}
   Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, ExtCtrls, StdCtrls, utuOQL, Menus, ComCtrls, Buttons, ActnList, ituExplorerV2, ImgList,
-  ituDataBaseLogin, ToolWin;
+  ituDataBaseLogin, ToolWin, SynHighlighterPas, SynEdit;
 
 type
 
   { TOQLExplorerV2 }
 
   TOQLExplorerV2 = class(TForm)
+    abCXOQL: TAction;
+    abExportPAS: TAction;
+    acttbOQL: TAction;
     aExportPas: TAction;
     aSaveFile: TAction;
     aLoadFile: TAction;
@@ -30,6 +33,9 @@ type
     ActionList1: TActionList;
     ilCXOQL: TImageList;
     pcCXOQL: TPageControl;
+    SelectUnitDirectory: TSelectDirectoryDialog;
+    memUnit: TSynEdit;
+    SynFreePascalSyn1: TSynFreePascalSyn;
     ToolBar1: TToolBar;
     ToolBar2: TToolBar;
     ToolButton1: TToolButton;
@@ -56,8 +62,6 @@ type
     pnlPASUnit: TPanel;
     OpenDialog1: TOpenDialog;
     SaveDialog1: TSaveDialog;
-    SaveUnit: TSaveDialog;
-    memUnit: TMemo;
     pnlList: TPanel;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure aNewOQLExecute(Sender: TObject);
@@ -144,13 +148,6 @@ begin
       Screen.Cursor := crDefault;
     end;
     pcCXOQL.ActivePage := tsPASUnit;
-    if SaveUnit.Execute then
-    begin
-      lFileName := SaveUnit.FileName;
-      if pos('.pas', lFileName) = 0 then
-        lFileName := lFileName + '.pas';
-      memUnit.Lines.SaveToFile(lFileName);
-    end
   end;
 end;
 
@@ -164,6 +161,7 @@ function TOQLExplorerV2.GerarUnitOQL(piXMLFileName: String): string;
 
 var
   lUnit: TStringStream;
+  lUnitFile: TFileStream;
   lFieldOQLFile, lFieldOQL: utField;
   lAux: TStringList;
   lOQLName, lOQLQuery: string;
@@ -407,7 +405,7 @@ begin
           AddText(lUnit, 2, 'result := T' + lOQLName + '.Create(pisessao,');
 
           lOQLQuery := StringReplace(lOQLQuery, '''', '''''', [rfReplaceAll]);
-          lOQLQuery := StringReplace(lOQLQuery, #13#10, ''' + #13#10 +' + #13#10 + '''', [rfReplaceAll]);
+          lOQLQuery := StringReplace(lOQLQuery, sLineBreak, ''' + sLineBreak +' + sLineBreak + '''', [rfReplaceAll]);
 
           AddText(lUnit, 0, '''' + lOQLQuery + ''');');
           AddText(lUnit, 0, 'end;');
@@ -423,6 +421,21 @@ begin
       AddText(lUnit, 0, 'end.');
 
       result := lUnit.DataString;
+
+      lFileName := 'utu' + lFileName + '.pas';
+      SelectUnitDirectory.FileName := lFileName;
+
+      if SelectUnitDirectory.Execute then
+      begin
+        try
+          lUnitFile := TFileStream.Create(SelectUnitDirectory.FileName + DirectorySeparator + lFileName, fmCreate);
+          lUnit.Position := 0;
+          lUnitFile.CopyFrom(lUnit, lUnit.Size);
+        finally
+          lUnitFile.Free;
+        end;
+      end
+
     finally
       lFieldOQLFile.free;
     end;