Feature 71 slide preview screen

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "pandoc-slave"]
+	path = pandoc-slave
+	url = https://github.com/PLLUG/pandoc-slave.git

appveyor.yml

@@ -1,17 +1,24 @@
 version: 0.0.1-{build}-{branch}
+
+install:  
+  - cmd: cd  %APPVEYOR_BUILD_FOLDER%\pllug-presentation-system
+  - ps: Start-FileDownload 'https://www.qpm.io/download/v0.10.0/windows_386/qpm.exe'
 pull_requests:
   do_not_increment_build_number: true
 environment:
   QT_INSTALL_ROOT: C:\Qt\5.7\msvc2015_64
 build_script:
 - cmd: >-
-
     %QT_INSTALL_ROOT%\bin\qtenv2.bat
 
     "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 
     cd %APPVEYOR_BUILD_FOLDER%\pllug-presentation-system
 
+    git submodule -q update --init
+
+    qpm install
+
     qmake CONFIG+=release
 
     nmake

pllug-presentation-system/main.cpp

@@ -1,15 +1,43 @@
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
+#include <QFile>
+#include <memory>
+#include <QList>
+#include <QQmlContext>
+
+#include "domdocumentdivider.h"
+#include "htmlimport.h"
+#include "presentationelement.h"
+#include "presentationelementfactory.h"
+#include "presentationmodel.h"
+#include "slideproxymodel.h"
 
 int main(int argc, char *argv[])
 {
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QGuiApplication app(argc, argv);
 
+    QFile htmlFile("D:/Qt_projects/SUMMERCAMP2016/pps2/pllug-presentation-system-2/tests/auto/resources/multiple_slides.html");
+    htmlFile.open(QFile::ReadOnly);
+    QByteArray input = htmlFile.readAll();
+    htmlFile.close();
+    std::shared_ptr<PresentationElementFactory> factoryPtr(new PresentationElementFactory());
+    HtmlImport importObject(factoryPtr);
+    QList<PresentationElement *> elements = importObject.import(input);
+    DomDocumentDivider divider;
+    std::unique_ptr<Presentation> presentation = divider.import(elements);
+
+    PresentationModel presentationModel;
+    presentationModel.setPresentation(presentation.release());
+    SlideProxyModel slideModel;
+    slideModel.setSourceModel(&presentationModel);
+    slideModel.setSlideNumber(0);
 
     QQmlApplicationEngine engine;
     engine.addImportPath(QStringLiteral("qrc:/"));
-    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
+    engine.rootContext()->setContextProperty("slideModel", &slideModel);
+    engine.rootContext()->setContextProperty("presentationModel", &presentationModel);
+    engine.load(QUrl(QLatin1String("qrc:/main.qml")));
 
     return app.exec();
 }

pllug-presentation-system/pllug-presentation-system.pro

@@ -18,3 +18,6 @@ QML_IMPORT_PATH =
 include(deployment.pri)
 include($$PWD/vendor/vendor.pri)
 
+# Pandoc-slave
+include($$PWD/../pandoc-slave/pandoc-slave/pandoc-slave/pandoc-slave.pri)
+

pllug-presentation-system/presentation-data/documentimportstrategy.h

@@ -5,7 +5,6 @@
 #include <QList>
 
 class Presentation;
-class QByteArray;
 class PresentationElementFactory;
 class PresentationElement;
 

pllug-presentation-system/presentation-data/domdocumentdivider.cpp

@@ -115,7 +115,8 @@ std::unique_ptr<Presentation> DomDocumentDivider::divideSlides(const QList<Slide
 QList<Slide *>  DomDocumentDivider::divideSlide(Slide *slide, int elementsNum) const
 {
     // TODO: Nothing done here yet, as we don't know how to divide a single slide
-    QList<Slide *> smallerSlides;
-    smallerSlides.push_back(slide);
-    return smallerSlides;
+    Q_UNUSED(elementsNum);
+    QList<Slide *> rSmallerSlides;
+    rSmallerSlides.push_back(slide);
+    return rSmallerSlides;
 }

pllug-presentation-system/presentation-data/htmlimport.cpp

@@ -1,10 +1,11 @@
 #include "htmlimport.h"
 #include "abstractpresentationelementfactory.h"
-#include "presentationElement.h"
+#include "presentationelement.h"
 
 #include <QDomDocument>
 #include <QByteArray>
 #include <QTextStream>
+
 HtmlImport::HtmlImport(std::shared_ptr<AbstractPresentationElementFactory> presentationElementFactory)
     : mPresentationElementFactory(presentationElementFactory)
 {

pllug-presentation-system/presentation-data/iroleprovider.h

@@ -0,0 +1,13 @@
+#ifndef IROLEPROVIDER_H
+#define IROLEPROVIDER_H
+
+#include <QHash>
+#include <QByteArray>
+
+class IRoleProvider
+{
+public:
+    virtual QHash<int, QByteArray> roleNameByValue() const = 0;
+};
+
+#endif // IROLEPROVIDER_H

pllug-presentation-system/presentation-data/presentation-data.pri

@@ -9,7 +9,10 @@ SOURCES += \
     $$PWD/paragraph.cpp \
     $$PWD/separator.cpp \
     $$PWD/htmlimport.cpp \
-    $$PWD/presentationelementfactory.cpp
+    $$PWD/presentationelementfactory.cpp \
+    $$PWD/presentationmodel.cpp \
+    $$PWD/slideproxymodel.cpp \
+    $$PWD/roleprovider.cpp
 
 HEADERS += \
     $$PWD/presentation.h \
@@ -24,6 +27,10 @@ HEADERS += \
     $$PWD/separator.h \
     $$PWD/htmlimport.h \
     $$PWD/abstractpresentationelementfactory.h \
-    $$PWD/presentationelementfactory.h
+    $$PWD/presentationelementfactory.h \
+    $$PWD/presentationmodel.h \
+    $$PWD/slideproxymodel.h \
+    $$PWD/iroleprovider.h \
+    $$PWD/roleprovider.h
 
 INCLUDEPATH += $$PWD

pllug-presentation-system/presentation-data/presentation.cpp

@@ -3,7 +3,7 @@
 #include <utility>
 #include <algorithm>
 #include <QtGlobal>
-
+#include <QDebug>
 /*!
  * \brief Public constructor.
  */
@@ -62,6 +62,16 @@ void Presentation::appendSlide(std::unique_ptr<Slide> slide)
 
 Slide *Presentation::slide(int index) const
 {
-    return mSlideList[index];
+    Slide *rSlide {};
+    if(index >= 0 && index < mSlideList.count())
+    {
+        rSlide = mSlideList[index];
+    }
+    else
+    {
+        qWarning() << "Warning: Invalid slide index.";
+        rSlide = new Slide();
+    }
+    return rSlide;
 }
 

pllug-presentation-system/presentation-data/presentation.h

@@ -2,7 +2,6 @@
 #define PRESENTATION_H
 
 #include <memory>
-
 #include <QVector>
 
 #include "slide.h"
@@ -27,6 +26,7 @@ class Presentation
     void appendSlide(std::unique_ptr<Slide> slide);
 
     Slide *slide(int index) const;
+
 private:
     QVector<Slide *> mSlideList;
 };

pllug-presentation-system/presentation-data/presentationelement.cpp

@@ -14,6 +14,26 @@ PresentationElement::PresentationElement(const QString &html)
 {
 }
 
+int PresentationElement::x() const
+{
+    return 1;
+}
+
+int PresentationElement::y() const
+{
+    return 1;
+}
+
+int PresentationElement::width() const
+{
+    return 1;
+}
+
+int PresentationElement::height() const
+{
+    return 1;
+}
+
 QString PresentationElement::toHtml() const
 {
     return mContent;

pllug-presentation-system/presentation-data/presentationelement.h

@@ -14,6 +14,10 @@ class PresentationElement
     PresentationElement(const QString &html);
     virtual ~PresentationElement() = 0;
 
+    int x() const;
+    int y() const;
+    int width() const;
+    int height() const;
     QString toHtml() const;
 
 protected:

pllug-presentation-system/presentation-data/presentationelementfactory.cpp

@@ -1,38 +1,33 @@
 #include "presentationelementfactory.h"
-
-#include <QString>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
 #include "presentationelement.h"
 #include "header.h"
 #include "paragraph.h"
 #include "separator.h"
 
+#include <QString>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+
 std::unique_ptr<PresentationElement> PresentationElementFactory::create(const QString &html) const
 {
     QRegularExpression re("(h[1-6]|hr|p)");
     QRegularExpressionMatch match = re.match(html);
+    std::unique_ptr<PresentationElement> rElement(new Separator("<hr />"));
     if(match.hasMatch())
     {
         QString tag = match.captured();
         if(tag == "p")
         {
-            return std::make_unique<Paragraph>(html);
+            rElement.reset(new Paragraph(html));
         }
-        else if(tag[0] == 'h')
+        else if(tag == "hr")
         {
-            if(tag[1] == 'r')
-            {
-                return std::make_unique<Separator>(html);
-            }
-            else
-            {
-                return std::make_unique<Header>(html);
-            }
+            rElement.reset(new Separator(html));
+        }
+        else
+        {
+            rElement.reset(new Header(html));
         }
     }
-    else
-    {
-        return nullptr;
-    }
+    return rElement;
 }