mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2026-11-21 09:31:32 -08:00
Merge remote-tracking branch 'upstream/develop' into feature/import-csv-format
This commit is contained in:
commit
3fcf342fbc
157 files changed
+2325
-519
No files matched your search
+15
-2
@@ -874,13 +874,15 @@ bool MainWindow::isTrayIconEnabled() const
|
||||
#endif
|
||||
}
|
||||
|
||||
void MainWindow::displayGlobalMessage(const QString& text, MessageWidget::MessageType type)
|
||||
void MainWindow::displayGlobalMessage(const QString& text, MessageWidget::MessageType type, bool showClosebutton)
|
||||
{
|
||||
m_ui->globalMessageWidget->setCloseButtonVisible(showClosebutton);
|
||||
m_ui->globalMessageWidget->showMessage(text, type);
|
||||
}
|
||||
|
||||
void MainWindow::displayTabMessage(const QString& text, MessageWidget::MessageType type)
|
||||
void MainWindow::displayTabMessage(const QString& text, MessageWidget::MessageType type, bool showClosebutton)
|
||||
{
|
||||
m_ui->globalMessageWidget->setCloseButtonVisible(showClosebutton);
|
||||
m_ui->tabWidget->currentDatabaseWidget()->showMessage(text, type);
|
||||
}
|
||||
|
||||
@@ -896,3 +898,14 @@ void MainWindow::hideTabMessage()
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::showYubiKeyPopup()
|
||||
{
|
||||
displayGlobalMessage(tr("Please touch the button on your YubiKey!"), MessageWidget::Information, false);
|
||||
setEnabled(false);
|
||||
}
|
||||
|
||||
void MainWindow::hideYubiKeyPopup()
|
||||
{
|
||||
hideGlobalMessage();
|
||||
setEnabled(true);
|
||||
}
|
||||
Reference in new issue
Block a user