Skip to content

Commit

Permalink
Enable save button when not auto-saving non-data changes
Browse files Browse the repository at this point in the history
* Fix #9501
  • Loading branch information
droidmonkey committed Aug 6, 2023
1 parent 1b12c95 commit 21d1582
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/core/Database.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -939,6 +939,7 @@ void Database::markAsClean()
void Database::markNonDataChange()
{
m_hasNonDataChange = true;
emit databaseNonDataChanged();
}

/**
Expand Down
1 change: 1 addition & 0 deletions src/core/Database.h
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ public slots:
void databaseSaved();
void databaseDiscarded();
void databaseFileChanged();
void databaseNonDataChanged();
void tagListUpdated();

private:
Expand Down
9 changes: 9 additions & 0 deletions src/gui/DatabaseWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1111,6 +1111,7 @@ 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::onDatabaseNonDataChanged);
}

void DatabaseWidget::loadDatabase(bool accepted)
Expand Down Expand Up @@ -1570,6 +1571,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;
Expand Down
1 change: 1 addition & 0 deletions src/gui/DatabaseWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ private slots:
void onEntryChanged(Entry* entry);
void onGroupChanged();
void onDatabaseModified();
void onDatabaseNonDataChanged();
void onAutosaveDelayTimeout();
void connectDatabaseSignals();
void loadDatabase(bool accepted);
Expand Down

0 comments on commit 21d1582

Please # to comment.