From 2812b0c289ff2007b83f87dcadf3111d1da35b2d Mon Sep 17 00:00:00 2001 From: bart <9132501-flyingsheep@users.noreply.gitlab.com> Date: Wed, 17 Aug 2016 12:10:40 +0000 Subject: [PATCH] IDE: use rsmbNo instead of lisNo in IDEQuestionDialog. git-svn-id: trunk@52817 - --- ide/main.pp | 6 +++--- ide/sourcefilemanager.pas | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ide/main.pp b/ide/main.pp index 1acedf566a..dce22dccab 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -62,7 +62,7 @@ uses Math, Classes, SysUtils, TypInfo, types, strutils, AVL_Tree, // LCL LCLProc, LCLType, LCLIntf, LResources, ComCtrls, HelpIntfs, InterfaceBase, - Forms, Buttons, Menus, Controls, GraphType, Graphics, ExtCtrls, Dialogs, + Forms, Buttons, Menus, Controls, GraphType, Graphics, ExtCtrls, Dialogs, LclStrConsts, // CodeTools FileProcs, FindDeclarationTool, LinkScanner, BasicCodeTools, CodeToolsStructs, CodeToolManager, CodeCache, DefineTemplates, KeywordFuncLists, CodeTree, @@ -7906,7 +7906,7 @@ begin Result:=mrOk; if ToolStatus=itDebugger then begin Result:=IDEQuestionDialog(lisStopDebugging2, lisStopCurrentDebuggingAndRebuildProject, - mtConfirmation,[mrYes, mrCancel, lisNo],''); + mtConfirmation,[mrYes, mrCancel, rsmbNo],''); if Result<>mrYes then exit; Result:=DebugBoss.DoStopProject; @@ -11095,7 +11095,7 @@ begin case IDEQuestionDialog(lisSaveChanges, Format(lisSaveFileBeforeClosingForm, [AnUnitInfo.Filename, LineEnding, ADesigner.LookupRoot.Name]), - mtConfirmation,[mrYes,mrNoToAll,lisNo,mrCancel],'') of + mtConfirmation,[mrYes,mrNoToAll,rsmbNo,mrCancel],'') of mrYes: begin if DoSaveEditorFile(ASrcEdit,[sfCheckAmbiguousFiles])<>mrOk then Exit; diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas index 922270247f..837edfa5e9 100644 --- a/ide/sourcefilemanager.pas +++ b/ide/sourcefilemanager.pas @@ -35,7 +35,7 @@ uses AVL_Tree, typinfo, math, Classes, SysUtils, Controls, Forms, Dialogs, LCLIntf, LCLType, LCLProc, FileProcs, IDEProcs, DialogProcs, IDEDialogs, LConvEncoding, LazFileCache, FileUtil, LazFileUtils, LazUTF8, LResources, PropEdits, - DefineTemplates, IDEMsgIntf, IDEProtocol, LazarusIDEStrConsts, NewDialog, + DefineTemplates, IDEMsgIntf, IDEProtocol, LazarusIDEStrConsts, LclStrConsts, NewDialog, NewProjectDlg, LazIDEIntf, MainBase, MainBar, MainIntf, MenuIntf, NewItemIntf, CompOptsIntf, SrcEditorIntf, IDEWindowIntf, ProjectIntf, Project, ProjectDefs, ProjectInspector, PackageIntf, PackageDefs, PackageSystem, CompilerOptions, @@ -5700,7 +5700,7 @@ begin Result:=IDEQuestionDialog(lisFileNotLowercase, Format(lisTheUnitIsNotLowercaseTheFreePascalCompiler, [OldFilename, LineEnding, LineEnding+LineEnding]), - mtConfirmation,[mrYes,mrIgnore,lisNo,mrAbort],''); + mtConfirmation,[mrYes,mrIgnore,rsmbNo,mrAbort],''); if Result<>mrYes then exit; end; NewUnitName:=AnUnitInfo.SrcUnitName; @@ -7868,7 +7868,7 @@ begin // lpi file will change => ask Result:=IDEQuestionDialog(lisProjectChanged, Format(lisSaveChangesToProject, [Project1.GetTitleOrName]), - mtConfirmation, [mrYes, mrNoToAll, lisNo, mbCancel], ''); + mtConfirmation, [mrYes, mrNoToAll, rsmbNo, mbCancel], ''); if Result=mrNoToAll then exit(mrOk); if Result<>mrYes then exit(mrCancel); end @@ -7876,7 +7876,7 @@ begin begin // some non project files were changes in the source editor Result:=IDEQuestionDialog(lisSaveChangedFiles,lisSaveChangedFiles, - mtConfirmation, [mrYes, mrNoToAll, lisNo, mbCancel], ''); + mtConfirmation, [mrYes, mrNoToAll, rsmbNo, mbCancel], ''); if Result=mrNoToAll then exit(mrOk); if Result<>mrYes then exit(mrCancel); end @@ -7893,7 +7893,7 @@ begin if EnvironmentOptions.AskSaveSessionOnly then begin Result:=IDEQuestionDialog(lisProjectSessionChanged, Format(lisSaveSessionChangesToProject, [Project1.GetTitleOrName]), - mtConfirmation, [mrYes, mrNoToAll, lisNo, mbCancel], ''); + mtConfirmation, [mrYes, mrNoToAll, rsmbNo, mbCancel], ''); if Result=mrNoToAll then exit(mrOk); if Result<>mrYes then exit(mrCancel); end;