Merge pull request #4 from DylanVanAssche/upgrade/2.0-0

Moving to C++ backend

Author: DylanVanAssche

harbour-rgbwifi.desktop

@@ -3,11 +3,10 @@ Type=Application
 X-Nemo-Application-Type=silica-qt5
 Icon=harbour-rgbwifi
 Exec=harbour-rgbwifi
-Name=RGB-WiFi
+Name=harbour-rgbwifi
 # translation example:
 # your app name in German locale (de)
 #
 # Remember to comment out the following line, if you do not want to use
 # a different app name in German locale (de).
 Name[de]=harbour-rgbwifi
-

harbour-rgbwifi.pro

@@ -14,15 +14,33 @@ TARGET = harbour-rgbwifi
 
 CONFIG += sailfishapp
 
-SOURCES += src/harbour-rgbwifi.cpp
+QT += network \
+    gui \
+    core
 
-OTHER_FILES += qml/harbour-rgbwifi.qml \
+# Disable debug and warning messages while releasing for security reasons
+CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT \
+    QT_NO_WARNING_OUTPUT
+
+SOURCES += src/harbour-rgbwifi.cpp \
+    src/api.cpp \
+    src/logger.cpp \
+    src/os.cpp
+
+DISTFILES += qml/harbour-rgbwifi.qml \
     qml/cover/CoverPage.qml \
     qml/pages/FirstPage.qml \
+    qml/pages/SecondPage.qml \
+    rpm/harbour-rgbwifi.changes.in \
+    rpm/harbour-rgbwifi.changes.run.in \
     rpm/harbour-rgbwifi.spec \
     rpm/harbour-rgbwifi.yaml \
     translations/*.ts \
-    harbour-rgbwifi.desktop
+    harbour-rgbwifi.desktop \
+    qml/pages/TextLabel.qml \
+    qml/pages/SettingsPage.qml \
+    qml/pages/AboutPage.qml \
+    qml/pages/GlasButton.qml
 
 SAILFISHAPP_ICONS = 86x86 108x108 128x128 256x256
 
@@ -36,102 +54,7 @@ CONFIG += sailfishapp_i18n
 # modify the localized app name in the the .desktop file.
 TRANSLATIONS += translations/harbour-rgbwifi-de.ts
 
-DISTFILES += \
-    icons/86x86/harbour-rgbwifi.png \
-    icons/108x108/harbour-rgbwifi.png \
-    icons/128x128/harbour-rgbwifi.png \
-    icons/256x256/harbour-rgbwifi.png \
-    rpm/harbour-rgbwifi.changes \
-    qml/pages/ledstrip.py \
-    qml/pages/GlasButton.qml \
-    qml/pages/TextLabel.qml \
-    qml/pages/AboutPage.qml \
-    qml/resources/images/icon-code.png \
-    qml/resources/images/icon-fontawesome.png \
-    qml/resources/images/icon-github.png \
-    qml/resources/images/icon-paypal.png \
-    qml/resources/images/sources.txt \
-    qml/pages/requests/cacert.pem \
-    qml/pages/requests/packages/chardet/__init__.py \
-    qml/pages/requests/packages/chardet/big5freq.py \
-    qml/pages/requests/packages/chardet/big5prober.py \
-    qml/pages/requests/packages/chardet/chardetect.py \
-    qml/pages/requests/packages/chardet/chardistribution.py \
-    qml/pages/requests/packages/chardet/charsetgroupprober.py \
-    qml/pages/requests/packages/chardet/charsetprober.py \
-    qml/pages/requests/packages/chardet/codingstatemachine.py \
-    qml/pages/requests/packages/chardet/compat.py \
-    qml/pages/requests/packages/chardet/constants.py \
-    qml/pages/requests/packages/chardet/cp949prober.py \
-    qml/pages/requests/packages/chardet/escprober.py \
-    qml/pages/requests/packages/chardet/escsm.py \
-    qml/pages/requests/packages/chardet/eucjpprober.py \
-    qml/pages/requests/packages/chardet/euckrfreq.py \
-    qml/pages/requests/packages/chardet/euckrprober.py \
-    qml/pages/requests/packages/chardet/euctwfreq.py \
-    qml/pages/requests/packages/chardet/euctwprober.py \
-    qml/pages/requests/packages/chardet/gb2312freq.py \
-    qml/pages/requests/packages/chardet/gb2312prober.py \
-    qml/pages/requests/packages/chardet/hebrewprober.py \
-    qml/pages/requests/packages/chardet/jisfreq.py \
-    qml/pages/requests/packages/chardet/jpcntx.py \
-    qml/pages/requests/packages/chardet/langbulgarianmodel.py \
-    qml/pages/requests/packages/chardet/langcyrillicmodel.py \
-    qml/pages/requests/packages/chardet/langgreekmodel.py \
-    qml/pages/requests/packages/chardet/langhebrewmodel.py \
-    qml/pages/requests/packages/chardet/langhungarianmodel.py \
-    qml/pages/requests/packages/chardet/langthaimodel.py \
-    qml/pages/requests/packages/chardet/latin1prober.py \
-    qml/pages/requests/packages/chardet/mbcharsetprober.py \
-    qml/pages/requests/packages/chardet/mbcsgroupprober.py \
-    qml/pages/requests/packages/chardet/mbcssm.py \
-    qml/pages/requests/packages/chardet/sbcharsetprober.py \
-    qml/pages/requests/packages/chardet/sbcsgroupprober.py \
-    qml/pages/requests/packages/chardet/sjisprober.py \
-    qml/pages/requests/packages/chardet/universaldetector.py \
-    qml/pages/requests/packages/chardet/utf8prober.py \
-    qml/pages/requests/packages/urllib3/contrib/__init__.py \
-    qml/pages/requests/packages/urllib3/contrib/appengine.py \
-    qml/pages/requests/packages/urllib3/contrib/ntlmpool.py \
-    qml/pages/requests/packages/urllib3/contrib/pyopenssl.py \
-    qml/pages/requests/packages/urllib3/contrib/socks.py \
-    qml/pages/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py \
-    qml/pages/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py \
-    qml/pages/requests/packages/urllib3/packages/__init__.py \
-    qml/pages/requests/packages/urllib3/packages/ordered_dict.py \
-    qml/pages/requests/packages/urllib3/packages/six.py \
-    qml/pages/requests/packages/urllib3/util/__init__.py \
-    qml/pages/requests/packages/urllib3/util/connection.py \
-    qml/pages/requests/packages/urllib3/util/request.py \
-    qml/pages/requests/packages/urllib3/util/response.py \
-    qml/pages/requests/packages/urllib3/util/retry.py \
-    qml/pages/requests/packages/urllib3/util/ssl_.py \
-    qml/pages/requests/packages/urllib3/util/timeout.py \
-    qml/pages/requests/packages/urllib3/util/url.py \
-    qml/pages/requests/packages/urllib3/__init__.py \
-    qml/pages/requests/packages/urllib3/_collections.py \
-    qml/pages/requests/packages/urllib3/connection.py \
-    qml/pages/requests/packages/urllib3/connectionpool.py \
-    qml/pages/requests/packages/urllib3/exceptions.py \
-    qml/pages/requests/packages/urllib3/fields.py \
-    qml/pages/requests/packages/urllib3/filepost.py \
-    qml/pages/requests/packages/urllib3/poolmanager.py \
-    qml/pages/requests/packages/urllib3/request.py \
-    qml/pages/requests/packages/urllib3/response.py \
-    qml/pages/requests/packages/__init__.py \
-    qml/pages/requests/__init__.py \
-    qml/pages/requests/adapters.py \
-    qml/pages/requests/api.py \
-    qml/pages/requests/auth.py \
-    qml/pages/requests/certs.py \
-    qml/pages/requests/compat.py \
-    qml/pages/requests/cookies.py \
-    qml/pages/requests/exceptions.py \
-    qml/pages/requests/hooks.py \
-    qml/pages/requests/models.py \
-    qml/pages/requests/sessions.py \
-    qml/pages/requests/status_codes.py \
-    qml/pages/requests/structures.py \
-    qml/pages/requests/utils.py \
-    qml/pages/SettingsPage.qml
-
+HEADERS += \
+    src/api.h \
+    src/logger.h \
+    src/os.h