Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-24 05:31:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

FdoSecrets: only enable the settings page when there is actually a service instance

Browse Source 
* Fix #4311
This commit is contained in:
Aetf 2020-02-15 20:39:32 -05:00 committed by Jonathan White
parent 8ae718b747
commit 2359742de1
4 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.ui
View File

@ -11,6 +11,18 @@
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="MessageWidget" name="warningWidget" native="true"/> <widget class="MessageWidget" name="warningWidget" native="true"/>
</item> </item>

41
src/fdosecrets/widgets/SettingsWidgetFdoSecrets.cpp
View File

@ -264,8 +264,11 @@ SettingsWidgetFdoSecrets::SettingsWidgetFdoSecrets(FdoSecretsPlugin* plugin, QWi
dbViewHeader->setSectionResizeMode(1, QHeaderView::Stretch); // group dbViewHeader->setSectionResizeMode(1, QHeaderView::Stretch); // group
dbViewHeader->setSectionResizeMode(2, QHeaderView::ResizeToContents); // manage button dbViewHeader->setSectionResizeMode(2, QHeaderView::ResizeToContents); // manage button
m_ui->tabWidget->setEnabled(m_ui->enableFdoSecretService->isChecked()); // prompt the user to save settings before the sections are enabled
connect(m_ui->enableFdoSecretService, &QCheckBox::toggled, m_ui->tabWidget, &QTabWidget::setEnabled); connect(m_plugin, &FdoSecretsPlugin::secretServiceStarted, this, &SettingsWidgetFdoSecrets::updateServiceState);
connect(m_plugin, &FdoSecretsPlugin::secretServiceStopped, this, &SettingsWidgetFdoSecrets::updateServiceState);
connect(m_ui->enableFdoSecretService, &QCheckBox::toggled, this, &SettingsWidgetFdoSecrets::updateServiceState);
updateServiceState();
// background checking // background checking
m_checkTimer.setInterval(2000); m_checkTimer.setInterval(2000);
@ -310,18 +313,6 @@ void SettingsWidgetFdoSecrets::saveSettings()
FdoSecrets::settings()->setNoConfirmDeleteItem(m_ui->noConfirmDeleteItem->isChecked()); FdoSecrets::settings()->setNoConfirmDeleteItem(m_ui->noConfirmDeleteItem->isChecked());
} }
void SettingsWidgetFdoSecrets::showMessage(const QString& text, MessageWidget::MessageType type)
{
// Show error messages for a longer time to make sure the user can read them
if (type == MessageWidget::Error) {
m_ui->warningMsg->setCloseButtonVisible(true);
m_ui->warningMsg->showMessage(text, type, -1);
} else {
m_ui->warningMsg->setCloseButtonVisible(false);
m_ui->warningMsg->showMessage(text, type, 2000);
}
}
void SettingsWidgetFdoSecrets::showEvent(QShowEvent* event) void SettingsWidgetFdoSecrets::showEvent(QShowEvent* event)
{ {
QWidget::showEvent(event); QWidget::showEvent(event);
@ -344,14 +335,32 @@ void SettingsWidgetFdoSecrets::checkDBusName()
auto reply = QDBusConnection::sessionBus().interface()->isServiceRegistered(QStringLiteral(DBUS_SERVICE_SECRET)); auto reply = QDBusConnection::sessionBus().interface()->isServiceRegistered(QStringLiteral(DBUS_SERVICE_SECRET));
if (!reply.isValid()) { if (!reply.isValid()) {
showMessage(tr("<b>Error:</b> Failed to connect to DBus. Please check your DBus setup."), MessageWidget::Error); m_ui->warningMsg->showMessage(
tr("<b>Error:</b> Failed to connect to DBus. Please check your DBus setup."), MessageWidget::Error, -1);
m_ui->enableFdoSecretService->setChecked(false);
m_ui->enableFdoSecretService->setEnabled(false);
return; return;
} }
if (reply.value()) { if (reply.value()) {
showMessage(tr("<b>Warning:</b> ") + m_plugin->reportExistingService(), MessageWidget::Warning); m_ui->warningMsg->showMessage(
tr("<b>Warning:</b> ") + m_plugin->reportExistingService(), MessageWidget::Warning, -1);
m_ui->enableFdoSecretService->setChecked(false);
m_ui->enableFdoSecretService->setEnabled(false);
return; return;
} }
m_ui->warningMsg->hideMessage(); m_ui->warningMsg->hideMessage();
m_ui->enableFdoSecretService->setEnabled(true);
}
void SettingsWidgetFdoSecrets::updateServiceState()
{
m_ui->tabWidget->setEnabled(m_plugin->serviceInstance() != nullptr);
if (m_ui->enableFdoSecretService->isChecked() && !m_plugin->serviceInstance()) {
m_ui->tabWidget->setToolTip(
tr("Save current changes to activate the plugin and enable editing of this section."));
} else {
m_ui->tabWidget->setToolTip("");
}
} }
#include "SettingsWidgetFdoSecrets.moc" #include "SettingsWidgetFdoSecrets.moc"

2
src/fdosecrets/widgets/SettingsWidgetFdoSecrets.h
View File

@ -55,7 +55,7 @@ public slots:
private slots: private slots:
void checkDBusName(); void checkDBusName();
void showMessage(const QString& text, MessageWidget::MessageType type); void updateServiceState();
protected: protected:
void showEvent(QShowEvent* event) override; void showEvent(QShowEvent* event) override;

12
src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui
View File

@ -14,6 +14,18 @@
<string>Options</string> <string>Options</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="MessageWidget" name="warningMsg" native="true"/> <widget class="MessageWidget" name="warningMsg" native="true"/>
</item> </item>