Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 14748 → Rev 14749

/trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
79,6 → 79,7
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
QString CurDirP = QDir::currentPath();
QDir::setCurrent(fi.path());
164,7 → 165,7
tmpImage.setText("XSize", QString("%1").arg(xs));
tmpImage.setText("YSize", QString("%1").arg(ys));
}
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
m_Doc->m_Selection->delaySignalsOff();
delete m_Doc;
174,7 → 175,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
delete m_Doc;
}
return QImage();
276,6 → 277,7
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->view()->updatesOn(false);
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
QString CurDirP = QDir::currentPath();
345,7 → 347,7
}
}
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
if ((Elements.count() > 0) && (!ret) && (interactive))
405,7 → 407,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->view()->updatesOn(true);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
}
/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
258,6 → 258,7
m_Doc->setGUI(false, ScCore->primaryMainWindow(), 0);
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
gc->FontFamily = m_Doc->itemToolPrefs.textFont;
if (!m_Doc->PageColors.contains("Black"))
366,7 → 367,7
tmpImage.setText("YSize", QString("%1").arg(ys));
m_Doc->m_Selection->delaySignalsOff();
}
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
delete m_Doc;
QDir::setCurrent(CurDirP);
459,6 → 460,7
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->view()->updatesOn(false);
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
gc->FontFamily = m_Doc->itemToolPrefs.textFont;
589,7 → 591,7
}
}
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
if (interactive)
m_Doc->setLoading(false);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
/trunk/Scribus/scribus/plugins/import/ps/importps.cpp
218,6 → 218,7
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->view()->updatesOn(false);
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
QString CurDirP = QDir::currentPath();
289,7 → 290,7
}
}
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
if ((Elements.count() > 0) && (!ret) && (interactive))
354,7 → 355,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->view()->updatesOn(true);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
}
/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
83,6 → 83,7
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
QString CurDirP = QDir::currentPath();
QDir::setCurrent(fi.path());
168,7 → 169,7
tmpImage.setText("XSize", QString("%1").arg(xs));
tmpImage.setText("YSize", QString("%1").arg(ys));
}
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
m_Doc->m_Selection->delaySignalsOff();
delete m_Doc;
178,7 → 179,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
delete m_Doc;
}
return QImage();
277,6 → 278,7
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->view()->updatesOn(false);
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
QString CurDirP = QDir::currentPath();
346,7 → 348,7
}
}
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
if ((Elements.count() > 0) && (!ret) && (interactive))
406,7 → 408,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->view()->updatesOn(true);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
}
/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
82,6 → 82,7
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
QString CurDirP = QDir::currentPath();
QDir::setCurrent(fi.path());
167,7 → 168,7
tmpImage.setText("XSize", QString("%1").arg(xs));
tmpImage.setText("YSize", QString("%1").arg(ys));
}
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
m_Doc->m_Selection->delaySignalsOff();
delete m_Doc;
177,7 → 178,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
delete m_Doc;
}
return QImage();
277,6 → 278,7
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->view()->updatesOn(false);
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
QString CurDirP = QDir::currentPath();
346,7 → 348,7
}
}
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
if ((Elements.count() > 0) && (!ret) && (interactive))
420,7 → 422,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->view()->updatesOn(true);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
}
/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
161,6 → 161,7
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
QString CurDirP = QDir::currentPath();
QDir::setCurrent(fi.path());
246,7 → 247,7
}
else
tmpImage = QImage();
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
delete m_Doc;
QDir::setCurrent(CurDirP);
395,6 → 396,7
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->view()->updatesOn(false);
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
QString CurDirP = QDir::currentPath();
487,7 → 489,7
}
}
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
if ((Elements.count() > 0) && (!ret) && (interactive))
573,7 → 575,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->view()->updatesOn(true);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
}
/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
349,6 → 349,7
m_Doc->setGUI(false, ScCore->primaryMainWindow(), 0);
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
m_Doc->PageColors.ensureBlackAndWhite();
QList<PageItem*> Elements = parseWmfCommands();
431,7 → 432,7
m_Doc->m_Selection->delaySignalsOff();
m_Doc->setLoading(false);
}
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
delete m_Doc;
QDir::setCurrent(CurDirP);
return tmpImage;
680,6 → 681,7
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->view()->updatesOn(false);
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
//gc->Family = m_Doc->toolSettings.textFont;
765,7 → 767,7
}
}
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
if (interactive)
m_Doc->setLoading(false);
qApp->setOverrideCursor(QCursor(Qt::ArrowCursor));
/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
235,6 → 235,7
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->view()->updatesOn(false);
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
QString CurDirP = QDir::currentPath();
304,7 → 305,7
}
}
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
if ((Elements.count() > 0) && (!ret) && (interactive))
380,7 → 381,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->view()->updatesOn(true);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
}
/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
344,6 → 344,7
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
if (!m_Doc->PageColors.contains("Black"))
m_Doc->PageColors.insert("Black", ScColor(0, 0, 0, 255));
432,7 → 433,7
m_Doc->m_Selection->delaySignalsOff();
m_Doc->setLoading(false);
}
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
delete m_Doc;
QDir::setCurrent(CurDirP);
return tmpImage;
601,6 → 602,7
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->view()->updatesOn(false);
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
if (!m_Doc->PageColors.contains("Black"))
696,7 → 698,7
}
}
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
if (interactive)
m_Doc->setLoading(false);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
84,6 → 84,7
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
QString CurDirP = QDir::currentPath();
QDir::setCurrent(fi.path());
181,7 → 182,7
tmpImage.setText("YSize", QString("%1").arg(ys));
}
}
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
m_Doc->m_Selection->delaySignalsOff();
delete m_Doc;
191,7 → 192,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
delete m_Doc;
}
return QImage();
291,6 → 292,7
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->view()->updatesOn(false);
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
QString CurDirP = QDir::currentPath();
360,7 → 362,7
}
}
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
if ((Elements.count() > 0) && (!ret) && (interactive))
434,7 → 436,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->view()->updatesOn(true);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
}
/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
491,6 → 491,7
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
QString CurDirP = QDir::currentPath();
QDir::setCurrent(fi.path());
576,7 → 577,7
tmpImage.setText("XSize", QString("%1").arg(xs));
tmpImage.setText("YSize", QString("%1").arg(ys));
}
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
m_Doc->m_Selection->delaySignalsOff();
delete m_Doc;
586,7 → 587,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
delete m_Doc;
}
return QImage();
685,6 → 686,7
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->view()->updatesOn(false);
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
QString CurDirP = QDir::currentPath();
754,7 → 756,7
}
}
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
if ((Elements.count() > 0) && (!ret) && (interactive))
814,7 → 816,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->view()->updatesOn(true);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
}
/trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
146,6 → 146,7
CustColors.insert("Gold", ScColor(255, 215, 0));
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
QString CurDirP = QDir::currentPath();
QDir::setCurrent(fi.path());
231,7 → 232,7
tmpImage.setText("XSize", QString("%1").arg(xs));
tmpImage.setText("YSize", QString("%1").arg(ys));
}
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
m_Doc->m_Selection->delaySignalsOff();
delete m_Doc;
241,7 → 242,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
delete m_Doc;
}
return QImage();
412,6 → 413,7
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->view()->updatesOn(false);
bool wasScriptRunning = m_Doc->scMW()->ScriptRunning;
m_Doc->scMW()->ScriptRunning = true;
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
QString CurDirP = QDir::currentPath();
481,7 → 483,7
}
}
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->setLoading(false);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
if ((Elements.count() > 0) && (!ret) && (interactive))
546,7 → 548,7
{
QDir::setCurrent(CurDirP);
m_Doc->DoDrawing = true;
m_Doc->scMW()->ScriptRunning = false;
m_Doc->scMW()->ScriptRunning = wasScriptRunning;
m_Doc->view()->updatesOn(true);
qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
}