This commit is contained in:
Basile Burg 2018-06-25 06:30:19 +02:00
parent 255271bbc7
commit 6c65d4b4fd
12 changed files with 109 additions and 62 deletions

View File

@ -71,6 +71,7 @@ inherited CEDubProjectEditorWidget: TCEDubProjectEditorWidget
end end
inherited toolbar: TCEToolBar inherited toolbar: TCEToolBar
Width = 399 Width = 399
OnResize = toolbarResize
object btnReload: TCEToolButton[0] object btnReload: TCEToolButton[0]
Left = 85 Left = 85
Hint = 'reload the project, useful to fetch new dependencies or detect new source files' Hint = 'reload the project, useful to fetch new dependencies or detect new source files'
@ -102,11 +103,11 @@ inherited CEDubProjectEditorWidget: TCEDubProjectEditorWidget
scaledSeparator = False scaledSeparator = False
end end
object fltEdit: TTreeFilterEdit[3] object fltEdit: TTreeFilterEdit[3]
Left = 128 Left = 120
Height = 26 Height = 26
Hint = 'filter properties' Hint = 'filter properties'
Top = 2 Top = 2
Width = 269 Width = 277
ButtonWidth = 23 ButtonWidth = 23
NumGlyphs = 1 NumGlyphs = 1
Align = alRight Align = alRight

View File

@ -55,6 +55,7 @@ type
procedure btnCloneObjectClick(Sender: TObject); procedure btnCloneObjectClick(Sender: TObject);
procedure MenuItem1Click(Sender: TObject); procedure MenuItem1Click(Sender: TObject);
procedure propTreeSelectionChanged(Sender: TObject); procedure propTreeSelectionChanged(Sender: TObject);
procedure toolbarResize(Sender: TObject);
private private
fSelectedNode: TTreeNode; fSelectedNode: TTreeNode;
fProj: TCEDubProject; fProj: TCEDubProject;
@ -387,6 +388,11 @@ begin
updateValueEditor; updateValueEditor;
end; end;
procedure TCEDubProjectEditorWidget.toolbarResize(Sender: TObject);
begin
fltEdit.Width := toolbar.Width - fltEdit.Left - fltEdit.BorderSpacing.Around;
end;
procedure TCEDubProjectEditorWidget.btnAcceptPropClick(Sender: TObject); procedure TCEDubProjectEditorWidget.btnAcceptPropClick(Sender: TObject);
begin begin
if fSelectedNode.isNil then if fSelectedNode.isNil then

View File

@ -46,6 +46,7 @@ inherited CEMessagesWidget: TCEMessagesWidget
Width = 836 Width = 836
ShowCaptions = True ShowCaptions = True
Wrapable = False Wrapable = False
OnResize = toolbarResize
object sep: TCEToolButton[0] object sep: TCEToolButton[0]
Left = 299 Left = 299
Height = 28 Height = 28
@ -133,11 +134,11 @@ inherited CEMessagesWidget: TCEMessagesWidget
scaledSeparator = False scaledSeparator = False
end end
object TreeFilterEdit1: TTreeFilterEdit[10] object TreeFilterEdit1: TTreeFilterEdit[10]
Left = 536 Left = 304
Height = 28 Height = 28
Hint = 'in the selected category, filter the messages that contain the text typed here' Hint = 'in the selected category, filter the messages that contain the text typed here'
Top = 1 Top = 1
Width = 299 Width = 528
OnAfterFilter = TreeFilterEdit1AfterFilter OnAfterFilter = TreeFilterEdit1AfterFilter
ButtonWidth = 23 ButtonWidth = 23
NumGlyphs = 1 NumGlyphs = 1

View File

@ -80,6 +80,7 @@ type
procedure ListCustomDrawItem(Sender: TCustomTreeView; Node: TTreeNode; procedure ListCustomDrawItem(Sender: TCustomTreeView; Node: TTreeNode;
State: TCustomDrawState; var DefaultDraw: Boolean); State: TCustomDrawState; var DefaultDraw: Boolean);
procedure ListKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure ListKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure toolbarResize(Sender: TObject);
procedure TreeFilterEdit1AfterFilter(Sender: TObject); procedure TreeFilterEdit1AfterFilter(Sender: TObject);
procedure TreeFilterEdit1ButtonClick(Sender: TObject); procedure TreeFilterEdit1ButtonClick(Sender: TObject);
private private
@ -497,6 +498,11 @@ begin
end; end;
end; end;
procedure TCEMessagesWidget.toolbarResize(Sender: TObject);
begin
TreeFilterEdit1.Width := toolbar.Width - TreeFilterEdit1.Left - TreeFilterEdit1.BorderSpacing.Around;
end;
procedure TCEMessagesWidget.TreeFilterEdit1AfterFilter(Sender: TObject); procedure TCEMessagesWidget.TreeFilterEdit1AfterFilter(Sender: TObject);
begin begin
fFiltering := TreeFilterEdit1.Filter.isNotEmpty; fFiltering := TreeFilterEdit1.Filter.isNotEmpty;

View File

@ -1,34 +1,34 @@
inherited CEMiniExplorerWidget: TCEMiniExplorerWidget inherited CEMiniExplorerWidget: TCEMiniExplorerWidget
Left = 1367 Left = 1367
Height = 654 Height = 565
Top = 3 Top = 3
Width = 530 Width = 535
ActiveControl = lstFav ActiveControl = lstFav
Caption = 'Mini explorer' Caption = 'Mini explorer'
ClientHeight = 654 ClientHeight = 565
ClientWidth = 530 ClientWidth = 535
inherited Back: TPanel inherited Back: TPanel
Height = 654 Height = 565
Width = 530 Width = 535
AutoSize = True AutoSize = True
ClientHeight = 654 ClientHeight = 565
ClientWidth = 530 ClientWidth = 535
inherited Content: TPanel inherited Content: TPanel
Left = 4 Left = 4
Height = 612 Height = 523
Width = 522 Width = 527
BorderSpacing.Around = 4 BorderSpacing.Around = 4
ClientHeight = 612 ClientHeight = 523
ClientWidth = 522 ClientWidth = 527
object lstFav: TListView[0] object lstFav: TListView[0]
Left = 0 Left = 0
Height = 131 Height = 131
Top = 0 Top = 0
Width = 522 Width = 527
Align = alTop Align = alTop
Columns = < Columns = <
item item
Width = 520 Width = 525
end> end>
ReadOnly = True ReadOnly = True
ScrollBars = ssAutoBoth ScrollBars = ssAutoBoth
@ -44,27 +44,27 @@ inherited CEMiniExplorerWidget: TCEMiniExplorerWidget
Left = 0 Left = 0
Height = 6 Height = 6
Top = 131 Top = 131
Width = 522 Width = 527
Align = alTop Align = alTop
ResizeAnchor = akTop ResizeAnchor = akTop
end end
object Panel2: TPanel[2] object Panel2: TPanel[2]
Left = 0 Left = 0
Height = 475 Height = 386
Top = 137 Top = 137
Width = 522 Width = 527
Align = alClient Align = alClient
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 475 ClientHeight = 386
ClientWidth = 522 ClientWidth = 527
TabOrder = 2 TabOrder = 2
object Splitter2: TSplitter object Splitter2: TSplitter
Cursor = crVSplit Cursor = crVSplit
Left = 0 Left = 0
Height = 6 Height = 6
Top = 218 Top = 218
Width = 522 Width = 527
Align = alTop Align = alTop
ResizeAnchor = akTop ResizeAnchor = akTop
end end
@ -72,7 +72,7 @@ inherited CEMiniExplorerWidget: TCEMiniExplorerWidget
Left = 0 Left = 0
Height = 218 Height = 218
Top = 0 Top = 0
Width = 522 Width = 527
Align = alTop Align = alTop
FileSortType = fstAlphabet FileSortType = fstAlphabet
ReadOnly = True ReadOnly = True
@ -89,9 +89,9 @@ inherited CEMiniExplorerWidget: TCEMiniExplorerWidget
end end
object lstFiles: TShellListView object lstFiles: TShellListView
Left = 0 Left = 0
Height = 251 Height = 162
Top = 224 Top = 224
Width = 522 Width = 527
Align = alClient Align = alClient
Color = clDefault Color = clDefault
DragMode = dmAutomatic DragMode = dmAutomatic
@ -108,7 +108,8 @@ inherited CEMiniExplorerWidget: TCEMiniExplorerWidget
end end
end end
inherited toolbar: TCEToolBar inherited toolbar: TCEToolBar
Width = 522 Width = 527
OnResize = toolbarResize
object btnEdit: TCEToolButton[0] object btnEdit: TCEToolButton[0]
Left = 153 Left = 153
Hint = 'open the selected file in an editor or as a new project' Hint = 'open the selected file in an editor or as a new project'
@ -181,7 +182,6 @@ inherited CEMiniExplorerWidget: TCEMiniExplorerWidget
Flat = True Flat = True
Align = alClient Align = alClient
BorderSpacing.Left = 180 BorderSpacing.Left = 180
BorderSpacing.Bottom = 2
BorderSpacing.Around = 2 BorderSpacing.Around = 2
MaxLength = 0 MaxLength = 0
TabOrder = 0 TabOrder = 0

View File

@ -95,6 +95,7 @@ type
procedure lstFilesFileAdded(Sender: TObject; Item: TListItem); procedure lstFilesFileAdded(Sender: TObject; Item: TListItem);
procedure lstFilterButtonClick(Sender: TObject); procedure lstFilterButtonClick(Sender: TObject);
procedure lstFilterKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState); procedure lstFilterKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure toolbarResize(Sender: TObject);
procedure TreeEnter(Sender: TObject); procedure TreeEnter(Sender: TObject);
procedure treeFoldersChange(Sender: TObject; Node: TTreeNode); procedure treeFoldersChange(Sender: TObject; Node: TTreeNode);
procedure treeFoldersDblClick(Sender: TObject); procedure treeFoldersDblClick(Sender: TObject);
@ -735,6 +736,11 @@ begin
filterFiles; filterFiles;
end; end;
procedure TCEMiniExplorerWidget.toolbarResize(Sender: TObject);
begin
lstFilter.Width := toolbar.Width - lstFilter.Left - lstFilter.BorderSpacing.Around;
end;
procedure TCEMiniExplorerWidget.shellOpenSelected; procedure TCEMiniExplorerWidget.shellOpenSelected;
var var
fname: string = ''; fname: string = '';

View File

@ -2,31 +2,31 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget
Left = 1443 Left = 1443
Height = 258 Height = 258
Top = 213 Top = 213
Width = 376 Width = 424
ActiveControl = Tree ActiveControl = Tree
AllowDropFiles = True AllowDropFiles = True
Caption = 'Project inspector' Caption = 'Project inspector'
ClientHeight = 258 ClientHeight = 258
ClientWidth = 376 ClientWidth = 424
OnDropFiles = FormDropFiles OnDropFiles = FormDropFiles
inherited Back: TPanel inherited Back: TPanel
Height = 258 Height = 258
Width = 376 Width = 424
AutoSize = True AutoSize = True
ClientHeight = 258 ClientHeight = 258
ClientWidth = 376 ClientWidth = 424
inherited Content: TPanel inherited Content: TPanel
Height = 222 Height = 222
Top = 36 Top = 36
Width = 376 Width = 424
ClientHeight = 222 ClientHeight = 222
ClientWidth = 376 ClientWidth = 424
PopupMenu = nil PopupMenu = nil
object Tree: TTreeView[0] object Tree: TTreeView[0]
Left = 2 Left = 2
Height = 218 Height = 218
Top = 2 Top = 2
Width = 372 Width = 420
Align = alClient Align = alClient
AutoExpand = True AutoExpand = True
BorderSpacing.Around = 2 BorderSpacing.Around = 2
@ -51,11 +51,12 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget
end end
end end
inherited toolbar: TCEToolBar inherited toolbar: TCEToolBar
Width = 368 Width = 416
OnResize = toolbarResize
object btnRemFold: TCEToolButton[0] object btnRemFold: TCEToolButton[0]
Left = 1 Left = 113
Hint = 'remove the selected source parent folder from the project' Hint = 'remove the selected source parent folder from the project'
Top = 28 Top = 0
AutoSize = True AutoSize = True
Caption = 'btnRemFold' Caption = 'btnRemFold'
OnClick = btnRemFoldClick OnClick = btnRemFoldClick
@ -63,7 +64,7 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget
scaledSeparator = False scaledSeparator = False
end end
object btnAddFold: TCEToolButton[1] object btnAddFold: TCEToolButton[1]
Left = 113 Left = 141
Hint = 'add a folder of sources to the project' Hint = 'add a folder of sources to the project'
Top = 0 Top = 0
AutoSize = True AutoSize = True
@ -93,11 +94,11 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget
scaledSeparator = False scaledSeparator = False
end end
object TreeFilterEdit1: TTreeFilterEdit[4] object TreeFilterEdit1: TTreeFilterEdit[4]
Left = 145 Left = 176
Height = 26 Height = 26
Hint = 'filter the source names that contain the text typed here' Hint = 'filter the source names that contain the text typed here'
Top = 2 Top = 2
Width = 221 Width = 232
ButtonWidth = 28 ButtonWidth = 28
NumGlyphs = 1 NumGlyphs = 1
Align = alClient Align = alClient

View File

@ -37,6 +37,7 @@ type
procedure btnTreeClick(Sender: TObject); procedure btnTreeClick(Sender: TObject);
procedure btnReloadClick(Sender: TObject); procedure btnReloadClick(Sender: TObject);
procedure FormDropFiles(Sender: TObject; const fnames: array of String); procedure FormDropFiles(Sender: TObject; const fnames: array of String);
procedure toolbarResize(Sender: TObject);
procedure TreeClick(Sender: TObject); procedure TreeClick(Sender: TObject);
procedure TreeDeletion(Sender: TObject; Node: TTreeNode); procedure TreeDeletion(Sender: TObject; Node: TTreeNode);
procedure TreeKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure TreeKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@ -162,6 +163,7 @@ begin
Tree.Images := fImages; Tree.Images := fImages;
Tree.PopupMenu := contextMenu; Tree.PopupMenu := contextMenu;
TreeFilterEdit1.BorderSpacing.Left := ScaleX(filterAlign[false], 96); TreeFilterEdit1.BorderSpacing.Left := ScaleX(filterAlign[false], 96);
toolbarResize(nil);
fname := getCoeditDocPath + optFname; fname := getCoeditDocPath + optFname;
if fname.fileExists then if fname.fileExists then
@ -321,7 +323,10 @@ begin
btnRemFold.Visible:= ce; btnRemFold.Visible:= ce;
btnAddFile.Visible:= ce; btnAddFile.Visible:= ce;
btnAddFold.Visible:= ce; btnAddFold.Visible:= ce;
TreeFilterEdit1.BorderSpacing.Left := ScaleX(filterAlign[ce], 96); toolbarResize(nil);
TreeFilterEdit1.BorderSpacing.Left:= 0;
TreeFilterEdit1.Left := ScaleX(filterAlign[ce], 96);
toolbarResize(nil);
end; end;
procedure TCEProjectInspectWidget.setFileListAsTree(value: boolean); procedure TCEProjectInspectWidget.setFileListAsTree(value: boolean);
@ -618,6 +623,11 @@ begin
end; end;
end; end;
procedure TCEProjectInspectWidget.toolbarResize(Sender: TObject);
begin
TreeFilterEdit1.Width := toolbar.Width - TreeFilterEdit1.Left - TreeFilterEdit1.BorderSpacing.Around;
end;
procedure TCEProjectInspectWidget.updateDelayed; procedure TCEProjectInspectWidget.updateDelayed;
begin begin
updateImperative; updateImperative;

View File

@ -1,29 +1,29 @@
inherited CESymbolListWidget: TCESymbolListWidget inherited CESymbolListWidget: TCESymbolListWidget
Left = 1515 Left = 1322
Height = 430 Height = 430
Top = 270 Top = 92
Width = 382 Width = 308
Caption = 'Symbol list' Caption = 'Symbol list'
ClientHeight = 430 ClientHeight = 430
ClientWidth = 382 ClientWidth = 308
inherited Back: TPanel inherited Back: TPanel
Height = 430 Height = 430
Width = 382 Width = 308
AutoSize = True AutoSize = True
ClientHeight = 430 ClientHeight = 430
ClientWidth = 382 ClientWidth = 308
inherited Content: TPanel inherited Content: TPanel
Height = 394 Height = 394
Top = 36 Top = 36
Width = 382 Width = 308
ClientHeight = 394 ClientHeight = 394
ClientWidth = 382 ClientWidth = 308
PopupMenu = nil PopupMenu = nil
object Tree: TTreeView[0] object Tree: TTreeView[0]
Left = 4 Left = 4
Height = 386 Height = 386
Top = 4 Top = 4
Width = 374 Width = 300
Align = alClient Align = alClient
BorderSpacing.Around = 4 BorderSpacing.Around = 4
HideSelection = False HideSelection = False
@ -57,9 +57,10 @@ inherited CESymbolListWidget: TCESymbolListWidget
end end
end end
inherited toolbar: TCEToolBar inherited toolbar: TCEToolBar
Width = 374 Width = 300
OnResize = toolbarResize
object btnRefresh: TCEToolButton[0] object btnRefresh: TCEToolButton[0]
Left = 372 Left = 1
Hint = 'refresh the symbol list' Hint = 'refresh the symbol list'
Top = 0 Top = 0
AutoSize = True AutoSize = True
@ -69,16 +70,17 @@ inherited CESymbolListWidget: TCESymbolListWidget
scaledSeparator = False scaledSeparator = False
end end
object TreeFilterEdit1: TTreeFilterEdit[1] object TreeFilterEdit1: TTreeFilterEdit[1]
Left = 3 Left = 32
Height = 26 Height = 26
Hint = 'filter the symbols that contain the text typed here' Hint = 'filter the symbols that contain the text typed here'
Top = 2 Top = 2
Width = 369 Width = 264
OnAfterFilter = TreeFilterEdit1AfterFilter OnAfterFilter = TreeFilterEdit1AfterFilter
OnFilterItem = TreeFilterEdit1FilterItem OnFilterItem = TreeFilterEdit1FilterItem
ButtonWidth = 28 ButtonWidth = 28
NumGlyphs = 1 NumGlyphs = 1
Align = alClient Align = alClient
BorderSpacing.Left = 30
BorderSpacing.Around = 2 BorderSpacing.Around = 2
MaxLength = 0 MaxLength = 0
TabOrder = 0 TabOrder = 0

View File

@ -102,11 +102,14 @@ type
procedure AssignTo(Dest: TPersistent); override; procedure AssignTo(Dest: TPersistent); override;
end; end;
{ TCESymbolListWidget }
TCESymbolListWidget = class(TCEWidget, ICEDocumentObserver, ICEEditableOptions) TCESymbolListWidget = class(TCEWidget, ICEDocumentObserver, ICEEditableOptions)
btnRefresh: TCEToolButton; btnRefresh: TCEToolButton;
Tree: TTreeView; Tree: TTreeView;
TreeFilterEdit1: TTreeFilterEdit; TreeFilterEdit1: TTreeFilterEdit;
procedure btnRefreshClick(Sender: TObject); procedure btnRefreshClick(Sender: TObject);
procedure toolbarResize(Sender: TObject);
procedure TreeCompare(Sender: TObject; Node1, Node2: TTreeNode; var Compare: Integer); procedure TreeCompare(Sender: TObject; Node1, Node2: TTreeNode; var Compare: Integer);
procedure TreeFilterEdit1AfterFilter(Sender: TObject); procedure TreeFilterEdit1AfterFilter(Sender: TObject);
function TreeFilterEdit1FilterItem(Item: TObject; out Done: Boolean): Boolean; function TreeFilterEdit1FilterItem(Item: TObject; out Done: Boolean): Boolean;
@ -614,6 +617,11 @@ begin
fActRefresh.Execute; fActRefresh.Execute;
end; end;
procedure TCESymbolListWidget.toolbarResize(Sender: TObject);
begin
TreeFilterEdit1.Width := toolbar.Width - TreeFilterEdit1.Left - TreeFilterEdit1.BorderSpacing.Around;
end;
procedure TCESymbolListWidget.TreeCompare(Sender: TObject; Node1, procedure TCESymbolListWidget.TreeCompare(Sender: TObject; Node1,
Node2: TTreeNode; var Compare: Integer); Node2: TTreeNode; var Compare: Integer);
begin begin

View File

@ -29,32 +29,31 @@ inherited CETodoListWidget: TCETodoListWidget
item item
AutoSize = True AutoSize = True
Caption = 'text' Caption = 'text'
Width = 38 Width = 36
end end
item item
AutoSize = True AutoSize = True
Caption = 'category' Caption = 'category'
Width = 69 Width = 67
end end
item item
AutoSize = True AutoSize = True
Caption = 'assignee' Caption = 'assignee'
Width = 70 Width = 68
end end
item item
AutoSize = True AutoSize = True
Caption = 'status' Caption = 'status'
Width = 52
end end
item item
AutoSize = True AutoSize = True
Caption = 'priority' Caption = 'priority'
Width = 59 Width = 57
end end
item item
AutoSize = True AutoSize = True
Caption = 'file' Caption = 'file'
Width = 266 Width = 278
end> end>
ReadOnly = True ReadOnly = True
SortType = stText SortType = stText
@ -64,6 +63,7 @@ inherited CETodoListWidget: TCETodoListWidget
end end
inherited toolbar: TCEToolBar inherited toolbar: TCEToolBar
Width = 576 Width = 576
OnResize = toolbarResize
object btnGo: TCEToolButton[0] object btnGo: TCEToolButton[0]
Left = 29 Left = 29
Hint = 'go the TODO item definition' Hint = 'go the TODO item definition'

View File

@ -83,6 +83,7 @@ type
mnuAutoRefresh: TMenuItem; mnuAutoRefresh: TMenuItem;
procedure handleListClick(Sender: TObject); procedure handleListClick(Sender: TObject);
procedure mnuAutoRefreshClick(Sender: TObject); procedure mnuAutoRefreshClick(Sender: TObject);
procedure toolbarResize(Sender: TObject);
private private
fAutoRefresh: Boolean; fAutoRefresh: Boolean;
fSingleClick: Boolean; fSingleClick: Boolean;
@ -577,6 +578,11 @@ begin
fOptions.autoRefresh := autoRefresh; fOptions.autoRefresh := autoRefresh;
end; end;
procedure TCETodoListWidget.toolbarResize(Sender: TObject);
begin
lstfilter.Width := toolbar.Width - lstfilter.Left - lstfilter.BorderSpacing.Around;
end;
procedure TCETodoListWidget.lstItemsColumnClick(Sender: TObject; Column: TListColumn); procedure TCETodoListWidget.lstItemsColumnClick(Sender: TObject; Column: TListColumn);
var var
curr: TListItem; curr: TListItem;