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

[HistoryMenu] Show recently visited sites in top-level menu

Browse Source 
Closes #1355
This commit is contained in:
David Rosca 2014-06-05 19:58:32 +02:00
parent dc1b5931ea
commit 325072881d
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/lib/history/historymenu.cpp
View File

@ -87,21 +87,20 @@ void HistoryMenu::aboutToShow()
actions().at(0)->setEnabled(view->history()->canGoBack());
actions().at(1)->setEnabled(view->history()->canGoForward());
}
}
void HistoryMenu::aboutToHide()
{
// Enable Back/Forward actions to ensure shortcuts are working
actions().at(0)->setEnabled(true);
actions().at(1)->setEnabled(true);
}
while (actions().count() != 7) {
QAction* act = actions().at(7);
if (act->menu()) {
act->menu()->clear();
}
removeAction(act);
delete act;
}
void HistoryMenu::aboutToShowRecentlyVisited()
{
m_menuRecentlyVisited->clear();
addSeparator();
QSqlQuery query;
query.exec("SELECT title, url FROM history ORDER BY date DESC LIMIT 15");
query.exec(QSL("SELECT title, url FROM history ORDER BY date DESC LIMIT 10"));
while (query.next()) {
const QUrl url = query.value(1).toUrl();
@ -112,12 +111,15 @@ void HistoryMenu::aboutToShowRecentlyVisited()
connect(act, SIGNAL(triggered()), this, SLOT(historyEntryActivated()));
connect(act, SIGNAL(ctrlTriggered()), this, SLOT(historyEntryCtrlActivated()));
connect(act, SIGNAL(shiftTriggered()), this, SLOT(historyEntryShiftActivated()));
m_menuRecentlyVisited->addAction(act);
addAction(act);
}
}
if (m_menuRecentlyVisited->isEmpty()) {
m_menuRecentlyVisited->addAction(tr("Empty"))->setEnabled(false);
}
void HistoryMenu::aboutToHide()
{
// Enable Back/Forward actions to ensure shortcuts are working
actions().at(0)->setEnabled(true);
actions().at(1)->setEnabled(true);
}
void HistoryMenu::aboutToShowMostVisited()
@ -230,16 +232,12 @@ void HistoryMenu::init()
connect(this, SIGNAL(aboutToShow()), this, SLOT(aboutToShow()));
connect(this, SIGNAL(aboutToHide()), this, SLOT(aboutToHide()));
m_menuRecentlyVisited = new Menu(tr("Recently Visited"), this);
connect(m_menuRecentlyVisited, SIGNAL(aboutToShow()), this, SLOT(aboutToShowRecentlyVisited()));
m_menuMostVisited = new Menu(tr("Most Visited"), this);
connect(m_menuMostVisited, SIGNAL(aboutToShow()), this, SLOT(aboutToShowMostVisited()));
m_menuClosedTabs = new Menu(tr("Closed Tabs"));
connect(m_menuClosedTabs, SIGNAL(aboutToShow()), this, SLOT(aboutToShowClosedTabs()));
addMenu(m_menuRecentlyVisited);
addMenu(m_menuMostVisited);
addMenu(m_menuClosedTabs);
}

2
src/lib/history/historymenu.h
View File

@ -45,7 +45,6 @@ private slots:
void aboutToShow();
void aboutToHide();
void aboutToShowRecentlyVisited();
void aboutToShowMostVisited();
void aboutToShowClosedTabs();
@ -61,7 +60,6 @@ private:
void init();
QPointer<BrowserWindow> m_window;
Menu* m_menuRecentlyVisited;
Menu* m_menuMostVisited;
Menu* m_menuClosedTabs;
};