Added pdf support for xoj files

MrWriter.desktop

@@ -2,7 +2,8 @@
 Type=Application
 Name=MrWriter
 GenericName=note program
-Icon=MyIcon
+Icon=MyIcon.png
 Exec=MrWriter %F
+MimeType=application/x-moj;application/pdf;application/x-xoj
 Terminal=false
 Categories=Office;

MrWriter.pro

@@ -24,7 +24,12 @@ HEADERS  += version.h \
     pagesettingsdialog.h \
     colorbutton.h \
     stroke.h \
-    mrdoc.h
+    mrdoc.h \
+    textbox.h \
+    searchbar.h \
+    markdownbox.h \
+    abstracttextbox.h \
+    markdownselection.h
 
 #VERSION_MAJOR = MY_MAJOR_VERSION
 #VERSION_MINOR = MY_MINOR_VERSION
@@ -40,7 +45,12 @@ SOURCES += main.cpp\
     tabletapplication.cpp \
     pagesettingsdialog.cpp \
     colorbutton.cpp \
-    stroke.cpp
+    stroke.cpp \
+    textbox.cpp \
+    searchbar.cpp \
+    abstracttextbox.cpp \
+    markdownbox.cpp \
+    markdownselection.cpp
 
 HEADERS  += mainwindow.h \
     widget.h \
@@ -53,12 +63,18 @@ HEADERS  += mainwindow.h \
     tabletapplication.h \
     version.h
 
-FORMS    +=
+FORMS    += \
+    searchbar.ui
 
 RESOURCES += \
     myresource.qrc
 
+INCLUDEPATH  += /usr/include/poppler/qt5
+LIBS         += -L/usr/lib -lpoppler-qt5
 LIBS += -lz
+LIBS += -lmarkdown
+
+QMAKE_LFLAGS += -lmarkdown
 
 ICON = MyIcon.icns
 
@@ -70,7 +86,7 @@ DISTFILES += \
     Info.plist \
     COPYING
 
-CONFIG += c++11
+CONFIG += c++17
 
 #QMAKE_CXXFLAGS_RELEASE -= -O
 #QMAKE_CXXFLAGS_RELEASE -= -O1

README.adoc

@@ -7,11 +7,20 @@ Notetaking and blackboard replacement application. Inspired by Xournal. Written
 
 See the http://unruhschuh.github.io/MrWriter/[project homepage] for more informations and screenshots.
 
+== Fork
+This is a fork of the original MrWriter software. The fork has the ability to annotate PDFs with your stylus. 
+
+== Prerequisites
+* Qt has to be installed
+* Poppler has to be installed
+* [Discount](https://www.pell.portland.or.us/~orc/Code/discount/) has to be installed
+* _(optional)_ pdftk has to be installed (for proper PDF export)
+
 == Build
-* Download and install http://www.qt.io/download/[Qt]
 * Run in the terminal
-** `git clone https://github.com/unruhschuh/MrWriter.git`
+** `git clone https://github.com/AlexD97/MrWriter.git`
 ** `cd MrWriter`
 ** `qmake`
 ** `make`
+** `./MrWriter`
 * Alternatively: open `MrWriter.pro` in QtCreator, configure, build and run

abstracttextbox.cpp

@@ -0,0 +1,53 @@
+#include "abstracttextbox.h"
+
+AbstractTextBox::AbstractTextBox(QWidget *parent)
+    : QTextEdit(parent) {
+}
+
+void AbstractTextBox::setBoundingRect(const QRectF &rect){
+    m_textRect = rect;
+}
+
+void AbstractTextBox::setPage(MrDoc::Page* page){
+    m_page = page;
+}
+
+void AbstractTextBox::setPageNum(int pageNum){
+    m_pageNum = pageNum;
+}
+
+int AbstractTextBox::getPageNum(){
+    return m_pageNum;
+}
+
+void AbstractTextBox::setPrevText(const QString &text){
+    m_prevText = text;
+}
+
+void AbstractTextBox::setTextIndex(int index){
+    m_textIndex = index;
+}
+
+MrDoc::Page* AbstractTextBox::getPage(){
+    return m_page;
+}
+
+int AbstractTextBox::getTextIndex() const {
+    return m_textIndex;
+}
+
+const QString& AbstractTextBox::getPrevText() const{
+    return m_prevText;
+}
+
+int AbstractTextBox::getTextX() const {
+    return m_textRect.x();
+}
+
+int AbstractTextBox::getTextY() const {
+    return m_textRect.y();
+}
+
+const QRectF& AbstractTextBox::getBoundingRect() const {
+    return m_textRect;
+}

abstracttextbox.h

@@ -0,0 +1,42 @@
+#ifndef ABSTRACTTEXTBOX_H
+#define ABSTRACTTEXTBOX_H
+#include <QTextEdit>
+#include "page.h"
+
+class AbstractTextBox : public QTextEdit {
+    Q_OBJECT
+public:
+    AbstractTextBox(QWidget* parent = nullptr);
+
+    void setBoundingRect(const QRectF& rect);
+    void setPage(MrDoc::Page *page);
+    void setPageNum(int pageNum);
+    void setPrevText(const QString& text);
+    void setTextIndex(int index);
+
+    MrDoc::Page* getPage();
+    int getPageNum();
+    int getTextIndex() const;
+    const QString& getPrevText() const;
+    int getTextX() const;
+    int getTextY() const;
+    const QRectF& getBoundingRect() const;
+
+public slots:
+    /**
+     * @brief applyText hides the widget (and emits signal @ref updatePage);
+     */
+    virtual void applyText() = 0;
+
+protected:
+    MrDoc::Page* m_page;
+    int m_pageNum;
+    QString m_prevText;
+    int m_textIndex;
+    //int x;  //x-Coordinate of the text, not of the textBox
+    //int y;
+    QRectF m_textRect;
+
+};
+
+#endif // ABSTRACTTEXTBOX_H