Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 16732 → Rev 16733

/trunk/Scribus/scribus/scribusdoc.cpp
2961,6 → 2961,12
name += "("+tmp.setNum(docPatterns.count())+")";
// name = tr("Copy_of_")+name;
docPatterns.insert(name, pattern);
QList<PageItem*> allItems = getAllItems(pattern.items);
for (int ii = 0; ii < allItems.count(); ii++)
{
PageItem* currItem = allItems.at(ii);
currItem->setLayer(0);
}
return true;
}
 
5364,6 → 5370,12
m_symbolEditMode = mode;
if (mode)
{
m_storedLayerID = activeLayer();
m_storedLayerLock = layerLocked(0);
m_storedLayerVis = layerVisible(0);
setActiveLayer(0);
setLayerVisible(0, true);
setLayerLocked(0, false);
ScPattern pa = docPatterns[symbolName];
currentEditedSymbol = symbolName;
ScPage* addedPage = new ScPage(docPrefsData.displayPrefs.scratch.Left, docPrefsData.displayPrefs.scratch.Top, pa.width, pa.height);
5393,6 → 5405,7
moveGroup(-sR.x() + addedPage->xOffset(), -sR.y() + addedPage->yOffset());
m_Selection->clear();
m_Selection->delaySignalsOff();
m_ScMW->changeLayer(0);
changed();
}
else
5469,6 → 5482,10
Items = &DocItems;
}
delete addedPage;
setActiveLayer(m_storedLayerID);
setLayerVisible(0, m_storedLayerVis);
setLayerLocked(0, m_storedLayerLock);
m_ScMW->changeLayer(m_storedLayerID);
}
}
 
/trunk/Scribus/scribus/scribusdoc.h
1050,6 → 1050,9
bool automaticTextFrames; // Flag for automatic Textframes
bool m_masterPageMode;
bool m_symbolEditMode;
int m_storedLayerID;
bool m_storedLayerLock;
bool m_storedLayerVis;
QMap<QString, double> m_constants;
ScribusMainWindow* m_ScMW;
ScribusView* m_View;
/trunk/Scribus/scribus/scribusview.cpp
2724,6 → 2724,7
Doc->setSymbolEditMode(true, symbolName);
Doc->setCurrentPage(Doc->Pages->at(0));
pageSelector->setEnabled(false);
layerMenu->setEnabled(false);
updateOn = false;
zoom();
oldX = qRound(Doc->currentPage()->xOffset()- 10);
2743,6 → 2744,7
updatesOn(true);
Doc->setCurrentPage(Doc->Pages->at(0));
pageSelector->setEnabled(true);
layerMenu->setEnabled(true);
resizeContents(qRound((Doc->maxCanvasCoordinate.x() - Doc->minCanvasCoordinate.x()) * m_canvas->scale()), qRound((Doc->maxCanvasCoordinate.y() - Doc->minCanvasCoordinate.y()) * m_canvas->scale()));
}
 
/trunk/Scribus/scribus/scribus.cpp
8511,6 → 8511,7
scrActions["toolsPDFAnnot3D"]->setEnabled(false);
#endif
pagePalette->enablePalette(false);
layerPalette->setEnabled(false);
patternsDependingOnThis.clear();
QStringList mainPatterns = doc->docPatterns.keys();
for (int a = 0; a < mainPatterns.count(); a++)
8579,6 → 8580,7
pagePalette->Rebuild();
propertiesPalette->updateColorList();
symbolPalette->editingFinished();
layerPalette->setEnabled(true);
updateActiveWindowCaption(doc->DocName);
}