Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 1368 → Rev 1369

/branches/Version13x/Scribus/scribus/undomanager.h
430,6 → 430,8
static const QString Rename;
static const QString FromTo;
static const QString ApplyTemplate;
static const QString Paste;
static const QString Cut;
/*@}*/
 
/**
460,6 → 462,8
static QPixmap *IUnLock;
static QPixmap *IDelete;
static QPixmap *ICreate;
static QPixmap *IPaste;
static QPixmap *ICut;
/*@}*/
 
protected:
/branches/Version13x/Scribus/scribus/scribusview.cpp
8029,10 → 8029,14
 
void ScribusView::PasteToPage()
{
if (UndoManager::undoEnabled())
undoManager->beginTransaction(Doc->currentPage->getUName(), 0, Um::Paste, "", Um::IPaste);
emit LoadElem(ScApp->Buffer2, qRound(Mxp/Scale), qRound(Myp/Scale), false, false, Doc, this);
Doc->DraggedElem = 0;
Doc->DragElements.clear();
updateContents();
if (UndoManager::undoEnabled())
undoManager->commit();
}
 
/** Waagrechter Scrollbalken */
/branches/Version13x/Scribus/scribus/scribus.cpp
5247,6 → 5247,14
QString BufferI = "";
if ((HaveDoc) && (view->SelItem.count() != 0))
{
if (UndoManager::undoEnabled())
{
if (view->SelItem.count() > 1)
undoManager->beginTransaction(Um::SelectionGroup, Um::IGroup, Um::Cut,"",Um::ICut);
else
undoManager->beginTransaction(view->SelItem.at(0)->getUName(),
view->SelItem.at(0)->getUPixmap(), Um::Cut, "", Um::ICut);
}
Buffer2 = "<SCRIBUSTEXT>";
PageItem *b = view->SelItem.at(0);
if (doc->appMode == EditMode)
5313,6 → 5321,8
BuFromApp = true;
ClipB->setText(BufferI);
scrActions["editPaste"]->setEnabled(true);
if (UndoManager::undoEnabled())
undoManager->commit();
}
}
 
/branches/Version13x/Scribus/scribus/undomanager.cpp
611,6 → 611,8
UndoManager::IUnLock = new QPixmap(iconDir + "u_unlock.png");
UndoManager::IDelete = new QPixmap(iconDir + "u_delete.png");
UndoManager::ICreate = new QPixmap(iconDir + "u_create.png");
UndoManager::IPaste = new QPixmap(iconDir + "editpaste.png");
UndoManager::ICut = new QPixmap(iconDir + "u_cut.png");
}
 
const QString UndoManager::AddVGuide = tr("Add vertical guide");
652,6 → 654,8
const QString UndoManager::Rename = tr("Rename");
const QString UndoManager::FromTo = tr("From %1 to %2");
const QString UndoManager::ApplyTemplate = tr("Apply template");
const QString UndoManager::Paste = tr("Paste");
const QString UndoManager::Cut = tr("Cut");
 
/*** Icons for UndoObjects *******************************************/
QPixmap *UndoManager::IImageFrame = NULL;
676,3 → 680,5
QPixmap *UndoManager::IUnLock = NULL;
QPixmap *UndoManager::IDelete = NULL;
QPixmap *UndoManager::ICreate = NULL;
QPixmap *UndoManager::IPaste = NULL;
QPixmap *UndoManager::ICut = NULL;