Merge branch 'devel' into patch-2

sailfishos-applications · Nov 23, 2024 · 68a4805 · 68a4805
2 parents f55075f + 814e496
commit 68a4805
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 90 deletions.
diff --git a/extras/Lockscreen.qml b/extras/Lockscreen.qml
@@ -5,7 +5,9 @@
 **
 ****************************************************************************/
 
-// This file bears some issues, see issue #102 //
+/***********************************************
+** This file bears some issues, see issue #102.
+***********************************************/
 
 import QtQuick 2.0
 import org.nemomobile.lipstick 0.1
@@ -434,6 +436,7 @@ MouseArea {
                     onTextChanged: {
                         setDefaultMarqueeOffset()
                         if (text!=="") {
+                            // Do not worry about this hardcoded path, see issues #101 and #102.
                             coverArt.source = "/home/nemo/.cache/currentAlbumArt.jpeg";
                             coverArt.sourceSize.width = 0
                             coverArt.sourceSize.height = 0

diff --git a/src/FlowPlayer.cpp b/src/FlowPlayer.cpp
@@ -7,6 +7,8 @@
 #include <sailfishapp.h>
 #include <QObject>
 #include <QTextCodec>
+#include <QSettings>
+#include <QStandardPaths>
 
 #include "playlistmanager.h"
 #include "utils.h"
@@ -34,7 +36,7 @@ int main(int argc, char *argv[])
     QString lang;
     QTranslator translator;
 
-    QSettings settings;
+    QSettings settings(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     lang = settings.value("Language", "undefined").toString();
 
     if (lang=="undefined")

diff --git a/src/coversearch.cpp b/src/coversearch.cpp
@@ -7,6 +7,7 @@
 #include <QStringList>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QSettings>
 #include <QStandardPaths>
 
 #define BING_ID "A16EECFD14108C2794E4BC29D4DE59C308685B4A"
@@ -165,7 +166,7 @@ void CoverSearch::remove(const QString &file)
     QString nf = file;
     if ( nf.startsWith("//") )
         nf.remove(0, 1);
-    QSettings settings;
+    QSettings settings(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QStringList entries = settings.value("CoverSearch","").toStringList();
     QStringList newfiles;
     for (int i=0; i< entries.count(); ++i)

diff --git a/src/datareader.cpp b/src/datareader.cpp
@@ -267,7 +267,7 @@ void DataReader::run()
     favFiles.clear();
     map.clear();
 
-    QSettings settings;
+    QSettings settings(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QStringList folders = settings.value("Folders","").toString().split("<separator>");
     folders.removeAll("");
 

diff --git a/src/datos.cpp b/src/datos.cpp
@@ -233,7 +233,7 @@ void Datos::addFilterToQueue()
     }*/
 
     QString norder;
-    QSettings settings;
+    QSettings settings(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QString order = settings.value("TrackOrder", "title").toString();
 
     if (order=="title") norder="title";
@@ -429,7 +429,7 @@ QString Datos::getArtistsCovers()
             dato1.append(coverart);
     }
 
-    QSettings settings;
+    QSettings settings(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     int first = settings.value("LastArtistItem", 0).toInt();
 
     if (first >= dato1.count()) {
@@ -463,7 +463,7 @@ QString Datos::getAlbumsCovers()
             dato1.append(coverart);
     }
 
-    QSettings settings;
+    QSettings settings(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     int first = settings.value("LastAlbumItem", 0).toInt();
 
     if (first >= dato1.count()) {

diff --git a/src/lfm.cpp b/src/lfm.cpp
@@ -31,7 +31,7 @@ LFM::LFM(QQuickItem *parent)
     //connect(datos5, SIGNAL(finished(QNetworkReply*)), this, SLOT(downloaded5(QNetworkReply*)));
     //connect(datos6, SIGNAL(finished(QNetworkReply*)), this, SLOT(downloaded6(QNetworkReply*)));
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     lang = sets.value("LastFMlang", "en").toString();
 }
 
@@ -277,7 +277,7 @@ void LFM::getBio(QString artist)
 
     //if ( reply1 && reply1->isRunning() )
     //    reply1->abort();
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     lang = sets.value("Language", "en").toString();
     artistInfo = tr("Fetching artist information");
     artistInfoLarge = "";
@@ -301,7 +301,7 @@ void LFM::getAlbumBio(QString artist, QString album)
 {
     /*if ( reply2 && reply2->isRunning() )
         reply2->abort();
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     lang = sets.value("LastFMlang", "en").toString();
     albumInfo = tr("Fetching album information");
     albumInfoLarge = "";
@@ -316,7 +316,7 @@ void LFM::getSongBio(QString artist, QString song)
 {
     /*if ( reply3 && reply3->isRunning() )
         reply3->abort();
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     lang = sets.value("LastFMlang", "en").toString();
     songInfo = tr("Fetching track information");
     songInfoLarge = "";

diff --git a/src/loadimage.cpp b/src/loadimage.cpp
@@ -6,7 +6,6 @@
 #include <qfileinfo.h>
 #include <qdir.h>
 #include <QImage>
-#include <QSettings>
 #include <QDebug>
 #include <QStandardPaths>
 

diff --git a/src/loadwebimage.cpp b/src/loadwebimage.cpp
@@ -7,7 +7,6 @@
 #include <qfileinfo.h>
 #include <qdir.h>
 #include <QImage>
-#include <QSettings>
 #include <QDebug>
 #include <QDateTime>
 #include <QStandardPaths>

diff --git a/src/missing.cpp b/src/missing.cpp
@@ -8,7 +8,6 @@
 #include <QImage>
 #include <QStringList>
 #include <QXmlStreamReader>
-#include <QSettings>
 #include <QStandardPaths>
 
 bool namefileLess(const QStringList &d1, const QStringList &d2)

diff --git a/src/musicmodel.cpp b/src/musicmodel.cpp
@@ -57,7 +57,7 @@ void MusicModel::loadData(QString artist, QString album, QString various)
 
     if (!isDBOpened) openDatabase();
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QString torder = sets.value("TrackOrder", "title").toString();
     QString order;
     if (torder=="title") order="title";

diff --git a/src/player.cpp b/src/player.cpp
@@ -3,6 +3,7 @@
 
 #include <QTimer>
 #include <QSettings>
+#include <QStandardPaths>
 #include "QVariantMap"
 
 extern bool databaseWorking;
@@ -20,7 +21,7 @@ static gboolean bus_cb (GstBus *bus, GstMessage *msg, gpointer data)
 static void prepare_next_stream(GstElement *obj, gpointer data) {
     qDebug() << "ABOUT TO FINISH";
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     if (sets.value("GaplessPlayback", "no").toString()=="no")
         return;
 
@@ -421,7 +422,7 @@ void Player::backend_deinit()
 void Player::setEq(bool enabled)
 {
     qDebug() << "Setting eq: " << enabled;
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     sets.setValue("Equalizer", enabled? "Yes" : "No");
     sets.sync();
 
@@ -472,7 +473,7 @@ void Player::setEqualizerReal(int band, int value)
 
 void Player::loadEqualizer()
 {
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     m_eqenabled = sets.value("Equalizer", "No").toString()=="Yes";
     emit eqEnabledChanged();
 

diff --git a/src/playlist.cpp b/src/playlist.cpp
@@ -24,14 +24,14 @@ int Playlist::current()
 
 QString Playlist::active() const
 {
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QString t = sets.value("Active", "false").toString();
     return t;
 }
 
 QString Playlist::unknown() const
 {
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QString t = sets.value("Unknown", "false").toString();
     return t;
 }
@@ -258,10 +258,10 @@ void Playlist::addAlbumToList(QString artist, QString album, QString various)
 
 void Playlist::saveList(QString list)
 {
-    //qDebug() << "Saving playlist :" << list;
+    //qDebug() << "Saving playlist: " << list;
 
     /*QString archivo;
-    archivo = "/home/nemo/.config/cepiperez/playlists/" + list + ".xml";
+    archivo = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/playlists/" + list + ".xml";
     QFile file( archivo );
     file.open( QIODevice::Truncate | QIODevice::Text | QIODevice::ReadWrite);
     QTextStream out(&file);
@@ -352,7 +352,7 @@ void Playlist::clearList(QString list)
     listado.clear();
     //saveList(list);
     /*QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
-    QString path("/home/nemo/.config/cepiperez/flowplayer.db");
+    QString path(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.db");
     db.setDatabaseName(path);
     db.open();
 
@@ -416,7 +416,7 @@ void Playlist::changeUnknown(bool active)
 {
     //qDebug() << "CHANGING UKNOWN: " << active;
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     sets.setValue("Unknown", active);
     sets.sync();
 }
@@ -425,7 +425,7 @@ void Playlist::changeMode(QString mode)
 {
     //qDebug() << "CHANGING MODE: " << mode;
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     sets.setValue("Mode", mode);
     sets.sync();
 }

diff --git a/src/playlistmanager.cpp b/src/playlistmanager.cpp
@@ -1,6 +1,7 @@
 #include "playlistmanager.h"
 
 #include <QSettings>
+#include <QStandardPaths>
 #include <QFileInfo>
 #include <QXmlStreamReader>
 #include <QDir>
@@ -89,7 +90,7 @@ void PlaylistManager::addAlbumToList(QString list, QString artist, QString album
 
     if (!isDBOpened) openDatabase();
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QString torder = sets.value("TrackOrder", "title").toString();
     QString order;
     if (torder=="title") order="title";
@@ -431,7 +432,7 @@ void PlaylistManager::loadAlbum(QString artist, QString album, QString various)
 
     if (!isDBOpened) openDatabase();
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QString torder = sets.value("TrackOrder", "title").toString();
     QString order;
     if (torder=="title") order="title";