From 7d63a58a6c3e5fce613147ea730d21c0e065667c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 8 Oct 2015 11:34:57 +0200 Subject: [PATCH] fix 201 --- libguh/guhsettings.cpp | 6 +++--- .../openweathermap/devicepluginopenweathermap.json | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libguh/guhsettings.cpp b/libguh/guhsettings.cpp index c9f7e13a..162f7d4e 100644 --- a/libguh/guhsettings.cpp +++ b/libguh/guhsettings.cpp @@ -79,7 +79,7 @@ GuhSettings::GuhSettings(const SettingsRole &role, QObject *parent): m_settings = new QSettings(settingsFile, QSettings::IniFormat, this); qDebug() << "Created device settings" << m_settings->fileName(); } else { - settingsFile = settingsPrefix + "/devices"; + settingsFile = QDir::homePath() + "/.config/" + settingsPrefix + "/devices.conf"; m_settings = new QSettings(settingsFile, QSettings::NativeFormat, this); qDebug() << "Created device settings" << m_settings->fileName(); } @@ -95,7 +95,7 @@ GuhSettings::GuhSettings(const SettingsRole &role, QObject *parent): m_settings = new QSettings(settingsFile, QSettings::IniFormat, this); qDebug() << "Created rule settings" << m_settings->fileName(); } else { - settingsFile = settingsPrefix + "/rules"; + settingsFile = QDir::homePath() + "/.config/" + settingsPrefix + "/rules.conf"; m_settings = new QSettings(settingsFile, QSettings::NativeFormat, this); qDebug() << "Created rule settings" << m_settings->fileName(); } @@ -111,7 +111,7 @@ GuhSettings::GuhSettings(const SettingsRole &role, QObject *parent): m_settings = new QSettings(settingsFile, QSettings::IniFormat, this); qDebug() << "Created plugin settings" << m_settings->fileName(); } else { - settingsFile = settingsPrefix + "/plugins"; + settingsFile = QDir::homePath() + "/.config/" + settingsPrefix + "/plugins.conf"; m_settings = new QSettings(settingsFile, QSettings::NativeFormat, this); qDebug() << "Created plugin settings" << m_settings->fileName(); } diff --git a/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.json b/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.json index cae594da..c368794f 100644 --- a/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.json +++ b/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.json @@ -17,7 +17,8 @@ { "name": "location", "type": "QString", - "inputType": "Search" + "inputType": "Search", + "defaultValue": "" } ], "paramTypes": [