prehistoric-systems/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2026-03-11 08:54:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge b05c73a708 into d9be1b0682

Browse source
This commit is contained in:
xboxones1 2026-03-09 18:59:34 +01:00 committed by GitHub
commit aca6b64bd5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/DatabaseWidget.cpp
View file

@ -1902,7 +1902,7 @@ 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();
emit databaseNonDataChanged();
}
}

28
src/gui/MainWindow.cpp
View file

@ -1041,7 +1041,11 @@ void MainWindow::updateMenuActionState()
m_ui->actionGroupDownloadFavicons->setEnabled(groupSelected && groupHasEntries && !inRecycleBin);
// Database Menu
m_ui->actionDatabaseSave->setEnabled(databaseUnlocked && m_ui->tabWidget->canSave());
bool enableSave = databaseUnlocked
&& (m_ui->tabWidget->canSave()
|| (dbWidget && dbWidget->database() && dbWidget->database()->hasNonDataChanges()
&& !config()->get(Config::AutoSaveNonDataChanges).toBool()));
m_ui->actionDatabaseSave->setEnabled(enableSave);
m_ui->actionDatabaseSaveAs->setEnabled(databaseUnlocked);
m_ui->actionDatabaseSaveBackup->setEnabled(databaseUnlocked);
m_ui->actionDatabaseClose->setEnabled(dbWidget);
@ -1094,7 +1098,12 @@ void MainWindow::updateWindowTitle()
if (isModified && customWindowTitlePart.endsWith("*")) {
customWindowTitlePart.remove(customWindowTitlePart.size() - 1, 1);
}
m_ui->actionDatabaseSave->setEnabled(m_ui->tabWidget->canSave(tabWidgetIndex));
auto dbWidget = m_ui->tabWidget->databaseWidgetFromIndex(tabWidgetIndex);
bool enableSave = (dbWidget && !dbWidget->isLocked())
&& (m_ui->tabWidget->canSave(tabWidgetIndex)
|| (dbWidget->database() && dbWidget->database()->hasNonDataChanges()
&& !config()->get(Config::AutoSaveNonDataChanges).toBool()));
m_ui->actionDatabaseSave->setEnabled(enableSave);
} else if (stackedWidgetIndex == StackedWidgetIndex::SettingsScreen) {
customWindowTitlePart = tr("Settings");
} else if (stackedWidgetIndex == StackedWidgetIndex::PasswordGeneratorScreen) {
@ -2270,8 +2279,21 @@ bool MainWindowEventFilter::eventFilter(QObject* watched, QEvent* event)
}
}
#endif
} else if (eventType == QEvent::KeyPress) {
auto keyEvent = static_cast<QKeyEvent*>(event);
if (keyEvent->key() == Qt::Key_Alt) {
m_altKeyAlone = (keyEvent->modifiers() == Qt::AltModifier);
} else {
m_altKeyAlone = false;
}
return QObject::eventFilter(watched, event);
} else if (eventType == QEvent::KeyRelease && watched == mainWindow) {
auto keyEvent = dynamic_cast<QKeyEvent*>(event);
if (keyEvent->key() != Qt::Key_Alt) {
m_altKeyAlone = false;
return QObject::eventFilter(watched, event);
}
#ifdef Q_OS_WIN
// Windows translates AltGr into CTRL + ALT, this breaks using AltGr when the menubar is hidden
// Prevent this by activating the ALT cooldown to ignore the next key event which will be an ALT key
@ -2281,7 +2303,7 @@ bool MainWindowEventFilter::eventFilter(QObject* watched, QEvent* event)
return false;
}
#endif
if (keyEvent->key() == Qt::Key_Alt && !keyEvent->modifiers() && config()->get(Config::GUI_HideMenubar).toBool()
if (keyEvent->key() == Qt::Key_Alt && m_altKeyAlone && config()->get(Config::GUI_HideMenubar).toBool()
&& !m_altCoolDown.isActive()) {
auto menubar = mainWindow->m_ui->menubar;
menubar->setMaximumHeight(menubar->maximumHeight() > 0 ? 0 : QWIDGETSIZE_MAX);

1
src/gui/MainWindow.h
View file

@ -220,6 +220,7 @@ public:
private:
QTimer m_menubarTimer;
QTimer m_altCoolDown;
bool m_altKeyAlone = false;
};
/**