From ce6e8bca97fd857151b30aa68585d71eb53e298d Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Wed, 4 Mar 2020 14:56:31 +0100 Subject: [PATCH] fix #4 - Automatic cleaning of MRU doesn't mix well with git checkout --- docs/options_application.md | 3 ++- src/u_main.pas | 34 +++++++++++++++++++++++++++++++++- src/u_mru.pas | 7 ++++++- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/docs/options_application.md b/docs/options_application.md index bbbb6616..a51537d4 100644 --- a/docs/options_application.md +++ b/docs/options_application.md @@ -3,7 +3,7 @@ title: Widgets - application options --- {% raw %} - + {% endraw %} #### Application @@ -16,6 +16,7 @@ The page exposes unsorted options. In the future some of them might be moved to - **additionalPATH**: Used to defined more paths were the background tools can be found. Each item must be separated by a path separator (`:` under Linux and `;` under Windows). - **autoCheckUpdates**: If checked and if a newer release is available then a dialog proposes to open the matching html page on github. +- **autoCleanMRU**: If checked then the MRU lists wont display files that dont exist. When using a version control software or removable disk it can be preferable not to use this option. - **autoKillProcThreshold**: When not zero this setting indicates the size of the stdandard output, in bytes, over which an inferior process gets killed automatically. By default set to 2 Mb. This is usefull for example to prevent issues when an inferior falls into an infinite loop that prints. - **autoSaveProjectFiles**: If checked the sources are automatically saved before compilation. - **consoleProgram**: Allows to set the terminal emulator used to execute programs. By default XTerm is used and an error can occur if it's not setup. The setting is used by the [runnable modules](features_runnables), the [custom tools](widgets_custom_tools) and the project launcher. Under Windows this option is not used. diff --git a/src/u_main.pas b/src/u_main.pas index 714237c1..128d2bcb 100644 --- a/src/u_main.pas +++ b/src/u_main.pas @@ -388,6 +388,7 @@ type fDockingIsInitialized: boolean; fGitIconIndex: integer; + fCleanIconIndex: integer; fImages: TImageList; fOptionCategories: TEditableOptionsSubject; fRunnablesOptions: TEditableRunnableOptions; @@ -529,6 +530,7 @@ type procedure mruProjItemClick(Sender: TObject); procedure mruProjGroupItemClick(Sender: TObject); procedure mruClearClick(Sender: TObject); + procedure mruClearInvalidClick(Sender: TObject); // layout procedure setSplitterWheelEvent; @@ -620,6 +622,7 @@ type fToolBarScaling: TToolBarScaling; fAutoKillProcThreshold: dword; fGlobalCompiler: DCompiler; + fAutoCleanMRU: boolean; function getConsoleProgram: string; procedure setConsoleProgram(const value: string); function getAdditionalPATH: string; @@ -630,6 +633,7 @@ type published property additionalPATH: string read getAdditionalPATH write setAdditionalPath; property autoCheckUpdates: boolean read fAutoCheckUpdates write fAutoCheckUpdates; + property autoCleanMRU: boolean read fAutoCleanMRU write fAutoCleanMRU default true; property autoKillProcThreshold: dword read fAutoKillProcThreshold write fAutoKillProcThreshold default 1024 * 1024 * 2; property consoleProgram: string read getConsoleProgram write setConsoleProgram; property coverModuleTests: boolean read fCovModUt write fCovModUt; @@ -853,6 +857,7 @@ begin fFlatLook:=true; fDcdPort:=DCDWrapper.port; fAutoKillProcThreshold := 1024 * 1024 * 2; + fAutoCleanMRU := true; end; function TApplicationOptionsBase.getNativeProjecCompiler: DCompiler; @@ -956,7 +961,9 @@ begin begin MainForm.fCovModUt:= fCovModUt; MainForm.fProjMru.maxCount := fMaxRecentProjs; + MainForm.fProjMru.removeNotExisting := fAutoCleanMRU; MainForm.fFileMru.maxCount := fMaxRecentDocs; + MainForm.fFileMru.removeNotExisting:= fAutoCleanMRU; MainForm.fPrjGrpMru.maxCount:= fMaxRecentGroups; MainForm.updateFloatingWidgetOnTop(fFloatingWidgetOnTop); MainForm.fDscanUnittests := fDscanUnittests; @@ -1556,6 +1563,8 @@ begin i := loadIcon('ARROW_UPDATE'); actProjGitBranchesUpd.ImageIndex:=i; + + fCleanIconIndex := loadIcon('CLEAN'); end; procedure TMainForm.InitWidgets; @@ -2334,9 +2343,17 @@ begin trgMnu.AddSeparator; itm := TMenuItem.Create(trgMnu); - itm.Caption := 'Clear'; + itm.Caption := 'Clear all'; itm.OnClick := @mruClearClick; itm.Tag := PtrInt(srcLst); + itm.ImageIndex:=fCleanIconIndex; + trgMnu.Add(itm); + + itm := TMenuItem.Create(trgMnu); + itm.Caption := 'Remove invalid entries'; + itm.OnClick := @mruClearInvalidClick; + itm.Tag := PtrInt(srcLst); + itm.ImageIndex:=fCleanIconIndex; trgMnu.Add(itm); finally @@ -2352,6 +2369,21 @@ begin if srcLst.isNotNil then srcLst.Clear; end; + +procedure TMainForm.mruClearInvalidClick(Sender: TObject); +var + srcLst: TMRUFileList; + i: integer; +begin + srcLst := TMRUFileList(TmenuItem(Sender).Tag); + if srcLst.isNil then + exit; + srcLst.BeginUpdate; + for i := srcLst.Count-1 downto 0 do + if not srcLst.Strings[i].fileExists then + srcLst.Delete(i); + srcLst.EndUpdate; +end; {$ENDREGION} {$REGION IMultiDocMonitor ----------------------------------------------------} diff --git a/src/u_mru.pas b/src/u_mru.pas index c8d77f1c..c4760686 100644 --- a/src/u_mru.pas +++ b/src/u_mru.pas @@ -36,11 +36,14 @@ type * MRU list for filenames. *) TMRUFileList = class(TMruList) + private + fRemoveNotExisting: boolean; protected function checkItem(const value: string): boolean; override; public constructor create; override; procedure assign(source: TPersistent); override; + property removeNotExisting: boolean read fRemoveNotExisting write fRemoveNotExisting; end; (** @@ -164,7 +167,9 @@ end; function TMRUFileList.checkItem(const value: string): boolean; begin - exit( inherited checkItem(value) and value.fileExists); + result := inherited checkItem(value); + if fRemoveNotExisting then + result := result and value.fileExists; end; constructor TMRUDocumentList.create;