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.dfm

 object OQLExplorerV2: TOQLExplorerV2
-  Left = 2177
+  Left = 2453
   Height = 552
-  Top = 281
+  Top = 431
   Width = 1090
   Caption = 'Curio OQL Explorer'
   ClientHeight = 552
@@ -11759,23 +11759,519 @@ object OQLExplorerV2: TOQLExplorerV2
       ImageIndex = 1
       object pnlPASUnit: TPanel
         Left = 0
-        Height = 497
+        Height = 489
         Top = 0
-        Width = 1082
+        Width = 1080
         Align = alClient
         BevelOuter = bvNone
-        ClientHeight = 497
-        ClientWidth = 1082
+        ClientHeight = 489
+        ClientWidth = 1080
         ParentBackground = False
         TabOrder = 0
-        object memUnit: TMemo
+        inline memUnit: TSynEdit
           Left = 0
-          Height = 497
+          Height = 489
           Top = 0
-          Width = 1082
+          Width = 1080
           Align = alClient
-          ScrollBars = ssBoth
+          Color = clWindow
+          Font.Color = clWindowText
+          Font.Height = 13
+          Font.Name = 'DejaVu Sans Mono'
+          Font.Pitch = fpFixed
+          Font.Quality = fqNonAntialiased
+          ParentColor = False
+          ParentFont = False
           TabOrder = 0
+          Gutter.Width = 57
+          Gutter.MouseActions = <>
+          RightGutter.Width = 0
+          RightGutter.MouseActions = <>
+          Highlighter = SynFreePascalSyn1
+          Keystrokes = <          
+            item
+              Command = ecUp
+              ShortCut = 38
+            end          
+            item
+              Command = ecSelUp
+              ShortCut = 8230
+            end          
+            item
+              Command = ecScrollUp
+              ShortCut = 16422
+            end          
+            item
+              Command = ecDown
+              ShortCut = 40
+            end          
+            item
+              Command = ecSelDown
+              ShortCut = 8232
+            end          
+            item
+              Command = ecScrollDown
+              ShortCut = 16424
+            end          
+            item
+              Command = ecLeft
+              ShortCut = 37
+            end          
+            item
+              Command = ecSelLeft
+              ShortCut = 8229
+            end          
+            item
+              Command = ecWordLeft
+              ShortCut = 16421
+            end          
+            item
+              Command = ecSelWordLeft
+              ShortCut = 24613
+            end          
+            item
+              Command = ecRight
+              ShortCut = 39
+            end          
+            item
+              Command = ecSelRight
+              ShortCut = 8231
+            end          
+            item
+              Command = ecWordRight
+              ShortCut = 16423
+            end          
+            item
+              Command = ecSelWordRight
+              ShortCut = 24615
+            end          
+            item
+              Command = ecPageDown
+              ShortCut = 34
+            end          
+            item
+              Command = ecSelPageDown
+              ShortCut = 8226
+            end          
+            item
+              Command = ecPageBottom
+              ShortCut = 16418
+            end          
+            item
+              Command = ecSelPageBottom
+              ShortCut = 24610
+            end          
+            item
+              Command = ecPageUp
+              ShortCut = 33
+            end          
+            item
+              Command = ecSelPageUp
+              ShortCut = 8225
+            end          
+            item
+              Command = ecPageTop
+              ShortCut = 16417
+            end          
+            item
+              Command = ecSelPageTop
+              ShortCut = 24609
+            end          
+            item
+              Command = ecLineStart
+              ShortCut = 36
+            end          
+            item
+              Command = ecSelLineStart
+              ShortCut = 8228
+            end          
+            item
+              Command = ecEditorTop
+              ShortCut = 16420
+            end          
+            item
+              Command = ecSelEditorTop
+              ShortCut = 24612
+            end          
+            item
+              Command = ecLineEnd
+              ShortCut = 35
+            end          
+            item
+              Command = ecSelLineEnd
+              ShortCut = 8227
+            end          
+            item
+              Command = ecEditorBottom
+              ShortCut = 16419
+            end          
+            item
+              Command = ecSelEditorBottom
+              ShortCut = 24611
+            end          
+            item
+              Command = ecToggleMode
+              ShortCut = 45
+            end          
+            item
+              Command = ecCopy
+              ShortCut = 16429
+            end          
+            item
+              Command = ecPaste
+              ShortCut = 8237
+            end          
+            item
+              Command = ecDeleteChar
+              ShortCut = 46
+            end          
+            item
+              Command = ecCut
+              ShortCut = 8238
+            end          
+            item
+              Command = ecDeleteLastChar
+              ShortCut = 8
+            end          
+            item
+              Command = ecDeleteLastChar
+              ShortCut = 8200
+            end          
+            item
+              Command = ecDeleteLastWord
+              ShortCut = 16392
+            end          
+            item
+              Command = ecUndo
+              ShortCut = 32776
+            end          
+            item
+              Command = ecRedo
+              ShortCut = 40968
+            end          
+            item
+              Command = ecLineBreak
+              ShortCut = 13
+            end          
+            item
+              Command = ecSelectAll
+              ShortCut = 16449
+            end          
+            item
+              Command = ecCopy
+              ShortCut = 16451
+            end          
+            item
+              Command = ecBlockIndent
+              ShortCut = 24649
+            end          
+            item
+              Command = ecLineBreak
+              ShortCut = 16461
+            end          
+            item
+              Command = ecInsertLine
+              ShortCut = 16462
+            end          
+            item
+              Command = ecDeleteWord
+              ShortCut = 16468
+            end          
+            item
+              Command = ecBlockUnindent
+              ShortCut = 24661
+            end          
+            item
+              Command = ecPaste
+              ShortCut = 16470
+            end          
+            item
+              Command = ecCut
+              ShortCut = 16472
+            end          
+            item
+              Command = ecDeleteLine
+              ShortCut = 16473
+            end          
+            item
+              Command = ecDeleteEOL
+              ShortCut = 24665
+            end          
+            item
+              Command = ecUndo
+              ShortCut = 16474
+            end          
+            item
+              Command = ecRedo
+              ShortCut = 24666
+            end          
+            item
+              Command = ecGotoMarker0
+              ShortCut = 16432
+            end          
+            item
+              Command = ecGotoMarker1
+              ShortCut = 16433
+            end          
+            item
+              Command = ecGotoMarker2
+              ShortCut = 16434
+            end          
+            item
+              Command = ecGotoMarker3
+              ShortCut = 16435
+            end          
+            item
+              Command = ecGotoMarker4
+              ShortCut = 16436
+            end          
+            item
+              Command = ecGotoMarker5
+              ShortCut = 16437
+            end          
+            item
+              Command = ecGotoMarker6
+              ShortCut = 16438
+            end          
+            item
+              Command = ecGotoMarker7
+              ShortCut = 16439
+            end          
+            item
+              Command = ecGotoMarker8
+              ShortCut = 16440
+            end          
+            item
+              Command = ecGotoMarker9
+              ShortCut = 16441
+            end          
+            item
+              Command = ecSetMarker0
+              ShortCut = 24624
+            end          
+            item
+              Command = ecSetMarker1
+              ShortCut = 24625
+            end          
+            item
+              Command = ecSetMarker2
+              ShortCut = 24626
+            end          
+            item
+              Command = ecSetMarker3
+              ShortCut = 24627
+            end          
+            item
+              Command = ecSetMarker4
+              ShortCut = 24628
+            end          
+            item
+              Command = ecSetMarker5
+              ShortCut = 24629
+            end          
+            item
+              Command = ecSetMarker6
+              ShortCut = 24630
+            end          
+            item
+              Command = ecSetMarker7
+              ShortCut = 24631
+            end          
+            item
+              Command = ecSetMarker8
+              ShortCut = 24632
+            end          
+            item
+              Command = ecSetMarker9
+              ShortCut = 24633
+            end          
+            item
+              Command = EcFoldLevel1
+              ShortCut = 41009
+            end          
+            item
+              Command = EcFoldLevel2
+              ShortCut = 41010
+            end          
+            item
+              Command = EcFoldLevel3
+              ShortCut = 41011
+            end          
+            item
+              Command = EcFoldLevel4
+              ShortCut = 41012
+            end          
+            item
+              Command = EcFoldLevel5
+              ShortCut = 41013
+            end          
+            item
+              Command = EcFoldLevel6
+              ShortCut = 41014
+            end          
+            item
+              Command = EcFoldLevel7
+              ShortCut = 41015
+            end          
+            item
+              Command = EcFoldLevel8
+              ShortCut = 41016
+            end          
+            item
+              Command = EcFoldLevel9
+              ShortCut = 41017
+            end          
+            item
+              Command = EcFoldLevel0
+              ShortCut = 41008
+            end          
+            item
+              Command = EcFoldCurrent
+              ShortCut = 41005
+            end          
+            item
+              Command = EcUnFoldCurrent
+              ShortCut = 41003
+            end          
+            item
+              Command = EcToggleMarkupWord
+              ShortCut = 32845
+            end          
+            item
+              Command = ecNormalSelect
+              ShortCut = 24654
+            end          
+            item
+              Command = ecColumnSelect
+              ShortCut = 24643
+            end          
+            item
+              Command = ecLineSelect
+              ShortCut = 24652
+            end          
+            item
+              Command = ecTab
+              ShortCut = 9
+            end          
+            item
+              Command = ecShiftTab
+              ShortCut = 8201
+            end          
+            item
+              Command = ecMatchBracket
+              ShortCut = 24642
+            end          
+            item
+              Command = ecColSelUp
+              ShortCut = 40998
+            end          
+            item
+              Command = ecColSelDown
+              ShortCut = 41000
+            end          
+            item
+              Command = ecColSelLeft
+              ShortCut = 40997
+            end          
+            item
+              Command = ecColSelRight
+              ShortCut = 40999
+            end          
+            item
+              Command = ecColSelPageDown
+              ShortCut = 40994
+            end          
+            item
+              Command = ecColSelPageBottom
+              ShortCut = 57378
+            end          
+            item
+              Command = ecColSelPageUp
+              ShortCut = 40993
+            end          
+            item
+              Command = ecColSelPageTop
+              ShortCut = 57377
+            end          
+            item
+              Command = ecColSelLineStart
+              ShortCut = 40996
+            end          
+            item
+              Command = ecColSelLineEnd
+              ShortCut = 40995
+            end          
+            item
+              Command = ecColSelEditorTop
+              ShortCut = 57380
+            end          
+            item
+              Command = ecColSelEditorBottom
+              ShortCut = 57379
+            end>
+          MouseActions = <>
+          MouseTextActions = <>
+          MouseSelActions = <>
+          Lines.Strings = (
+            ''
+          )
+          VisibleSpecialChars = [vscSpace, vscTabAtLast]
+          ReadOnly = True
+          RightEdge = 0
+          ScrollBars = ssAutoBoth
+          SelectedColor.BackPriority = 50
+          SelectedColor.ForePriority = 50
+          SelectedColor.FramePriority = 50
+          SelectedColor.BoldPriority = 50
+          SelectedColor.ItalicPriority = 50
+          SelectedColor.UnderlinePriority = 50
+          SelectedColor.StrikeOutPriority = 50
+          BracketHighlightStyle = sbhsBoth
+          BracketMatchColor.Background = clNone
+          BracketMatchColor.Foreground = clNone
+          BracketMatchColor.Style = [fsBold]
+          FoldedCodeColor.Background = clNone
+          FoldedCodeColor.Foreground = clGray
+          FoldedCodeColor.FrameColor = clGray
+          MouseLinkColor.Background = clNone
+          MouseLinkColor.Foreground = clBlue
+          LineHighlightColor.Background = clNone
+          LineHighlightColor.Foreground = clNone
+          inline SynLeftGutterPartList1: TSynGutterPartList
+            object SynGutterMarks1: TSynGutterMarks
+              Width = 24
+              MouseActions = <>
+            end
+            object SynGutterLineNumber1: TSynGutterLineNumber
+              Width = 17
+              MouseActions = <>
+              MarkupInfo.Background = clBtnFace
+              MarkupInfo.Foreground = clNone
+              DigitCount = 2
+              ShowOnlyLineNumbersMultiplesOf = 1
+              ZeroStart = False
+              LeadingZeros = False
+            end
+            object SynGutterChanges1: TSynGutterChanges
+              Width = 4
+              MouseActions = <>
+              ModifiedColor = 59900
+              SavedColor = clGreen
+            end
+            object SynGutterSeparator1: TSynGutterSeparator
+              Width = 2
+              MouseActions = <>
+              MarkupInfo.Background = clWhite
+              MarkupInfo.Foreground = clGray
+            end
+            object SynGutterCodeFolding1: TSynGutterCodeFolding
+              MouseActions = <>
+              MarkupInfo.Background = clNone
+              MarkupInfo.Foreground = clGray
+              MouseActionsExpanded = <>
+              MouseActionsCollapsed = <>
+            end
+          end
         end
       end
     end
@@ -12735,10 +13231,6 @@ object OQLExplorerV2: TOQLExplorerV2
     Filter = 'cxoql|*.cxoql'
     left = 688
   end
-  object SaveUnit: TSaveDialog
-    Filter = 'pas|*.pas'
-    left = 616
-  end
   object ActionList1: TActionList
     left = 926
     top = 6
@@ -12773,4 +13265,14 @@ object OQLExplorerV2: TOQLExplorerV2
       OnExecute = aExportPASExecute
     end
   end
+  object SelectUnitDirectory: TSelectDirectoryDialog
+    left = 561
+  end
+  object SynFreePascalSyn1: TSynFreePascalSyn
+    Enabled = False
+    CompilerMode = pcmObjFPC
+    NestedComments = True
+    left = 1002
+    top = 12
+  end
 end

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;