Gui: Use QStringLiteral
This commit is contained in:
@@ -285,15 +285,15 @@ void GraphvizView::updateSvgItem(const App::Document &doc)
|
||||
args << QLatin1String("-Granksep=2") << QLatin1String("-Goutputorder=edgesfirst")
|
||||
<< QLatin1String("-Gsplines=ortho") << QLatin1String("-Tsvg");
|
||||
flatArgs << QLatin1String("-c2 -l2");
|
||||
auto dot = QString::fromLatin1("dot");
|
||||
auto unflatten = QString::fromLatin1("unflatten");
|
||||
auto dot = QStringLiteral("dot");
|
||||
auto unflatten = QStringLiteral("unflatten");
|
||||
auto path = QString::fromUtf8(hGrp->GetASCII("Graphviz").c_str());
|
||||
bool pathChanged = false;
|
||||
QDir dir;
|
||||
if (!path.isEmpty()) {
|
||||
dir = QDir(path);
|
||||
dot = dir.filePath(QString::fromLatin1("dot"));
|
||||
unflatten = dir.filePath(QString::fromLatin1("unflatten"));
|
||||
dot = dir.filePath(QStringLiteral("dot"));
|
||||
unflatten = dir.filePath(QStringLiteral("unflatten"));
|
||||
}
|
||||
dotProc->setEnvironment(QProcess::systemEnvironment());
|
||||
flatProc->setEnvironment(QProcess::systemEnvironment());
|
||||
@@ -305,7 +305,7 @@ void GraphvizView::updateSvgItem(const App::Document &doc)
|
||||
if (!dotProc->waitForStarted()) {
|
||||
int ret = QMessageBox::warning(Gui::getMainWindow(),
|
||||
tr("Graphviz not found"),
|
||||
QString::fromLatin1("<html><head/><body>%1 "
|
||||
QStringLiteral("<html><head/><body>%1 "
|
||||
"<a href=\"https://www.freecad.org/wiki/Std_DependencyGraph\">%2"
|
||||
"</a><p>%3</p></body></html>")
|
||||
.arg(tr("Graphviz couldn't be found on your system."),
|
||||
@@ -324,8 +324,8 @@ void GraphvizView::updateSvgItem(const App::Document &doc)
|
||||
}
|
||||
else {
|
||||
dir = QDir(path);
|
||||
dot = dir.filePath(QString::fromLatin1("dot"));
|
||||
unflatten = dir.filePath(QString::fromLatin1("unflatten"));
|
||||
dot = dir.filePath(QStringLiteral("dot"));
|
||||
unflatten = dir.filePath(QStringLiteral("unflatten"));
|
||||
pathChanged = true;
|
||||
}
|
||||
}
|
||||
@@ -391,7 +391,7 @@ QByteArray GraphvizView::exportGraph(const QString& format)
|
||||
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Paths");
|
||||
QProcess dotProc, flatProc;
|
||||
QStringList args, flatArgs;
|
||||
args << QString::fromLatin1("-T%1").arg(format);
|
||||
args << QStringLiteral("-T%1").arg(format);
|
||||
flatArgs << QLatin1String("-c2 -l2");
|
||||
|
||||
#ifdef FC_OS_LINUX
|
||||
@@ -401,11 +401,11 @@ QByteArray GraphvizView::exportGraph(const QString& format)
|
||||
#endif
|
||||
|
||||
#ifdef FC_OS_WIN32
|
||||
QString exe = QString::fromLatin1("\"%1/dot\"").arg(path);
|
||||
QString unflatten = QString::fromLatin1("\"%1/unflatten\"").arg(path);
|
||||
QString exe = QStringLiteral("\"%1/dot\"").arg(path);
|
||||
QString unflatten = QStringLiteral("\"%1/unflatten\"").arg(path);
|
||||
#else
|
||||
QString exe = QString::fromLatin1("%1/dot").arg(path);
|
||||
QString unflatten = QString::fromLatin1("%1/unflatten").arg(path);
|
||||
QString exe = QStringLiteral("%1/dot").arg(path);
|
||||
QString unflatten = QStringLiteral("%1/unflatten").arg(path);
|
||||
#endif
|
||||
|
||||
dotProc.setEnvironment(QProcess::systemEnvironment());
|
||||
@@ -442,13 +442,13 @@ bool GraphvizView::onMsg(const char* pMsg, const char**)
|
||||
{
|
||||
if (strcmp("Save",pMsg) == 0 || strcmp("SaveAs",pMsg) == 0) {
|
||||
QList< QPair<QString, QString> > formatMap;
|
||||
formatMap << qMakePair(QString::fromLatin1("%1 (*.gv)").arg(tr("Graphviz format")), QString::fromLatin1("gv"));
|
||||
formatMap << qMakePair(QString::fromLatin1("%1 (*.png)").arg(tr("PNG format")), QString::fromLatin1("png"));
|
||||
formatMap << qMakePair(QString::fromLatin1("%1 (*.bmp)").arg(tr("Bitmap format")), QString::fromLatin1("bmp"));
|
||||
formatMap << qMakePair(QString::fromLatin1("%1 (*.gif)").arg(tr("GIF format")), QString::fromLatin1("gif"));
|
||||
formatMap << qMakePair(QString::fromLatin1("%1 (*.jpg)").arg(tr("JPG format")), QString::fromLatin1("jpg"));
|
||||
formatMap << qMakePair(QString::fromLatin1("%1 (*.svg)").arg(tr("SVG format")), QString::fromLatin1("svg"));
|
||||
formatMap << qMakePair(QString::fromLatin1("%1 (*.pdf)").arg(tr("PDF format")), QString::fromLatin1("pdf"));
|
||||
formatMap << qMakePair(QStringLiteral("%1 (*.gv)").arg(tr("Graphviz format")), QStringLiteral("gv"));
|
||||
formatMap << qMakePair(QStringLiteral("%1 (*.png)").arg(tr("PNG format")), QStringLiteral("png"));
|
||||
formatMap << qMakePair(QStringLiteral("%1 (*.bmp)").arg(tr("Bitmap format")), QStringLiteral("bmp"));
|
||||
formatMap << qMakePair(QStringLiteral("%1 (*.gif)").arg(tr("GIF format")), QStringLiteral("gif"));
|
||||
formatMap << qMakePair(QStringLiteral("%1 (*.jpg)").arg(tr("JPG format")), QStringLiteral("jpg"));
|
||||
formatMap << qMakePair(QStringLiteral("%1 (*.svg)").arg(tr("SVG format")), QStringLiteral("svg"));
|
||||
formatMap << qMakePair(QStringLiteral("%1 (*.pdf)").arg(tr("PDF format")), QStringLiteral("pdf"));
|
||||
|
||||
QStringList filter;
|
||||
for (const auto & it : std::as_const(formatMap)) {
|
||||
@@ -523,7 +523,7 @@ void GraphvizView::print(QPrinter* printer)
|
||||
QPainter p(printer);
|
||||
QRect rect = printer->pageLayout().paintRectPixels(printer->resolution());
|
||||
view->scene()->render(&p, rect);
|
||||
//QByteArray buffer = exportGraph(QString::fromLatin1("svg"));
|
||||
//QByteArray buffer = exportGraph(QStringLiteral("svg"));
|
||||
//QSvgRenderer svg(buffer);
|
||||
//svg.render(&p, rect);
|
||||
p.end();
|
||||
@@ -543,7 +543,7 @@ void GraphvizView::print()
|
||||
void GraphvizView::printPdf()
|
||||
{
|
||||
QStringList filter;
|
||||
filter << QString::fromLatin1("%1 (*.pdf)").arg(tr("PDF format"));
|
||||
filter << QStringLiteral("%1 (*.pdf)").arg(tr("PDF format"));
|
||||
|
||||
QString selectedFilter;
|
||||
QString fn = Gui::FileDialog::getSaveFileName(this, tr("Export graph"), QString(), filter.join(QLatin1String(";;")), &selectedFilter);
|
||||
|
||||
Reference in New Issue
Block a user