Merge lp:~mzanetti/reminders-app/libqtevernote into lp:reminders-app

[Michael Zanetti]

Split the actual evernote code out from the QML plugin into a libqtevernote

Split the actual evernote code out from the QML plugin into a libqtevernote

[lp:~mzanetti/reminders-app/libqtevernote]

287. By Michael Zanetti on 2014-10-23

move evernote code into a libqtevernote

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

FAILED: Continuous integration, rev:287
http://91.189.93.70:8080/job/reminders-app-ci/564/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1227/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/260/console

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/reminders-app/libqtevernote]

288. By Michael Zanetti on 2014-10-24

add pkg-config to build-deps

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

PASSED: Continuous integration, rev:288
http://91.189.93.70:8080/job/reminders-app-ci/565/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1246
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1246/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/261

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

review: Approve (continuous-integration)

[David Planella (dpm)]

I've been testing this branch and manually exercising all features of the app. Overall it seems to work all fine.

However, I've noticed a regression that I'm not sure if it's been introduced on this branch or previously: the reminders page does not classify the dates of the reminders correctly. E.g. if I set a reminder to today, it shows it under "Overdue", whereas the truly overdue ones are shown under "Today".

[Penk Chen (penk)]

review: Approve

=== modified file '3rdParty/evernote-sdk-cpp/CMakeLists.txt'
--- 3rdParty/evernote-sdk-cpp/CMakeLists.txt	2013-12-19 00:03:30 +0000
+++ 3rdParty/evernote-sdk-cpp/CMakeLists.txt	2014-10-24 13:13:46 +0000
@@ -18,4 +18,5 @@
     src/UserStore_types.cpp
 )
 
-add_library(evernote-sdk-cpp ${evernote-sdk-cpp_SRCS})
+add_library(evernote-sdk-cpp STATIC ${evernote-sdk-cpp_SRCS})
+

=== modified file '3rdParty/libthrift/CMakeLists.txt'
--- 3rdParty/libthrift/CMakeLists.txt	2013-12-18 00:30:17 +0000
+++ 3rdParty/libthrift/CMakeLists.txt	2014-10-24 13:13:46 +0000
@@ -1,3 +1,5 @@
+pkg_search_module(SSL openssl REQUIRED)
+
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
@@ -37,4 +39,5 @@
     concurrency/Util.cpp
 )
 
-add_library(libthrift ${libthrift_SRCS})
+add_library(libthrift STATIC ${libthrift_SRCS})
+target_link_libraries(libthrift ${SSL_LDFLAGS})

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-02 16:28:04 +0000
+++ CMakeLists.txt	2014-10-24 13:13:46 +0000
@@ -6,6 +6,7 @@
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra -fPIC")
 
+include(FindPkgConfig)
 # Standard install paths
 include(GNUInstallDirs)
 

=== modified file 'debian/control'
--- debian/control	2014-10-02 16:28:04 +0000
+++ debian/control	2014-10-24 13:13:46 +0000
@@ -8,6 +8,7 @@
                intltool,
                libboost-dev,
                libssl-dev,
+               pkg-config,
                python3-all,
                qt5-default,
                qtdeclarative5-dev

=== modified file 'po/com.ubuntu.reminders.pot'
--- po/com.ubuntu.reminders.pot	2014-10-16 02:49:55 +0000
+++ po/com.ubuntu.reminders.pot	2014-10-24 13:13:46 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-10 21:11+0200\n"
+"POT-Creation-Date: 2014-10-23 23:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -47,7 +47,7 @@
 msgstr ""
 
 #: src/app/qml/components/RemindersDelegate.qml:50
-#: src/app/qml/ui/SetReminderView.qml:55
+#: src/app/qml/ui/SetReminderView.qml:69
 msgid "Clear reminder"
 msgstr ""
 
@@ -103,7 +103,7 @@
 msgstr ""
 
 #: src/app/qml/ui/NotePage.qml:43 src/app/qml/ui/NotesPage.qml:119
-#: src/app/qml/ui/SetReminderView.qml:66
+#: src/app/qml/ui/SetReminderView.qml:53
 msgid "Set reminder"
 msgstr ""
 
@@ -146,7 +146,7 @@
 "No notes available. You can create new notes using the \"Add note\" button."
 msgstr ""
 
-#: src/app/qml/ui/RemindersPage.qml:108
+#: src/app/qml/ui/RemindersPage.qml:111
 msgid ""
 "No reminders available. You can create new reminders by setting a reminder "
 "when viewing a note."
@@ -164,110 +164,110 @@
 msgid "No tags available. You can tag notes while viewing them."
 msgstr ""
 
-#: src/plugin/Evernote/jobs/evernotejob.cpp:91
+#: src/libqtevernote/jobs/evernotejob.cpp:91
 msgid "Authentication expired."
 msgstr ""
 
-#: src/plugin/Evernote/jobs/evernotejob.cpp:95
+#: src/libqtevernote/jobs/evernotejob.cpp:95
 msgid "Limit exceeded."
 msgstr ""
 
-#: src/plugin/Evernote/jobs/evernotejob.cpp:99
+#: src/libqtevernote/jobs/evernotejob.cpp:99
 msgid "Rate limit exceeded."
 msgstr ""
 
-#: src/plugin/Evernote/jobs/evernotejob.cpp:103
+#: src/libqtevernote/jobs/evernotejob.cpp:103
 msgid "Quota exceeded."
 msgstr ""
 
-#: src/plugin/Evernote/note.cpp:82 src/plugin/Evernote/note.cpp:260
+#: src/libqtevernote/note.cpp:82 src/libqtevernote/note.cpp:260
 msgid "Today"
 msgstr ""
 
-#: src/plugin/Evernote/note.cpp:85
+#: src/libqtevernote/note.cpp:85
 msgid "Yesterday"
 msgstr ""
 
-#: src/plugin/Evernote/note.cpp:88
+#: src/libqtevernote/note.cpp:88
 msgid "Last week"
 msgstr ""
 
-#: src/plugin/Evernote/note.cpp:91
+#: src/libqtevernote/note.cpp:91
 msgid "Two weeks ago"
 msgstr ""
 
 #. TRANSLATORS: the first argument refers to a month name and the second to a year
-#: src/plugin/Evernote/note.cpp:95
+#: src/libqtevernote/note.cpp:95
 #, qt-format
 msgid "%1 %2"
 msgstr ""
 
-#: src/plugin/Evernote/note.cpp:248
+#: src/libqtevernote/note.cpp:248
 msgid "Done"
 msgstr ""
 
-#: src/plugin/Evernote/note.cpp:254
+#: src/libqtevernote/note.cpp:254
 msgid "No date"
 msgstr ""
 
-#: src/plugin/Evernote/note.cpp:257
+#: src/libqtevernote/note.cpp:257
 msgid "Overdue"
 msgstr ""
 
-#: src/plugin/Evernote/note.cpp:263
+#: src/libqtevernote/note.cpp:263
 msgid "Tomorrow"
 msgstr ""
 
-#: src/plugin/Evernote/note.cpp:266
+#: src/libqtevernote/note.cpp:266
 msgid "Next week"
 msgstr ""
 
-#: src/plugin/Evernote/note.cpp:269
+#: src/libqtevernote/note.cpp:269
 msgid "In two weeks"
 msgstr ""
 
-#: src/plugin/Evernote/note.cpp:271
+#: src/libqtevernote/note.cpp:271
 msgid "Later"
 msgstr ""
 
 #. TRANSLATORS: this is part of a longer string - "Last updated: today"
-#: src/plugin/Evernote/notebook.cpp:100
+#: src/libqtevernote/notebook.cpp:100
 msgid "today"
 msgstr ""
 
 #. TRANSLATORS: this is part of a longer string - "Last updated: yesterday"
-#: src/plugin/Evernote/notebook.cpp:104
+#: src/libqtevernote/notebook.cpp:104
 msgid "yesterday"
 msgstr ""
 
 #. TRANSLATORS: this is part of a longer string - "Last updated: last week"
-#: src/plugin/Evernote/notebook.cpp:108
+#: src/libqtevernote/notebook.cpp:108
 msgid "last week"
 msgstr ""
 
 #. TRANSLATORS: this is part of a longer string - "Last updated: two weeks ago"
-#: src/plugin/Evernote/notebook.cpp:112
+#: src/libqtevernote/notebook.cpp:112
 msgid "two weeks ago"
 msgstr ""
 
 #. TRANSLATORS: this is used in the notes list to group notes created on the same month
 #. the first parameter refers to a month name and the second to a year
-#: src/plugin/Evernote/notebook.cpp:116
+#: src/libqtevernote/notebook.cpp:116
 #, qt-format
 msgid "on %1 %2"
 msgstr ""
 
-#: src/plugin/Evernote/notesstore.cpp:361
+#: src/libqtevernote/notesstore.cpp:361
 #, qt-format
 msgid "Error refreshing notes: %1"
 msgstr ""
 
-#: src/plugin/Evernote/notesstore.cpp:542
+#: src/libqtevernote/notesstore.cpp:542
 #, qt-format
 msgid "Error refreshing notebooks: %1"
 msgstr ""
 
-#: src/plugin/Evernote/notesstore.cpp:596
+#: src/libqtevernote/notesstore.cpp:596
 #, qt-format
 msgid "Error refreshing tags: %1"
 msgstr ""

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-08-14 09:41:33 +0000
+++ src/CMakeLists.txt	2014-10-24 13:13:46 +0000
@@ -1,3 +1,8 @@
+find_package(Qt5Core)
+find_package(Qt5Qml)
+find_package(Qt5Quick)
+
+add_subdirectory(libqtevernote)
 add_subdirectory(account-plugin)
 add_subdirectory(plugin)
 add_subdirectory(app)

=== added directory 'src/libqtevernote'
=== added file 'src/libqtevernote/CMakeLists.txt'
--- src/libqtevernote/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/libqtevernote/CMakeLists.txt	2014-10-24 13:13:46 +0000
@@ -0,0 +1,46 @@
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/3rdParty/libthrift
+    ${CMAKE_SOURCE_DIR}/3rdParty/evernote-sdk-cpp/src/
+)
+
+set(qtevernote_SRCS
+    notesstore.cpp
+    userstore.cpp
+    notebooks.cpp
+    notes.cpp
+    note.cpp
+    resource.cpp
+    notebook.cpp
+    tag.cpp
+    tags.cpp
+    jobs/fetchnotesjob.cpp
+    jobs/fetchnotebooksjob.cpp
+    jobs/fetchnotejob.cpp
+    jobs/createnotejob.cpp
+    jobs/evernotejob.cpp
+    jobs/savenotejob.cpp
+    jobs/savenotebookjob.cpp
+    jobs/deletenotejob.cpp
+    evernoteconnection.cpp
+    jobs/userstorejob.cpp
+    jobs/notesstorejob.cpp
+    jobs/fetchusernamejob.cpp
+    jobs/createnotebookjob.cpp
+    jobs/expungenotebookjob.cpp
+    jobs/fetchtagsjob.cpp
+    jobs/createtagjob.cpp
+    jobs/savetagjob.cpp
+    resourceimageprovider.cpp
+    utils/enmldocument.cpp
+    utils/textformat.cpp
+)
+
+add_library(qtevernote STATIC
+    ${qtevernote_SRCS}
+)
+
+target_link_libraries(qtevernote evernote-sdk-cpp libthrift)
+add_dependencies(qtevernote evernote-sdk-cpp libthrift)
+qt5_use_modules(qtevernote Gui Qml Quick)
+

=== renamed file 'src/plugin/Evernote/evernoteconnection.cpp' => 'src/libqtevernote/evernoteconnection.cpp'
=== renamed file 'src/plugin/Evernote/evernoteconnection.h' => 'src/libqtevernote/evernoteconnection.h'
=== renamed directory 'src/plugin/Evernote/jobs' => 'src/libqtevernote/jobs'
=== renamed file 'src/plugin/Evernote/note.cpp' => 'src/libqtevernote/note.cpp'
=== renamed file 'src/plugin/Evernote/note.h' => 'src/libqtevernote/note.h'
=== renamed file 'src/plugin/Evernote/notebook.cpp' => 'src/libqtevernote/notebook.cpp'
=== renamed file 'src/plugin/Evernote/notebook.h' => 'src/libqtevernote/notebook.h'
=== renamed file 'src/plugin/Evernote/notebooks.cpp' => 'src/libqtevernote/notebooks.cpp'
=== renamed file 'src/plugin/Evernote/notebooks.h' => 'src/libqtevernote/notebooks.h'
=== renamed file 'src/plugin/Evernote/notes.cpp' => 'src/libqtevernote/notes.cpp'
=== renamed file 'src/plugin/Evernote/notes.h' => 'src/libqtevernote/notes.h'
=== renamed file 'src/plugin/Evernote/notesstore.cpp' => 'src/libqtevernote/notesstore.cpp'
=== renamed file 'src/plugin/Evernote/notesstore.h' => 'src/libqtevernote/notesstore.h'
=== renamed file 'src/plugin/Evernote/resource.cpp' => 'src/libqtevernote/resource.cpp'
=== renamed file 'src/plugin/Evernote/resource.h' => 'src/libqtevernote/resource.h'
=== renamed file 'src/plugin/Evernote/resourceimageprovider.cpp' => 'src/libqtevernote/resourceimageprovider.cpp'
=== renamed file 'src/plugin/Evernote/resourceimageprovider.h' => 'src/libqtevernote/resourceimageprovider.h'
=== renamed file 'src/plugin/Evernote/tag.cpp' => 'src/libqtevernote/tag.cpp'
=== renamed file 'src/plugin/Evernote/tag.h' => 'src/libqtevernote/tag.h'
=== renamed file 'src/plugin/Evernote/tags.cpp' => 'src/libqtevernote/tags.cpp'
=== renamed file 'src/plugin/Evernote/tags.h' => 'src/libqtevernote/tags.h'
=== renamed file 'src/plugin/Evernote/userstore.cpp' => 'src/libqtevernote/userstore.cpp'
=== renamed file 'src/plugin/Evernote/userstore.h' => 'src/libqtevernote/userstore.h'
=== renamed directory 'src/plugin/Evernote/utils' => 'src/libqtevernote/utils'
=== modified file 'src/plugin/CMakeLists.txt'
--- src/plugin/CMakeLists.txt	2013-12-18 00:30:17 +0000
+++ src/plugin/CMakeLists.txt	2014-10-24 13:13:46 +0000
@@ -1,6 +1,1 @@
-include(FindPkgConfig)
-find_package(Qt5Core)
-find_package(Qt5Qml)
-find_package(Qt5Quick)
-
 add_subdirectory(Evernote)

=== modified file 'src/plugin/Evernote/CMakeLists.txt'
--- src/plugin/Evernote/CMakeLists.txt	2014-10-09 00:08:52 +0000
+++ src/plugin/Evernote/CMakeLists.txt	2014-10-24 13:13:46 +0000
@@ -1,53 +1,24 @@
+pkg_search_module(SSL openssl REQUIRED)
+
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/3rdParty/libthrift
     ${CMAKE_SOURCE_DIR}/3rdParty/evernote-sdk-cpp/src/
+    ${CMAKE_SOURCE_DIR}/src/libqtevernote
 )
 
 set(evernoteplugin_SRCS
     evernoteplugin.cpp
-    notesstore.cpp
-    userstore.cpp
-    notebooks.cpp
-    notes.cpp
-    note.cpp
-    resource.cpp
-    notebook.cpp
-    tag.cpp
-    tags.cpp
-    jobs/fetchnotesjob.cpp
-    jobs/fetchnotebooksjob.cpp
-    jobs/fetchnotejob.cpp
-    jobs/createnotejob.cpp
-    jobs/evernotejob.cpp
-    jobs/savenotejob.cpp
-    jobs/savenotebookjob.cpp
-    jobs/deletenotejob.cpp
-    evernoteconnection.cpp
-    jobs/userstorejob.cpp
-    jobs/notesstorejob.cpp
-    jobs/fetchusernamejob.cpp
-    jobs/createnotebookjob.cpp
-    jobs/expungenotebookjob.cpp
-    jobs/fetchtagsjob.cpp
-    jobs/createtagjob.cpp
-    jobs/savetagjob.cpp
-    resourceimageprovider.cpp
-    utils/enmldocument.cpp
-    utils/textformat.cpp
 )
 
 add_library(evernoteplugin MODULE
     ${evernoteplugin_SRCS}
 )
 
-target_link_libraries(evernoteplugin
-    -L${CMAKE_BINARY_DIR}/3rdParty/evernote-sdk-cpp/ -L${CMAKE_BINARY_DIR}/3rdParty/libthrift/ -levernote-sdk-cpp -llibthrift -lssl -lcrypto
-)
-
+target_link_libraries(evernoteplugin evernote-sdk-cpp libthrift qtevernote ${SSL_LDFLAGS})
+add_dependencies(evernoteplugin qtevernote)
 qt5_use_modules(evernoteplugin Gui Qml Quick)
 
-
 # Copy qmldir file to build dir for running in QtCreator
 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 add_custom_target(evernoteplugin-qmldir ALL