Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-25 07:19:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Enable save button when not auto-saving non-data changes (#9634)

Browse Source 
* Fix #9501 
* Also fix bug where context menu did not update when entry moved to very top or bottom of list
This commit is contained in:
Jonathan White 2023-08-06 22:22:23 -04:00 committed by GitHub
parent e1482dee2b
commit 5fb26d666a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/Database.cpp
View File

@ -939,6 +939,7 @@ void Database::markAsClean()
void Database::markNonDataChange()
{
m_hasNonDataChange = true;
emit databaseNonDataChanged();
}
/**

1
src/core/Database.h
View File

@ -171,6 +171,7 @@ signals:
void databaseSaved();
void databaseDiscarded();
void databaseFileChanged();
void databaseNonDataChanged();
void tagListUpdated();
private:

10
src/gui/DatabaseWidget.cpp
View File

@ -1112,6 +1112,8 @@ void DatabaseWidget::connectDatabaseSignals()
connect(m_db.data(), &Database::modified, this, &DatabaseWidget::onDatabaseModified);
connect(m_db.data(), &Database::databaseSaved, this, &DatabaseWidget::databaseSaved);
connect(m_db.data(), &Database::databaseFileChanged, this, &DatabaseWidget::reloadDatabaseFile);
connect(m_db.data(), &Database::databaseNonDataChanged, this, &DatabaseWidget::databaseNonDataChanged);
connect(m_db.data(), &Database::databaseNonDataChanged, this, &DatabaseWidget::onDatabaseNonDataChanged);
}
void DatabaseWidget::loadDatabase(bool accepted)
@ -1571,6 +1573,14 @@ void DatabaseWidget::triggerAutosaveTimer()
QMetaObject::invokeMethod(m_autosaveTimer, "timeout");
}
void DatabaseWidget::onDatabaseNonDataChanged()
{
// Force mark the database modified if we are not auto-saving non-data changes
if (!config()->get(Config::AutoSaveNonDataChanges).toBool()) {
m_db->markAsModified();
}
}
QString DatabaseWidget::getCurrentSearch()
{
return m_lastSearchText;

2
src/gui/DatabaseWidget.h
View File

@ -129,6 +129,7 @@ signals:
// relayed Database signals
void databaseFilePathChanged(const QString& oldPath, const QString& newPath);
void databaseModified();
void databaseNonDataChanged();
void databaseSaved();
void databaseUnlocked();
void databaseLockRequested();
@ -254,6 +255,7 @@ private slots:
void onEntryChanged(Entry* entry);
void onGroupChanged();
void onDatabaseModified();
void onDatabaseNonDataChanged();
void onAutosaveDelayTimeout();
void connectDatabaseSignals();
void loadDatabase(bool accepted);

1
src/gui/MainWindow.cpp
View File

@ -442,6 +442,7 @@ MainWindow::MainWindow()
SIGNAL(currentModeChanged(DatabaseWidget::Mode)), this, SLOT(setMenuActionState(DatabaseWidget::Mode)));
m_actionMultiplexer.connect(SIGNAL(groupChanged()), this, SLOT(setMenuActionState()));
m_actionMultiplexer.connect(SIGNAL(entrySelectionChanged()), this, SLOT(setMenuActionState()));
m_actionMultiplexer.connect(SIGNAL(databaseNonDataChanged()), this, SLOT(setMenuActionState()));
m_actionMultiplexer.connect(SIGNAL(groupContextMenuRequested(QPoint)), this, SLOT(showGroupContextMenu(QPoint)));
m_actionMultiplexer.connect(SIGNAL(entryContextMenuRequested(QPoint)), this, SLOT(showEntryContextMenu(QPoint)));
m_actionMultiplexer.connect(SIGNAL(groupChanged()), this, SLOT(updateEntryCountLabel()));