anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 21:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unneeded cycle checks (#12954)

Browse Source 
(cherry picked from commit b5260a3a0f)
This commit is contained in:
Juergen Spitzmueller 2024-06-23 14:53:07 +02:00
parent e5030ad915
commit 03f59bf49e
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontends/qt/GuiDocument.cpp
View File

@ -821,7 +821,7 @@ GuiDocument::GuiDocument(GuiView & lv)
: GuiDialog(lv, "document", qt_("Document Settings")),
biblioChanged_(false), nonModuleChanged_(false),
modulesChanged_(false), shellescapeChanged_(false),
switchback_(false), prompted_(false)
switchback_(false)
{
setupUi(this);
@ -1889,21 +1889,15 @@ void GuiDocument::onBufferViewChanged()
&& theBufferList().exists(FileName(prev_buffer_filename_))
&& buttonBox->button(QDialogButtonBox::Apply)->isEnabled()) {
// Only ask if we haven't yet in this cycle
int const ret = prompted_ ? 3 : Alert::prompt(_("Unapplied changes"),
int const ret = Alert::prompt(_("Unapplied changes"),
_("Some changes in the previous document were not yet applied.\n"
"Do you want to switch back in order to apply them or dismiss the changes?"),
1, 1, _("&Switch Back"), _("&Dismiss Changes"));
if (ret == 0) {
// Switch to previous buffer view
switchback_ = true;
// Record that we have asked.
prompted_ = true;
lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH, prev_buffer_filename_));
return;
} else if (ret == 3) {
// We are in the second cycle. Set back.
prompted_ = false;
return;
}
}

3
src/frontends/qt/GuiDocument.h
View File

@ -358,9 +358,6 @@ private:
/// Track if we switch back to a buffer due to unapplied
/// changes
bool switchback_;
/// Track whether we prompted the user about unapplied
/// changes
bool prompted_;
/// Cache margin values
std::string tmp_leftmargin_;
///