Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

[Styles] Don't mention to use [style=QtStyle] selectors in comment

Browse Source 
It is not available in current Qt releases

QzSchemeHandler+AboutDialog: Fixed coding style
This commit is contained in:
David Rosca 2014-04-19 11:23:25 +02:00
parent badb9ec98c
commit 8283a5a42e
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/app/mainapplication.cpp
View File

@ -923,9 +923,6 @@ void MainApplication::loadTheme(const QString &name)
QString qss = QzTools::readAllFileContents(activeThemePath + QLatin1String("/main.css"));
// #id[style=QtStyle] (QtStyle = QMacStyle, QWindowsVistaStyle, QGtkStyle, ...)
// should be enough instead of loading special stylesheets
#if defined(Q_OS_MAC)
qss.append(QzTools::readAllFileContents(activeThemePath + QLatin1String("/linux.css")));
#elif defined(Q_OS_UNIX)
@ -939,7 +936,7 @@ void MainApplication::loadTheme(const QString &name)
}
QString relativePath = QDir::current().relativeFilePath(activeThemePath);
qss.replace(QzRegExp(QLatin1String("url\\s*\\(\\s*([^\\*:\\);]+)\\s*\\)"), Qt::CaseSensitive), QString("url(%1\\1)").arg(relativePath + "/"));
qss.replace(QzRegExp(QSL("url\\s*\\(\\s*([^\\*:\\);]+)\\s*\\)"), Qt::CaseSensitive), QString("url(%1/\\1)").arg(relativePath));
setStyleSheet(qss);
}

12
src/lib/network/schemehandlers/qupzillaschemehandler.cpp
View File

@ -167,9 +167,9 @@ QString QupZillaSchemeReply::reportbugPage()
bPage.replace(QLatin1String("%INFO_OS%"), QzTools::operatingSystem());
bPage.replace(QLatin1String("%INFO_APP%"),
#ifdef GIT_REVISION
QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION)
QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION)
#else
Qz::VERSION
Qz::VERSION
#endif
);
bPage.replace(QLatin1String("%INFO_QT%"), QString("%1 (built with %2)").arg(qVersion(), QT_VERSION_STR));
@ -222,9 +222,9 @@ QString QupZillaSchemeReply::aboutPage()
aPage.replace(QLatin1String("%VERSION-INFO%"),
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Version"),
#ifdef GIT_REVISION
QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION)
QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION)
#else
Qz::VERSION
Qz::VERSION
#endif
) +
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("WebKit version"), qWebKitVersion()));
@ -391,9 +391,9 @@ QString QupZillaSchemeReply::configPage()
cPage.replace(QLatin1String("%VERSION-INFO%"),
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Application version"),
#ifdef GIT_REVISION
QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION)
QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION)
#else
Qz::VERSION
Qz::VERSION
#endif
) +
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Qt version"), QT_VERSION_STR) +

6
src/lib/other/aboutdialog.cpp
View File

@ -68,11 +68,11 @@ void AboutDialog::showAbout()
m_aboutHtml += "<center><div style='margin:10px;'>";
m_aboutHtml += tr("<p><b>Application version %1</b><br/>").arg(
#ifdef GIT_REVISION
QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION)
QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION)
#else
Qz::VERSION
Qz::VERSION
#endif
);
);
m_aboutHtml += tr("<b>WebKit version %1</b></p>").arg(qWebKitVersion());
m_aboutHtml += QString("<p>&copy; %1 %2<br/>").arg(Qz::COPYRIGHT, Qz::AUTHOR);
m_aboutHtml += tr("<small>Build time: %1 </small></p>").arg(Qz::BUILDTIME);