Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adding warning messages when config access error.

Browse Source
This commit is contained in:
Louis-Bertrand Varin 2017-03-06 17:12:07 -05:00 committed by Louis-Bertrand Varin
parent c4d6fa855c
commit 15a288aa5b
4 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/Config.cpp
View File

@ -35,6 +35,16 @@ QVariant Config::get(const QString& key, const QVariant& defaultValue)
return m_settings->value(key, defaultValue);
}
bool Config::hasAccessError()
{
return m_settings->status() & QSettings::AccessError;
}
QString Config::getFileName()
{
return m_settings->fileName();
}
void Config::set(const QString& key, const QVariant& value)
{
m_settings->setValue(key, value);
@ -92,6 +102,10 @@ void Config::init(const QString& fileName)
{
m_settings.reset(new QSettings(fileName, QSettings::IniFormat));
if (hasAccessError()) {
qWarning("Access error with config file %s", qPrintable(fileName));
}
m_defaults.insert("RememberLastDatabases", true);
m_defaults.insert("RememberLastKeyFiles", true);
m_defaults.insert("OpenPreviousDatabasesOnStartup", true);

2
src/core/Config.h
View File

@ -31,7 +31,9 @@ public:
~Config();
QVariant get(const QString& key);
QVariant get(const QString& key, const QVariant& defaultValue);
QString getFileName();
void set(const QString& key, const QVariant& value);
bool hasAccessError();
static Config* instance();
static void createConfigFromFile(const QString& file);

5
src/gui/SettingsWidget.cpp
View File

@ -62,6 +62,11 @@ SettingsWidget::SettingsWidget(QWidget* parent)
addPage(tr("General"), FilePath::instance()->icon("categories", "preferences-other"), m_generalWidget);
addPage(tr("Security"), FilePath::instance()->icon("status", "security-high"), m_secWidget);
if (config()->hasAccessError()) {
m_generalUi->messageWidget->showMessage(
tr("Access error with config file ") + config()->getFileName(), MessageWidget::Error);
}
if (!autoType()->isAvailable()) {
m_generalUi->generalSettingsTabWidget->removeTab(1);
}

9
src/gui/SettingsWidgetGeneral.ui
View File

@ -23,6 +23,9 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="MessageWidget" name="messageWidget" native="true"/>
</item>
<item>
<widget class="QTabWidget" name="generalSettingsTabWidget">
<property name="currentIndex">
@ -368,6 +371,12 @@
<extends>QLineEdit</extends>
<header>autotype/ShortcutWidget.h</header>
</customwidget>
<customwidget>
<class>MessageWidget</class>
<extends>QWidget</extends>
<header>gui/MessageWidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>