Merge pull request #5 from vadrian89/dev

Merge v3.0.2 to master branch
vadrian89 · May 3, 2017 · 35ddbdb · 35ddbdb
2 parents 4a08abf + 3af3fca
commit 35ddbdb
Show file tree

Hide file tree

Showing 20 changed files with 198 additions and 224 deletions.
diff --git a/ApplicationBar.qml b/ApplicationBar.qml
@@ -19,8 +19,8 @@
 * You should have received a copy of the GNU General Public License
 * along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 */
-import QtQuick 2.5
-import QtQuick.Layouts 1.1
+import QtQuick 2.7
+import QtQuick.Layouts 1.3
 
 Item {
     id: root

diff --git a/ColorPalleteButton.qml b/ColorPalleteButton.qml
@@ -19,8 +19,8 @@
 * You should have received a copy of the GNU General Public License
 * along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 */
-import QtQuick 2.5
-import QtQuick.Layouts 1.1
+import QtQuick 2.7
+import QtQuick.Layouts 1.3
 
 Item {
     id: root

diff --git a/CppFiles/DbConnection.cpp b/CppFiles/DbConnection.cpp
@@ -20,12 +20,16 @@
 * along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "DbConnection.h"
+#include "Util.h"
 #include <QApplication>
-
 #include <QDebug>
+
 DbConnection::DbConnection(QObject *parent) : QObject(parent){
     QString appName = QApplication::applicationName();
-    QString databaseName = QApplication::applicationDirPath() + "/" + appName + "-local.db";
+    QString databaseName = appName + "-local.db";
+    if (Util::osType() != "android") {
+        databaseName = QApplication::applicationDirPath() + "/" + appName + "-local.db";
+    }
     db = QSqlDatabase::database();
     if (db.isValid() == false) {
         db = QSqlDatabase::addDatabase("QSQLITE");

diff --git a/CppFiles/TrayController.cpp b/CppFiles/TrayController.cpp
@@ -20,7 +20,12 @@
 * along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "TrayController.h"
+#include "Util.h"
+
+#include <QDebug>
 TrayController::TrayController(QObject *parent) : QObject(parent) {
+    trayIcon = NULL;
+    m_trayVisibility = false;
 }
 
 QString TrayController::icon() const {
@@ -29,35 +34,26 @@ QString TrayController::icon() const {
 
 void TrayController::setIcon(const QString &icon) {
     if (m_icon != icon && icon.trimmed().size() > 0) {
+        m_icon = icon;
         setTrayIcon(icon);
         emit iconChanged();
     }
 }
 
-bool TrayController::startUp() const {
-    return m_startUp;
-}
-
-void TrayController::setStartUp(const bool &startUp) {
-    if (m_startUp != startUp) {
-        if (startUp == true) {
-            initialiseTray();
-        }
-        emit startUpChanged();
-    }
-}
-
 bool TrayController::trayVisibility() const {
     return m_trayVisibility;
 }
 
-void TrayController::setTrayVisibility(const bool &trayVisibility) {    
-    if (m_trayVisibility != trayVisibility) {
+void TrayController::setTrayVisibility(const bool &trayVisibility) {
+    if (m_trayVisibility != trayVisibility) {        
         if (trayVisibility == true) {
+            if (trayIcon == NULL)
+                initialiseTray();
             enableTray();
         }
         else {
-            disableTray();
+            if (trayIcon != NULL)
+                disableTray();
         }
         m_trayVisibility = trayVisibility;
         emit trayVisibilityChanged();
@@ -77,7 +73,8 @@ void TrayController::setTrayIcon(const QString &weather) {
 }
 
 void TrayController::setTrayIcon(const QImage &image) {
-    trayIcon->setIcon(QIcon(QPixmap::fromImage(image)));
+    if (trayIcon != NULL)
+        trayIcon->setIcon(QIcon(QPixmap::fromImage(image)));
     thread->quit();
     thread->wait();
 }
@@ -101,12 +98,15 @@ void TrayController::initialiseTray() {
 void TrayController::enableTray() {
     if (QSystemTrayIcon::isSystemTrayAvailable()) {
         trayIcon->show();
+        setTrayIcon(m_icon);
     }
 }
 
 void TrayController::disableTray() {
     if (QSystemTrayIcon::isSystemTrayAvailable()) {
         trayIcon->hide();
+        delete trayIcon;
+        trayIcon = NULL;
     }
 }
 

diff --git a/CppFiles/TrayController.h b/CppFiles/TrayController.h
@@ -38,11 +38,10 @@
 class TrayController : public QObject {
     Q_OBJECT
     Q_PROPERTY(QString icon READ icon WRITE setIcon NOTIFY iconChanged)
-    Q_PROPERTY(bool startUp READ startUp WRITE setStartUp NOTIFY startUpChanged)
     Q_PROPERTY(bool trayVisibility READ trayVisibility WRITE setTrayVisibility NOTIFY trayVisibilityChanged)
 
     QString m_icon;
-    bool m_startUp, m_trayVisibility;
+    bool m_trayVisibility;
     QSystemTrayIcon *trayIcon;
 
     void initialiseTray();
@@ -66,7 +65,6 @@ private slots:
     void setTrayIcon(const QImage &image);
 signals:
     void iconChanged();
-    void startUpChanged();
     void trayVisibilityChanged();
     void closeApp();
     void showGui();

diff --git a/CppFiles/YWeatherController.cpp b/CppFiles/YWeatherController.cpp
@@ -30,12 +30,12 @@ YWeatherController::YWeatherController(QObject *parent) : AbstractWeatherControl
 
 void YWeatherController::searchByLocation(QString &location) {
     operationData = OperationData::GetLocationId;
-    dataController->getDataFromUrl("https://query.yahooapis.com/v1/public/yql?q=select woeid from geo.places(1) where text='" + location + "'&format=json&env=store://datatables.org/alltableswithkeys");
+    dataController->getDataFromUrl("https://query.yahooapis.com/v1/public/yql?q=select woeid from geo.places(1) where text='" + location + "'&format=json");
 }
 
 void YWeatherController::searchBycode(QString &code) {
     operationData = OperationData::GetWeather;
-    dataController->getDataFromUrl("https://query.yahooapis.com/v1/public/yql?q=select * from weather.forecast where woeid=" + code +"&format=json&env=store://datatables.org/alltableswithkeys");
+    dataController->getDataFromUrl("https://query.yahooapis.com/v1/public/yql?q=select * from weather.forecast where woeid=" + code +"&format=json");
 }
 
 void YWeatherController::readJsonData(QJsonObject jsonObject) {

diff --git a/CreditsView.qml b/CreditsView.qml
@@ -19,15 +19,14 @@
 * You should have received a copy of the GNU General Public License
 * along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 */
-import QtQuick 2.5
-import QtQuick.Dialogs 1.2
-import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.1
+import QtQuick 2.7
+import QtQuick.Controls 2.1
+import QtQuick.Layouts 1.3
 
 Item {
     id: rootDialog
     visible: false
-    property string appVersion: "3.0.1"
+    property string appVersion: "3.0.2"
     property string textColor: util.textColor()
     property string backgroundColor: util.backgroundColor()
     property int contentWidth: rootDialog.width * 90 / 100
@@ -37,20 +36,22 @@ Item {
         color: backgroundColor
         width: rootDialog.width
         height: rootDialog.height
-        ScrollView {
-            id: rootScrollView
+        Flickable {
+            id: rootView
             anchors.fill: parent
-            horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-            ColumnLayout {
+            width: rootDialog.width
+            height: rootDialog.height
+            contentWidth: rootDialog.width
+            contentHeight: contentItem.height
+            Rectangle {
+                id: contentItem
+                color: "transparent"
                 width: rootDialog.width
-                spacing: 0
+                height: childrenRect.height
                 LinkedText {
                     id: versionText
-                    Layout.fillHeight: false
-                    Layout.preferredHeight: 60
-                    Layout.fillWidth: false
-                    Layout.preferredWidth: rootDialog.contentWidth
-                    Layout.alignment: Qt.AlignCenter
+                    height: 60
+                    width: rootDialog.contentWidth
                     horizontalAlignment: Text.AlignHCenter
                     verticalAlignment: Text.AlignVCenter
                     font.bold: true
@@ -60,10 +61,11 @@ Item {
                     url: "https://vadrian89.github.io/cumulus-qt/"
                 }
                 LinkedText {
-                    Layout.fillHeight: true
-                    Layout.fillWidth: false
-                    Layout.preferredWidth: rootDialog.contentWidth
-                    Layout.alignment: Qt.AlignCenter
+                    id: fontCreditsText
+                    anchors.top: versionText.bottom
+                    anchors.left: parent.left
+                    anchors.leftMargin: (rootDialog.width - fontCreditsText.width) / 2
+                    width: rootDialog.contentWidth
                     font.pixelSize: 14
                     color: rootDialog.textColor
                     wrapMode: Text.Wrap
@@ -72,10 +74,10 @@ Item {
                 }
                 Text {
                     id: creditsText
-                    Layout.fillHeight: true
-                    Layout.fillWidth: false
-                    Layout.preferredWidth: rootDialog.contentWidth
-                    Layout.alignment: Qt.AlignCenter
+                    anchors.top: fontCreditsText.bottom
+                    anchors.left: parent.left
+                    anchors.leftMargin: (rootDialog.width - creditsText.width) / 2
+                    width: rootDialog.contentWidth
                     font.pixelSize: 14
                     color: rootDialog.textColor
                     wrapMode: Text.Wrap
@@ -90,11 +92,11 @@ Item {
                 }
                 ListView {
                     id: iconCreditsList
-                    Layout.fillHeight: false
-                    Layout.preferredHeight: 200
-                    Layout.fillWidth: false
-                    Layout.preferredWidth: rootDialog.contentWidth
-                    Layout.alignment: Qt.AlignCenter
+                    anchors.top: creditsText.bottom
+                    anchors.left: parent.left
+                    anchors.leftMargin: (rootDialog.width - iconCreditsList.width) / 2
+                    height: 300
+                    width: rootDialog.contentWidth
                     orientation: ListView.Vertical
                     clip: true
                     spacing: 0

diff --git a/CustomBorder.qml b/CustomBorder.qml
diff --git a/ForecastDelegate.qml b/ForecastDelegate.qml
@@ -19,7 +19,7 @@
 * You should have received a copy of the GNU General Public License
 * along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 */
-import QtQuick 2.5
+import QtQuick 2.7
 
 Item {
     property string forecastDay

diff --git a/ForecastView.qml b/ForecastView.qml
@@ -19,7 +19,7 @@
 * You should have received a copy of the GNU General Public License
 * along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 */
-import QtQuick 2.0
+import QtQuick 2.7
 
 Item {
     id: root
@@ -53,5 +53,8 @@ Item {
             forecastTemperature: model.modelData.tempHigh + "° / " + model.modelData.tempLow + "°"
             forecastDesc: util.firstLetterUp(model.modelData.forecastDesc)
         }
+        onModelChanged: positionViewAtBeginning()
+        onWidthChanged: positionViewAtBeginning()
+        onHeightChanged: positionViewAtBeginning()
     }
 }
diff --git a/LinkedText.qml b/LinkedText.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.5
+import QtQuick 2.7
 
 Text {
     id: root

diff --git a/SearchLocation.qml b/SearchLocation.qml
@@ -19,11 +19,10 @@
 * You should have received a copy of the GNU General Public License
 * along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 */
-import QtQuick 2.5
-import QtQuick.Window 2.0
-import QtQuick.Controls 1.4
+import QtQuick 2.7
+import QtQuick.Window 2.2
+import QtQuick.Controls 2.1
 import QtQuick.Dialogs 1.2
-import QtQuick.Controls.Styles 1.4
 
 import ownTypes.searchLocation 0.4
 
@@ -54,13 +53,10 @@ Item {
             anchors.topMargin: 10
             anchors.left: parent.left
             anchors.leftMargin: (parent.width - width) / 2
-            style: TextFieldStyle {
-                textColor: root.textColor
-                placeholderTextColor: root.textColor
-                background: Rectangle {
-                    border.width: 0
-                    color: "transparent"
-                }
+            color: root.textColor
+            background: Rectangle {
+                border.width: 0
+                color: "transparent"
             }
 
             onTextChanged: {

diff --git a/SelectionButton.qml b/SelectionButton.qml
@@ -19,8 +19,8 @@
 * You should have received a copy of the GNU General Public License
 * along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 */
-import QtQuick 2.5
-import QtQuick.Controls 1.4
+import QtQuick 2.7
+import QtQuick.Controls 2.1
 
 Item {
     id: rootItem

diff --git a/SettingsOptionItem.qml b/SettingsOptionItem.qml
@@ -19,8 +19,8 @@
 * You should have received a copy of the GNU General Public License
 * along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 */
-import QtQuick 2.0
-import QtQuick.Layouts 1.1
+import QtQuick 2.7
+import QtQuick.Layouts 1.3
 
 Item {
     id: root