1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00

Fixed copying url with special characters into clipboard.

Also properly encode url for loading in W3 validator.

Followup to #762
This commit is contained in:
nowrep 2013-02-23 17:21:33 +01:00
parent 1ae60d65bb
commit 53b31ea912

View File

@ -475,7 +475,7 @@ void WebView::sendPageByMail()
void WebView::copyLinkToClipboard() void WebView::copyLinkToClipboard()
{ {
if (QAction* action = qobject_cast<QAction*>(sender())) { if (QAction* action = qobject_cast<QAction*>(sender())) {
QApplication::clipboard()->setText(action->data().toString()); QApplication::clipboard()->setText(action->data().toUrl().toEncoded());
} }
} }
@ -912,9 +912,8 @@ void WebView::createPageContextMenu(QMenu* menu, const QPoint &pos)
menu->addAction(QIcon::fromTheme("edit-select-all"), tr("Select &all"), this, SLOT(selectAll())); menu->addAction(QIcon::fromTheme("edit-select-all"), tr("Select &all"), this, SLOT(selectAll()));
menu->addSeparator(); menu->addSeparator();
if (url().scheme() == QLatin1String("http") || url().scheme() == QLatin1String("https")) { if (url().scheme() == QLatin1String("http") || url().scheme() == QLatin1String("https")) {
// bool result = validateConfirm(tr("Do you want to upload this page to an online source code validator?")); const QByteArray &w3url = "http://validator.w3.org/check?uri=" + QUrl::toPercentEncoding(url().toEncoded());
// if (result) menu->addAction(tr("Validate page"), this, SLOT(openUrlInSelectedTab()))->setData(QUrl::fromEncoded(w3url));
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())); menu->addAction(QIcon::fromTheme("text-html"), tr("Show so&urce code"), this, SLOT(showSource()));