Merge lp:~mzanetti/reminders-app/textformat-enum into lp:reminders-app

[Michael Zanetti]

This adds a helper class to export TextFormat enums to QML

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:39
http://91.189.93.70:8080/job/reminders-app-ci/86/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/852/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/86
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/86

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/86/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/reminders-app/textformat-enum]

40. By Michael Zanetti on 2014-01-29

fix enum for usage in qml with another class

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:40
http://91.189.93.70:8080/job/reminders-app-ci/87/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/855/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/87
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/87

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/87/rebuild

review: Needs Fixing (continuous-integration)

[Riccardo Padovani (rpadovani)]

Work as expected! Thanks!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'src/plugin/Evernote/CMakeLists.txt'
--- src/plugin/Evernote/CMakeLists.txt	2014-01-24 18:13:04 +0000
+++ src/plugin/Evernote/CMakeLists.txt	2014-01-29 18:27:37 +0000
@@ -28,6 +28,7 @@
     jobs/expungenotebookjob.cpp
     resourceimageprovider.cpp
     utils/enmldocument.cpp
+    utils/textformat.cpp
 )
 
 add_library(evernoteplugin MODULE

=== modified file 'src/plugin/Evernote/evernoteplugin.cpp'
--- src/plugin/Evernote/evernoteplugin.cpp	2014-01-23 09:39:43 +0000
+++ src/plugin/Evernote/evernoteplugin.cpp	2014-01-29 18:27:37 +0000
@@ -30,6 +30,8 @@
 #include "notebook.h"
 #include "resourceimageprovider.h"
 
+#include "utils/textformat.h"
+
 #include <QtQml>
 
 static QObject* userStoreProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
@@ -58,6 +60,8 @@
     qmlRegisterUncreatableType<Note>("Evernote", 0, 1, "Note", "Cannot create Notes in QML. Use NotesStore.createNote() instead.");
     qmlRegisterUncreatableType<Notebook>("Evernote", 0, 1, "Notebook", "Cannot create Notes in QML. Use NotesStore.createNotebook() instead.");
     qmlRegisterUncreatableType<Resource>("Evernote", 0, 1, "Resource", "Cannot create Resources. Use Note.attachFile() instead.");
+
+    qmlRegisterUncreatableType<TextFormat>("Evernote", 0, 1, "TextFormat", "TextFormat is not creatable. It's just here to export enums to QML");
 }
 
 void EvernotePlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2014-01-23 09:46:02 +0000
+++ src/plugin/Evernote/note.cpp	2014-01-29 18:27:37 +0000
@@ -247,6 +247,11 @@
     emit contentChanged();
 }
 
+void Note::format(int startPos, int endPos, TextFormat::Format format)
+{
+    qDebug() << "Should format from" << startPos << "to" << endPos << "with format:" << format;
+}
+
 Note *Note::clone()
 {
     Note *note = new Note(m_guid, m_created);

=== modified file 'src/plugin/Evernote/note.h'
--- src/plugin/Evernote/note.h	2014-01-24 18:13:04 +0000
+++ src/plugin/Evernote/note.h	2014-01-29 18:27:37 +0000
@@ -23,6 +23,7 @@
 
 #include "utils/enmldocument.h"
 #include "resource.h"
+#include "utils/textformat.h"
 
 #include <QObject>
 #include <QDateTime>
@@ -106,6 +107,7 @@
 
     Q_INVOKABLE void markTodo(const QString &todoId, bool checked);
     Q_INVOKABLE void attachFile(int position, const QUrl &fileName);
+    Q_INVOKABLE void format(int startPos, int endPos, TextFormat::Format format);
 
     Note* clone();
 

=== added file 'src/plugin/Evernote/utils/textformat.cpp'
--- src/plugin/Evernote/utils/textformat.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/utils/textformat.cpp	2014-01-29 18:27:37 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#include "textformat.h"
+
+TextFormat::TextFormat(QObject *parent): QObject(parent)
+{
+}

=== added file 'src/plugin/Evernote/utils/textformat.h'
--- src/plugin/Evernote/utils/textformat.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/utils/textformat.h	2014-01-29 18:27:37 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#ifndef TEXTFORMAT_H
+#define TEXTFORMAT_H
+
+#include <QObject>
+
+class TextFormat: public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(Format)
+public:
+    enum Format {
+        Bold,
+        Italic,
+        Underlined
+    };
+    Q_DECLARE_FLAGS(Formats, Format)
+
+    TextFormat(QObject *parent = 0);
+};
+Q_DECLARE_OPERATORS_FOR_FLAGS(TextFormat::Formats)
+Q_DECLARE_METATYPE(TextFormat::Format)
+
+#endif