ui: Added history of last active symbols to UI and menu (issue 151)

* holding down back or forward button shows list of current back-forward stack * added narrow button between back and forward to show the list * added History menu * moved back and forward actions to History menu * show chronological list of recently active symbols in History menu bug id = 151 fortune cookie message = Dein Geschäft wird gut laufen und expandieren.
2017-05-09 17:14:43 +02:00
parent bb8c2ae5a9
commit f4caacacf2
30 changed files with 668 additions and 65 deletions
@@ -95,7 +95,8 @@ bool MouseReleaseFilter::eventFilter(QObject* obj, QEvent* event)


 QtMainWindow::QtMainWindow()
-	: m_showDockWidgetTitleBars(true)
+	: m_historyMenu(nullptr)
+	, m_showDockWidgetTitleBars(true)
 	, m_windowStack(this)
 {
 	setObjectName("QtMainWindow");
@@ -115,6 +116,7 @@ QtMainWindow::QtMainWindow()
 	setupProjectMenu();
 	setupEditMenu();
 	setupViewMenu();
+	setupHistoryMenu();
 	setupBookmarksMenu();
 	setupHelpMenu();

@@ -252,6 +254,12 @@ void QtMainWindow::forceEnterLicense(bool expired)
 	}
 }

+void QtMainWindow::updateHistoryMenu(const std::vector<SearchMatch>& history)
+{
+	m_history = history;
+	setupHistoryMenu();
+}
+
 bool QtMainWindow::event(QEvent* event)
 {
 	if (event->type() == QEvent::WindowActivate)
@@ -534,7 +542,7 @@ void QtMainWindow::resetWindowLayout()

 void QtMainWindow::openRecentProject()
 {
-	QAction *action = qobject_cast<QAction *>(sender());
+	QAction *action = qobject_cast<QAction*>(sender());
 	if (action)
 	{
 		MessageLoadProject(FilePath(action->data().toString().toStdString()), false).dispatch();
@@ -590,6 +598,19 @@ void QtMainWindow::showBookmarkBrowser()
 	MessageDisplayBookmarks().dispatch();
 }

+void QtMainWindow::openHistoryAction()
+{
+	QAction* action = qobject_cast<QAction*>(sender());
+	if (action)
+	{
+		SearchMatch& match = m_history[action->data().toInt()];
+
+		MessageSearch msg({ match });
+		msg.isFromSearch = false;
+		msg.dispatch();
+	}
+}
+
 void QtMainWindow::setupProjectMenu()
 {
 	QMenu *menu = new QMenu(tr("&Project"), this);
@@ -626,10 +647,6 @@ void QtMainWindow::setupEditMenu()
 	QMenu *menu = new QMenu(tr("&Edit"), this);
 	menuBar()->addMenu(menu);

-	menu->addAction(tr("Back"), this, SLOT(undo()), QKeySequence::Undo);
-	menu->addAction(tr("Forward"), this, SLOT(redo()), QKeySequence::Redo);
-
-	menu->addSeparator();
 	m_trialDisabledActions.push_back(menu->addAction(tr("&Refresh"), this, SLOT(refresh()), QKeySequence::Refresh));
 	if (QSysInfo::windowsVersion() != QSysInfo::WV_None)
 	{
@@ -689,6 +706,41 @@ void QtMainWindow::setupViewMenu()
 	m_viewMenu = menu;
 }

+void QtMainWindow::setupHistoryMenu()
+{
+	if (!m_historyMenu)
+	{
+		m_historyMenu = new QMenu(tr("&History"), this);
+		menuBar()->addMenu(m_historyMenu);
+	}
+	else
+	{
+		m_historyMenu->clear();
+	}
+
+	m_historyMenu->addAction(tr("Back"), this, SLOT(undo()), QKeySequence::Undo);
+	m_historyMenu->addAction(tr("Forward"), this, SLOT(redo()), QKeySequence::Redo);
+
+	m_historyMenu->addSeparator();
+
+	QAction* title = new QAction(tr("Recently Active Symbols"));
+	title->setEnabled(false);
+	m_historyMenu->addAction(title);
+
+	for (size_t i = 0; i < m_history.size(); i++)
+	{
+		SearchMatch& match = m_history[i];
+		std::string name = utility::elide(match.nodeType == Node::NODE_FILE ? match.text : match.name, utility::ELIDE_RIGHT, 50);
+
+		QAction* action = new QAction();
+		action->setText(name.c_str());
+		action->setData(QVariant(int(i)));
+
+		connect(action, SIGNAL(triggered()), this, SLOT(openHistoryAction()));
+		m_historyMenu->addAction(action);
+	}
+}
+
 void QtMainWindow::setupBookmarksMenu()
 {
 	QMenu *menu = new QMenu(tr("&Bookmarks"), this);
@@ -7,6 +7,7 @@

 #include <QMainWindow>

+#include "data/search/SearchMatch.h"
 #include "qt/utility/QtThreadedFunctor.h"
 #include "qt/window/QtWindowStack.h"

@@ -69,6 +70,8 @@ public:

 	void forceEnterLicense(bool expired);

+	void updateHistoryMenu(const std::vector<SearchMatch>& history);
+
 protected:
 	bool event(QEvent* event);
 	void keyPressEvent(QKeyEvent* event);
@@ -126,6 +129,8 @@ private slots:
 	void showBookmarkCreator();
 	void showBookmarkBrowser();

+	void openHistoryAction();
+
 private:
 	struct DockWidget
 	{
@@ -138,6 +143,7 @@ private:
    void setupEditMenu();
 	void setupProjectMenu();
 	void setupViewMenu();
+	void setupHistoryMenu();
 	void setupBookmarksMenu();
 	void setupHelpMenu();

@@ -153,6 +159,10 @@ private:
 	std::vector<DockWidget> m_dockWidgets;
 	QMenu* m_viewMenu;
 	QAction* m_viewSeparator;
+
+	QMenu* m_historyMenu;
+	std::vector<SearchMatch> m_history;
+
 	QAction** m_recentProjectAction;
 	QAction* m_showTitleBarsAction;