Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 1433 → Rev 1434

/branches/Version13x/Scribus/scribus/undomanager.h
473,6 → 473,9
static const QString BezierCurve;
static const QString Polyline;
static const QString ConvertTo;
static const QString ImportSVG;
static const QString ImportEPS;
static const QString ImportOOoDraw;
/*@}*/
 
/**
510,6 → 513,9
static QPixmap *IArrow;
static QPixmap *ITable;
static QPixmap *IFont;
static QPixmap *IImportSVG;
static QPixmap *IImportEPS;
static QPixmap *IImportOOoDraw;
/*@}*/
 
protected:
/branches/Version13x/Scribus/scribus/plugins/psimport/importps.cpp
16,6 → 16,7
#include <qcursor.h>
#include <cmath>
#include <cstdlib>
#include "undomanager.h"
 
extern QPointArray FlattenPath(FPointArray ina, QValueList<uint> &Segs);
extern QPixmap loadIcon(QString nam);
108,7 → 109,12
else
return;
}
if (UndoManager::undoEnabled())
UndoManager::instance()->beginTransaction(plug->doc->currentPage->getUName(),0,Um::ImportEPS,
fileName, Um::IImportEPS);
EPSPlug *dia = new EPSPlug(plug, fileName);
if (UndoManager::undoEnabled())
UndoManager::instance()->commit();
delete dia;
}
 
/branches/Version13x/Scribus/scribus/undomanager.cpp
697,6 → 697,9
const QString UndoManager::BezierCurve = tr("Bezier curve");
const QString UndoManager::Polyline = tr("Polyline");
const QString UndoManager::ConvertTo = tr("Convert to");
const QString UndoManager::ImportSVG = tr("Import SVG image");
const QString UndoManager::ImportEPS = tr("Import EPS image");
const QString UndoManager::ImportOOoDraw = tr("Import OpenOffice draw image");
 
/*** Icons for UndoObjects *******************************************/
QPixmap *UndoManager::IImageFrame = NULL;
728,3 → 731,6
QPixmap *UndoManager::ILineStyle = NULL;
QPixmap *UndoManager::IArrow = NULL;
QPixmap *UndoManager::IFont = NULL;
QPixmap *UndoManager::IImportSVG = NULL;
QPixmap *UndoManager::IImportEPS = NULL;
QPixmap *UndoManager::IImportOOoDraw = NULL;