prepared for laz 1.4

This commit is contained in:
Basile Burg 2015-02-22 02:26:35 +01:00
parent 8bd0bcae68
commit fd0b98ea7c
12 changed files with 67 additions and 105 deletions

View File

@ -54,11 +54,7 @@
</Debugging>
</Linking>
<Other>
<CompilerMessages>
<MsgFileName Value=""/>
</CompilerMessages>
<CustomOptions Value="-dDEBUG"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
</Item2>
@ -102,11 +98,7 @@
</Options>
</Linking>
<Other>
<CompilerMessages>
<MsgFileName Value=""/>
</CompilerMessages>
<CustomOptions Value="-dDEBUG"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
</Item3>
@ -144,7 +136,6 @@
<Unit0>
<Filename Value="coedit.lpr"/>
<IsPartOfProject Value="True"/>
<UnitName Value="coedit"/>
</Unit0>
<Unit1>
<Filename Value="..\src\ce_cdbcmd.pas"/>
@ -152,37 +143,30 @@
<ComponentName Value="CECdbWidget"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="ce_cdbcmd"/>
</Unit1>
<Unit2>
<Filename Value="..\src\ce_common.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_common"/>
</Unit2>
<Unit3>
<Filename Value="..\src\ce_d2syn.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_d2syn"/>
</Unit3>
<Unit4>
<Filename Value="..\src\ce_dcd.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_dcd"/>
</Unit4>
<Unit5>
<Filename Value="..\src\ce_dlang.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_dlang"/>
</Unit5>
<Unit6>
<Filename Value="..\src\ce_dlangutils.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_dlangutils"/>
</Unit6>
<Unit7>
<Filename Value="..\src\ce_dmdwrap.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_dmdwrap"/>
</Unit7>
<Unit8>
<Filename Value="..\src\ce_editor.pas"/>
@ -200,7 +184,6 @@
<Unit10>
<Filename Value="..\src\ce_libman.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_libman"/>
</Unit10>
<Unit11>
<Filename Value="..\src\ce_libmaneditor.pas"/>
@ -208,7 +191,6 @@
<ComponentName Value="CELibManEditorWidget"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="ce_libmaneditor"/>
</Unit11>
<Unit12>
<Filename Value="..\src\ce_main.pas"/>
@ -224,7 +206,6 @@
<ComponentName Value="CEMessagesWidget"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="ce_messages"/>
</Unit13>
<Unit14>
<Filename Value="..\src\ce_miniexplorer.pas"/>
@ -242,7 +223,6 @@
<Unit16>
<Filename Value="..\src\ce_options.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_options"/>
</Unit16>
<Unit17>
<Filename Value="..\src\ce_procinput.pas"/>
@ -250,7 +230,6 @@
<ComponentName Value="CEProcInputWidget"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="ce_procinput"/>
</Unit17>
<Unit18>
<Filename Value="..\src\ce_projconf.pas"/>
@ -263,7 +242,6 @@
<Unit19>
<Filename Value="..\src\ce_project.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_project"/>
</Unit19>
<Unit20>
<Filename Value="..\src\ce_projinspect.pas"/>
@ -279,7 +257,6 @@
<ComponentName Value="CESearchWidget"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="ce_search"/>
</Unit21>
<Unit22>
<Filename Value="..\src\ce_staticexplorer.pas"/>
@ -297,7 +274,6 @@
<Unit24>
<Filename Value="..\src\ce_symstring.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_symstring"/>
</Unit24>
<Unit25>
<Filename Value="..\src\ce_synmemo.pas"/>
@ -307,7 +283,6 @@
<Unit26>
<Filename Value="..\src\ce_tools.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_tools"/>
</Unit26>
<Unit27>
<Filename Value="..\src\ce_toolseditor.pas"/>
@ -315,12 +290,10 @@
<ComponentName Value="CEToolsEditorWidget"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="ce_toolseditor"/>
</Unit27>
<Unit28>
<Filename Value="..\src\ce_txtsyn.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_txtsyn"/>
</Unit28>
<Unit29>
<Filename Value="..\src\ce_widget.pas"/>
@ -328,12 +301,10 @@
<ComponentName Value="CEWidget"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="ce_widget"/>
</Unit29>
<Unit30>
<Filename Value="..\src\ce_writablecomponent.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_writableComponent"/>
</Unit30>
<Unit31>
<Filename Value="..\src\ce_todolist.pas"/>
@ -346,7 +317,6 @@
<Unit32>
<Filename Value="..\src\ce_inspectors.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_inspectors"/>
</Unit32>
<Unit33>
<Filename Value="..\src\ce_optionseditor.pas"/>
@ -364,12 +334,12 @@
<Unit35>
<Filename Value="..\src\ce_dockoptions.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ce_dockoptions"/>
</Unit35>
<Unit36>
<Filename Value="..\src\ce_shortcutseditor.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="CEShortcutEditor"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Frame"/>
<UnitName Value="ce_shortcutseditor"/>
</Unit36>
@ -407,11 +377,7 @@
<Verbosity>
<ShowHints Value="False"/>
</Verbosity>
<CompilerMessages>
<MsgFileName Value=""/>
</CompilerMessages>
<CustomOptions Value="-dRELEASE"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
<Debugging>

View File

@ -98,8 +98,7 @@ begin
//
completion.OnPaintItem := @completionItemPaint;
fSyncEdit := TSynPluginSyncroEdit.Create(self);
//TODO-cLCL&LAZ-specific: activate this after next Laz release
//fSyncEdit.CaseSensitive:=true;
fSyncEdit.CaseSensitive:=true;
png := TPortableNetworkGraphic.Create;
try
png.LoadFromLazarusResource('link_edit');

View File

@ -19,9 +19,6 @@ type
end;
// attributes frameedges are not stored because of:
//TODO-cLCL&LAZ-specific: remove this comment once http://bugs.freepascal.org/view.php?id=27513 merged/fixed
(**
* Container for the editor and highlither options.
* The base class is also used to backup the settings

View File

@ -10,7 +10,7 @@ object CEMainForm: TCEMainForm
OnCloseQuery = FormCloseQuery
OnDropFiles = FormDropFiles
ShowHint = True
LCLVersion = '1.2.6.0'
LCLVersion = '1.4.0.1'
object mainMenu: TMainMenu
Images = imgList
top = 1

View File

@ -1435,7 +1435,7 @@ var
xcfg: TXMLConfigStorage;
i: NativeInt;
begin
// TODO-cLCL&LAZ-specific: possible loading AV, xml saved after undocking some widgets, xml file abnormal size.
// TODO-cbugfix: possible loading AV, xml saved after undocking some widgets, xml file abnormal size, seems to be related to Anchordocking itself, not its usage.
for i:= 0 to fWidgList.Count-1 do
begin
if not fWidgList.widget[i].isDockable then continue;

View File

@ -149,14 +149,15 @@ inherited CEMiniExplorerWidget: TCEMiniExplorerWidget
TabOrder = 3
end
object lstFilter: TListFilterEdit
Left = 116
Height = 23
Top = 0
Width = 196
ButtonWidth = 23
Left = 113
Height = 22
Top = 1
Width = 221
ButtonWidth = 28
NumGlyphs = 1
Align = alCustom
Align = alClient
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 1
MaxLength = 0
TabOrder = 4
end

View File

@ -102,11 +102,7 @@ begin
Tree.OnDeletion := @treeDeletion;
Tree.OnSelectionChanged := @treeSelectionChanged;
Tree.OnExpanding := @treeExpanding;
// http://bugs.freepascal.org/view.php?id=27137
// TODO-cLCL&LAZ-specific: remove comment after next Laz release
// TODO-cLCL&LAZ-specific, try the new TListViewFilterEdit here.
// TODO-cLCL&LAZ-specific, the align/anchors of filterxxx must be redefined, previously there was a bug.
//
lstFilter.FilteredListbox := nil;
lstFilter.onChange := @lstFilterChange;
//

View File

@ -89,13 +89,13 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget
ShowCaption = False
end
object TreeFilterEdit1: TTreeFilterEdit
Left = 144
Height = 23
Top = 0
Width = 159
Left = 142
Height = 20
Top = 2
Width = 193
ButtonWidth = 28
NumGlyphs = 1
Align = alCustom
Align = alClient
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 2
MaxLength = 0

View File

@ -6,8 +6,8 @@ object CEShortcutEditor: TCEShortcutEditor
ClientHeight = 463
ClientWidth = 424
TabOrder = 0
DesignLeft = 796
DesignTop = 213
DesignLeft = 1449
DesignTop = 4
object Panel1: TPanel
Left = 0
Height = 463
@ -19,26 +19,27 @@ object CEShortcutEditor: TCEShortcutEditor
ClientWidth = 424
TabOrder = 0
object fltItems: TTreeFilterEdit
Left = 0
Left = 2
Height = 23
Top = 0
Width = 400
ButtonWidth = 23
Top = 2
Width = 420
ButtonWidth = 28
NumGlyphs = 1
Align = alCustom
Anchors = [akTop, akLeft, akRight]
Align = alTop
BorderSpacing.Around = 2
MaxLength = 0
TabOrder = 0
FilteredTreeview = tree
end
object tree: TTreeView
Left = 1
Height = 400
Top = 28
Width = 423
Align = alCustom
Anchors = [akTop, akLeft, akRight, akBottom]
Left = 2
Height = 404
Top = 29
Width = 420
Align = alClient
AutoExpand = True
BorderSpacing.Top = 2
BorderSpacing.Around = 2
DefaultItemHeight = 18
HideSelection = False
ReadOnly = True
@ -48,34 +49,37 @@ object CEShortcutEditor: TCEShortcutEditor
Options = [tvoAutoExpand, tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
end
object Panel2: TPanel
Left = 0
Height = 31
Top = 432
Width = 424
Left = 2
Height = 26
Top = 435
Width = 420
Align = alBottom
BorderSpacing.Around = 2
BevelOuter = bvNone
ClientHeight = 31
ClientWidth = 424
ClientHeight = 26
ClientWidth = 420
TabOrder = 2
object schrtText: TStaticText
Left = 4
Height = 23
Top = 4
Width = 277
Left = 0
Height = 22
Top = 2
Width = 283
Align = alClient
Alignment = taCenter
BorderSpacing.Around = 4
BorderSpacing.Top = 2
BorderSpacing.Bottom = 2
BorderStyle = sbsSunken
TabOrder = 0
end
object shcCatch: TEdit
Left = 312
Height = 25
Top = 3
Width = 112
Left = 310
Height = 22
Top = 2
Width = 109
Align = alRight
BorderSpacing.Top = 3
BorderSpacing.Bottom = 3
BorderSpacing.Top = 1
BorderSpacing.Bottom = 1
BorderSpacing.Around = 1
Enabled = False
OnExit = shcCatchExit
OnKeyDown = LabeledEdit1KeyDown
@ -84,11 +88,11 @@ object CEShortcutEditor: TCEShortcutEditor
end
object btnActivate: TSpeedButton
Left = 285
Height = 23
Top = 4
Height = 22
Top = 2
Width = 23
Align = alRight
BorderSpacing.Around = 4
BorderSpacing.Around = 2
OnClick = btnActivateClick
end
end

View File

@ -1,7 +1,7 @@
inherited CEStaticExplorerWidget: TCEStaticExplorerWidget
Left = 1521
Left = 1548
Height = 430
Top = 259
Top = 457
Width = 310
Caption = 'Static explorer'
ClientHeight = 430
@ -68,14 +68,14 @@ inherited CEStaticExplorerWidget: TCEStaticExplorerWidget
PopupMenu = contextMenu
TabOrder = 1
object TreeFilterEdit1: TTreeFilterEdit
Left = 36
Height = 23
Left = 32
Height = 22
Top = 2
Width = 242
Width = 272
OnAfterFilter = TreeFilterEdit1AfterFilter
ButtonWidth = 23
ButtonWidth = 28
NumGlyphs = 1
Align = alCustom
Align = alClient
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 2
MaxLength = 0

View File

@ -41,14 +41,15 @@ inherited CETodoListWidget: TCETodoListWidget
TabOrder = 0
end
object lstfilter: TListFilterEdit
Left = 68
Height = 23
Left = 62
Height = 22
Top = 2
Width = 483
Width = 516
ButtonWidth = 28
NumGlyphs = 1
Align = alCustom
Align = alClient
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 2
MaxLength = 0
TabOrder = 1
end

View File

@ -177,8 +177,6 @@ begin
lstItems.OnCompare := @lstItemsCompare;
fAutoRefresh := true;
mnuAutoRefresh.Checked := true;
// http://bugs.freepascal.org/view.php?id=27137
// TODO-cLCL&LAZ-specific: remove comment after next Laz release
// TODO-cLCL&LAZ-specific, try the new TListViewFilterEdit here.
// TODO-cLCL&LAZ-specific, the align/anchors of filterxxx must be redefined, previously there was a bug.
lstfilter.OnChange:= @filterItems;