Differential D9409 Diff 24105 src/core/KexiWindow.cpp

Changeset View

Standalone View

View Options

src/core/KexiWindow.cpp

Show First 20 Lines • Show All 532 Lines • ▼ Show 20 Line(s)529 if (!res) {
533 << d->currentViewMode << " restored."; 533​ << d->currentViewMode << " restored.";
534 return false; 534​ return false;
535 } 535​ }
536 d->currentViewMode = newViewMode; 536​ d->currentViewMode = newViewMode;
537 d->newlySelectedView = newView; 537​ d->newlySelectedView = newView;
538 if (prevViewMode == Kexi::NoViewMode) 538​ if (prevViewMode == Kexi::NoViewMode)
539 d->newlySelectedView->setDirty(false); 539​ d->newlySelectedView->setDirty(false);
540 540​
541​ if ((prevViewMode == Kexi::DesignViewMode && d->currentViewMode == Kexi::TextViewMode)
542​ || (prevViewMode == Kexi::TextViewMode && d->currentViewMode == Kexi::DesignViewMode)) {
543​ wasDirty = view->isDirty(); // synchronize the dirty flag between Design and Text views
544​ } else {
541 wasDirty = newView->isDirty(); // remember and restore the flag if the view was clean 545​ wasDirty = newView->isDirty(); // remember and restore the flag if the view was clean
546​ }
547​
542 res = newView->afterSwitchFrom( 548​ res = newView->afterSwitchFrom(
543 designModePreloadedForTextModeHack ? Kexi::NoViewMode : prevViewMode); 549​ designModePreloadedForTextModeHack ? Kexi::NoViewMode : prevViewMode);
544 if (!wasDirty) { 550​ newView->setDirty(wasDirty);
545 newView->setDirty(false); 551​
546 } ​
547 *proposeOpeningInTextViewModeBecauseOfProblems 552​ *proposeOpeningInTextViewModeBecauseOfProblems
548 = data()->proposeOpeningInTextViewModeBecauseOfProblems; 553​ = data()->proposeOpeningInTextViewModeBecauseOfProblems;
549 if (!res) { 554​ if (!res) {
550 removeView(newViewMode); 555​ removeView(newViewMode);
551 delete newView; 556​ delete newView;
552 qWarning() << "Switching to mode " << newViewMode << " failed. Previous mode " 557​ qWarning() << "Switching to mode " << newViewMode << " failed. Previous mode "
553 << prevViewMode << " restored."; 558​ << prevViewMode << " restored.";
554 const Kexi::ObjectStatus status(*this); 559​ const Kexi::ObjectStatus status(*this);
▲ Show 20 Lines • Show All 329 Lines • Show Last 20 Lines