Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 16741 → Rev 16742

/trunk/Scribus/scribus/scribusdoc.cpp
8212,29 → 8212,19
if (tmpSelection.count() != 0)
itemSelection_DeleteItem(&tmpSelection);
tmpSelection.clear();
QList<PageItem*> allItems;
for (int b = 0; b < DocItems.count(); ++b)
{
PageItem* currItem = DocItems.at(b);
if (currItem->isGroup())
allItems = currItem->getItemList();
else
allItems.append(currItem);
for (int ii = 0; ii < allItems.count(); ii++)
if (currItem->LayerID == l)
{
currItem = allItems.at(ii);
if (currItem->LayerID == l)
if (dl)
{
if (dl)
{
tmpSelection.addItem(currItem);
currItem->setLocked(false);
}
else
currItem->setLayer(newLayerID);
tmpSelection.addItem(currItem);
currItem->setLocked(false);
}
else
currItem->setLayer(newLayerID);
}
allItems.clear();
}
if (tmpSelection.count() != 0)
itemSelection_DeleteItem(&tmpSelection);
/trunk/Scribus/scribus/pageitem_group.cpp
82,6 → 82,16
return ret;
}
 
void PageItem_Group::setLayer(int newLayerID)
{
for (int em = 0; em < groupItemList.count(); ++em)
{
PageItem* embedded = groupItemList.at(em);
embedded->setLayer(newLayerID);
}
LayerID = newLayerID;
}
 
void PageItem_Group::replaceNamedResources(ResourceCollection& newNames)
{
for (int em = 0; em < groupItemList.count(); ++em)
/trunk/Scribus/scribus/pageitem.h
1075,7 → 1075,7
* Set the layer for the item
* @param layerId layer where this item is moved
*/
void setLayer(int layerId);
virtual void setLayer(int layerId);
 
/**
* @brief Check the changes to the item and add undo actions for them.
/trunk/Scribus/scribus/scribus.cpp
391,8 → 391,8
scrActions["SaveAsDocumentTemplate"]->setEnabled(false);
 
connect(ScCore->fileWatcher, SIGNAL(fileDeleted(QString )), this, SLOT(removeRecentFromWatcher(QString)));
connect(this, SIGNAL(TextStyle(const ParagraphStyle&)), propertiesPalette, SLOT(updateStyle(const ParagraphStyle&)));
connect(this, SIGNAL(TextEffects(int)), propertiesPalette, SLOT(setStil(int)));
// connect(this, SIGNAL(TextStyle(const ParagraphStyle&)), propertiesPalette, SLOT(updateStyle(const ParagraphStyle&)));
// connect(this, SIGNAL(TextEffects(int)), propertiesPalette, SLOT(setStil(int)));
connect(ClipB, SIGNAL(dataChanged()), this, SLOT(ClipChange()));
// connect(ClipB, SIGNAL(selectionChanged()), this, SLOT(ClipChange()));
setAcceptDrops(true);
/trunk/Scribus/scribus/pageitem_group.h
43,12 → 43,13
virtual PageItem_Group * asGroupFrame() { return this; }
virtual bool isGroup() const { return true; }
virtual ItemType realItemType() const { return PageItem::Group; }
void adjustXYPosition();
virtual QList<PageItem*> getItemList();
virtual void setLayer(int layerId);
virtual void getNamedResources(ResourceCollection& lists) const;
virtual void replaceNamedResources(ResourceCollection& newNames);
virtual void applicableActions(QStringList& actionList);
virtual QString infoDescription();
void adjustXYPosition();
protected:
virtual void DrawObj_Item(ScPainter *p, QRectF e);