Open person from tree view

Completes #47
niknetniko · Dec 8, 2024 · d8cb8b9 · d8cb8b9
1 parent a84d0ff
commit d8cb8b9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/src/main/main_window.cpp b/src/main/main_window.cpp
@@ -23,7 +23,7 @@
 #include <QDockWidget>
 #include <QFileDialog>
 
-void openOrSelectPerson(IntegerPrimaryKey personId) {
+void openOrSelectPerson(IntegerPrimaryKey personId, bool activate) {
     auto allWindows = QApplication::topLevelWidgets();
     const auto it = std::find_if(allWindows.constBegin(), allWindows.constEnd(), [](QWidget* element) {
         return qobject_cast<MainWindow*>(element) != nullptr;
@@ -37,6 +37,9 @@ void openOrSelectPerson(IntegerPrimaryKey personId) {
     auto* mainWindow = qobject_cast<MainWindow*>(*it);
     assert(mainWindow != nullptr);
     mainWindow->openOrSelectPerson(personId);
+    if (activate) {
+        mainWindow->activateWindow();
+    }
 }
 
 MainWindow::MainWindow() {

diff --git a/src/main/main_window.h b/src/main/main_window.h
@@ -25,8 +25,9 @@ class opaView;
  * TODO: is this the best way of doing this?
  *
  * @param personId The ID to open.
+ * @param activate If the window with the person should be activated.
  */
-void openOrSelectPerson(IntegerPrimaryKey personId);
+void openOrSelectPerson(IntegerPrimaryKey personId, bool activate = false);
 
 /**
  * The main window of the program.

diff --git a/src/tree_view/tree_view_window.cpp b/src/tree_view/tree_view_window.cpp
@@ -8,6 +8,7 @@
 #include "tree_view_window.h"
 
 #include "data/family.h"
+#include "main/main_window.h"
 #include "person_tree_graph_model.h"
 #include "utils/formatted_identifier_delegate.h"
 
@@ -51,16 +52,10 @@ TreeViewWindow::TreeViewWindow(IntegerPrimaryKey person, QWidget* parent) : QMai
     setCentralWidget(view);
     toolbar->setMovable(false);
 
-    view->setContextMenuPolicy(Qt::ActionsContextMenu);
-    auto* openPersonAction = new QAction(view);
-    openPersonAction->setText(i18n("Open person details"));
-    connect(openPersonAction, &QAction::triggered, [&]() {
-        // TODO: how can we get the current model here?
-        // Mouse position in scene coordinates.
-        // QPointF posView = view->mapToScene(view->mapFromGlobal(QCursor::pos()));
-        // const NodeId newId = graphModel.addNode();
-        // graphModel.setNodeData(newId, NodeRole::Position, posView);
+    connect(scene, &QtNodes::BasicGraphicsScene::nodeDoubleClicked, this, [](NodeId nodeId) {
+        openOrSelectPerson(nodeId, true);
     });
-    // TODO: remove some existing actions
-    view->addAction(openPersonAction);
+
+    // // TODO: remove some existing actions
+    // view->addAction(openPersonAction);
 }