ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix 201

pull/135/head
Simon Stürz 2015-10-08 11:34:57 +02:00 committed by Michael Zanetti
parent 964ecfef29
commit 7d63a58a6c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libguh/guhsettings.cpp
View File

@ -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();
}

3
plugins/deviceplugins/openweathermap/devicepluginopenweathermap.json
View File

@ -17,7 +17,8 @@
{
"name": "location",
"type": "QString",
"inputType": "Search"
"inputType": "Search",
"defaultValue": ""
}
],
"paramTypes": [