Fix camera action: show correctly camera view

calaos · Mar 25, 2024 · 89d5823 · 89d5823
1 parent 6f2ef9f
commit 89d5823
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/qml/desktop/main.qml b/qml/desktop/main.qml
@@ -390,12 +390,4 @@ Window {
     ScreenSuspend {
         id: screenSuspend
     }
-
-    Connections {
-        target: cameraModel
-
-        function onActionViewCamera() {
-            AppActions.openCameraSingleView(camModel)
-        }
-    }
 }
diff --git a/src/CameraModel.cpp b/src/CameraModel.cpp
@@ -65,14 +65,16 @@ void CameraModel::eventTouchscreenCamera(QString cameraId)
         if (cam && cam->get_cameraId() == cameraId)
         {
             //Wake up screen
+            QFAppDispatcher *appDispatcher = QFAppDispatcher::instance(engine);
+
 #ifdef CALAOS_DESKTOP
             ScreenManager::Instance().wakeupScreen();
 
             //Also tell ScreenSuspend.qml to wake up
-            QFAppDispatcher *appDispatcher = QFAppDispatcher::instance(engine);
             appDispatcher->dispatch("wakeupScreen");
 #endif
-            emit actionViewCamera(getItemModel(i));
+            QVariantMap m = {{ "camModel", QVariant::fromValue(getItemModel(i)) }};
+            appDispatcher->dispatch("openCameraSingleView", m);
         }
     }
 }

diff --git a/src/CameraModel.h b/src/CameraModel.h
@@ -46,9 +46,6 @@ class CameraModel: public QStandardItemModel
     Q_INVOKABLE QObject *getItemModel(int idx);
     Q_INVOKABLE int cameraCount() { return rowCount(); }
 
-signals:
-    void actionViewCamera(QObject *camModel);
-
 private slots:
     void eventTouchscreenCamera(QString cameraId);