Commit 8209f16a authored by Sandro Camata Santana's avatar Sandro Camata Santana

Ajustes

parent 29d6d4f7
object ExplorerV2: TExplorerV2 object ExplorerV2: TExplorerV2
Left = 523 Left = -1230
Height = 871 Height = 697
Top = 77 Top = 112
Width = 1387 Width = 1110
Caption = 'Model OQL Query' Caption = 'Model OQL Query'
ClientHeight = 871 ClientHeight = 697
ClientWidth = 1387 ClientWidth = 1110
Color = clWindow Color = clWindow
DesignTimePPI = 120
Font.Color = clWindowText Font.Color = clWindowText
Icon.Data = { Icon.Data = {
96A5050000000100060000000000010020002820040066000000101000000100 96A5050000000100060000000000010020002820040066000000101000000100
...@@ -11585,42 +11584,42 @@ object ExplorerV2: TExplorerV2 ...@@ -11585,42 +11584,42 @@ object ExplorerV2: TExplorerV2
ShowInTaskBar = stAlways ShowInTaskBar = stAlways
LCLVersion = '2.0.10.0' LCLVersion = '2.0.10.0'
object splVertical: TSplitter object splVertical: TSplitter
Left = 450 Left = 360
Height = 871 Height = 697
Top = 0 Top = 0
Width = 6 Width = 5
MinSize = 5 MinSize = 5
ResizeStyle = rsPattern ResizeStyle = rsPattern
end end
object pnlEditor: TPanel object pnlEditor: TPanel
Left = 456 Left = 365
Height = 871 Height = 697
Top = 0 Top = 0
Width = 931 Width = 745
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 871 ClientHeight = 697
ClientWidth = 931 ClientWidth = 745
Font.Color = clWindowText Font.Color = clWindowText
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
object pnlResult: TPanel object pnlResult: TPanel
Left = 0 Left = 0
Height = 231 Height = 185
Top = 611 Top = 489
Width = 931 Width = 745
Align = alBottom Align = alBottom
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 231 ClientHeight = 185
ClientWidth = 931 ClientWidth = 745
Font.Color = clWindowText Font.Color = clWindowText
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
object pcResults: TPageControl object pcResults: TPageControl
Left = 0 Left = 0
Height = 231 Height = 185
Top = 0 Top = 0
Width = 931 Width = 745
ActivePage = tsError ActivePage = tsError
Align = alClient Align = alClient
Font.Color = clWindowText Font.Color = clWindowText
...@@ -11696,16 +11695,16 @@ object ExplorerV2: TExplorerV2 ...@@ -11696,16 +11695,16 @@ object ExplorerV2: TExplorerV2
end end
object tsError: TTabSheet object tsError: TTabSheet
Caption = 'tsError' Caption = 'tsError'
ClientHeight = 223 ClientHeight = 177
ClientWidth = 923 ClientWidth = 737
Font.Color = clWindowText Font.Color = clWindowText
ImageIndex = 1 ImageIndex = 1
ParentFont = False ParentFont = False
object memErrorText: TMemo object memErrorText: TMemo
Left = 0 Left = 0
Height = 223 Height = 177
Top = 0 Top = 0
Width = 923 Width = 737
Align = alClient Align = alClient
BorderStyle = bsNone BorderStyle = bsNone
Font.Color = clWindowText Font.Color = clWindowText
...@@ -11720,9 +11719,9 @@ object ExplorerV2: TExplorerV2 ...@@ -11720,9 +11719,9 @@ object ExplorerV2: TExplorerV2
end end
object pcEditor: TPageControl object pcEditor: TPageControl
Left = 0 Left = 0
Height = 545 Height = 436
Top = 60 Top = 48
Width = 475 Width = 380
ActivePage = tsOQL ActivePage = tsOQL
Align = alClient Align = alClient
Font.Color = clWindowText Font.Color = clWindowText
...@@ -11734,27 +11733,29 @@ object ExplorerV2: TExplorerV2 ...@@ -11734,27 +11733,29 @@ object ExplorerV2: TExplorerV2
Options = [nboMultiLine] Options = [nboMultiLine]
object tsOQL: TTabSheet object tsOQL: TTabSheet
Caption = 'OQL - Object Query Language' Caption = 'OQL - Object Query Language'
ClientHeight = 512 ClientHeight = 408
ClientWidth = 467 ClientWidth = 372
Font.Color = clWindowText Font.Color = clWindowText
ParentFont = False ParentFont = False
inline SynEditOQL: TSynEdit inline SynEditOQL: TSynEdit
Left = 0 Left = 0
Height = 512 Height = 408
Top = 0 Top = 0
Width = 467 Width = 372
Align = alClient Align = alClient
Font.Height = -16 Font.Height = -13
Font.Name = 'Courier New' Font.Name = 'Courier New'
Font.Pitch = fpFixed Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased Font.Quality = fqNonAntialiased
ParentColor = False ParentColor = False
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
OnDragDrop = memOQLQuery2DragDrop
OnDragOver = memOQLQuery2DragOver
OnKeyUp = SynEditOQLKeyUp OnKeyUp = SynEditOQLKeyUp
OnUTF8KeyPress = SynEditOQLUTF8KeyPress OnUTF8KeyPress = SynEditOQLUTF8KeyPress
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 42 Gutter.Width = 23
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -12213,12 +12214,12 @@ object ExplorerV2: TExplorerV2 ...@@ -12213,12 +12214,12 @@ object ExplorerV2: TExplorerV2
OnCommandProcessed = SynEditOQLCommandProcessed OnCommandProcessed = SynEditOQLCommandProcessed
inline SynLeftGutterPartList1: TSynGutterPartList inline SynLeftGutterPartList1: TSynGutterPartList
object SynGutterMarks1: TSynGutterMarks object SynGutterMarks1: TSynGutterMarks
Width = 30 Width = 24
Visible = False Visible = False
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 21 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
...@@ -12228,19 +12229,18 @@ object ExplorerV2: TExplorerV2 ...@@ -12228,19 +12229,18 @@ object ExplorerV2: TExplorerV2
LeadingZeros = False LeadingZeros = False
end end
object SynGutterChanges1: TSynGutterChanges object SynGutterChanges1: TSynGutterChanges
Width = 5 Width = 4
MouseActions = <> MouseActions = <>
ModifiedColor = 59900 ModifiedColor = 59900
SavedColor = clGreen SavedColor = clGreen
end end
object SynGutterSeparator1: TSynGutterSeparator object SynGutterSeparator1: TSynGutterSeparator
Width = 3 Width = 2
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clWhite MarkupInfo.Background = clWhite
MarkupInfo.Foreground = clGray MarkupInfo.Foreground = clGray
end end
object SynGutterCodeFolding1: TSynGutterCodeFolding object SynGutterCodeFolding1: TSynGutterCodeFolding
Width = 13
Visible = False Visible = False
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clNone MarkupInfo.Background = clNone
...@@ -12263,7 +12263,7 @@ object ExplorerV2: TExplorerV2 ...@@ -12263,7 +12263,7 @@ object ExplorerV2: TExplorerV2
Top = 0 Top = 0
Width = 467 Width = 467
Align = alClient Align = alClient
Font.Height = -16 Font.Height = -13
Font.Name = 'Courier New' Font.Name = 'Courier New'
Font.Pitch = fpFixed Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased Font.Quality = fqNonAntialiased
...@@ -12271,7 +12271,7 @@ object ExplorerV2: TExplorerV2 ...@@ -12271,7 +12271,7 @@ object ExplorerV2: TExplorerV2
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 42 Gutter.Width = 23
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -12730,12 +12730,12 @@ object ExplorerV2: TExplorerV2 ...@@ -12730,12 +12730,12 @@ object ExplorerV2: TExplorerV2
LineHighlightColor.Foreground = clNone LineHighlightColor.Foreground = clNone
inline SynLeftGutterPartList1: TSynGutterPartList inline SynLeftGutterPartList1: TSynGutterPartList
object SynGutterMarks1: TSynGutterMarks object SynGutterMarks1: TSynGutterMarks
Width = 30 Width = 24
Visible = False Visible = False
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 21 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
...@@ -12745,19 +12745,18 @@ object ExplorerV2: TExplorerV2 ...@@ -12745,19 +12745,18 @@ object ExplorerV2: TExplorerV2
LeadingZeros = False LeadingZeros = False
end end
object SynGutterChanges1: TSynGutterChanges object SynGutterChanges1: TSynGutterChanges
Width = 5 Width = 4
MouseActions = <> MouseActions = <>
ModifiedColor = 59900 ModifiedColor = 59900
SavedColor = clGreen SavedColor = clGreen
end end
object SynGutterSeparator1: TSynGutterSeparator object SynGutterSeparator1: TSynGutterSeparator
Width = 3 Width = 2
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clWhite MarkupInfo.Background = clWhite
MarkupInfo.Foreground = clGray MarkupInfo.Foreground = clGray
end end
object SynGutterCodeFolding1: TSynGutterCodeFolding object SynGutterCodeFolding1: TSynGutterCodeFolding
Width = 13
Visible = False Visible = False
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clNone MarkupInfo.Background = clNone
...@@ -12771,24 +12770,24 @@ object ExplorerV2: TExplorerV2 ...@@ -12771,24 +12770,24 @@ object ExplorerV2: TExplorerV2
end end
object pnlActionBar: TPanel object pnlActionBar: TPanel
Left = 0 Left = 0
Height = 60 Height = 48
Top = 0 Top = 0
Width = 931 Width = 745
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 60 ClientHeight = 48
ClientWidth = 931 ClientWidth = 745
Font.Color = clWindowText Font.Color = clWindowText
ParentFont = False ParentFont = False
TabOrder = 2 TabOrder = 2
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Height = 60 Height = 48
Top = 0 Top = 0
Width = 931 Width = 745
ButtonHeight = 50 ButtonHeight = 40
ButtonWidth = 62 ButtonWidth = 50
Caption = 'ToolBar1' Caption = 'ToolBar1'
Color = clBtnFace Color = clBtnFace
Font.Color = clWindowText Font.Color = clWindowText
...@@ -12798,41 +12797,41 @@ object ExplorerV2: TExplorerV2 ...@@ -12798,41 +12797,41 @@ object ExplorerV2: TExplorerV2
ShowCaptions = True ShowCaptions = True
TabOrder = 0 TabOrder = 0
object ToolButton1: TToolButton object ToolButton1: TToolButton
Left = 68 Left = 55
Top = 2 Top = 2
Action = actModelPanel Action = actModelPanel
end end
object ToolButton2: TToolButton object ToolButton2: TToolButton
Left = 130 Left = 105
Top = 2 Top = 2
Action = actResultsPanel Action = actResultsPanel
end end
object ToolButton3: TToolButton object ToolButton3: TToolButton
Left = 63 Left = 51
Height = 50 Height = 40
Top = 2 Top = 2
Caption = 'ToolButton3' Caption = 'ToolButton3'
Style = tbsDivider Style = tbsDivider
end end
object ToolButton4: TToolButton object ToolButton4: TToolButton
Left = 197 Left = 159
Top = 2 Top = 2
Action = actExecute Action = actExecute
end end
object ToolButton5: TToolButton object ToolButton5: TToolButton
Left = 259 Left = 209
Top = 2 Top = 2
Action = actCancel Action = actCancel
end end
object ToolButton6: TToolButton object ToolButton6: TToolButton
Left = 321 Left = 259
Height = 50 Height = 40
Top = 2 Top = 2
Caption = 'ToolButton6' Caption = 'ToolButton6'
Style = tbsDivider Style = tbsDivider
end end
object ToolButton7: TToolButton object ToolButton7: TToolButton
Left = 326 Left = 263
Top = 2 Top = 2
Action = OQLQuery Action = OQLQuery
AutoSize = True AutoSize = True
...@@ -12840,7 +12839,7 @@ object ExplorerV2: TExplorerV2 ...@@ -12840,7 +12839,7 @@ object ExplorerV2: TExplorerV2
Style = tbsCheck Style = tbsCheck
end end
object ToolButton8: TToolButton object ToolButton8: TToolButton
Left = 414 Left = 336
Top = 2 Top = 2
Action = XMLQuery Action = XMLQuery
Grouped = True Grouped = True
...@@ -12852,8 +12851,8 @@ object ExplorerV2: TExplorerV2 ...@@ -12852,8 +12851,8 @@ object ExplorerV2: TExplorerV2
Action = ReconnectDB Action = ReconnectDB
end end
object ToolButton10: TToolButton object ToolButton10: TToolButton
Left = 192 Left = 155
Height = 50 Height = 40
Top = 2 Top = 2
Caption = 'ToolButton10' Caption = 'ToolButton10'
Style = tbsDivider Style = tbsDivider
...@@ -12861,32 +12860,30 @@ object ExplorerV2: TExplorerV2 ...@@ -12861,32 +12860,30 @@ object ExplorerV2: TExplorerV2
end end
end end
object spResultObject: TSplitter object spResultObject: TSplitter
Left = 475 Left = 380
Height = 545 Height = 436
Top = 60 Top = 48
Width = 6 Width = 5
Align = alRight Align = alRight
ResizeAnchor = akRight ResizeAnchor = akRight
ResizeStyle = rsPattern ResizeStyle = rsPattern
end end
inline OQLObjects: TObjectExplorer inline OQLObjects: TObjectExplorer
Left = 481 Left = 385
Height = 545 Height = 436
Top = 60 Top = 48
Width = 450 Width = 360
Align = alRight Align = alRight
ClientHeight = 545 ClientHeight = 436
ClientWidth = 450 ClientWidth = 360
TabOrder = 4 TabOrder = 4
Visible = False Visible = False
DesignLeft = 3089
DesignTop = 631
inherited tvExplorer: TTreeView inherited tvExplorer: TTreeView
Height = 545 Height = 436
Width = 450 Width = 360
ExpandSignSize = 14 ExpandSignSize = 11
Images = ilModel Images = ilModel
Indent = 28 Indent = 22
ParentColor = True ParentColor = True
PopupMenu = pmCopiar PopupMenu = pmCopiar
RightClickSelect = True RightClickSelect = True
...@@ -12896,33 +12893,33 @@ object ExplorerV2: TExplorerV2 ...@@ -12896,33 +12893,33 @@ object ExplorerV2: TExplorerV2
object spResultXML: TSplitter object spResultXML: TSplitter
Cursor = crVSplit Cursor = crVSplit
Left = 0 Left = 0
Height = 6 Height = 5
Top = 605 Top = 484
Width = 931 Width = 745
Align = alBottom Align = alBottom
ResizeAnchor = akBottom ResizeAnchor = akBottom
ResizeStyle = rsPattern ResizeStyle = rsPattern
end end
object sbStatusBar: TStatusBar object sbStatusBar: TStatusBar
Left = 0 Left = 0
Height = 29 Height = 23
Top = 842 Top = 674
Width = 931 Width = 745
AutoSize = False AutoSize = False
Font.Color = clWindowText Font.Color = clWindowText
Panels = < Panels = <
item item
Width = 500 Width = 400
end end
item item
Width = 188 Width = 150
end end
item item
Width = 125 Width = 100
end end
item item
Alignment = taRightJustify Alignment = taRightJustify
Width = 375 Width = 300
end> end>
ParentFont = False ParentFont = False
SimplePanel = False SimplePanel = False
...@@ -12930,33 +12927,33 @@ object ExplorerV2: TExplorerV2 ...@@ -12930,33 +12927,33 @@ object ExplorerV2: TExplorerV2
end end
object pnlModel: TPanel object pnlModel: TPanel
Left = 0 Left = 0
Height = 871 Height = 697
Top = 0 Top = 0
Width = 450 Width = 360
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 871 ClientHeight = 697
ClientWidth = 450 ClientWidth = 360
Font.Color = clWindowText Font.Color = clWindowText
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
object tvModelExplorer: TTreeView object tvModelExplorer: TTreeView
Left = 0 Left = 0
Height = 751 Height = 601
Top = 120 Top = 96
Width = 450 Width = 360
Align = alClient Align = alClient
BorderStyle = bsNone BorderStyle = bsNone
DragMode = dmAutomatic DragMode = dmAutomatic
ExpandSignSize = 12 ExpandSignSize = 10
Font.CharSet = ANSI_CHARSET Font.CharSet = ANSI_CHARSET
Font.Color = clBlack Font.Color = clBlack
Font.Height = -15 Font.Height = -12
Font.Name = 'Segoe UI' Font.Name = 'Segoe UI'
Font.Pitch = fpVariable Font.Pitch = fpVariable
Font.Quality = fqDraft Font.Quality = fqDraft
Images = ilModel Images = ilModel
Indent = 22 Indent = 18
ParentColor = True ParentColor = True
ParentFont = False ParentFont = False
ReadOnly = True ReadOnly = True
...@@ -12969,67 +12966,85 @@ object ExplorerV2: TExplorerV2 ...@@ -12969,67 +12966,85 @@ object ExplorerV2: TExplorerV2
end end
object pnFiltroClasse: TPanel object pnFiltroClasse: TPanel
Left = 0 Left = 0
Height = 120 Height = 96
Top = 0 Top = 0
Width = 450 Width = 360
Align = alTop Align = alTop
ClientHeight = 120 ClientHeight = 96
ClientWidth = 450 ClientWidth = 360
Font.Color = clWindowText
ParentFont = False
TabOrder = 1 TabOrder = 1
object edtClasse: TEdit object edtClasse: TEdit
Left = 11 Left = 9
Height = 28 Height = 23
Top = 83 Top = 66
Width = 419 Width = 335
Font.Color = clWindowText
OnChange = edtClasseChange OnChange = edtClasseChange
ParentFont = False
TabOrder = 0 TabOrder = 0
end end
object gbAgrupamento: TGroupBox object gbAgrupamento: TGroupBox
Left = 11 Left = 9
Height = 56 Height = 45
Top = 3 Top = 2
Width = 419 Width = 335
Caption = 'Group' Caption = 'Group'
ClientHeight = 31 ClientHeight = 25
ClientWidth = 415 ClientWidth = 331
Font.CharSet = ANSI_CHARSET Font.CharSet = ANSI_CHARSET
Font.Color = clBlack Font.Color = clBlack
Font.Height = -15 Font.Height = -12
Font.Name = 'Segoe UI' Font.Name = 'Segoe UI'
Font.Pitch = fpVariable Font.Pitch = fpVariable
Font.Quality = fqDraft Font.Quality = fqDraft
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
object rbHieraquia: TRadioButton object rbHieraquia: TRadioButton
Left = 200 Left = 160
Height = 24 Height = 19
Top = 0 Top = 0
Width = 87 Width = 71
Caption = 'Hierarchy' Caption = 'Hierarchy'
Font.CharSet = ANSI_CHARSET
Font.Color = clBlack
Font.Height = -12
Font.Name = 'Segoe UI'
Font.Pitch = fpVariable
Font.Quality = fqDraft
OnClick = edtClasseChange OnClick = edtClasseChange
ParentFont = False
TabOrder = 0 TabOrder = 0
end end
object rbSequencial: TRadioButton object rbSequencial: TRadioButton
Left = 16 Left = 13
Height = 24 Height = 19
Top = 0 Top = 0
Width = 48 Width = 39
Caption = 'Flat' Caption = 'Flat'
Checked = True Checked = True
Font.CharSet = ANSI_CHARSET
Font.Color = clBlack
Font.Height = -12
Font.Name = 'Segoe UI'
Font.Pitch = fpVariable
Font.Quality = fqDraft
OnClick = edtClasseChange OnClick = edtClasseChange
ParentFont = False
TabOrder = 1 TabOrder = 1
TabStop = True TabStop = True
end end
end end
object Label2: TLabel object Label2: TLabel
Left = 15 Left = 12
Height = 20 Height = 15
Top = 61 Top = 49
Width = 33 Width = 27
Caption = 'Class' Caption = 'Class'
Font.CharSet = ANSI_CHARSET Font.CharSet = ANSI_CHARSET
Font.Color = clBlack Font.Color = clBlack
Font.Height = -15 Font.Height = -12
Font.Name = 'Segoe UI' Font.Name = 'Segoe UI'
Font.Pitch = fpVariable Font.Pitch = fpVariable
Font.Quality = fqDraft Font.Quality = fqDraft
...@@ -13041,8 +13056,8 @@ object ExplorerV2: TExplorerV2 ...@@ -13041,8 +13056,8 @@ object ExplorerV2: TExplorerV2
object il1: TImageList object il1: TImageList
Height = 24 Height = 24
Width = 24 Width = 24
Left = 1190 Left = 952
Top = 10 Top = 8
Bitmap = { Bitmap = {
4C690C0000001800000018000000000000000000000000000000000000000000 4C690C0000001800000018000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000
...@@ -13912,16 +13927,16 @@ object ExplorerV2: TExplorerV2 ...@@ -13912,16 +13927,16 @@ object ExplorerV2: TExplorerV2
} }
end end
object pmCopiar: TPopupMenu object pmCopiar: TPopupMenu
Left = 1190 Left = 952
Top = 110 Top = 88
object Copia: TMenuItem object Copia: TMenuItem
Caption = 'Copiar Dados' Caption = 'Copiar Dados'
OnClick = CopiaDadosObjeto OnClick = CopiaDadosObjeto
end end
end end
object ActionList1: TActionList object ActionList1: TActionList
Left = 1300 Left = 1040
Top = 110 Top = 88
object actModelPanel: TAction object actModelPanel: TAction
Checked = True Checked = True
Hint = 'Show/Hide Persistence Model' Hint = 'Show/Hide Persistence Model'
...@@ -13965,12 +13980,12 @@ object ExplorerV2: TExplorerV2 ...@@ -13965,12 +13980,12 @@ object ExplorerV2: TExplorerV2
DefaultFilter = 'Arquivos SQL (*.sql)|*.sql' DefaultFilter = 'Arquivos SQL (*.sql)|*.sql'
Enabled = False Enabled = False
SQLDialect = sqlSybase SQLDialect = sqlSybase
Left = 1400 Left = 1120
Top = 10 Top = 8
end end
object ilModel: TImageList object ilModel: TImageList
Left = 140 Left = 112
Top = 210 Top = 168
Bitmap = { Bitmap = {
4C69090000001000000010000000000000000000000000000000000000000000 4C69090000001000000010000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000
......
...@@ -2224,17 +2224,39 @@ begin ...@@ -2224,17 +2224,39 @@ begin
end; end;
procedure TExplorerV2.memOQLQuery2DragDrop(Sender, Source: TObject; X,Y: Integer); procedure TExplorerV2.memOQLQuery2DragDrop(Sender, Source: TObject; X,Y: Integer);
function FromClause(piNode: TTreeNode; var poPath: string): string; function IsRoot(piNode: TTreeNode): Boolean;
begin begin
if piNode.Level = 1 if (piNode.Level > 1) then
begin
if ((TObject(piNode.Data) is acClassTicket) and (piNode.ImageIndex = 6))
then Result := IsRoot(piNode.Parent)
else Result := False;
end
else Result := True;
end;
function FromClause(piNode: TTreeNode; piCast:String; var poPath: string): string;
begin
if IsRoot(piNode) //((piNode.Level = 1) or ((TObject(piNode.Data) is acClassTicket) and (piNode.ImageIndex = 6)))
then begin then begin
poPath := acClassTicket(piNode.Data).PersistentObjectClassName; poPath := acClassTicket(piNode.Data).PersistentObjectClassName;
result := poPath; result := poPath;
end end
else begin else begin
result := FromClause(piNode.Parent, poPath); if ((TObject(piNode.Data) is acClassTicket) and (piNode.ImageIndex = 6)) then
begin
if piCast <> ''
then result := FromClause(piNode.Parent, piCast, poPath)
else result := FromClause(piNode.Parent, acClassTicket(piNode.Data).PersistentObjectClassName, poPath);
end
else
begin
result := FromClause(piNode.Parent, '', poPath);
poPath := poPath + '.' + copy(piNode.Text, 1, pred(pos(':', piNode.Text))); poPath := poPath + '.' + copy(piNode.Text, 1, pred(pos(':', piNode.Text)));
result := result + ', ' + #13#10 + ' ' + poPath; if piCast <> ''
then result := result + ', ' + #13#10 + ' ' + '('+ piCast +')' + poPath
else result := result + ', ' + #13#10 + ' ' + poPath;
end;
end; end;
end; end;
var lCaption: string; var lCaption: string;
...@@ -2260,7 +2282,7 @@ begin ...@@ -2260,7 +2282,7 @@ begin
if GetKeyState(VK_CONTROL) < 0 if GetKeyState(VK_CONTROL) < 0
then begin then begin
lCaption := (TObject(lNode.Parent.data) as acClassTicket).PersistentObjectClassName; lCaption := (TObject(lNode.Parent.data) as acClassTicket).PersistentObjectClassName;
lFrom := FromClause(lNode.Parent, lPath); lFrom := FromClause(lNode.Parent, '', lPath);
lSelect := copy(lPath, 1, pred(pos('.', lPath))); lSelect := copy(lPath, 1, pred(pos('.', lPath)));
if lSelect = '' then lSelect := lPath; if lSelect = '' then lSelect := lPath;
SynEditOQL.SelText := #13#10 + SynEditOQL.SelText := #13#10 +
...@@ -2347,16 +2369,22 @@ begin ...@@ -2347,16 +2369,22 @@ begin
end; end;
end; end;
end; end;
fLastExecErrorFlag := False;
sbStatusBar.Panels[0].Text := '';
sbStatusBar.Panels[1].Text := '';
sbStatusBar.Panels[2].Text := '';
if actResultsPanel.Checked then actResultsPanel.Execute;
except except
on e: Exception do on e: Exception do
begin begin
if not actResultsPanel.Checked then actResultsPanel.Execute; fLastExecErrorFlag := True;
memErrorText.Text := e.Message; memErrorText.Text := e.Message;
pcResults.ActivePageIndex := 1; pcResults.ActivePageIndex := 1;
pcEditor.ActivePageIndex := 0; pcEditor.ActivePageIndex := 0;
sbStatusBar.Panels[0].Text := 'OQL translation to SQL failed.'; sbStatusBar.Panels[0].Text := 'OQL translation to SQL failed.';
sbStatusBar.Panels[1].Text := ''; sbStatusBar.Panels[1].Text := '';
sbStatusBar.Panels[2].Text := ''; sbStatusBar.Panels[2].Text := '';
if not actResultsPanel.Checked then actResultsPanel.Execute;
end; end;
end; end;
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment