Show main page when editing entry or database settings

* Fixes #11891
This commit is contained in:
Jonathan White
2025-05-17 16:44:36 -04:00
parent f7fedaa441
commit cb9b8ba484
3 changed files with 9 additions and 1 deletions

View File

@@ -1811,6 +1811,10 @@ Are you sure you want to continue with this file?.</source>
<source>Secret Service Integration</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Database Settings: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DatabaseSettingsWidgetBrowser</name>

View File

@@ -86,7 +86,7 @@ int EditWidget::pageIndex(const QWidget* widget) const
for (int i = 0; i < m_ui->stackedWidget->count(); i++) {
auto* scrollArea = qobject_cast<QScrollArea*>(m_ui->stackedWidget->widget(i));
if (scrollArea && scrollArea->widget() == widget) {
if (scrollArea && (scrollArea == widget || scrollArea->widget() == widget)) {
return i;
}
}

View File

@@ -97,6 +97,10 @@ DatabaseSettingsDialog::~DatabaseSettingsDialog()
void DatabaseSettingsDialog::load(const QSharedPointer<Database>& db)
{
// Default to the main page on load
setCurrentPage(0);
setHeadline(tr("Database Settings: %1").arg(db->canonicalFilePath()));
m_generalWidget->loadSettings(db);
m_databaseKeyWidget->loadSettings(db);
m_encryptionWidget->loadSettings(db);