Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 14750 → Rev 14751

/branches/Version135/Scribus/scribus/plugins/wmfimplugin/wmfimport.cpp
574,6 → 574,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.defFont;
659,7 → 660,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));
/branches/Version135/Scribus/scribus/plugins/aiimplugin/importai.cpp
207,6 → 207,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();
275,7 → 276,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))
340,7 → 341,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));
}
/branches/Version135/Scribus/scribus/plugins/xfigimplugin/importxfig.cpp
224,6 → 224,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();
293,7 → 294,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))
358,7 → 359,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));
}
/branches/Version135/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp
305,6 → 305,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->toolSettings.defFont;
422,7 → 423,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));
/branches/Version135/Scribus/scribus/plugins/fileloader/oodraw/oodrawimp.cpp
387,6 → 387,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"))
482,7 → 483,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));
/branches/Version135/Scribus/scribus/plugins/psimport/importps.cpp
222,6 → 222,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();
293,7 → 294,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))
358,7 → 359,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));
}