paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-02 19:47:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: simplified save project changes

Browse Source 
git-svn-id: trunk@34728 -
This commit is contained in:
mattias 2012-01-14 13:15:17 +00:00
parent 8a46f0dbf3
commit 8a4b3116bb
7 changed files with 58 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/ide/languages/codystrconsts.de.po
View File

@ -310,7 +310,7 @@ msgid "Insert Call Inherited"
msgstr ""
#: codystrconsts.crsinsertfileatcursor
msgid "Insert File at Cursor ..."
msgid "Insert File Contents at Cursor ..."
msgstr ""
#: codystrconsts.crsjumpto

2
components/codetools/ide/languages/codystrconsts.it.po
View File

@ -311,7 +311,7 @@ msgid "Insert Call Inherited"
msgstr ""
#: codystrconsts.crsinsertfileatcursor
msgid "Insert File at Cursor ..."
msgid "Insert File Contents at Cursor ..."
msgstr ""
#: codystrconsts.crsjumpto

2
components/codetools/ide/languages/codystrconsts.po
View File

@ -302,7 +302,7 @@ msgid "Insert Call Inherited"
msgstr ""
#: codystrconsts.crsinsertfileatcursor
msgid "Insert File at Cursor ..."
msgid "Insert File Contents at Cursor ..."
msgstr ""
#: codystrconsts.crsjumpto

5
components/codetools/ide/languages/codystrconsts.pt_BR.po
View File

@ -318,8 +318,9 @@ msgid "Insert Call Inherited"
msgstr "Inserir chamada à \"Inherited\""
#: codystrconsts.crsinsertfileatcursor
#| msgid "Insert file at cursor ..."
msgid "Insert File at Cursor ..."
#, fuzzy
#| msgid "Insert File at Cursor ..."
msgid "Insert File Contents at Cursor ..."
msgstr "Inserir arquivo na posição do cursor ..."
#: codystrconsts.crsjumpto

5
components/codetools/ide/languages/codystrconsts.ru.po
View File

@ -318,8 +318,9 @@ msgid "Insert Call Inherited"
msgstr "Вставить вызов унаследованного"
#: codystrconsts.crsinsertfileatcursor
#| msgid "Insert file at cursor ..."
msgid "Insert File at Cursor ..."
#, fuzzy
#| msgid "Insert File at Cursor ..."
msgid "Insert File Contents at Cursor ..."
msgstr "Вставить содержимое файла в месте расположения курсора ..."
#: codystrconsts.crsjumpto

4
components/codetools/ide/languages/codystrconsts.uk.po
View File

@ -321,8 +321,8 @@ msgstr ""
#: codystrconsts.crsinsertfileatcursor
#, fuzzy
#| msgid "Insert file at cursor ..."
msgid "Insert File at Cursor ..."
#| msgid "Insert File at Cursor ..."
msgid "Insert File Contents at Cursor ..."
msgstr "Вставити файл під курсором ..."
#: codystrconsts.crsjumpto

141
ide/main.pp
View File

@ -785,6 +785,7 @@ type
procedure SaveSrcEditorProjectSpecificSettings(AnEditorInfo: TUnitEditorInfo);
procedure SaveSourceEditorProjectSpecificSettings;
function DoShowSaveProjectAsDialog(UseMainSourceFile: boolean): TModalResult;
function AskSaveProject(const ContinueText, ContinueBtn: string): TModalResult;
// methods for open project, create project from source
function DoCompleteLoadingProjectInfo: TModalResult;
@ -1825,8 +1826,6 @@ begin
end;
procedure TMainIDE.MainIDEFormCloseQuery(Sender: TObject; var CanClose: boolean);
var
MsgResult: integer;
const IsClosing: Boolean = False;
begin
CanClose := True;
@ -1841,40 +1840,12 @@ begin
// check foreign windows
if not CloseQueryIDEWindows then exit;
// check packages
// save packages
if PkgBoss.DoCloseAllPackageEditors<>mrOk then exit;
// check project
if SomethingOfProjectIsModified then begin
if (Project1.SessionStorage=pssInProjectInfo)
or (Project1.SomeDataModified(false)) then begin
// lpi file will change => ask
MsgResult:=QuestionDlg(lisProjectChanged,
Format(lisSaveChangesToProject, [Project1.GetTitleOrName]), mtConfirmation,
[mrYes, lisMenuSave, mrNoToAll, lisDiscardChanges,
mrAbort, lisDoNotCloseTheIDE],
0);
if MsgResult in [mrCancel,mrAbort] then exit;
end
else if Project1.SessionStorage=pssNone then begin
// only session data changed and session is not saved => skip
MsgResult:=mrNone;
end else begin
// only session data changed and session is saved separately => save without asking
MsgResult:=mrYes;
end;
if MsgResult=mrYes then
begin
MsgResult:=DoSaveProject([sfCanAbort]);
if MsgResult<>mrOk then begin
MsgResult:=IDEQuestionDialog(lisChangesWereNotSaved,
lisDoYouStillWantToQuit,
mtConfirmation, [mrOk, lisDiscardChangesAndQuit, mrAbort]);
end;
CanClose := MsgResult=mrOk;
if not CanClose then exit;
end;
end;
// save project
if AskSaveProject(lisDoYouStillWantToQuit,lisDiscardChangesAndQuit)<>mrOk then
exit;
CanClose:=(DoCloseProject <> mrAbort);
finally
@ -8354,6 +8325,37 @@ begin
//DebugLn(['TMainIDE.DoShowSaveProjectAsDialog END OK']);
end;
function TMainIDE.AskSaveProject(const ContinueText, ContinueBtn: string
): TModalResult;
begin
if not SomethingOfProjectIsModified then exit(mrOk);
if (Project1.SomeDataModified(false))
or (Project1.SessionStorage=pssInProjectInfo)
then begin
// lpi file will change => ask
Result:=IDEQuestionDialog(lisProjectChanged,
Format(lisSaveChangesToProject, [Project1.GetTitleOrName]),
mtConfirmation, [mrYes, mrNoToAll, lisNo, mbCancel], '');
if Result in [mrCancel,mrNoToAll] then exit(mrCancel);
end
else if Project1.SessionStorage=pssNone then
// only session data changed and session is not saved => skip
exit(mrOk)
else if not SomethingOfProjectIsModified then
exit(mrOk)
else begin
// only session data changed and session is saved separately => save without asking
end;
Result:=DoSaveProject([sfCanAbort]);
if Result=mrAbort then exit;
if Result<>mrOk then begin
Result:=IDEQuestionDialog(lisChangesWereNotSaved,
ContinueText,
mtConfirmation, [mrOk, ContinueBtn, mrAbort]);
if Result<>mrOk then exit(mrCancel);
end;
end;
function TMainIDE.DoCompleteLoadingProjectInfo: TModalResult;
begin
UpdateCaption;
@ -10547,36 +10549,10 @@ begin
if Result<>mrOk then exit;
// close current project first
If Project1<>nil then begin
if SomethingOfProjectIsModified then begin
if (Project1.SessionStorage=pssInProjectInfo)
or (Project1.SomeDataModified(false)) then begin
// lpi file will change => ask
Result:=IDEQuestionDialog(lisProjectChanged, Format(lisSaveChangesToProject,
[Project1.GetTitleOrName]),
mtConfirmation, [mrYes, lisHintSave, mrNo, lisDiscardChanges, mrAbort,
dlgCancel]);
if Result in [mrCancel,mrAbort] then exit;
end
else if Project1.SessionStorage=pssNone then begin
// only session data changed and session is not saved => skip
Result:=mrNone;
end else begin
// only session data changed and session is saved separately => save without asking
Result:=mrYes;
end;
if Result=mrYes then
begin
Result:=DoSaveProject([sfCanAbort]);
if Result=mrAbort then exit;
if Result<>mrOk then begin
Result:=IDEQuestionDialog(lisChangesWereNotSaved,
lisDoYouStillWantToCreateTheNewProject,
mtConfirmation, [mrYes, lisDiscardChangesCreateNewProject, mrAbort]);
if Result<>mrYes then exit;
end;
end;
end;
if Project1<>nil then begin
if AskSaveProject(lisDoYouStillWantToCreateTheNewProject,
lisDiscardChangesCreateNewProject)<>mrOK then exit;
Result:=DoCloseProject;
if Result=mrAbort then exit;
end;
@ -10816,39 +10792,16 @@ var
HandlerResult: TModalResult;
AnEditorInfo: TUnitEditorInfo;
begin
// close the old project
if SomethingOfProjectIsModified then begin
if (Project1.SessionStorage=pssInProjectInfo)
or (Project1.SomeDataModified(false)) then begin
// lpi file will change => ask
Result:=IDEQuestionDialog(lisProjectChanged,
Format(lisSaveChangesToProject, [Project1.GetTitleOrName]),
mtconfirmation, [mrYes, mrNoToAll, lisNo, mbCancel], '');
if Result in [mrCancel,mrAbort] then exit;
end
else if Project1.SessionStorage=pssNone then begin
// only session data changed and session is not saved => skip
Result:=mrNone;
end else begin
// only session data changed and session is saved separately => save without asking
Result:=mrYes;
end;
if Result=mrYes then begin
Result:=DoSaveProject([sfCanAbort]);
if Result=mrAbort then exit;
if Result<>mrOk then begin
Result:=IDEQuestionDialog(lisChangesWereNotSaved,
lisDoYouStillWantToOpenAnotherProject,
mtConfirmation, [mrOk, lisDiscardChangesAndOpenProject, mrAbort]);
if Result<>mrOk then exit(mrCancel);
end;
end;
end;
Result:=mrCancel;
// save old project
if AskSaveProject(lisDoYouStillWantToOpenAnotherProject,
lisDiscardChangesAndOpenProject)<>mrOk then exit;
{$IFDEF IDE_VERBOSE}
writeln('TMainIDE.DoOpenProjectFile A "'+AFileName+'"');
debugln('TMainIDE.DoOpenProjectFile A "'+AFileName+'"');
{$ENDIF}
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.DoOpenProjectFile A');{$ENDIF}
Result:=mrCancel;
if ExtractFileNameOnly(AFileName)='' then exit;
//debugln('TMainIDE.DoOpenProjectFile A1 "'+AFileName+'"');
AFilename:=ExpandFileNameUTF8(TrimFilename(AFilename));