Revert "Issue #1169"

This reverts commit c7cc6bdd42bfd6dd66bae30fb78d74faca6bfa34.
This commit is contained in:
Jan Kohlmeyer
2022-03-07 11:56:37 +01:00
committed by Ansgar Becker
parent 231d000251
commit 2befc563ee
7 changed files with 11 additions and 57 deletions

View File

@ -7,7 +7,7 @@
<AppType>Package</AppType>
<FrameworkType>VCL</FrameworkType>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<ProjectVersion>19.2</ProjectVersion>
<ProjectVersion>19.0</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1</TargetedPlatforms>
</PropertyGroup>
@ -19,11 +19,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
<Base_Win64>true</Base_Win64>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
<Cfg_1>true</Cfg_1>
<CfgParent>Base</CfgParent>
@ -60,13 +55,6 @@
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
<DCC_UsePackage>vcl;VirtualTreesR;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win64)'!=''">
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
<BT_BuildType>Debug</BT_BuildType>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
<VerInfo_Locale>1033</VerInfo_Locale>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
</PropertyGroup>
@ -134,7 +122,6 @@
</Delphi.Personality>
<Platforms>
<Platform value="Win32">True</Platform>
<Platform value="Win64">False</Platform>
</Platforms>
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>

View File

@ -7,7 +7,7 @@
<AppType>Package</AppType>
<FrameworkType>VCL</FrameworkType>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<ProjectVersion>19.2</ProjectVersion>
<ProjectVersion>19.0</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win64</Platform>
<TargetedPlatforms>3</TargetedPlatforms>
</PropertyGroup>
@ -89,7 +89,6 @@
<DCCReference Include="..\..\Source\VirtualTrees.Actions.pas"/>
<DCCReference Include="..\..\Source\VirtualTrees.Export.pas"/>
<DCCReference Include="..\..\Source\VirtualTrees.Utils.pas"/>
<DCCReference Include="..\..\Source\VirtualTrees.Types.pas"/>
<BuildConfiguration Include="Debug">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>

View File

@ -1,6 +1,7 @@
program heidisql;
uses
madExcept,
Forms,
SysUtils,
Dialogs,

View File

@ -8,7 +8,7 @@
<AppType>Application</AppType>
<FrameworkType>VCL</FrameworkType>
<ProjectVersion>19.2</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<Platform Condition="'$(Platform)'==''">Win64</Platform>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>

View File

@ -26,7 +26,7 @@ object frmTableEditor: TfrmTableEditor
Width = 694
Height = 150
Margins.Bottom = 0
ActivePage = tabIndexes
ActivePage = tabBasic
Align = alTop
Images = MainForm.VirtualImageListMain
TabOrder = 0
@ -67,7 +67,7 @@ object frmTableEditor: TfrmTableEditor
Left = 96
Top = 30
Width = 589
Height = 77
Height = 78
Anchors = [akLeft, akTop, akRight, akBottom]
Lines.Strings = (
'memoComment')
@ -275,14 +275,12 @@ object frmTableEditor: TfrmTableEditor
OnInitNode = treeIndexesInitNode
OnNewText = treeIndexesNewText
OnStructureChange = AnyTreeStructureChange
Touch.InteractiveGestures = [igPan, igPressAndTap]
Touch.InteractiveGestureOptions = [igoPanSingleFingerHorizontal, igoPanSingleFingerVertical, igoPanInertia, igoPanGutter, igoParentPassthrough]
Columns = <
item
Options = [coEnabled, coParentBidiMode, coParentColor, coResizable, coShowDropMark, coVisible, coAllowFocus]
Position = 0
Text = 'Name'
Width = 430
Width = 434
end
item
Options = [coEnabled, coParentBidiMode, coParentColor, coResizable, coShowDropMark, coVisible, coAllowFocus]
@ -433,8 +431,6 @@ object frmTableEditor: TfrmTableEditor
OnGetImageIndex = listForeignKeysGetImageIndex
OnNewText = listForeignKeysNewText
OnStructureChange = AnyTreeStructureChange
Touch.InteractiveGestures = [igPan, igPressAndTap]
Touch.InteractiveGestureOptions = [igoPanSingleFingerHorizontal, igoPanSingleFingerVertical, igoPanInertia, igoPanGutter, igoParentPassthrough]
Columns = <
item
Options = [coDraggable, coEnabled, coParentBidiMode, coParentColor, coResizable, coShowDropMark, coVisible, coAllowFocus]
@ -540,8 +536,6 @@ object frmTableEditor: TfrmTableEditor
OnGetImageIndex = listCheckConstraintsGetImageIndex
OnNewText = listCheckConstraintsNewText
OnStructureChange = AnyTreeStructureChange
Touch.InteractiveGestures = [igPan, igPressAndTap]
Touch.InteractiveGestureOptions = [igoPanSingleFingerHorizontal, igoPanSingleFingerVertical, igoPanInertia, igoPanGutter, igoParentPassthrough]
Columns = <
item
Options = [coDraggable, coEnabled, coParentBidiMode, coParentColor, coResizable, coShowDropMark, coVisible, coAllowFocus, coEditable, coStyleColor]
@ -564,7 +558,7 @@ object frmTableEditor: TfrmTableEditor
object SynMemoPartitions: TSynMemo
Left = 0
Top = 0
Width = 686
Width = 593
Height = 121
SingleLineMode = False
Align = alClient
@ -574,14 +568,6 @@ object frmTableEditor: TfrmTableEditor
Font.Name = 'Courier New'
Font.Style = []
TabOrder = 0
CodeFolding.GutterShapeSize = 11
CodeFolding.CollapsedLineColor = clGrayText
CodeFolding.FolderBarLinesColor = clGrayText
CodeFolding.IndentGuidesColor = clGray
CodeFolding.IndentGuides = True
CodeFolding.ShowCollapsedLine = False
CodeFolding.ShowHintMark = True
UseCodeFolding = False
Gutter.AutoSize = True
Gutter.DigitCount = 2
Gutter.Font.Charset = DEFAULT_CHARSET
@ -606,7 +592,7 @@ object frmTableEditor: TfrmTableEditor
object SynMemoCREATEcode: TSynMemo
Left = 0
Top = 0
Width = 686
Width = 593
Height = 121
SingleLineMode = False
Align = alClient
@ -616,14 +602,6 @@ object frmTableEditor: TfrmTableEditor
Font.Name = 'Courier New'
Font.Style = []
TabOrder = 0
CodeFolding.GutterShapeSize = 11
CodeFolding.CollapsedLineColor = clGrayText
CodeFolding.FolderBarLinesColor = clGrayText
CodeFolding.IndentGuidesColor = clGray
CodeFolding.IndentGuides = True
CodeFolding.ShowCollapsedLine = False
CodeFolding.ShowHintMark = True
UseCodeFolding = False
Gutter.AutoSize = True
Gutter.DigitCount = 2
Gutter.Font.Charset = DEFAULT_CHARSET
@ -648,7 +626,7 @@ object frmTableEditor: TfrmTableEditor
object SynMemoALTERcode: TSynMemo
Left = 0
Top = 0
Width = 686
Width = 593
Height = 121
SingleLineMode = False
Align = alClient
@ -658,14 +636,6 @@ object frmTableEditor: TfrmTableEditor
Font.Name = 'Courier New'
Font.Style = []
TabOrder = 0
CodeFolding.GutterShapeSize = 11
CodeFolding.CollapsedLineColor = clGrayText
CodeFolding.FolderBarLinesColor = clGrayText
CodeFolding.IndentGuidesColor = clGray
CodeFolding.IndentGuides = True
CodeFolding.ShowCollapsedLine = False
CodeFolding.ShowHintMark = True
UseCodeFolding = False
Gutter.AutoSize = True
Gutter.DigitCount = 2
Gutter.Font.Charset = DEFAULT_CHARSET
@ -792,8 +762,6 @@ object frmTableEditor: TfrmTableEditor
OnKeyPress = listColumnsKeyPress
OnNewText = listColumnsNewText
OnNodeMoved = listColumnsNodeMoved
Touch.InteractiveGestures = [igPan, igPressAndTap]
Touch.InteractiveGestureOptions = [igoPanSingleFingerHorizontal, igoPanSingleFingerVertical, igoPanInertia, igoPanGutter, igoParentPassthrough]
Columns = <
item
Alignment = taRightJustify

View File

@ -15,7 +15,6 @@ object frmTriggerEditor: TfrmTriggerEditor
Height = 13
Align = alTop
Caption = 'Trigger statement: (e.g. "SET NEW.columnA = TRIM(OLD.columnA)"'
ExplicitWidth = 327
end
object PageControlMain: TPageControl
AlignWithMargins = True

View File

@ -1,2 +1,2 @@
"C:\delphi\10.4\bin\brcc32.exe" AwesomeFont.rc
"C:\Program Files (x86)\Embarcadero\Studio\18.0\bin\brcc32.exe" AwesomeFont.rc
Pause