Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 16491 → Rev 16492

/trunk/Scribus/scribus/undomanager.h
569,6 → 569,8
static QString PrintLayer;
static QString DoNotPrintLayer;
static QString SetLayerName;
static QString FlowLayer;
static QString DisableFlowLayer;
static QString GetImage;
static QString ChangeFormula;
static QString MultipleDuplicate;
/trunk/Scribus/scribus/scribusdoc.cpp
1465,6 → 1465,12
setLayerPrintable(ss->getInt("ACTIVE"), isUndo ? !print : print);
layersUndo=true;
}
else if (ss->contains("FLOW_LAYER"))
{
bool flow = ss->getBool("FLOW");
setLayerFlow(ss->getInt("ACTIVE"), isUndo ? !flow : flow);
layersUndo=true;
}
else if (ss->contains("ADD_LAYER"))
{
if (isUndo)
2207,7 → 2213,7
ss->set("PRINT_LAYER", "print_layer");
ss->set("ACTIVE", (*it).ID);
ss->set("PRINT", isPrintable);
undoManager->action(this, ss, DocName, Um::IDocument);
undoManager->action(this, ss, it->Name, Um::IDocument);
}
found=true;
break;
2307,7 → 2313,18
{
if (it->ID == layerID)
{
bool oldFlow = it->flowControl;
it->flowControl = flow;
 
if (oldFlow!=flow && UndoManager::undoEnabled())
{
SimpleState *ss = new SimpleState(flow ? Um::FlowLayer : Um::DisableFlowLayer,"", Um::ITextFrame);
ss->set("FLOW_LAYER", "flow_layer");
ss->set("ACTIVE", (*it).ID);
ss->set("FLOW", flow);
undoManager->action(this, ss, it->Name, Um::IDocument);
}
 
found=true;
break;
}
/trunk/Scribus/scribus/pageitem.h
1220,6 → 1220,7
void restoreShapeContour(UndoState *state, bool isUndo);
void restoreImageEffects(UndoState *state, bool isUndo);
void restoreLinkTextFrame(UndoState *state, bool isUndo);
void restoreUnlinkTextFrame(UndoState *state, bool isUndo);
/*@}*/
 
/**
/trunk/Scribus/scribus/undomanager.cpp
941,6 → 941,8
UndoManager::PrintLayer = tr("Enable printing of layer");
UndoManager::DoNotPrintLayer = tr("Disable printing of layer");
UndoManager::SetLayerName = tr("Change name of the layer");
UndoManager::FlowLayer = tr("Enable text flow around for lower layers");
UndoManager::DisableFlowLayer = tr("Disable text flow around for lower layers");
UndoManager::GetImage = tr("Get image");
UndoManager::ChangeFormula = tr("Change formula");
UndoManager::MultipleDuplicate = tr("Multiple duplicate");
1145,6 → 1147,8
QString UndoManager::PrintLayer = "";
QString UndoManager::DoNotPrintLayer = "";
QString UndoManager::SetLayerName = "";
QString UndoManager::FlowLayer = "";
QString UndoManager::DisableFlowLayer = "";
QString UndoManager::GetImage = "";
QString UndoManager::ChangeFormula = "";
QString UndoManager::MultipleDuplicate = "";