Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00
Code Releases Activity

Option to "Search with..." in new background tab with middle click.

Browse Source
This commit is contained in:
nowrep 2012-06-01 20:25:37 +02:00
parent e61e961339
commit 4375b54b5c
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -452,6 +452,19 @@ void WebView::searchSelectedText()
openUrlInNewTab(urlToLoad, Qz::NT_SelectedTab); openUrlInNewTab(urlToLoad, Qz::NT_SelectedTab);
} }
void WebView::searchSelectedTextInBackgroundTab()
{
SearchEngine engine = mApp->searchEnginesManager()->activeEngine();
if (QAction* act = qobject_cast<QAction*>(sender())) {
if (act->data().isValid()) {
engine = qVariantValue<SearchEngine>(act->data());
}
}
const QUrl &urlToLoad = mApp->searchEnginesManager()->searchUrl(engine, selectedText());
openUrlInNewTab(urlToLoad, Qz::NT_NotSelectedTab);
}
void WebView::bookmarkLink() void WebView::bookmarkLink()
{ {
if (QAction* action = qobject_cast<QAction*>(sender())) { if (QAction* action = qobject_cast<QAction*>(sender())) {
@ -831,6 +844,7 @@ void WebView::createSelectedTextContextMenu(QMenu* menu, const QWebHitTestResult
if (isUrlValid(guessedUrl)) { if (isUrlValid(guessedUrl)) {
Action* act = new Action(QIcon::fromTheme("document-open-remote"), tr("Go to &web address")); Action* act = new Action(QIcon::fromTheme("document-open-remote"), tr("Go to &web address"));
act->setData(guessedUrl); act->setData(guessedUrl);
connect(act, SIGNAL(triggered()), this, SLOT(openActionUrl())); connect(act, SIGNAL(triggered()), this, SLOT(openActionUrl()));
connect(act, SIGNAL(middleClicked()), this, SLOT(openUrlInBackgroundTab())); connect(act, SIGNAL(middleClicked()), this, SLOT(openUrlInBackgroundTab()));
menu->addAction(act); menu->addAction(act);
@ -842,12 +856,23 @@ void WebView::createSelectedTextContextMenu(QMenu* menu, const QWebHitTestResult
selectedText.replace("\n", " ").replace("\t", ""); selectedText.replace("\n", " ").replace("\t", "");
SearchEngine engine = mApp->searchEnginesManager()->activeEngine(); SearchEngine engine = mApp->searchEnginesManager()->activeEngine();
menu->addAction(engine.icon, tr("Search \"%1 ..\" with %2").arg(selectedText, engine.name), this, SLOT(searchSelectedText())); Action* act = new Action(engine.icon, tr("Search \"%1 ..\" with %2").arg(selectedText, engine.name));
QMenu* swMenu = new QMenu(tr("Search with...")); connect(act, SIGNAL(triggered()), this, SLOT(searchSelectedText()));
connect(act, SIGNAL(middleClicked()), this, SLOT(searchSelectedTextInBackgroundTab()));
menu->addAction(act);
// Search with ...
Menu* swMenu = new Menu(tr("Search with..."), menu);
SearchEnginesManager* searchManager = mApp->searchEnginesManager(); SearchEnginesManager* searchManager = mApp->searchEnginesManager();
foreach(const SearchEngine & en, searchManager->allEngines()) { foreach(const SearchEngine & en, searchManager->allEngines()) {
swMenu->addAction(en.icon, en.name, this, SLOT(searchSelectedText()))->setData(qVariantFromValue(en)); Action* act = new Action(en.icon, en.name);
act->setData(qVariantFromValue(en));
connect(act, SIGNAL(triggered()), this, SLOT(searchSelectedText()));
connect(act, SIGNAL(middleClicked()), this, SLOT(searchSelectedTextInBackgroundTab()));
swMenu->addAction(act);
} }
menu->addMenu(swMenu); menu->addMenu(swMenu);
} }

1
src/lib/webview/webview.h
View File

@ -95,6 +95,7 @@ protected slots:
void showSource(QWebFrame* frame = 0, const QString &selectedHtml = QString()); void showSource(QWebFrame* frame = 0, const QString &selectedHtml = QString());
void showSiteInfo(); void showSiteInfo();
void searchSelectedText(); void searchSelectedText();
void searchSelectedTextInBackgroundTab();
void bookmarkLink(); void bookmarkLink();
void showSourceOfSelection(); void showSourceOfSelection();
void openUrlInSelectedTab(); void openUrlInSelectedTab();