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

Using QStringBuilder now. Fixed speed dial dialogs for webkit 533.3

Browse Source
This commit is contained in:
nowrep 2012-03-30 12:01:12 +02:00
parent fa4be83ea9
commit 43cd497d3f
9 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/defines.pri
View File

@ -15,7 +15,7 @@ win32 {
LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
}
DEFINES *= QT_NO_URL_CAST_FROM_STRING
DEFINES *= QT_NO_URL_CAST_FROM_STRING QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
##It won't compile on windows with this define. Some bug in qtsingleapp / qvector template
!win32: !CONFIG(debug, debug|release): DEFINES *= QT_NO_DEBUG_OUTPUT

3
src/lib/data/html/speeddial.html
View File

@ -46,8 +46,7 @@ span.reload:hover {border-color: grey; border-radius: 4px;}
#settingsBox .rowsel span {font-weight: bold;text-align: center;margin: 2px;margin-right: 7px;display: inline-block;width: 25px;}
.buttonbox {margin-top: 5px;margin-bottom:-5px;text-align:right;}
/*.buttonbox input {margin-left:3px; margin-right:0;padding:0;}*/
.overlay { background:-webkit-radial-gradient(rgba(127, 127, 127, 0.5),rgba(127, 127, 127, 0.5) 35%,rgba(0, 0, 0, 0.7));bottom:0;left: 0;padding: 20px;padding-bottom: 130px;position: fixed;right:0;top:0;}
.overlay {background:rgba(128,128,128,0.8);background:-webkit-radial-gradient(rgba(127, 127, 127, 0.5),rgba(127, 127, 127, 0.5) 35%,rgba(0, 0, 0, 0.7));bottom:0;left: 0;padding: 20px;padding-bottom: 130px;position: fixed;right:0;top:0;}
</style>
<script type="text/javascript" src="%JQUERY%"></script>
<script type="text/javascript" src="%JQUERY-UI%"></script>

2
src/lib/downloads/downloadmanager.cpp
View File

@ -74,7 +74,7 @@ void DownloadManager::loadSettings()
Settings settings;
settings.beginGroup("DownloadManager");
m_downloadPath = settings.value("defaultDownloadPath", "").toString();
m_lastDownloadPath = settings.value("lastDownloadPath", QDir::homePath() + "/").toString();
m_lastDownloadPath = settings.value("lastDownloadPath", QDir::homePath().append("/")).toString();
m_closeOnFinish = settings.value("CloseManagerOnFinish", false).toBool();
m_useNativeDialog = settings.value("useNativeDialog", DEFAULT_USE_NATIVE_DIALOG).toBool();

18
src/lib/network/networkmanager.cpp
View File

@ -187,15 +187,15 @@ void NetworkManager::sslError(QNetworkReply* reply, QList<QSslError> errors)
}
QSslCertificate cert = error.certificate();
certs.append("<ul><li>");
certs.append(tr("<b>Organization: </b>") + CertificateInfoWidget::clearCertSpecialSymbols(cert.subjectInfo(QSslCertificate::Organization)));
certs.append("</li><li>");
certs.append(tr("<b>Domain Name: </b>") + CertificateInfoWidget::clearCertSpecialSymbols(cert.subjectInfo(QSslCertificate::CommonName)));
certs.append("</li><li>");
certs.append(tr("<b>Expiration Date: </b>") + cert.expiryDate().toString("hh:mm:ss dddd d. MMMM yyyy"));
certs.append("</li><li>");
certs.append(tr("<b>Error: </b>") + error.errorString());
certs.append("</li></ul>");
certs += "<ul><li>";
certs += tr("<b>Organization: </b>") + CertificateInfoWidget::clearCertSpecialSymbols(cert.subjectInfo(QSslCertificate::Organization));
certs += "</li><li>";
certs += tr("<b>Domain Name: </b>") + CertificateInfoWidget::clearCertSpecialSymbols(cert.subjectInfo(QSslCertificate::CommonName));
certs += "</li><li>";
certs += tr("<b>Expiration Date: </b>") + cert.expiryDate().toString("hh:mm:ss dddd d. MMMM yyyy");
certs += "</li><li>";
certs += tr("<b>Error: </b>") + error.errorString();
certs += "</li></ul>";
}
QString text2 = tr("Would you like to make an exception for this certificate?");

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

@ -55,18 +55,18 @@ void AboutDialog::showAbout()
{
ui->authorsButton->setText(tr("Authors and Contributors"));
if (m_aboutHtml.isEmpty()) {
m_aboutHtml.append("<center><div style='margin:10px;'>");
m_aboutHtml.append(tr("<p><b>Application version %1</b><br/>").arg(QupZilla::VERSION
m_aboutHtml += "<center><div style='margin:10px;'>";
m_aboutHtml += tr("<p><b>Application version %1</b><br/>").arg(QupZilla::VERSION
#ifdef GIT_REVISION
+ " (" + GIT_REVISION + ")"
#endif
));
m_aboutHtml.append(tr("<b>WebKit version %1</b></p>").arg(QupZilla::WEBKITVERSION));
m_aboutHtml.append(QString("<p>&copy; %1 %2<br/>").arg(QupZilla::COPYRIGHT, QupZilla::AUTHOR));
m_aboutHtml.append(tr("<small>Build time: %1 </small></p>").arg(QupZilla::BUILDTIME));
m_aboutHtml.append(QString("<p><a href=%1>%1</a></p>").arg(QupZilla::WWWADDRESS));
m_aboutHtml.append("<p>" + mApp->getWindow()->weView()->webPage()->userAgentForUrl(QUrl()) + "</p>");
m_aboutHtml.append("</div></center>");
);
m_aboutHtml += tr("<b>WebKit version %1</b></p>").arg(QupZilla::WEBKITVERSION);
m_aboutHtml += QString("<p>&copy; %1 %2<br/>").arg(QupZilla::COPYRIGHT, QupZilla::AUTHOR);
m_aboutHtml += tr("<small>Build time: %1 </small></p>").arg(QupZilla::BUILDTIME);
m_aboutHtml += QString("<p><a href=%1>%1</a></p>").arg(QupZilla::WWWADDRESS);
m_aboutHtml += "<p>" + mApp->getWindow()->weView()->webPage()->userAgentForUrl(QUrl()) + "</p>";
m_aboutHtml += "</div></center>";
}
ui->textBrowser->setHtml(m_aboutHtml);
}
@ -75,17 +75,17 @@ void AboutDialog::showAuthors()
{
ui->authorsButton->setText(tr("< About QupZilla"));
if (m_authorsHtml.isEmpty()) {
m_authorsHtml.append("<center><div style='margin:10px;'>");
m_authorsHtml.append(tr("<p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p>").arg(QupZilla::AUTHOR, "<a href=mailto:nowrep@gmail.com>nowrep@gmail.com</a>"));
m_authorsHtml.append(tr("<p><b>Contributors:</b><br/>%1</p>").arg(
m_authorsHtml += "<center><div style='margin:10px;'>";
m_authorsHtml += tr("<p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p>").arg(QupZilla::AUTHOR, "<a href=mailto:nowrep@gmail.com>nowrep@gmail.com</a>");
m_authorsHtml += tr("<p><b>Contributors:</b><br/>%1</p>").arg(
QString::fromUtf8("Mladen Pejaković<br/>"
"Bryan M Dunsmore<br/>"
"Mariusz Fik<br/>"
"Jan Rajnoha<br/>"
"Daniele Cocca")
));
);
m_authorsHtml.append(tr("<p><b>Translators:</b><br/>%1</p>").arg(
m_authorsHtml += tr("<p><b>Translators:</b><br/>%1</p>").arg(
QString::fromUtf8("Heimen Stoffels<br/>"
"Peter Vacula<br/>"
"Jonathan Hooverman<br/>"
@ -110,9 +110,10 @@ void AboutDialog::showAuthors()
"Daiki Noda<br/>"
"Gábor Oberle<br/>"
"Piccoro McKay Lenz")
));
m_authorsHtml.append("</div></center>");
);
m_authorsHtml += "</div></center>";
}
ui->textBrowser->setHtml(m_authorsHtml);
}

6
src/lib/tools/globalfunctions.cpp
View File

@ -164,13 +164,11 @@ QString qz_urlEncodeQueryString(const QUrl &url)
QString returnString = url.toString(QUrl::RemoveQuery | QUrl::RemoveFragment);
if (url.hasQuery()) {
returnString.append("?");
returnString.append(url.encodedQuery());
returnString += "?" + url.encodedQuery();
}
if (url.hasFragment()) {
returnString.append("#");
returnString.append(url.encodedFragment());
returnString += "#" + url.encodedFragment();
}
returnString.replace(" ", "%20");

4
src/lib/webview/webview.cpp
View File

@ -685,7 +685,7 @@ void WebView::createPageContextMenu(QMenu* menu, const QPoint &pos)
if (url().scheme() == "http" || url().scheme() == "https") {
// bool result = validateConfirm(tr("Do you want to upload this page to an online source code validator?"));
// if (result)
menu->addAction(tr("Validate page"), this, SLOT(openUrlInSelectedTab()))->setData("http://validator.w3.org/check?uri=" + url().toString());
menu->addAction(tr("Validate page"), this, SLOT(openUrlInSelectedTab()))->setData(QUrl("http://validator.w3.org/check?uri=" + url().toString()));
}
menu->addAction(QIcon::fromTheme("text-html"), tr("Show so&urce code"), this, SLOT(showSource()));
@ -757,7 +757,7 @@ void WebView::createSelectedTextContextMenu(QMenu* menu, const QWebHitTestResult
connect(gtwact, SIGNAL(middleClicked()), this, SLOT(openUrlInBackgroundTab()));
menu->addAction(gtwact);
Action* dictact = new Action(QIcon::fromTheme("accessories-dictionary"), tr("Dictionary"));
dictact->setData("http://" + (langCode != "" ? langCode + "." : langCode) + "wiktionary.org/wiki/Special:Search?search=" + selectedText);
dictact->setData(QUrl("http://" + (langCode != "" ? langCode + "." : langCode) + "wiktionary.org/wiki/Special:Search?search=" + selectedText));
connect(dictact, SIGNAL(triggered()), this, SLOT(openUrlInSelectedTab()));
connect(dictact, SIGNAL(middleClicked()), this, SLOT(openUrlInBackgroundTab()));
menu->addAction(dictact);

4
src/plugins/MouseGestures/3rdparty/QjtMouseGestureFilter.cpp vendored
View File

@ -107,7 +107,7 @@ void QjtMouseGestureFilter::addGesture(QjtMouseGesture* gesture)
{
Gesture::DirectionList dl;
for (DirectionList::const_iterator source = gesture->directions().begin(); source != gesture->directions().end(); ++source) {
for (DirectionList::const_iterator source = gesture->directions().constBegin(); source != gesture->directions().end(); ++source) {
dl.push_back(*source);
}
@ -120,7 +120,7 @@ void QjtMouseGestureFilter::addGesture(QjtMouseGesture* gesture)
void QjtMouseGestureFilter::clearGestures(bool deleteGestures)
{
if (deleteGestures)
for (GestureList::const_iterator i = d->gestures.begin(); i != d->gestures.end(); ++i) {
for (GestureList::const_iterator i = d->gestures.constBegin(); i != d->gestures.constEnd(); ++i) {
delete *i;
}

1
translations/translations.pri
View File

@ -21,7 +21,6 @@ TRANSLATIONS += $$PWD/cs_CZ.ts\
$$PWD/ja_JP.ts\
$$PWD/ro_RO.ts\
$$PWD/hu_HU.ts\
$$PWD/es_VE.ts\
updateqm.input = TRANSLATIONS
updateqm.output = $$PWD/../bin/locale/${QMAKE_FILE_BASE}.qm