change local setting prefix
This commit is contained in:
parent
a4fd9bfb72
commit
f83bbe53a8
|
@ -38,7 +38,7 @@ SnoreCore::SnoreCore()
|
||||||
d_ptr = new SnoreCorePrivate();
|
d_ptr = new SnoreCorePrivate();
|
||||||
Q_D(SnoreCore);
|
Q_D(SnoreCore);
|
||||||
d->q_ptr = this;
|
d->q_ptr = this;
|
||||||
setDefaultValue("Timeout", 10, LOCAL_SETTING);
|
d->setDefaults();
|
||||||
}
|
}
|
||||||
|
|
||||||
SnoreCore &SnoreCore::instance()
|
SnoreCore &SnoreCore::instance()
|
||||||
|
|
|
@ -132,6 +132,12 @@ bool SnoreCorePrivate::initPrimaryNotificationBackend()
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SnoreCorePrivate::setDefaults()
|
||||||
|
{
|
||||||
|
Q_Q(SnoreCore);
|
||||||
|
q->setDefaultValue("Timeout", 10, LOCAL_SETTING);
|
||||||
|
}
|
||||||
|
|
||||||
void SnoreCorePrivate::syncSettings()
|
void SnoreCorePrivate::syncSettings()
|
||||||
{
|
{
|
||||||
Q_Q(SnoreCore);
|
Q_Q(SnoreCore);
|
||||||
|
@ -177,6 +183,7 @@ QStringList SnoreCorePrivate::knownClients(){
|
||||||
void SnoreCorePrivate::setLocalSttingsPrefix(const QString &prefix)
|
void SnoreCorePrivate::setLocalSttingsPrefix(const QString &prefix)
|
||||||
{
|
{
|
||||||
m_localSettingsPrefix = prefix;
|
m_localSettingsPrefix = prefix;
|
||||||
|
setDefaults();
|
||||||
syncSettings();
|
syncSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -86,6 +86,8 @@ public:
|
||||||
|
|
||||||
void setLocalSttingsPrefix(const QString &prefix);
|
void setLocalSttingsPrefix(const QString &prefix);
|
||||||
|
|
||||||
|
void setDefaults();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void applicationRegistered(const Snore::Application &);
|
void applicationRegistered(const Snore::Application &);
|
||||||
void applicationDeregistered(const Snore::Application &);
|
void applicationDeregistered(const Snore::Application &);
|
||||||
|
@ -108,7 +110,7 @@ private:
|
||||||
|
|
||||||
Application m_defaultApp;
|
Application m_defaultApp;
|
||||||
|
|
||||||
QString m_localSettingsPrefix = QString("%1.%2").arg(qApp->organizationName(), qApp->applicationName());
|
QString m_localSettingsPrefix = qApp->applicationName().isEmpty() ? "SnoreNotify" : qApp->applicationName();
|
||||||
|
|
||||||
QSettings *m_settings;
|
QSettings *m_settings;
|
||||||
};
|
};
|
||||||
|
|
|
@ -19,7 +19,7 @@ SettingsWindow::SettingsWindow(QWidget *parent) :
|
||||||
connect(ui->widget, &Snore::SettingsDialog::finished, qApp, &QApplication::quit);
|
connect(ui->widget, &Snore::SettingsDialog::finished, qApp, &QApplication::quit);
|
||||||
|
|
||||||
QStringList list = SnoreCorePrivate::instance()->knownClients();
|
QStringList list = SnoreCorePrivate::instance()->knownClients();
|
||||||
list.removeAll(QString("%1.%2").arg(qApp->organizationName(), qApp->applicationName()));
|
list.removeAll(qApp->applicationName());
|
||||||
ui->comboBox->addItems(list);
|
ui->comboBox->addItems(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue