forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace uses of important literal with an unique string const

This commit is contained in:
Basile Burg 2020-04-25 02:17:34 +02:00
parent 9ab0537c6c
commit 593b49c695
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/u_common.pas
View File

@ -337,6 +337,10 @@ var
// terminal used under posix // terminal used under posix
consoleProgram: string; consoleProgram: string;
const
// used as page caption and filename when a doc has never been saved
newdocPageCaption = '<new document>';
implementation implementation

8
src/u_editor.pas
View File

@ -515,7 +515,7 @@ end;
procedure TEditorWidget.docFocused(document: TDexedMemo); procedure TEditorWidget.docFocused(document: TDexedMemo);
begin begin
if fDoc.isNotNil and pageControl.currentPage.isNotNil and if fDoc.isNotNil and pageControl.currentPage.isNotNil and
(pageControl.currentPage.Caption = '<new document>') then (pageControl.currentPage.Caption = newdocPageCaption) then
updatePageCaption(pageControl.currentPage); updatePageCaption(pageControl.currentPage);
if document = fDoc then if document = fDoc then
exit; exit;
@ -652,7 +652,7 @@ end;
procedure TEditorWidget.pageBtnAddCLick(Sender: TObject); procedure TEditorWidget.pageBtnAddCLick(Sender: TObject);
begin begin
TDexedMemo.Create(nil); TDexedMemo.Create(nil);
pageControl.currentPage.Caption:='<new document>'; pageControl.currentPage.Caption := newdocPageCaption;
end; end;
procedure TEditorWidget.setDetectModuleName(value: boolean); procedure TEditorWidget.setDetectModuleName(value: boolean);
@ -675,7 +675,7 @@ begin
fDoc.hideCallTips; fDoc.hideCallTips;
fDoc.hideDDocs; fDoc.hideDDocs;
if (pageControl.currentPage.Caption = '') or if (pageControl.currentPage.Caption = '') or
(pageControl.currentPage.Caption ='<new document>') then (pageControl.currentPage.Caption = newdocPageCaption) then
begin begin
fKeyChanged := true; fKeyChanged := true;
beginDelayedUpdate; beginDelayedUpdate;
@ -842,7 +842,7 @@ end;
procedure TEditorWidget.updatePageCaption(page: TDexedPage); procedure TEditorWidget.updatePageCaption(page: TDexedPage);
var var
txt: string = '<new document>'; txt: string = newdocPageCaption;
dc1: TDexedMemo = nil; dc1: TDexedMemo = nil;
dc2: TDexedMemo = nil; dc2: TDexedMemo = nil;
begin begin

2
src/u_gdb.pas
View File

@ -1525,7 +1525,7 @@ begin
fDoc := document; fDoc := document;
if fGdbState = gsNone then if fGdbState = gsNone then
updateDebugeeOptionsEditor; updateDebugeeOptionsEditor;
if (fDoc.fileName <> '<new document>') then if (fDoc.fileName <> newdocPageCaption) then
begin begin
fSynchronizingBreakpoints:= true; fSynchronizingBreakpoints:= true;
if fSynchronizedDocuments.IndexOf(document.fileName) = -1 then if fSynchronizedDocuments.IndexOf(document.fileName) = -1 then

6
src/u_synmemo.pas
View File

@ -1147,7 +1147,7 @@ begin
Highlighter := fD2Highlighter; Highlighter := fD2Highlighter;
fTempFileName := GetTempDir(false) + 'temp_' + uniqueObjStr(self) + '.d'; fTempFileName := GetTempDir(false) + 'temp_' + uniqueObjStr(self) + '.d';
fFilename := '<new document>'; fFilename := newdocPageCaption;
fModified := false; fModified := false;
TextBuffer.AddNotifyHandler(senrUndoRedoAdded, @changeNotify); TextBuffer.AddNotifyHandler(senrUndoRedoAdded, @changeNotify);
@ -3138,7 +3138,7 @@ begin
if fFilename.length > 0 then if fFilename.length > 0 then
result := fFilename.extractFileName result := fFilename.extractFileName
else else
result := '<new document>'; result := newdocPageCaption;
end; end;
end; end;
@ -3437,7 +3437,7 @@ begin
if fDiffDialogWillClose or fDisableFileDateCheck then if fDiffDialogWillClose or fDisableFileDateCheck then
exit; exit;
if fFilename.isNotEmpty and not fFilename.fileExists and if fFilename.isNotEmpty and not fFilename.fileExists and
(fFilename <> '<new document>') then (fFilename <> newdocPageCaption) then
begin begin
// cant use a dialog: dialog closed -> doc focused -> warn again, etc // cant use a dialog: dialog closed -> doc focused -> warn again, etc
getMessageDisplay.message(fFilename + ' does not exist anymore', self, amcEdit, amkWarn); getMessageDisplay.message(fFilename + ' does not exist anymore', self, amcEdit, amkWarn);