r19883 by fschmid - File Importers: don't show the Progress Window when an importer is used by another importer.
scribus-commit
scribus-commit at lists.scribus.net
Wed Feb 25 21:01:15 UTC 2015
Author: fschmid
Date: Wed Feb 25 21:01:15 2015
New Revision: 19883
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19883
Log:
File Importers: don't show the Progress Window when an importer is used by another importer.
Modified:
trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
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/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/shape/importshapeplugin.cpp
trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.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/xfig/importxfigplugin.cpp
trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp
Modified: trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19883&path=/trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp Wed Feb 25 21:01:15 2015
@@ -216,7 +216,7 @@
#endif
AIPlug *dia = new AIPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- bool success = dia->import(fileName, trSettings, flags);
+ bool success = dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19883&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 Wed Feb 25 21:01:15 2015
@@ -148,7 +148,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
CdrPlug *dia = new CdrPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- if (!dia->import(fileName, trSettings, flags))
+ if (!dia->import(fileName, trSettings, flags, !(flags & lfScripted)))
{
ScribusMainWindow* mw=(m_Doc==0) ? ScCore->primaryMainWindow() : m_Doc->scMW();
//Import per Uniconverter
Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19883&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 Wed Feb 25 21:01:15 2015
@@ -151,7 +151,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
CgmPlug *dia = new CgmPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
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=19883&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 Wed Feb 25 21:01:15 2015
@@ -144,7 +144,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
CvgPlug *dia = new CvgPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
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=19883&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 Wed Feb 25 21:01:15 2015
@@ -152,7 +152,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
DrwPlug *dia = new DrwPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
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=19883&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 Wed Feb 25 21:01:15 2015
@@ -150,7 +150,7 @@
activeTransaction = new UndoTransaction(UndoManager::instance()->beginTransaction(trSettings));
EmfPlug *dia = new EmfPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
{
activeTransaction->commit();
Modified: trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19883&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 Wed Feb 25 21:01:15 2015
@@ -169,7 +169,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
IdmlPlug *dia = new IdmlPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
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=19883&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 Wed Feb 25 21:01:15 2015
@@ -168,7 +168,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
OdgPlug *dia = new OdgPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- bool ret = dia->import(fileName, trSettings, flags);
+ bool ret = dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19883&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 Wed Feb 25 21:01:15 2015
@@ -152,7 +152,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
PagesPlug *dia = new PagesPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- bool ret = dia->import(fileName, trSettings, flags);
+ bool ret = dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
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=19883&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 Wed Feb 25 21:01:15 2015
@@ -145,7 +145,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
PctPlug *dia = new PctPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
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=19883&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 Wed Feb 25 21:01:15 2015
@@ -221,9 +221,9 @@
PdfPlug *dia = new PdfPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
if (isCleanedFile)
- ret = dia->import(cleanFile, trSettings, flags);
+ ret = dia->import(cleanFile, trSettings, flags, !(flags & lfScripted));
else
- ret = dia->import(fileName, trSettings, flags);
+ ret = dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19883&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 Wed Feb 25 21:01:15 2015
@@ -145,7 +145,7 @@
activeTransaction = new UndoTransaction(UndoManager::instance()->beginTransaction(trSettings));
PmPlug *dia = new PmPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
{
activeTransaction->commit();
Modified: trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19883&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 Wed Feb 25 21:01:15 2015
@@ -146,7 +146,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
PubPlug *dia = new PubPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
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=19883&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 Wed Feb 25 21:01:15 2015
@@ -145,7 +145,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
ShapePlug *dia = new ShapePlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
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=19883&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 Wed Feb 25 21:01:15 2015
@@ -145,7 +145,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
SmlPlug *dia = new SmlPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
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=19883&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 Wed Feb 25 21:01:15 2015
@@ -152,7 +152,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
VivaPlug *dia = new VivaPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
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=19883&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 Wed Feb 25 21:01:15 2015
@@ -146,7 +146,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
VsdPlug *dia = new VsdPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
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=19883&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 Wed Feb 25 21:01:15 2015
@@ -144,7 +144,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
WpgPlug *dia = new WpgPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
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=19883&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 Wed Feb 25 21:01:15 2015
@@ -145,7 +145,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
XarPlug *dia = new XarPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19883&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp Wed Feb 25 21:01:15 2015
@@ -144,7 +144,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
XfigPlug *dia = new XfigPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- dia->import(fileName, trSettings, flags);
+ dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
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=19883&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 Wed Feb 25 21:01:15 2015
@@ -168,7 +168,7 @@
activeTransaction = UndoManager::instance()->beginTransaction(trSettings);
XpsPlug *dia = new XpsPlug(m_Doc, flags);
Q_CHECK_PTR(dia);
- bool ret = dia->import(fileName, trSettings, flags);
+ bool ret = dia->import(fileName, trSettings, flags, !(flags & lfScripted));
if (activeTransaction)
activeTransaction.commit();
if (emptyDoc || !(flags & lfInteractive) || !(flags & lfScripted))
More information about the scribus-commit
mailing list