Index: scribus/commonstrings.cpp =================================================================== --- scribus/commonstrings.cpp (revision 27864) +++ scribus/commonstrings.cpp (working copy) @@ -108,6 +108,8 @@ QString CommonStrings:: trMasterPageNormalMiddle; QString CommonStrings:: masterPageNormalRight; QString CommonStrings:: trMasterPageNormalRight; +QString CommonStrings:: masterPageNormalSpread; +QString CommonStrings:: trMasterPageNormalSpread; QString CommonStrings::trPenStyle_SolidLine; QString CommonStrings::trPenStyle_DashedLine; @@ -381,6 +383,8 @@ CommonStrings::trMasterPageNormalMiddle = tr( "Normal Middle", "Default middle master page" ); CommonStrings::masterPageNormalRight = "Normal Right"; CommonStrings::trMasterPageNormalRight = tr( "Normal Right", "Default right master page" ); + CommonStrings::masterPageNormalSpread = "Normal Spread"; + CommonStrings::trMasterPageNormalSpread = tr( "Normal Spread", "Default facing master spread" ); CommonStrings::trPenStyle_SolidLine = tr("Solid Line"); CommonStrings::trPenStyle_DashedLine = tr("Dashed Line"); Index: scribus/commonstrings.h =================================================================== --- scribus/commonstrings.h (revision 27864) +++ scribus/commonstrings.h (working copy) @@ -174,6 +174,8 @@ static QString trMasterPageNormalMiddle; static QString masterPageNormalRight; static QString trMasterPageNormalRight; + static QString masterPageNormalSpread; + static QString trMasterPageNormalSpread; //Pen Styles static QString trPenStyle_SolidLine; Index: scribus/scribus.cpp =================================================================== --- scribus/scribus.cpp (revision 27864) +++ scribus/scribus.cpp (working copy) @@ -5287,7 +5287,7 @@ doc->addPageToSection(wo + 1, where, 1); } - doc->reconcileMasterPageSides(); + doc->reconcileMasterPages(); view->reformPages(false); doc->updateEndnotesFrames(); doc->changed(); @@ -5422,7 +5422,7 @@ doc->addPageToAnnotLinks(wot, where, numPages); doc->addPageToSection(wo, where, numPages); if (!m_deferMasterPageSideReconcile) - doc->reconcileMasterPageSides(); + doc->reconcileMasterPages(); doc->reformPages(); doc->updateEndnotesFrames(); updateGUIAfterPagesChanged(); @@ -5478,24 +5478,16 @@ int pageLocation = 0; copyDialog.values(masterPageName, copyFromMaster, pageLocation); bool badMasterPageName = doc->MasterNames.contains(masterPageName); - badMasterPageName |= (masterPageName == CommonStrings::masterPageNormal); - badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormal); - badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormalLeft); - badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormalMiddle); - badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormalRight); - badMasterPageName |= masterPageName.isEmpty(); + badMasterPageName |= doc->isDefaultMasterPageName(masterPageName); + badMasterPageName |= masterPageName.isEmpty(); while (badMasterPageName) { if (!copyDialog.exec()) return; copyDialog.values(masterPageName, copyFromMaster, pageLocation); badMasterPageName = doc->MasterNames.contains(masterPageName); - badMasterPageName |= (masterPageName == CommonStrings::masterPageNormal); - badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormal); - badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormalLeft); - badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormalMiddle); - badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormalRight); - badMasterPageName |= masterPageName.isEmpty(); + badMasterPageName |= doc->isDefaultMasterPageName(masterPageName); + badMasterPageName |= masterPageName.isEmpty(); } int currentPageNumber = doc->currentPage()->pageNr(); bool ok = doc->copyPageToMasterPage(currentPageNumber, pageLocation, pageLocationCount, masterPageName, copyFromMaster); @@ -6110,7 +6102,7 @@ void ScribusMainWindow::deleteMasterPage(const QString& masterPageName) { - if (!HaveDoc) + if (!HaveDoc || doc->isDefaultMasterPage(masterPageName)) return; const QUuid masterId = doc->masterPageId(masterPageName); @@ -6278,7 +6270,7 @@ } if (!doc->masterPageMode() && !m_deferMasterPageSideReconcile) { - doc->reconcileMasterPageSides(); + doc->reconcileMasterPages(); doc->reformPages(); } pageSelector->setMaximum(doc->Pages->count()); @@ -6880,6 +6872,8 @@ view->reformPages(); view->GotoPage(doc->currentPage()->pageNr()); view->DrawNew(); + if (oldDocPrefs.docSetupPrefs.pagePositioning != newDocPrefs.docSetupPrefs.pagePositioning) + pagePalette->updateMasterPageList(); pagePalette->rebuildPages(); emit UpdateRequest(reqCmsOptionsUpdate); doc->changed(); @@ -8119,7 +8113,7 @@ if (!savedMasterPageMode && batchEnd) { m_deferMasterPageSideReconcile = false; - doc->reconcileMasterPageSides(); + doc->reconcileMasterPages(); doc->reformPages(); } doc->rebuildMasterNames(); Index: scribus/scribusdoc.cpp =================================================================== --- scribus/scribusdoc.cpp (revision 27864) +++ scribus/scribusdoc.cpp (working copy) @@ -118,6 +118,102 @@ +namespace +{ +enum class DefaultMasterRole +{ + None, + Single, + Left, + Right, + Middle, + Spread +}; + +DefaultMasterRole defaultMasterRoleForName(const QString& name) +{ + if (name == CommonStrings::masterPageNormal || name == CommonStrings::trMasterPageNormal) + return DefaultMasterRole::Single; + if (name == CommonStrings::masterPageNormalLeft || name == CommonStrings::trMasterPageNormalLeft) + return DefaultMasterRole::Left; + if (name == CommonStrings::masterPageNormalRight || name == CommonStrings::trMasterPageNormalRight) + return DefaultMasterRole::Right; + if (name == CommonStrings::masterPageNormalMiddle || name == CommonStrings::trMasterPageNormalMiddle) + return DefaultMasterRole::Middle; + if (name == CommonStrings::masterPageNormalSpread || name == CommonStrings::trMasterPageNormalSpread) + return DefaultMasterRole::Spread; + return DefaultMasterRole::None; +} + +QString defaultMasterName(DefaultMasterRole role) +{ + switch (role) + { + case DefaultMasterRole::Single: + return CommonStrings::trMasterPageNormal; + case DefaultMasterRole::Left: + return CommonStrings::trMasterPageNormalLeft; + case DefaultMasterRole::Right: + return CommonStrings::trMasterPageNormalRight; + case DefaultMasterRole::Middle: + return CommonStrings::trMasterPageNormalMiddle; + case DefaultMasterRole::Spread: + return CommonStrings::trMasterPageNormalSpread; + case DefaultMasterRole::None: + break; + } + return QString(); +} + +QStringList defaultMasterNames(DefaultMasterRole role) +{ + QStringList names; + const QString translatedName = defaultMasterName(role); + if (!translatedName.isEmpty()) + names.append(translatedName); + + QString canonicalName; + switch (role) + { + case DefaultMasterRole::Single: + canonicalName = CommonStrings::masterPageNormal; + break; + case DefaultMasterRole::Left: + canonicalName = CommonStrings::masterPageNormalLeft; + break; + case DefaultMasterRole::Right: + canonicalName = CommonStrings::masterPageNormalRight; + break; + case DefaultMasterRole::Middle: + canonicalName = CommonStrings::masterPageNormalMiddle; + break; + case DefaultMasterRole::Spread: + canonicalName = CommonStrings::masterPageNormalSpread; + break; + case DefaultMasterRole::None: + break; + } + if (!canonicalName.isEmpty() && !names.contains(canonicalName)) + names.append(canonicalName); + return names; +} + +QUuid defaultMasterId(const ScribusDoc* doc, DefaultMasterRole role) +{ + const bool spreadRole = role == DefaultMasterRole::Spread; + for (const QString& name : defaultMasterNames(role)) + { + const QUuid id = doc->masterPageId(name); + if (id.isNull()) + continue; + if (doc->isMasterSpread(id) == spreadRole) + return id; + } + return QUuid(); +} +} + + /** This class forwards change events for pages and pageitems to the region occupied by this page or pageitem. @@ -2834,7 +2930,8 @@ if (oldPageName != newPageName && MasterNames.contains(newPageName)) return false; - Q_ASSERT(oldPageName != CommonStrings::masterPageNormal && oldPageName != CommonStrings::trMasterPageNormal); + if (isDefaultMasterPage(oldPageName)) + return false; for (int index : indices) MasterPages.at(index)->setPageName(newPageName); @@ -2868,6 +2965,8 @@ { assert(masterPageMode()); assert( Pages->count() > 1 && Pages->count() > pageNumber ); + if (pageNumber < 0 || pageNumber >= Pages->count() || isDefaultMasterPage(Pages->at(pageNumber)->pageName())) + return; setCurrentPage(Pages->at(0)); ScPage* page = Pages->takeAt(pageNumber); delete page; @@ -2978,6 +3077,38 @@ return masterPageHasSide(masterId, MasterPageSide::Left) && masterPageHasSide(masterId, MasterPageSide::Right); } +bool ScribusDoc::isDefaultMasterPageName(const QString& pageName) const +{ + return defaultMasterRoleForName(pageName) != DefaultMasterRole::None; +} + +QStringList ScribusDoc::defaultMasterPageNames() const +{ + QStringList names; + for (DefaultMasterRole role : { DefaultMasterRole::Single, DefaultMasterRole::Left, DefaultMasterRole::Right, DefaultMasterRole::Middle, DefaultMasterRole::Spread }) + names.append(defaultMasterNames(role)); + names.removeDuplicates(); + return names; +} + +QString ScribusDoc::translatedDefaultMasterPageName(const QString& pageName) const +{ + const DefaultMasterRole role = defaultMasterRoleForName(pageName); + return role == DefaultMasterRole::None ? pageName : defaultMasterName(role); +} + +bool ScribusDoc::isDefaultMasterPage(const QString& pageName) const +{ + const DefaultMasterRole role = defaultMasterRoleForName(pageName); + if (role == DefaultMasterRole::None) + return false; + + const QUuid id = masterPageId(pageName); + if (id.isNull()) + return false; + return isMasterSpread(id) == (role == DefaultMasterRole::Spread); +} + int ScribusDoc::appliedMasterPageIndex(const ScPage* page) const { if (!page) @@ -3110,6 +3241,156 @@ return leftPage >= 0 && rightPage >= 0; } +void ScribusDoc::ensureDefaultMasterPages() +{ + const int columns = pageSets().at(m_docPrefsData.docSetupPrefs.pagePositioning).Columns; + UndoBlocker undoBlocker; + + auto moveConflictingReservedMaster = [this](DefaultMasterRole role) + { + for (const QString& reservedName : defaultMasterNames(role)) + { + const QUuid existingId = masterPageId(reservedName); + if (existingId.isNull()) + continue; + const bool expectedSpread = role == DefaultMasterRole::Spread; + if (isMasterSpread(existingId) == expectedSpread) + continue; + + const QString replacementName = getUniqueName(reservedName, MasterNames.keys()); + renameMasterPage(existingId, replacementName); + } + }; + + auto ensureOnePageDefault = [this, &moveConflictingReservedMaster](DefaultMasterRole role) -> ScPage* + { + QUuid id = defaultMasterId(this, role); + if (!id.isNull()) + { + const int index = masterPageIndex(id, MasterPageSide::Single); + return index >= 0 ? MasterPages.at(index) : nullptr; + } + + moveConflictingReservedMaster(role); + ScPage* page = addMasterPage(MasterPages.count(), defaultMasterName(role)); + switch (role) + { + case DefaultMasterRole::Left: + page->LeftPg = 1; + page->Margins.setLeft(page->initialMargins.right()); + page->Margins.setRight(page->initialMargins.left()); + break; + case DefaultMasterRole::Right: + page->LeftPg = 0; + page->Margins.setRight(page->initialMargins.right()); + page->Margins.setLeft(page->initialMargins.left()); + break; + case DefaultMasterRole::Middle: + page->LeftPg = 2; + page->Margins.setLeft(page->initialMargins.left()); + page->Margins.setRight(page->initialMargins.left()); + break; + case DefaultMasterRole::Single: + case DefaultMasterRole::Spread: + case DefaultMasterRole::None: + break; + } + return page; + }; + + if (columns == 1) + { + ensureOnePageDefault(DefaultMasterRole::Single); + return; + } + + ScPage* leftDefault = ensureOnePageDefault(DefaultMasterRole::Left); + ScPage* rightDefault = ensureOnePageDefault(DefaultMasterRole::Right); + if (columns == 3 || columns == 4) + { + ensureOnePageDefault(DefaultMasterRole::Middle); + return; + } + if (columns != 2 || !defaultMasterId(this, DefaultMasterRole::Spread).isNull()) + return; + + moveConflictingReservedMaster(DefaultMasterRole::Spread); + const auto spread = addMasterSpread(MasterPages.count(), defaultMasterName(DefaultMasterRole::Spread)); + spread.first->LeftPg = 1; + spread.second->LeftPg = 0; + if (leftDefault) + { + spread.first->copySizingProperties(leftDefault, leftDefault->Margins); + leftDefault->guides.copy(&spread.first->guides); + } + if (rightDefault) + { + spread.second->copySizingProperties(rightDefault, rightDefault->Margins); + rightDefault->guides.copy(&spread.second->guides); + } + + // Default spreads can be created while the document is not in master-page + // mode, so reformPages() cannot position the pair at that point. Give the + // newly created spread valid geometry immediately. + const double spreadX = m_docPrefsData.displayPrefs.scratch.left(); + const double spreadY = m_docPrefsData.displayPrefs.scratch.top(); + spread.first->setXOffset(spreadX); + spread.first->setYOffset(spreadY); + spread.second->setXOffset(spreadX + spread.first->width()); + spread.second->setYOffset(spreadY); +} + +QUuid ScribusDoc::defaultMasterPageIdForLocation(PageLocation pageLocation) const +{ + const int columns = pageSets().at(m_docPrefsData.docSetupPrefs.pagePositioning).Columns; + if (columns == 1) + return defaultMasterId(this, DefaultMasterRole::Single); + if (pageLocation == LeftPage) + return defaultMasterId(this, DefaultMasterRole::Left); + if (pageLocation == RightPage) + return defaultMasterId(this, DefaultMasterRole::Right); + if (columns == 3 || columns == 4) + return defaultMasterId(this, DefaultMasterRole::Middle); + return QUuid(); +} + +void ScribusDoc::reconcileDefaultMasterPages() +{ + if (masterPageMode()) + return; + + for (int pageNumber = 0; pageNumber < DocPages.count(); ++pageNumber) + { + ScPage* page = DocPages.at(pageNumber); + QUuid currentId = page->appliedMasterPageId(); + QString currentName; + if (!currentId.isNull()) + currentName = masterPageName(currentId); + if (currentName.isEmpty()) + currentName = page->masterPageName(); + + const DefaultMasterRole currentRole = defaultMasterRoleForName(currentName); + if (currentRole == DefaultMasterRole::None || currentRole == DefaultMasterRole::Spread) + continue; + if (!isDefaultMasterPage(currentName)) + continue; + + const QUuid targetId = defaultMasterPageIdForLocation(locationOfPage(pageNumber)); + if (targetId.isNull()) + continue; + if (page->appliedMasterPageId() == targetId && page->appliedMasterPageSide() == MasterPageSide::Single) + continue; + + applyMasterPageInternal(targetId, MasterPageSide::Single, pageNumber, false); + } +} + +void ScribusDoc::reconcileMasterPages() +{ + reconcileDefaultMasterPages(); + reconcileMasterPageSides(); +} + void ScribusDoc::preserveMasterPageMarginsForLayoutChange(int oldPagePositioning) { if (oldPagePositioning < 0 || oldPagePositioning >= pageSets().count()) @@ -3185,46 +3466,38 @@ void ScribusDoc::replaceMasterPage(const QString& oldMasterPage) { + const QUuid oldMasterId = masterPageId(oldMasterPage); for (int pageIndex = 0; pageIndex < DocPages.count(); ++pageIndex) { ScPage* docPage = DocPages.at(pageIndex); - if (docPage->masterPageName() != oldMasterPage) + QUuid appliedId = docPage->appliedMasterPageId(); + if (appliedId.isNull()) + appliedId = masterPageId(docPage->masterPageName()); + if ((!oldMasterId.isNull() && appliedId != oldMasterId) || + (oldMasterId.isNull() && docPage->masterPageName() != oldMasterPage)) continue; - QString replacementName; - const PageLocation pageLoc = locationOfPage(pageIndex); - if (pageLoc == LeftPage && MasterNames.contains(CommonStrings::trMasterPageNormalLeft) - && CommonStrings::trMasterPageNormalLeft != oldMasterPage) - replacementName = CommonStrings::trMasterPageNormalLeft; - else if (pageLoc == RightPage && MasterNames.contains(CommonStrings::trMasterPageNormalRight) - && CommonStrings::trMasterPageNormalRight != oldMasterPage) - replacementName = CommonStrings::trMasterPageNormalRight; - else if (pageLoc == MiddlePage && MasterNames.contains(CommonStrings::trMasterPageNormalMiddle) - && CommonStrings::trMasterPageNormalMiddle != oldMasterPage) - replacementName = CommonStrings::trMasterPageNormalMiddle; - else if (MasterNames.contains(CommonStrings::trMasterPageNormal) - && CommonStrings::trMasterPageNormal != oldMasterPage) - replacementName = CommonStrings::trMasterPageNormal; - - if (replacementName.isEmpty()) + QUuid replacementId = defaultMasterPageIdForLocation(locationOfPage(pageIndex)); + if (replacementId.isNull() || replacementId == oldMasterId) { for (auto it = MasterNames.cbegin(); it != MasterNames.cend(); ++it) { - if (it.key() != oldMasterPage) + const QUuid candidateId = masterPageId(it.key()); + if (!candidateId.isNull() && candidateId != oldMasterId) { - replacementName = it.key(); + replacementId = candidateId; break; } } } - const QUuid replacementId = masterPageId(replacementName); if (!replacementId.isNull()) applyMasterPage(replacementId, pageIndex); } } + void ScribusDoc::deletePage(int pageNumber) { assert( Pages->count() > 1 && Pages->count() > pageNumber ); @@ -3247,7 +3520,7 @@ m_undoManager->action(this, ss); } Pages->swapItemsAt(a, b); - reconcileMasterPageSides(); + reconcileMasterPages(); reformPages(); changed(); } @@ -3301,7 +3574,7 @@ ss->set("PAGE_MOVE_NEWPOS", position); m_undoManager->action(this, ss); } - reconcileMasterPageSides(); + reconcileMasterPages(); reformPages(); if (m_View && m_ScMW) { @@ -7989,7 +8262,7 @@ addPageToAnnotLinks(annotLinksInsert, whereToInsert, copyCount); addPageToSection(existingPage, whereToInsert, copyCount); - reconcileMasterPageSides(); + reconcileMasterPages(); if (lastDest != nullptr) setCurrentPage(lastDest); else @@ -15141,37 +15414,7 @@ void ScribusDoc::createDefaultMasterPages() { - int setcol = pageSets()[m_docPrefsData.docSetupPrefs.pagePositioning].Columns; - if (setcol == 1) - { - addMasterPage(0, CommonStrings::trMasterPageNormal); - } - else if (setcol == 2) - { - ScPage *lp = addMasterPage(0, CommonStrings::trMasterPageNormalLeft); - lp->LeftPg = 1; - lp->Margins.setLeft(lp->initialMargins.right()); - lp->Margins.setRight(lp->initialMargins.left()); - lp = addMasterPage(1, CommonStrings::trMasterPageNormalRight); - lp->LeftPg = 0; - lp->Margins.setRight(lp->initialMargins.right()); - lp->Margins.setLeft(lp->initialMargins.left()); - } - else if ((setcol == 3) || (setcol == 4)) - { - ScPage *lp = addMasterPage(0, CommonStrings::trMasterPageNormalLeft); - lp->LeftPg = 1; - lp->Margins.setLeft(lp->initialMargins.right()); - lp->Margins.setRight(lp->initialMargins.left()); - lp = addMasterPage(1, CommonStrings::trMasterPageNormalRight); - lp->LeftPg = 0; - lp->Margins.setRight(lp->initialMargins.right()); - lp->Margins.setLeft(lp->initialMargins.left()); - lp = addMasterPage(2, CommonStrings::trMasterPageNormalMiddle); - lp->LeftPg = 2; - lp->Margins.setLeft(lp->initialMargins.left()); - lp->Margins.setRight(lp->initialMargins.left()); - } + ensureDefaultMasterPages(); } @@ -17747,8 +17990,11 @@ m_docPrefsData = prefsData; double topDisplacement = prefsData.displayPrefs.scratch.top() - oldPrefsData.displayPrefs.scratch.top(); double leftDisplacement = prefsData.displayPrefs.scratch.left() - oldPrefsData.displayPrefs.scratch.left(); + preserveMasterPageMarginsForLayoutChange(oldPrefsData.docSetupPrefs.pagePositioning); applyPrefsPageSizingAndMargins(resizePages, resizeMasterPages, resizePageMargins, resizeMasterPageMargins); - reconcileMasterPageSides(); + if (prefsData.docSetupPrefs.pagePositioning != oldPrefsData.docSetupPrefs.pagePositioning) + ensureDefaultMasterPages(); + reconcileMasterPages(); int docItemsCount = MasterItems.count(); for (int i = 0; i < docItemsCount; ++i) Index: scribus/scribusdoc.h =================================================================== --- scribus/scribusdoc.h (revision 27864) +++ scribus/scribusdoc.h (working copy) @@ -280,7 +280,12 @@ QList masterItemsForMasterPage(const ScPage* masterPage) const; MasterPageSide matchingMasterPageSide(const QUuid& masterId, int pageNumber) const; bool documentSpreadPages(int pageNumber, int& leftPage, int& rightPage) const; + bool isDefaultMasterPageName(const QString& pageName) const; + QStringList defaultMasterPageNames() const; + QString translatedDefaultMasterPageName(const QString& pageName) const; + bool isDefaultMasterPage(const QString& pageName) const; void preserveMasterPageMarginsForLayoutChange(int oldPagePositioning); + void reconcileMasterPages(); void reconcileMasterPageSides(); bool isMasterItemOnCurrentMaster(const PageItem* item) const; //! @brief Replace a master page by default one @@ -288,7 +293,7 @@ //! @brief Rename a master page bool renameMasterPage(const QString& oldPageName, const QString& newPageName); bool renameMasterPage(const QUuid& masterId, const QString& newPageName); - //! @brief Create the default master pages based on the layout selected by the user, ie, Normal, Normal Left, etc. + //! @brief Ensure the built-in master pages required by the current layout, including Normal Spread for facing pages. void createDefaultMasterPages(); //! @brief Create the requested pages in a new document, run after createDefaultMasterPages() void createNewDocPages(int pageCount); @@ -1388,6 +1393,9 @@ protected: bool applyMasterPageInternal(const QUuid& masterId, MasterPageSide side, int pageNumber, bool recordUndo); + void ensureDefaultMasterPages(); + void reconcileDefaultMasterPages(); + QUuid defaultMasterPageIdForLocation(PageLocation pageLocation) const; void addSymbols(); void applyPrefsPageSizingAndMargins(bool resizePages, bool resizeMasterPages, bool resizePageMargins, bool resizeMasterPageMargins); bool m_hasGUI {false}; Index: scribus/ui/pagepalette_masterpages.cpp =================================================================== --- scribus/ui/pagepalette_masterpages.cpp (revision 27864) +++ scribus/ui/pagepalette_masterpages.cpp (working copy) @@ -158,9 +158,9 @@ // allow to delete multiple pages in one step foreach (QListWidgetItem * delItem, masterPageListBox->selectedItems()) { - m_currentPage = delItem->text(); + m_currentPage = delItem->data(Qt::UserRole).toString(); - if (isReservedName(m_currentPage)) + if (m_doc->isDefaultMasterPage(m_currentPage)) continue; QString extraWarn; @@ -425,7 +425,8 @@ QString lastName; for (int selectionIndex = 0; selectionIndex < selectedNames.count(); ++selectionIndex) { - QString name = getUniqueName(selectedNames.at(selectionIndex), m_doc->MasterNames); + QString name = getNonReservedName(selectedNames.at(selectionIndex)); + name = getUniqueName(name, m_doc->MasterNames); const QList sourceIndices = indexGroups.value(selectionIndex); if (sourceIndices.isEmpty()) continue; @@ -468,8 +469,7 @@ bool deleteEnabled = true; deleteEnabled &= (m_doc->MasterNames.count() > 1); - deleteEnabled &= (m_currentPage != CommonStrings::masterPageNormal); - deleteEnabled &= (m_currentPage != CommonStrings::trMasterPageNormal); + deleteEnabled &= !m_doc->isDefaultMasterPage(m_currentPage); deleteButton->setEnabled(deleteEnabled); if (m_doc->appMode == modeEditClip) @@ -508,8 +508,7 @@ bool deleteEnabled = true; deleteEnabled &= (m_doc->MasterNames.count() > 1); - deleteEnabled &= (m_currentPage != CommonStrings::masterPageNormal); - deleteEnabled &= (m_currentPage != CommonStrings::trMasterPageNormal); + deleteEnabled &= !m_doc->isDefaultMasterPage(m_currentPage); deleteButton->setEnabled(deleteEnabled); if (m_doc->appMode == modeEditClip) @@ -533,17 +532,14 @@ masterPageListBox->clear(); for (auto it = m_doc->MasterNames.cbegin(); it != m_doc->MasterNames.cend(); ++it) { - QString mpName = it.key(); - - if (it.key() == CommonStrings::masterPageNormal) - mpName = CommonStrings::trMasterPageNormal; + QString mpName = getTranslatedReservedName(it.key()); QListWidgetItem* mpItem = new QListWidgetItem(mpName); const QUuid masterId = m_doc->masterPageId(it.key()); const bool spread = m_doc->isMasterSpread(masterId); mpItem->setIcon(IconManager::instance().loadIcon(spread ? "page-type-facing" : "page-type-single")); mpItem->setToolTip(spread ? tr("Facing master spread") : tr("One-page master")); - if (!isReservedName(mpName)) + if (!m_doc->isDefaultMasterPage(it.key())) mpItem->setFlags(mpItem->flags() |= Qt::ItemIsEditable); else mpItem->setFlags(mpItem->flags() &= ~Qt::ItemIsEditable); @@ -551,12 +547,8 @@ mpItem->setData(Qt::UserRole, it.key()); masterPageListBox->addItem(mpItem); } - deleteButton->setEnabled(m_doc->MasterNames.count() != 1); - if (masterPageName == CommonStrings::masterPageNormal) - { - masterPageName = CommonStrings::trMasterPageNormal; - deleteButton->setEnabled(false); - } + deleteButton->setEnabled(m_doc->MasterNames.count() != 1 && !m_doc->isDefaultMasterPage(masterPageName)); + masterPageName = getTranslatedReservedName(masterPageName); QList itL = masterPageListBox->findItems(masterPageName, Qt::MatchExactly); if (itL.count() != 0) itL.at(0)->setSelected(true); @@ -628,40 +620,17 @@ // FIXME: move to a new masterpages.h bool PagePalette_MasterPages::isReservedName(const QString& name) const { - bool retval = name == CommonStrings::masterPageNormal || - name == CommonStrings::trMasterPageNormal || - name == CommonStrings::masterPageNormalLeft || - name == CommonStrings::trMasterPageNormalLeft || - name == CommonStrings::masterPageNormalMiddle || - name == CommonStrings::trMasterPageNormalMiddle || - name == CommonStrings::masterPageNormalRight || - name == CommonStrings::trMasterPageNormalRight; - return retval; + return m_doc->isDefaultMasterPageName(name); } // FIXME: move to a new masterpages.h QString PagePalette_MasterPages::getNonReservedName(const QString& name) const { - const QStringList reservedNames = { - CommonStrings::masterPageNormal, - CommonStrings::trMasterPageNormal, - CommonStrings::trMasterPageNormalLeft, - CommonStrings::trMasterPageNormalMiddle, - CommonStrings::trMasterPageNormalRight - }; - return getUniqueName(name, reservedNames); + return getUniqueName(name, m_doc->defaultMasterPageNames()); } // FIXME: move to a new masterpages.h QString PagePalette_MasterPages::getTranslatedReservedName(const QString& name) const { - if (name == CommonStrings::masterPageNormal) - return CommonStrings::trMasterPageNormal; - if (name == CommonStrings::masterPageNormalLeft) - return CommonStrings::trMasterPageNormalLeft; - if (name == CommonStrings::masterPageNormalMiddle) - return CommonStrings::trMasterPageNormalMiddle; - if (name == CommonStrings::masterPageNormalRight) - return CommonStrings::trMasterPageNormalRight; - return name; + return m_doc->translatedDefaultMasterPageName(name); } Index: scribus/ui/pagepalette_pages.cpp =================================================================== --- scribus/ui/pagepalette_pages.cpp (revision 27864) +++ scribus/ui/pagepalette_pages.cpp (working copy) @@ -86,7 +86,7 @@ void PagePalette_Pages::deleteMasterPage(const QString &tmp) { - if (tmp == CommonStrings::trMasterPageNormal) + if (currView->m_doc->isDefaultMasterPage(tmp)) return; QString extraWarn; for (int i = 0; i < currView->m_doc->DocPages.count(); ++i) @@ -313,10 +313,12 @@ connect(pageLayout, SIGNAL(firstPageChanged(int)), this, SLOT(handleFirstPage(int))); currView->m_doc->preserveMasterPageMarginsForLayoutChange(oldPagePositioning); - currView->m_doc->reconcileMasterPageSides(); + currView->m_doc->createDefaultMasterPages(); + currView->m_doc->reconcileMasterPages(); currView->reformPages(); currView->DrawNew(); currView->GotoPage(currView->m_doc->currentPageNumber()); + rebuildMasters(); rebuildPages(); } @@ -325,7 +327,7 @@ if (!currView) return; currView->m_doc->setPageSetFirstPage(currView->m_doc->pagePositioning(), fp); - currView->m_doc->reconcileMasterPageSides(); + currView->m_doc->reconcileMasterPages(); currView->reformPages(); currView->DrawNew(); currView->GotoPage(currView->m_doc->currentPageNumber()); @@ -337,7 +339,7 @@ if (!currView) return; currView->m_doc->setBindingDirection(direction); - currView->m_doc->reconcileMasterPageSides(); + currView->m_doc->reconcileMasterPages(); currView->reformPages(); currView->DrawNew(); currView->GotoPage(currView->m_doc->currentPageNumber());