Commit af71990f authored by Sandro Camata Santana's avatar Sandro Camata Santana

Ajustes de cor e posicionamento de janelas. Ajuste na janela gerar RegisterModelMappings

parent f589c165
...@@ -4613,7 +4613,7 @@ begin ...@@ -4613,7 +4613,7 @@ begin
lInstantCodeProperty.Name := lRelation.DestinationPropertyName; lInstantCodeProperty.Name := lRelation.DestinationPropertyName;
lInstantCodeProperty.TypeName := 'acRelationPartnerShip'; lInstantCodeProperty.TypeName := 'acRelationPartnerShip';
end; end;
lInstantCodeProperty.Index := IntToStr(lRelation.DestinationPropertyIndex); lInstantCodeProperty.Index := piClassTicket.PersistentObjectClassName + '_' + lRelation.DestinationPropertyName;
end; end;
end; end;
for li := 0 to piClassTicket.RelationTicketsOut.Count - 1 do for li := 0 to piClassTicket.RelationTicketsOut.Count - 1 do
...@@ -4634,16 +4634,16 @@ begin ...@@ -4634,16 +4634,16 @@ begin
end end
else else
begin begin
lInstantCodeField := piInstantCodeClass.AddField(viPrivate); // lInstantCodeField := piInstantCodeClass.AddField(viPrivate);
lInstantCodeField.TypeName := 'acRelationPartnerShip'; // lInstantCodeField.TypeName := 'acRelationPartnerShip';
lInstantCodeField.Name := 'f'+lRelation.OriginPropertyName; // lInstantCodeField.Name := 'f'+lRelation.OriginPropertyName;
lInstantCodeProperty := piInstantCodeClass.AddProperty(viPublished); lInstantCodeProperty := piInstantCodeClass.AddProperty(viPublished);
lInstantCodeProperty.GetterName := 'getPartnerShip'; lInstantCodeProperty.GetterName := 'getPartnerShip';
lInstantCodeProperty.Name := lRelation.OriginPropertyName; lInstantCodeProperty.Name := lRelation.OriginPropertyName;
lInstantCodeProperty.TypeName := 'acRelationPartnerShip'; lInstantCodeProperty.TypeName := 'acRelationPartnerShip';
end; end;
lInstantCodeProperty.Index := IntToStr(lRelation.OriginPropertyindex); lInstantCodeProperty.Index := piClassTicket.PersistentObjectClassName + '_' + lRelation.OriginPropertyName;
end; end;
end; end;
// piClassTicket := piClassTicket.ParentClassTicket; // piClassTicket := piClassTicket.ParentClassTicket;
...@@ -5019,12 +5019,12 @@ begin ...@@ -5019,12 +5019,12 @@ begin
else else
begin begin
if not SameText(piClass.GetGeneralizationAt(0).Parent.Name, cBASE_PERSISTENT_OBJECT_CLASS) then if not SameText(piClass.GetGeneralizationAt(0).Parent.Name, cBASE_PERSISTENT_OBJECT_CLASS) then
lInstantCodeModule.InterfaceSection.AddUses.Name := 'acuframework, ' + lInstantCodeModule.InterfaceSection.AddUses.Name := 'acuframework, acuRegisterModelMappings, ' +
Copy(piClass.GetGeneralizationAt(0).Parent.Name, 1, 2) + 'u' + Copy(piClass.GetGeneralizationAt(0).Parent.Name, 1, 2) + 'u' +
Copy(piClass.GetGeneralizationAt(0).Parent.Name, 3, Copy(piClass.GetGeneralizationAt(0).Parent.Name, 3,
Length(piClass.GetGeneralizationAt(0).Parent.Name)-2) Length(piClass.GetGeneralizationAt(0).Parent.Name)-2)
else else
lInstantCodeModule.InterfaceSection.AddUses.Name := 'acuframework'; lInstantCodeModule.InterfaceSection.AddUses.Name := 'acuframework, acuRegisterModelMappings';
lInstantCodeClass := lInstantCodeModule.InterfaceSection.AddClass(lInstantCodeClass); lInstantCodeClass := lInstantCodeModule.InterfaceSection.AddClass(lInstantCodeClass);
lInstantCodeClass.Name := lsNomeClasse; lInstantCodeClass.Name := lsNomeClasse;
...@@ -5052,7 +5052,7 @@ begin ...@@ -5052,7 +5052,7 @@ begin
// end; // end;
lInstantCodeProperty := lInstantCodeClass.AddProperty(viPublished); lInstantCodeProperty := lInstantCodeClass.AddProperty(viPublished);
lInstantCodeProperty.Index := IntToStr(lAttributeTicket.AttributeIndex); lInstantCodeProperty.Index := lClassTicket.PersistentObjectClassName + '_' + lsAtributo;
lInstantCodeProperty.GetterName := 'get'+copy(lAttributeTicket.AttributeType,3,Length(lAttributeTicket.AttributeType) - 2); lInstantCodeProperty.GetterName := 'get'+copy(lAttributeTicket.AttributeType,3,Length(lAttributeTicket.AttributeType) - 2);
lInstantCodeProperty.Name := lsAtributo; lInstantCodeProperty.Name := lsAtributo;
lInstantCodeProperty.TypeName := lsTipoAttribute; lInstantCodeProperty.TypeName := lsTipoAttribute;
...@@ -5080,7 +5080,7 @@ begin ...@@ -5080,7 +5080,7 @@ begin
GerarRelationsPartnerShips(lClassTicket, lInstantCodeClass); GerarRelationsPartnerShips(lClassTicket, lInstantCodeClass);
lInstantCodeModule.ImplementationSection.Clear; lInstantCodeModule.ImplementationSection.Clear;
lInstantCodeModule.ImplementationSection.AddUses.Name := 'acuObject;'; lInstantCodeModule.ImplementationSection.AddUses.Name := 'acuObject';
lInstantCodeModule.InitializationSection.CodeText := ' PersistenceManager.RegisterClass(TypeOf('+lsNomeClasse+'));'; lInstantCodeModule.InitializationSection.CodeText := ' PersistenceManager.RegisterClass(TypeOf('+lsNomeClasse+'));';
result := lInstantCodeModule.AsString; result := lInstantCodeModule.AsString;
......
...@@ -12,7 +12,7 @@ object CodeGen: TCodeGen ...@@ -12,7 +12,7 @@ object CodeGen: TCodeGen
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
KeyPreview = True KeyPreview = True
OnShow = FormShow OnShow = FormShow
Position = poDesktopCenter Position = poScreenCenter
LCLVersion = '2.0.2.0' LCLVersion = '2.0.2.0'
object PageControl1: TPageControl object PageControl1: TPageControl
Left = 0 Left = 0
...@@ -287,9 +287,15 @@ object CodeGen: TCodeGen ...@@ -287,9 +287,15 @@ object CodeGen: TCodeGen
Top = 22 Top = 22
Width = 587 Width = 587
Align = alClient Align = alClient
Font.Height = -13
Font.Name = 'Courier New'
Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased
ParentColor = False
ParentFont = False
TabOrder = 1 TabOrder = 1
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 29 Gutter.Width = 33
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -753,7 +759,7 @@ object CodeGen: TCodeGen ...@@ -753,7 +759,7 @@ object CodeGen: TCodeGen
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 23 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
...@@ -847,9 +853,15 @@ object CodeGen: TCodeGen ...@@ -847,9 +853,15 @@ object CodeGen: TCodeGen
Top = 0 Top = 0
Width = 583 Width = 583
Align = alClient Align = alClient
Font.Height = -13
Font.Name = 'Courier New'
Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased
ParentColor = False
ParentFont = False
TabOrder = 0 TabOrder = 0
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 29 Gutter.Width = 33
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -1313,7 +1325,7 @@ object CodeGen: TCodeGen ...@@ -1313,7 +1325,7 @@ object CodeGen: TCodeGen
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 23 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
...@@ -1356,9 +1368,15 @@ object CodeGen: TCodeGen ...@@ -1356,9 +1368,15 @@ object CodeGen: TCodeGen
Top = 0 Top = 0
Width = 583 Width = 583
Align = alClient Align = alClient
Font.Height = -13
Font.Name = 'Courier New'
Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased
ParentColor = False
ParentFont = False
TabOrder = 0 TabOrder = 0
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 29 Gutter.Width = 33
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -1822,7 +1840,7 @@ object CodeGen: TCodeGen ...@@ -1822,7 +1840,7 @@ object CodeGen: TCodeGen
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 23 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
...@@ -2346,9 +2364,15 @@ object CodeGen: TCodeGen ...@@ -2346,9 +2364,15 @@ object CodeGen: TCodeGen
Top = 41 Top = 41
Width = 871 Width = 871
Align = alClient Align = alClient
Font.Height = -13
Font.Name = 'Courier New'
Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased
ParentColor = False
ParentFont = False
TabOrder = 1 TabOrder = 1
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 29 Gutter.Width = 33
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -2812,7 +2836,7 @@ object CodeGen: TCodeGen ...@@ -2812,7 +2836,7 @@ object CodeGen: TCodeGen
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 23 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
......
object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions
Left = 640 Left = 2084
Height = 496 Height = 515
Top = 251 Top = 331
Width = 376 Width = 376
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Model Mappings options' Caption = 'Model Mappings options'
ClientHeight = 496 ClientHeight = 515
ClientWidth = 376 ClientWidth = 376
Color = clBtnFace Color = clBtnFace
OnDestroy = FormDestroy OnDestroy = FormDestroy
OnShow = FormShow OnShow = FormShow
ParentFont = True ParentFont = True
Position = poDesktopCenter Position = poScreenCenter
LCLVersion = '2.0.2.0'
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 56 Height = 56
Top = 440 Top = 459
Width = 376 Width = 376
Align = alBottom Align = alBottom
ClientHeight = 56 ClientHeight = 56
...@@ -98,9 +99,9 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions ...@@ -98,9 +99,9 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions
end end
object ckbDefault: TCheckBox object ckbDefault: TCheckBox
Left = 7 Left = 7
Height = 18 Height = 19
Top = 3 Top = 3
Width = 66 Width = 58
Caption = 'Default' Caption = 'Default'
Checked = True Checked = True
State = cbChecked State = cbChecked
...@@ -109,18 +110,18 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions ...@@ -109,18 +110,18 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions
end end
object Panel2: TPanel object Panel2: TPanel
Left = 0 Left = 0
Height = 440 Height = 459
Top = 0 Top = 0
Width = 376 Width = 376
Align = alClient Align = alClient
ClientHeight = 440 ClientHeight = 459
ClientWidth = 376 ClientWidth = 376
TabOrder = 1 TabOrder = 1
object Label1: TLabel object Label1: TLabel
Left = 8 Left = 8
Height = 16 Height = 15
Top = 8 Top = 8
Width = 108 Width = 91
Caption = 'Output directory:' Caption = 'Output directory:'
ParentColor = False ParentColor = False
end end
...@@ -162,17 +163,17 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions ...@@ -162,17 +163,17 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions
end end
object GroupBox1: TGroupBox object GroupBox1: TGroupBox
Left = 8 Left = 8
Height = 56 Height = 80
Top = 248 Top = 240
Width = 360 Width = 360
Caption = 'Output file name' Caption = 'Output file name'
ClientHeight = 33 ClientHeight = 60
ClientWidth = 352 ClientWidth = 356
TabOrder = 2 TabOrder = 2
object lblFileExists: TLabel object lblFileExists: TLabel
Left = 13 Left = 8
Height = 13 Height = 14
Top = 43 Top = 34
Width = 194 Width = 194
Caption = 'File already exists at specified directory.' Caption = 'File already exists at specified directory.'
Font.CharSet = ANSI_CHARSET Font.CharSet = ANSI_CHARSET
...@@ -184,7 +185,7 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions ...@@ -184,7 +185,7 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions
end end
object edtFileName: TEdit object edtFileName: TEdit
Left = 6 Left = 6
Height = 15 Height = 23
Top = 8 Top = 8
Width = 338 Width = 338
OnChange = edtFileNameChange OnChange = edtFileNameChange
...@@ -194,17 +195,17 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions ...@@ -194,17 +195,17 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions
object GroupBox2: TGroupBox object GroupBox2: TGroupBox
Left = 8 Left = 8
Height = 56 Height = 56
Top = 312 Top = 326
Width = 360 Width = 360
Caption = 'Options' Caption = 'Options'
ClientHeight = 33 ClientHeight = 36
ClientWidth = 352 ClientWidth = 356
TabOrder = 0 TabOrder = 0
object ckbIgnoreXSD: TCheckBox object ckbIgnoreXSD: TCheckBox
Left = 8 Left = 8
Height = 18 Height = 19
Top = 8 Top = 8
Width = 142 Width = 122
Caption = 'Ignore XSD schema' Caption = 'Ignore XSD schema'
TabOrder = 0 TabOrder = 0
end end
...@@ -212,34 +213,37 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions ...@@ -212,34 +213,37 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions
object GroupBox3: TGroupBox object GroupBox3: TGroupBox
Left = 8 Left = 8
Height = 56 Height = 56
Top = 376 Top = 393
Width = 360 Width = 360
Caption = 'Target Code Laguage' Caption = 'Target Code Laguage'
ClientHeight = 33 ClientHeight = 36
ClientWidth = 352 ClientWidth = 356
TabOrder = 1 TabOrder = 1
object rdObjectPascal: TRadioButton object rdObjectPascal: TRadioButton
Left = 8 Left = 8
Height = 18 Height = 19
Top = 8 Top = 8
Width = 104 Width = 91
Caption = 'Object Pascal' Caption = 'Object Pascal'
OnClick = rdLanguageClick
TabOrder = 0 TabOrder = 0
end end
object rdCSharp: TRadioButton object rdCSharp: TRadioButton
Left = 160 Left = 160
Height = 18 Height = 19
Top = 8 Top = 8
Width = 38 Width = 35
Caption = 'C#' Caption = 'C#'
OnClick = rdLanguageClick
TabOrder = 1 TabOrder = 1
end end
object rdJava: TRadioButton object rdJava: TRadioButton
Left = 272 Left = 272
Height = 18 Height = 19
Top = 8 Top = 8
Width = 46 Width = 42
Caption = 'Java' Caption = 'Java'
OnClick = rdLanguageClick
TabOrder = 2 TabOrder = 2
end end
end end
...@@ -251,8 +255,10 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions ...@@ -251,8 +255,10 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions
BorderWidth = 1 BorderWidth = 1
ExpandSignType = tvestPlusMinus ExpandSignType = tvestPlusMinus
FileSortType = fstNone FileSortType = fstNone
Images = ImageList1
ReadOnly = True ReadOnly = True
TabOrder = 3 TabOrder = 3
OnGetImageIndex = dlbDirectoryGetImageIndex
Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw] Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
ObjectTypes = [otFolders] ObjectTypes = [otFolders]
end end
...@@ -262,4 +268,53 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions ...@@ -262,4 +268,53 @@ object ModelMappingsGenerationOptions: TModelMappingsGenerationOptions
left = 184 left = 184
top = 24 top = 24
end end
object ImageList1: TImageList
left = 255
top = 15
Bitmap = {
4C69010000001000000010000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000002230383802355455003555550035
555500345455212F383800000000000000000000000000000000000000000000
0000000000000000000000000000000000002777A8AA02A1FFFF00A0FFFF00A0
FFFF009FFFFF43A5E0E3212F3838000000000000000000000000000000000000
000000000000000000000000000000000000006BAAAA00A0FFFF00A0FFFF00A0
FFFF00A0FFFF00A0FFFF00A0FFFF00A0FFFF00A0FFFF00A0FFFF00A0FFFF06A2
FFFF77CBFDFF000000000000000000000000006BAAAA00A0FFFF00A0FFFF00A1
FFFF02A2FFFF02A2FFFF02A2FFFF02A2FFFF02A2FFFF02A2FFFF02A2FFFF02A2
FFFF2DB1FDFF000000000000000000000000006BAAAA00A0FFFF04A4FFFF23C6
FFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CA
FFFF28CAFFFF59D4FDFF374D545500000000006BAAAA00A0FFFF0DAEFFFF28CA
FFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CA
FFFF28CAFFFF3BCFFEFF2047545500000000006BAAAA00A0FFFF15B7FFFF28CA
FFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CA
FFFF28CAFFFF4DD3FFFF324C545500000000006BAAAA01A1FFFF1BBDFFFF28CA
FFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CA
FFFF28CAFFFF5DD7FFFF4350545500000000006BAAAA04A5FFFF1FC1FFFF28CA
FFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CA
FFFF28CAFFFF2288A7AA0000000000000000006BAAAA08A9FFFF22C5FFFF28CA
FFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CAFFFF28CA
FFFF28CAFFFF428FA8AA0000000000000000377EA8AA1BB1FEFF26C6FEFF28C8
FEFF28C8FEFF28C8FEFF28C8FEFF28C8FEFF28C8FEFF28C8FEFF28C8FEFF28C8
FEFF38CCFEFF4967707100000000000000002C333838133E54550D4053550D40
53550D4053550D4053550D4053550D4053550D4053550D4053550D4053550D40
53551D4554550000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000
}
BitmapAdv = {
4C69010000004C7A010000001800000018000000E00000000000000078DA6360
18058301CCB9F1F73FF7A2DFFF1916FC47C5737EFF9F7EFDEF7F4ACDE75A80C5
6C6ADA81CB6C12B0FCAADFFF2FBFC5E10E2A980FC2C17BFF106D3EF362D2B1F5
B65F04CD675AF4FFBFDC81FFFF354E9187CD4FFDFE7FFA035A382199CFBF9E7C
B36138EEDA1F9CE68BEFA0DCFCE4EBB8CD97DB4FB9F95D0F709BAF7A8272F3D7
BFC21EFEAC4B29371B84AF7EC66E3ECF1A2A987FF2F77F5CE953780BE5E67B5E
C46DBEF41ECACD2FB8859987255740CA37A5C3949BBFE439661974F2E5DFFF2E
DBFFFCD738F49B6CAC75E8D7FF82EB7FFE8FD67683070000D9CC5696
}
end
end end
...@@ -13,7 +13,7 @@ uses ...@@ -13,7 +13,7 @@ uses
LCLIntf, LCLType, LMessages, LCLIntf, LCLType, LMessages,
{$ENDIF} {$ENDIF}
Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs,
ExtCtrls, StdCtrls, Buttons, ShellCtrls, Registry, IntegracaoDelphiSUML; ExtCtrls, StdCtrls, Buttons, ShellCtrls, Registry, IntegracaoDelphiSUML, ComCtrls;
const cPROJECT_SAVE_OPTIONS_PATH = 'Software\StarUML\Options\' + cOPTIONSCHEMAID + '\Projects\'; const cPROJECT_SAVE_OPTIONS_PATH = 'Software\StarUML\Options\' + cOPTIONSCHEMAID + '\Projects\';
...@@ -22,6 +22,7 @@ type ...@@ -22,6 +22,7 @@ type
{ TModelMappingsGenerationOptions } { TModelMappingsGenerationOptions }
TModelMappingsGenerationOptions = class(TForm) TModelMappingsGenerationOptions = class(TForm)
ImageList1: TImageList;
Panel1: TPanel; Panel1: TPanel;
Panel2: TPanel; Panel2: TPanel;
Label1: TLabel; Label1: TLabel;
...@@ -41,11 +42,13 @@ type ...@@ -41,11 +42,13 @@ type
rdObjectPascal: TRadioButton; rdObjectPascal: TRadioButton;
rdCSharp: TRadioButton; rdCSharp: TRadioButton;
rdJava: TRadioButton; rdJava: TRadioButton;
procedure dlbDirectoryGetImageIndex(Sender: TObject; Node: TTreeNode);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure BitBtn1Click(Sender: TObject); procedure BitBtn1Click(Sender: TObject);
procedure edtFileNameChange(Sender: TObject); procedure edtFileNameChange(Sender: TObject);
procedure dlbDirectoryClick(Sender: TObject); procedure dlbDirectoryClick(Sender: TObject);
procedure BitBtn3Click(Sender: TObject); procedure BitBtn3Click(Sender: TObject);
procedure rdLanguageClick(Sender: TObject);
procedure SpeedButton1Click(Sender: TObject); procedure SpeedButton1Click(Sender: TObject);
procedure FormDestroy(Sender: TObject); procedure FormDestroy(Sender: TObject);
private private
...@@ -112,6 +115,15 @@ begin ...@@ -112,6 +115,15 @@ begin
GetParameters; GetParameters;
end; end;
procedure TModelMappingsGenerationOptions.rdLanguageClick(Sender: TObject);
begin
if Sender = rdCSharp
then edtFileName.Text := ChangeFileExt(edtFileName.Text, '.cs')
else if Sender = rdJava
then edtFileName.Text := ChangeFileExt(edtFileName.Text, '.java')
else edtFileName.Text := ChangeFileExt(edtFileName.Text, '.pas');
end;
procedure TModelMappingsGenerationOptions.CheckFile; procedure TModelMappingsGenerationOptions.CheckFile;
begin begin
lblFileExists.Visible := FileExists(IncludeTrailingPathDelimiter(dlbDirectory.Path) + edtFileName.Text); lblFileExists.Visible := FileExists(IncludeTrailingPathDelimiter(dlbDirectory.Path) + edtFileName.Text);
...@@ -136,6 +148,11 @@ begin ...@@ -136,6 +148,11 @@ begin
GetParameters; GetParameters;
end; end;
procedure TModelMappingsGenerationOptions.dlbDirectoryGetImageIndex(Sender: TObject; Node: TTreeNode);
begin
Node.ImageIndex := 0;
end;
procedure TModelMappingsGenerationOptions.GetParameters; procedure TModelMappingsGenerationOptions.GetParameters;
var lReg: TRegistry; var lReg: TRegistry;
begin begin
......
...@@ -11580,7 +11580,7 @@ object ExplorerV2: TExplorerV2 ...@@ -11580,7 +11580,7 @@ object ExplorerV2: TExplorerV2
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
OnShow = FormShow OnShow = FormShow
Position = poMainFormCenter Position = poScreenCenter
ShowInTaskBar = stAlways ShowInTaskBar = stAlways
LCLVersion = '2.0.2.0' LCLVersion = '2.0.2.0'
object splVertical: TSplitter object splVertical: TSplitter
...@@ -11717,11 +11717,17 @@ object ExplorerV2: TExplorerV2 ...@@ -11717,11 +11717,17 @@ object ExplorerV2: TExplorerV2
Top = 0 Top = 0
Width = 494 Width = 494
Align = alClient Align = alClient
Font.Height = -13
Font.Name = 'Courier New'
Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased
ParentColor = False
ParentFont = False
TabOrder = 0 TabOrder = 0
OnDragDrop = memOQLQuery2DragDrop OnDragDrop = memOQLQuery2DragDrop
OnDragOver = memOQLQuery2DragOver OnDragOver = memOQLQuery2DragOver
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 31 Gutter.Width = 33
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -12184,7 +12190,7 @@ object ExplorerV2: TExplorerV2 ...@@ -12184,7 +12190,7 @@ object ExplorerV2: TExplorerV2
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 25 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
...@@ -12226,9 +12232,15 @@ object ExplorerV2: TExplorerV2 ...@@ -12226,9 +12232,15 @@ object ExplorerV2: TExplorerV2
Top = 0 Top = 0
Width = 494 Width = 494
Align = alClient Align = alClient
Font.Height = -13
Font.Name = 'Courier New'
Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased
ParentColor = False
ParentFont = False
TabOrder = 0 TabOrder = 0
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 31 Gutter.Width = 33
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -12692,7 +12704,7 @@ object ExplorerV2: TExplorerV2 ...@@ -12692,7 +12704,7 @@ object ExplorerV2: TExplorerV2
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 25 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
......
...@@ -11582,7 +11582,8 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11582,7 +11582,8 @@ object OQLExplorerV2: TOQLExplorerV2
OnCreate = FormCreate OnCreate = FormCreate
OnResize = FormResize OnResize = FormResize
OnShow = FormShow OnShow = FormShow
LCLVersion = '2.0.0.4' Position = poScreenCenter
LCLVersion = '2.0.2.0'
object pcCXOQL: TPageControl object pcCXOQL: TPageControl
Left = 0 Left = 0
Height = 517 Height = 517
...@@ -11594,22 +11595,22 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11594,22 +11595,22 @@ object OQLExplorerV2: TOQLExplorerV2
TabOrder = 0 TabOrder = 0
object tsCXOQL: TTabSheet object tsCXOQL: TTabSheet
Caption = 'CXOQL' Caption = 'CXOQL'
ClientHeight = 489 ClientHeight = 491
ClientWidth = 1080 ClientWidth = 1082
object pnlCXOQL: TPanel object pnlCXOQL: TPanel
Left = 0 Left = 0
Height = 489 Height = 491
Top = 0 Top = 0
Width = 1080 Width = 1082
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 489 ClientHeight = 491
ClientWidth = 1080 ClientWidth = 1082
ParentBackground = False ParentBackground = False
TabOrder = 0 TabOrder = 0
object splVertical: TSplitter object splVertical: TSplitter
Left = 274 Left = 274
Height = 489 Height = 491
Top = 0 Top = 0
Width = 4 Width = 4
Color = clBtnFace Color = clBtnFace
...@@ -11618,27 +11619,27 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11618,27 +11619,27 @@ object OQLExplorerV2: TOQLExplorerV2
end end
object pnlOQLList: TPanel object pnlOQLList: TPanel
Left = 0 Left = 0
Height = 489 Height = 491
Top = 0 Top = 0
Width = 274 Width = 274
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 489 ClientHeight = 491
ClientWidth = 274 ClientWidth = 274
TabOrder = 0 TabOrder = 0
object pnlList: TPanel object pnlList: TPanel
Left = 0 Left = 0
Height = 463 Height = 465
Top = 26 Top = 26
Width = 274 Width = 274
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 463 ClientHeight = 465
ClientWidth = 274 ClientWidth = 274
TabOrder = 0 TabOrder = 0
object lvOQLList: TListView object lvOQLList: TListView
Left = 0 Left = 0
Height = 375 Height = 377
Top = 0 Top = 0
Width = 274 Width = 274
Align = alClient Align = alClient
...@@ -11646,7 +11647,7 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11646,7 +11647,7 @@ object OQLExplorerV2: TOQLExplorerV2
item item
AutoSize = True AutoSize = True
Caption = 'OQL Name' Caption = 'OQL Name'
Width = 272 Width = 74
end> end>
ScrollBars = ssAutoBoth ScrollBars = ssAutoBoth
SmallImages = ilOQLState SmallImages = ilOQLState
...@@ -11657,7 +11658,7 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11657,7 +11658,7 @@ object OQLExplorerV2: TOQLExplorerV2
object memError: TMemo object memError: TMemo
Left = 0 Left = 0
Height = 88 Height = 88
Top = 375 Top = 377
Width = 274 Width = 274
Align = alBottom Align = alBottom
Color = clBtnFace Color = clBtnFace
...@@ -11689,19 +11690,19 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11689,19 +11690,19 @@ object OQLExplorerV2: TOQLExplorerV2
end end
object pnlRight: TPanel object pnlRight: TPanel
Left = 278 Left = 278
Height = 489 Height = 491
Top = 0 Top = 0
Width = 802 Width = 804
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 489 ClientHeight = 491
ClientWidth = 802 ClientWidth = 804
TabOrder = 1 TabOrder = 1
object pnlOQLExplorer: TPanel object pnlOQLExplorer: TPanel
Left = 0 Left = 0
Height = 416 Height = 418
Top = 73 Top = 73
Width = 802 Width = 804
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ParentBackground = False ParentBackground = False
...@@ -11711,16 +11712,16 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11711,16 +11712,16 @@ object OQLExplorerV2: TOQLExplorerV2
Left = 0 Left = 0
Height = 73 Height = 73
Top = 0 Top = 0
Width = 802 Width = 804
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 73 ClientHeight = 73
ClientWidth = 802 ClientWidth = 804
ParentBackground = False ParentBackground = False
TabOrder = 0 TabOrder = 0
object labelName: TLabel object labelName: TLabel
Left = 58 Left = 58
Height = 14 Height = 13
Top = 13 Top = 13
Width = 31 Width = 31
Caption = 'Name:' Caption = 'Name:'
...@@ -11728,7 +11729,7 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11728,7 +11729,7 @@ object OQLExplorerV2: TOQLExplorerV2
end end
object labelDescription: TLabel object labelDescription: TLabel
Left = 32 Left = 32
Height = 14 Height = 13
Top = 43 Top = 43
Width = 57 Width = 57
Caption = 'Description:' Caption = 'Description:'
...@@ -11736,14 +11737,14 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11736,14 +11737,14 @@ object OQLExplorerV2: TOQLExplorerV2
end end
object edtName: TEdit object edtName: TEdit
Left = 97 Left = 97
Height = 31 Height = 21
Top = 10 Top = 10
Width = 384 Width = 384
TabOrder = 0 TabOrder = 0
end end
object edtDescription: TEdit object edtDescription: TEdit
Left = 97 Left = 97
Height = 31 Height = 21
Top = 40 Top = 40
Width = 384 Width = 384
TabOrder = 1 TabOrder = 1
...@@ -11783,7 +11784,7 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11783,7 +11784,7 @@ object OQLExplorerV2: TOQLExplorerV2
ParentColor = False ParentColor = False
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
Gutter.Width = 57 Gutter.Width = 53
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -12243,7 +12244,7 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -12243,7 +12244,7 @@ object OQLExplorerV2: TOQLExplorerV2
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 17 Width = 13
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
......
object itServiceParameters: TitServiceParameters object itServiceParameters: TitServiceParameters
Left = 778 Left = 2317
Height = 289 Height = 333
Top = 453 Top = 486
Width = 314 Width = 314
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Propriedades do Serviço' Caption = 'Propriedades do Serviço'
ClientHeight = 289 ClientHeight = 333
ClientWidth = 314 ClientWidth = 314
ParentFont = True ParentFont = True
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '2.0.0.4' LCLVersion = '2.0.2.0'
object Panel2: TPanel object Panel2: TPanel
Left = 0 Left = 0
Height = 240 Height = 284
Top = 0 Top = 0
Width = 314 Width = 314
Align = alClient Align = alClient
ClientHeight = 240 ClientHeight = 284
ClientWidth = 314 ClientWidth = 314
TabOrder = 1 TabOrder = 1
object GroupBox1: TGroupBox object GroupBox1: TGroupBox
Left = 6 Left = 6
Height = 77 Height = 93
Top = 3 Top = 3
Width = 296 Width = 296
ClientHeight = 75 ClientHeight = 73
ClientWidth = 294 ClientWidth = 292
TabOrder = 0 TabOrder = 0
object Label2: TLabel object Label2: TLabel
Left = 5 Left = 5
Height = 19 Height = 15
Top = 14 Top = 14
Width = 122 Width = 99
Caption = 'Nome do Servidor:' Caption = 'Nome do Servidor:'
ParentColor = False ParentColor = False
end end
object Label1: TLabel object Label1: TLabel
Left = 11 Left = 11
Height = 19 Height = 15
Top = 42 Top = 42
Width = 116 Width = 94
Caption = 'Número da Porta:' Caption = 'Número da Porta:'
ParentColor = False ParentColor = False
end end
object edtServerName: TEdit object edtServerName: TEdit
Left = 133 Left = 133
Height = 29 Height = 23
Top = 8 Top = 8
Width = 155 Width = 155
TabOrder = 0 TabOrder = 0
end end
object edtPortNumber: TEdit object edtPortNumber: TEdit
Left = 133 Left = 133
Height = 29 Height = 23
Top = 36 Top = 36
Width = 155 Width = 155
TabOrder = 1 TabOrder = 1
...@@ -60,23 +60,23 @@ object itServiceParameters: TitServiceParameters ...@@ -60,23 +60,23 @@ object itServiceParameters: TitServiceParameters
end end
object GroupBox2: TGroupBox object GroupBox2: TGroupBox
Left = 6 Left = 6
Height = 48 Height = 64
Top = 88 Top = 104
Width = 296 Width = 296
ClientHeight = 46 ClientHeight = 44
ClientWidth = 294 ClientWidth = 292
TabOrder = 1 TabOrder = 1
object Label3: TLabel object Label3: TLabel
Left = 0 Left = 0
Height = 19 Height = 15
Top = 12 Top = 12
Width = 126 Width = 103
Caption = 'Código do Sistema:' Caption = 'Código do Sistema:'
ParentColor = False ParentColor = False
end end
object edtSystemCode: TEdit object edtSystemCode: TEdit
Left = 133 Left = 133
Height = 29 Height = 23
Top = 8 Top = 8
Width = 155 Width = 155
TabOrder = 0 TabOrder = 0
...@@ -84,38 +84,38 @@ object itServiceParameters: TitServiceParameters ...@@ -84,38 +84,38 @@ object itServiceParameters: TitServiceParameters
end end
object GroupBox3: TGroupBox object GroupBox3: TGroupBox
Left = 6 Left = 6
Height = 80 Height = 96
Top = 144 Top = 176
Width = 296 Width = 296
ClientHeight = 78 ClientHeight = 76
ClientWidth = 294 ClientWidth = 292
TabOrder = 2 TabOrder = 2
object Label5: TLabel object Label5: TLabel
Left = 9 Left = 9
Height = 19 Height = 15
Top = 12 Top = 12
Width = 117 Width = 96
Caption = 'Nome do Usuário:' Caption = 'Nome do Usuário:'
ParentColor = False ParentColor = False
end end
object Label4: TLabel object Label4: TLabel
Left = 80 Left = 80
Height = 19 Height = 15
Top = 46 Top = 46
Width = 45 Width = 35
Caption = 'Senha:' Caption = 'Senha:'
ParentColor = False ParentColor = False
end end
object edtUserName: TEdit object edtUserName: TEdit
Left = 133 Left = 133
Height = 29 Height = 23
Top = 6 Top = 6
Width = 155 Width = 155
TabOrder = 0 TabOrder = 0
end end
object edtPassword: TEdit object edtPassword: TEdit
Left = 133 Left = 133
Height = 29 Height = 23
Top = 40 Top = 40
Width = 155 Width = 155
EchoMode = emPassword EchoMode = emPassword
...@@ -127,7 +127,7 @@ object itServiceParameters: TitServiceParameters ...@@ -127,7 +127,7 @@ object itServiceParameters: TitServiceParameters
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 49 Height = 49
Top = 240 Top = 284
Width = 314 Width = 314
Align = alBottom Align = alBottom
ClientHeight = 49 ClientHeight = 49
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment