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

Paste and Search action for Search Bar v2

Browse Source
This commit is contained in:
Mladen Pejaković 2012-01-24 18:23:43 +01:00
parent a09766a2ee
commit 4423f884bf
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/navigation/websearchbar.cpp
View File

@ -32,6 +32,7 @@ WebSearchBar::WebSearchBar(QupZilla* mainClass, QWidget* parent)
, p_QupZilla(mainClass) , p_QupZilla(mainClass)
, m_menu(new QMenu(this)) , m_menu(new QMenu(this))
, m_pasteAndGoAction(0) , m_pasteAndGoAction(0)
, m_clearAction(0)
{ {
setObjectName("websearchbar"); setObjectName("websearchbar");
m_buttonSearch = new ClickableLabel(this); m_buttonSearch = new ClickableLabel(this);
@ -195,11 +196,16 @@ void WebSearchBar::contextMenuEvent(QContextMenuEvent* event)
Q_UNUSED(event) Q_UNUSED(event)
if (!m_pasteAndGoAction) { if (!m_pasteAndGoAction) {
m_pasteAndGoAction = new QAction(tr("Paste And &Go"), this); m_pasteAndGoAction = new QAction(QIcon::fromTheme("edit-paste"), tr("Paste And &Search"), this);
// m_pasteAndGoAction->setShortcut(QKeySequence("Ctrl+Shift+V")); m_pasteAndGoAction->setShortcut(QKeySequence("Ctrl+Shift+V"));
connect(m_pasteAndGoAction, SIGNAL(triggered()), this, SLOT(pasteAndGo())); connect(m_pasteAndGoAction, SIGNAL(triggered()), this, SLOT(pasteAndGo()));
} }
if (!m_clearAction) {
m_clearAction = new QAction(QIcon::fromTheme("edit-clear"), tr("Clear All"), this);
connect(m_clearAction, SIGNAL(triggered()), this, SLOT(clear()));
}
QMenu* tempMenu = createStandardContextMenu(); QMenu* tempMenu = createStandardContextMenu();
m_menu->clear(); m_menu->clear();
@ -209,8 +215,32 @@ void WebSearchBar::contextMenuEvent(QContextMenuEvent* event)
tempMenu->removeAction(act); tempMenu->removeAction(act);
m_menu->addAction(act); m_menu->addAction(act);
if (i == 5) { switch (i) {
case 0:
act->setIcon(QIcon::fromTheme("edit-undo"));
break;
case 1:
act->setIcon(QIcon::fromTheme("edit-redo"));
break;
case 3:
act->setIcon(QIcon::fromTheme("edit-cut"));
break;
case 4:
act->setIcon(QIcon::fromTheme("edit-copy"));
break;
case 5:
act->setIcon(QIcon::fromTheme("edit-paste"));
m_menu->addAction(act);
m_menu->addAction(m_pasteAndGoAction); m_menu->addAction(m_pasteAndGoAction);
break;
case 6:
act->setIcon(QIcon::fromTheme("edit-delete"));
m_menu->addAction(act);
m_menu->addAction(m_clearAction);
break;
case 8:
act->setIcon(QIcon::fromTheme("edit-select-all"));
break;
} }
++i; ++i;
} }

4
src/navigation/websearchbar.h
View File

@ -83,9 +83,9 @@ private:
SearchEnginesManager* m_searchManager; SearchEnginesManager* m_searchManager;
QWeakPointer<SearchEnginesDialog> m_searchDialog; QWeakPointer<SearchEnginesDialog> m_searchDialog;
QAction* m_pasteAndGoAction;
QMenu* m_menu; QMenu* m_menu;
QAction* m_pasteAndGoAction;
QAction* m_clearAction;
}; };
#endif // WEBSEARCHBAR_H #endif // WEBSEARCHBAR_H