From 25b07dbab9e26aa2cae983b5b5af705507254902 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Wed, 13 Jul 2022 14:28:51 -0500
Subject: [PATCH] adding text to the SlideObject

---
 src/qml/presenter/MainWindow.qml         |  7 ++++---
 src/qml/presenter/Presentation.qml       | 22 +++++++++++-----------
 src/qml/presenter/PresentationWindow.qml | 10 +++++++++-
 src/slide.cpp                            |  1 +
 src/slide.h                              |  6 ++++--
 5 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml
index 8bfab9d..7a7fcd8 100644
--- a/src/qml/presenter/MainWindow.qml
+++ b/src/qml/presenter/MainWindow.qml
@@ -138,12 +138,13 @@ Controls.Page {
             presentation.loadVideo()
         }
 
-        print(item.text.length)
+        print("text length: " + item.text.length);
+        print("text: " + item.text);
         if (item.text.length === 0) {
-            presentation.text = [""];
+            SlideObject.setText("");
         }
         else
-            presentation.text = item.text;
+            SlideObject.setText(item.text);
         presentation.textIndex = 0;
         presentation.changeSlide();
 
diff --git a/src/qml/presenter/Presentation.qml b/src/qml/presenter/Presentation.qml
index 643d432..7b2fe59 100644
--- a/src/qml/presenter/Presentation.qml
+++ b/src/qml/presenter/Presentation.qml
@@ -135,15 +135,15 @@ Item {
             } else {
                 print("Next slide time");
                 textIndex = 0;
-                clearText();
+                /* clearText(); */
                 nextSlide();
             }
         } else if (itemType === "video") {
-            clearText();
+            /* clearText(); */
             nextSlide();
         }
         else if (itemType === "image") {
-            clearText();
+            /* clearText(); */
             nextSlide();
         }
     }
@@ -157,7 +157,7 @@ Item {
         print(textIndex);
         if (itemType === "song") {
             if (textIndex === 0) {
-                clearText();
+                /* clearText(); */
                 nextSlide();
             } else if (textIndex <= root.text.length) {
                 previewSlide.text = root.text[textIndex];
@@ -165,11 +165,11 @@ Item {
                 --textIndex;
             }
         } else if (itemType === "video") {
-            clearText();
+            /* clearText(); */
             previousSlide();
         }
         else if (itemType === "image") {
-            clearText();
+            /* clearText(); */
             previousSlide();
         }
     }
@@ -185,14 +185,14 @@ Item {
             print(root.text[textIndex]);
             textIndex++;
         } else if (itemType === "video") {
-            clearText();
+            /* clearText(); */
         }
         else if (itemType === "image") {
-            clearText();
+            /* clearText(); */
         }
     }
 
-    function clearText() {
-        previewSlide.text = "";
-    }
+    /* function clearText() { */
+    /*     previewSlide.text = ""; */
+    /* } */
 }
diff --git a/src/qml/presenter/PresentationWindow.qml b/src/qml/presenter/PresentationWindow.qml
index 3833395..82cde59 100644
--- a/src/qml/presenter/PresentationWindow.qml
+++ b/src/qml/presenter/PresentationWindow.qml
@@ -28,6 +28,14 @@ Window {
         videoSource: SlideObject.videoBackground
         text: SlideObject.text
 
-        Component.onCompleted: slideItem = presentationSlide
+        /* Component.onCompleted: slideItem = presentationSlide */
+    }
+
+    function loadVideo() {
+        presentationSlide.loadVideo();
+    }
+
+    function stopVideo() {
+        presentationSlide.stopVideo()
     }
 }
diff --git a/src/slide.cpp b/src/slide.cpp
index 3f5087e..5275e71 100644
--- a/src/slide.cpp
+++ b/src/slide.cpp
@@ -63,6 +63,7 @@ void Slide::setText(QString text)
     if (m_text == text)
         return;
 
+    qDebug() << "####changing text to: " << text;
     m_text = text;
     emit textChanged(m_text);
 }
diff --git a/src/slide.h b/src/slide.h
index 01f1f24..b14b626 100644
--- a/src/slide.h
+++ b/src/slide.h
@@ -13,8 +13,10 @@ class Slide : public QObject
   Q_PROPERTY(QString audio READ audio WRITE setAudio NOTIFY audioChanged)
   Q_PROPERTY(QString imageBackground READ imageBackground WRITE setImageBackground NOTIFY imageBackgroundChanged)
   Q_PROPERTY(QString videoBackground READ videoBackground WRITE setVideoBackground NOTIFY videoBackgroundChanged)
-  Q_PROPERTY(QString horizontalTextAlignment READ horizontalTextAlignment WRITE setHorizontalTextAlignment NOTIFY horizontalTextAlignmentChanged)
-  Q_PROPERTY(QString verticalTextAlignment READ verticalTextAlignment WRITE setVerticalTextAlignment NOTIFY verticalTextAlignmentChanged)
+  Q_PROPERTY(QString horizontalTextAlignment READ horizontalTextAlignment
+             WRITE setHorizontalTextAlignment NOTIFY horizontalTextAlignmentChanged)
+  Q_PROPERTY(QString verticalTextAlignment READ verticalTextAlignment
+             WRITE setVerticalTextAlignment NOTIFY verticalTextAlignmentChanged)
   Q_PROPERTY(QString font READ font WRITE setFont NOTIFY fontChanged)
   Q_PROPERTY(int fontSize READ fontSize WRITE setFontSize NOTIFY fontSizeChanged)
   // QML_ELEMENT