Author: jghali
Date: Sun Oct 25 16:05:43 2020
New Revision: 24103
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24103
Log:
#16280: Incorrect Undo listing for vector graphics import
Modified:
trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.cpp
trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp
trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp
trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp
trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp
trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp
trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp
trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp
trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp
trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp
trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp
trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp
trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp
trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp
trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp
trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp
trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp
trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp
trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp
trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
trunk/Scribus/scribus/undomanager.cpp
trunk/Scribus/scribus/undomanager.h
Modified: trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.cpp Sun Oct
25 16:05:43 2020
@@ -139,7 +139,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportCDR;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp Sun Oct
25 16:05:43 2020
@@ -142,7 +142,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportCGM;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp Sun Oct
25 16:05:43 2020
@@ -135,7 +135,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportCVG;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp Sun Oct
25 16:05:43 2020
@@ -143,7 +143,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportDRW;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp Sun Oct
25 16:05:43 2020
@@ -141,7 +141,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportEMF;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp Sun Oct 25
16:05:43 2020
@@ -137,7 +137,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportFreehand;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp Sun Oct
25 16:05:43 2020
@@ -160,7 +160,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportIDML;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp Sun Oct
25 16:05:43 2020
@@ -159,9 +159,9 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportOOoDraw;
trSettings.description = fileName;
- trSettings.actionPixmap = Um::IXFIG;
+ trSettings.actionPixmap = Um::IImportOOoDraw;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
UndoManager::instance()->setUndoEnabled(false);
if (UndoManager::undoEnabled())
Modified: trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp Sun Oct
25 16:05:43 2020
@@ -143,7 +143,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportApplePages;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp Sun Oct
25 16:05:43 2020
@@ -136,7 +136,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportPict;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp Sun Oct
25 16:05:43 2020
@@ -165,24 +165,35 @@
fileName = diaf.selectedFile();
prefs->set("wdir", fileName.left(fileName.lastIndexOf("/")));
}
- m_Doc =ScCore->primaryMainWindow()->doc;
- UndoTransaction activeTransaction;
+ m_Doc = ScCore->primaryMainWindow()->doc;
bool emptyDoc = (m_Doc == nullptr);
bool hasCurrentPage = (m_Doc && m_Doc->currentPage());
+
+ QFileInfo fi(fileName);
+ QStringList exts = QStringList() << "eps" << "epsf" << "epsi" << "eps2"
<< "eps3" << "epi" << "ept" << "ps" << "ai";
+ QString lowerExt = fi.suffix().toLower();
+
+ QString undoActionName = Um::ImportPDF;
+ if (lowerExt == QLatin1String("ai"))
+ undoActionName = Um::ImportAI;
+ else if (exts.contains(fi.suffix().toLower()))
+ undoActionName = Um::ImportEPS;
+
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = undoActionName;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
+
+ UndoTransaction activeTransaction;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
UndoManager::instance()->setUndoEnabled(false);
if (UndoManager::undoEnabled())
activeTransaction =
UndoManager::instance()->beginTransaction(trSettings);
+
bool isCleanedFile = false;
QString cleanFile = "";
- QFileInfo fi(fileName);
- QStringList exts = QStringList() << "eps" << "epsf" << "epsi" << "eps2"
<< "eps3" << "epi" << "ept" << "ps" << "ai";
if (exts.contains(fi.suffix().toLower()))
{
if (!ScCore->haveGS())
Modified: trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp Sun Oct 25
16:05:43 2020
@@ -136,7 +136,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportPageMaker;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp Sun Oct
25 16:05:43 2020
@@ -137,7 +137,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportPublisher;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp Sun Oct
25 16:05:43 2020
@@ -135,7 +135,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportQXP;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp Sun Oct
25 16:05:43 2020
@@ -136,7 +136,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportShape;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp Sun Oct
25 16:05:43 2020
@@ -136,7 +136,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportSML;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp Sun Oct
25 16:05:43 2020
@@ -142,7 +142,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportSVM;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp Sun Oct
25 16:05:43 2020
@@ -143,7 +143,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportViva;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp Sun Oct
25 16:05:43 2020
@@ -137,7 +137,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportVSD;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp Sun Oct
25 16:05:43 2020
@@ -135,7 +135,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportWPG;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp Sun Oct
25 16:05:43 2020
@@ -136,7 +136,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportXara;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp Sun Oct
25 16:05:43 2020
@@ -159,7 +159,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportXPS;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
(original)
+++ trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp Sun Oct
25 16:05:43 2020
@@ -135,7 +135,7 @@
TransactionSettings trSettings;
trSettings.targetName = hasCurrentPage ?
m_Doc->currentPage()->getUName() : "";
trSettings.targetPixmap = Um::IImageFrame;
- trSettings.actionName = Um::ImportXfig;
+ trSettings.actionName = Um::ImportZMF;
trSettings.description = fileName;
trSettings.actionPixmap = Um::IXFIG;
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/undomanager.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/undomanager.cpp
==============================================================================
--- trunk/Scribus/scribus/undomanager.cpp (original)
+++ trunk/Scribus/scribus/undomanager.cpp Sun Oct 25 16:05:43 2020
@@ -677,19 +677,40 @@
UndoManager::Polyline = tr("Polyline");
UndoManager::PathText = tr("Text on a Path");
UndoManager::ConvertTo = tr("Convert to");
+ UndoManager::ImportAI = tr("Import AI drawing");
+ UndoManager::ImportApplePages = tr("Import Apple Pages document");
+ UndoManager::ImportBarcode = tr("Import Barcode");
+ UndoManager::ImportCDR = tr("Import CorelDraw drawing");
+ UndoManager::ImportCGM = tr("Import CGM drawing");
+ UndoManager::ImportCVG = tr("Import Calamus CVG drawing");
+ UndoManager::ImportDRW = tr("Import Micrografx Draw drawing");
+ UndoManager::ImportEMF = tr("Import EMF drawing");
+ UndoManager::ImportEPS = tr("Import EPS image");
+ UndoManager::ImportFreehand = tr("Import FreeHand document");
+ UndoManager::ImportIDML = tr("Import IDML document");
+ UndoManager::ImportOOoDraw = tr("Import OpenOffice.org Draw
image");
+ UndoManager::ImportPageMaker = tr("Import PageMaker document");
+ UndoManager::ImportPDF = tr("Import PDF document");
+ UndoManager::ImportPict = tr("Import Macintosh Pict drawing");
+ UndoManager::ImportPublisher = tr("Import MS Publisher document");
+ UndoManager::ImportQXP = tr("Import QuarkXPress document");
+ UndoManager::ImportShape = tr("Import Shape drawing");
+ UndoManager::ImportSML = tr("Import Kivio stencil");
UndoManager::ImportSVG = tr("Import SVG image");
+ UndoManager::ImportSVM = tr("Import SVM image");
UndoManager::ImportUniconv = tr("Import Uniconvertor image");
- UndoManager::ImportEPS = tr("Import EPS image");
- UndoManager::ImportBarcode = tr("Import Barcode");
- UndoManager::ImportOOoDraw = tr("Import OpenOffice.org Draw
image");
- UndoManager::ImportAI = tr("Import AI drawing");
+ UndoManager::ImportViva = tr("Import Viva Designer document");
+ UndoManager::ImportVSD = tr("Import Visio document");
+ UndoManager::ImportWMF = tr("Import WMF drawing");
+ UndoManager::ImportWPG = tr("Import WordPerfect graphic");
+ UndoManager::ImportXara = tr("Import Xara image");
UndoManager::ImportXfig = tr("Import XFig drawing");
+ UndoManager::ImportXPS = tr("Import XPS document");
+ UndoManager::ImportZMF = tr("Import Zoner Draw image");
UndoManager::Columns = tr("Change columns");
UndoManager::ColumnsGap = tr("Change columns gap");
- UndoManager::ImportWMF = tr("Import WMF drawing");
UndoManager::TextFrameDist = tr("Change text to frame distance");
UndoManager::ScratchSpace = tr("Scratch space");
- //UndoManager::TextFlow = tr("Text flows around the frame");
UndoManager::ObjectFrame = tr("Text flows around the frame");
UndoManager::BoundingBox = tr("Text flows around bounding box");
UndoManager::ContourLine = tr("Text flows around contour line");
@@ -832,13 +853,13 @@
UndoManager::IArrow = new QPixmap(iconDir + "u_arrow.png");
UndoManager::ITable = new QPixmap(iconDir +
"frame_table.png");
UndoManager::IFont = new QPixmap(iconDir + "u_font.png");
+ UndoManager::IAI = new QPixmap(iconDir + "u_eps.png"); //
using the icon for EPS for now
+ UndoManager::IEPS = new QPixmap(iconDir + "u_eps.png");
UndoManager::IImportOOoDraw = new QPixmap(iconDir + "ooo_draw.png");
UndoManager::ISVG = new QPixmap(iconDir + "u_svg.png");
UndoManager::IUniconv = new QPixmap(iconDir + "u_svg.png"); //
using the icon for SVG for now
- UndoManager::IEPS = new QPixmap(iconDir + "u_eps.png");
- UndoManager::IAI = new QPixmap(iconDir + "u_eps.png"); //
using the icon for EPS for now
+ UndoManager::IWMF = new QPixmap(iconDir + "u_eps.png"); //
using the icon for EPS for now
UndoManager::IXFIG = new QPixmap(iconDir + "u_eps.png"); //
using the icon for EPS for now
- UndoManager::IWMF = new QPixmap(iconDir + "u_eps.png"); //
using the icon for EPS for now
UndoManager::IImageScaling = new QPixmap(iconDir +
"u_scale_image.png");
UndoManager::IBorder = new QPixmap(iconDir + "u_shape.png");
UndoManager::IDocument = new QPixmap(iconDir +
"16/document-new.png");
@@ -968,14 +989,36 @@
QString UndoManager::Polyline = "";
QString UndoManager::PathText = "";
QString UndoManager::ConvertTo = "";
+QString UndoManager::ImportAI = "";
+QString UndoManager::ImportApplePages = "";
+QString UndoManager::ImportBarcode = "";
+QString UndoManager::ImportCDR = "";
+QString UndoManager::ImportCGM = "";
+QString UndoManager::ImportCVG = "";
+QString UndoManager::ImportDRW = "";
+QString UndoManager::ImportEMF = "";
+QString UndoManager::ImportEPS = "";
+QString UndoManager::ImportFreehand = "";
+QString UndoManager::ImportIDML = "";
+QString UndoManager::ImportOOoDraw = "";
+QString UndoManager::ImportPageMaker = "";
+QString UndoManager::ImportPDF = "";
+QString UndoManager::ImportPict = "";
+QString UndoManager::ImportPublisher = "";
+QString UndoManager::ImportQXP = "";
+QString UndoManager::ImportShape = "";
+QString UndoManager::ImportSML = "";
QString UndoManager::ImportSVG = "";
+QString UndoManager::ImportSVM = "";
QString UndoManager::ImportUniconv = "";
-QString UndoManager::ImportEPS = "";
-QString UndoManager::ImportBarcode = "";
-QString UndoManager::ImportOOoDraw = "";
-QString UndoManager::ImportAI = "";
+QString UndoManager::ImportViva = "";
+QString UndoManager::ImportVSD = "";
+QString UndoManager::ImportWMF = "";
+QString UndoManager::ImportWPG = "";
+QString UndoManager::ImportXara = "";
QString UndoManager::ImportXfig = "";
-QString UndoManager::ImportWMF = "";
+QString UndoManager::ImportXPS = "";
+QString UndoManager::ImportZMF = "";
QString UndoManager::ScratchSpace = "";
QString UndoManager::ObjectFrame = "";
QString UndoManager::BoundingBox = "";
@@ -1014,7 +1057,7 @@
QString UndoManager::InsertNote = "";
QString UndoManager::DeleteNote = "";
QString UndoManager::NewNotesStyle = "";
-QString UndoManager::EditNotesStyle = "";
+QString UndoManager::EditNotesStyle = "";
QString UndoManager::DeleteNotesStyle = "";
QString UndoManager::DeletePage = "";
QString UndoManager::DeletePages = "";
@@ -1115,11 +1158,11 @@
QPixmap *UndoManager::IFont = nullptr;
QPixmap *UndoManager::ISVG = nullptr;
QPixmap *UndoManager::IUniconv = nullptr;
+QPixmap *UndoManager::IAI = nullptr;
QPixmap *UndoManager::IEPS = nullptr;
-QPixmap *UndoManager::IAI = nullptr;
+QPixmap *UndoManager::IImportOOoDraw = nullptr;
+QPixmap *UndoManager::IWMF = nullptr;
QPixmap *UndoManager::IXFIG = nullptr;
-QPixmap *UndoManager::IWMF = nullptr;
-QPixmap *UndoManager::IImportOOoDraw = nullptr;
QPixmap *UndoManager::IImageScaling = nullptr;
QPixmap *UndoManager::IBorder = nullptr;
QPixmap *UndoManager::IDocument = nullptr;
Modified: trunk/Scribus/scribus/undomanager.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24103&path=/trunk/Scribus/scribus/undomanager.h
==============================================================================
--- trunk/Scribus/scribus/undomanager.h (original)
+++ trunk/Scribus/scribus/undomanager.h Sun Oct 25 16:05:43 2020
@@ -457,17 +457,38 @@
static QString Polyline;
static QString PathText;
static QString ConvertTo;
+ static QString RoundCorner;
+ static QString ImportAI;
+ static QString ImportApplePages;
+ static QString ImportBarcode;
+ static QString ImportCDR;
+ static QString ImportCGM;
+ static QString ImportCVG;
+ static QString ImportDRW;
+ static QString ImportEMF;
+ static QString ImportEPS;
+ static QString ImportFreehand;
+ static QString ImportIDML;
+ static QString ImportOOoDraw;
+ static QString ImportPageMaker;
+ static QString ImportPDF;
+ static QString ImportPict;
+ static QString ImportPublisher;
+ static QString ImportQXP;
+ static QString ImportShape;
+ static QString ImportSML;
static QString ImportSVG;
- static QString RoundCorner;
+ static QString ImportSVM;
static QString ImportUniconv;
- static QString ImportEPS;
- static QString ImportBarcode;
- static QString ImportOOoDraw;
- static QString ImportAI;
+ static QString ImportViva;
+ static QString ImportVSD;
+ static QString ImportWMF;
+ static QString ImportWPG;
+ static QString ImportXara;
static QString ImportXfig;
- static QString ImportWMF;
+ static QString ImportXPS;
+ static QString ImportZMF;
static QString ScratchSpace;
- //static QString TextFlow;
static QString ObjectFrame;
static QString BoundingBox;
static QString ContourLine;
@@ -624,13 +645,13 @@
static QPixmap *IArrow;
static QPixmap *ITable;
static QPixmap *IFont;
+ static QPixmap *IAI;
+ static QPixmap *IEPS;
+ static QPixmap *IImportOOoDraw;
static QPixmap *ISVG;
static QPixmap *IUniconv;
- static QPixmap *IEPS;
- static QPixmap *IAI;
+ static QPixmap *IWMF;
static QPixmap *IXFIG;
- static QPixmap *IWMF;
- static QPixmap *IImportOOoDraw;
static QPixmap *IImageScaling;
static QPixmap *IBorder;
static QPixmap *IDocument;
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
