rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hide close button on YubiKey user interaction message

Browse Source
This commit is contained in:
Janek Bevendorff
2017-02-25 22:09:55 +01:00
parent 3230206b69
commit 3715286eba
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/MainWindow.cpp
View File

@@ -862,13 +862,15 @@ bool MainWindow::isTrayIconEnabled() const
#endif #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); 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); m_ui->tabWidget->currentDatabaseWidget()->showMessage(text, type);
} }
@@ -886,7 +888,7 @@ void MainWindow::hideTabMessage()
void MainWindow::showYubiKeyPopup() void MainWindow::showYubiKeyPopup()
{ {
displayGlobalMessage(tr("Please touch the button on your YubiKey!"), MessageWidget::Information); displayGlobalMessage(tr("Please touch the button on your YubiKey!"), MessageWidget::Information, false);
setEnabled(false); setEnabled(false);
} }

4
src/gui/MainWindow.h
View File

@@ -44,8 +44,8 @@ public Q_SLOTS:
void openDatabase(const QString& fileName, const QString& pw = QString(), void openDatabase(const QString& fileName, const QString& pw = QString(),
const QString& keyFile = QString()); const QString& keyFile = QString());
void appExit(); void appExit();
void displayGlobalMessage(const QString& text, MessageWidget::MessageType type); void displayGlobalMessage(const QString& text, MessageWidget::MessageType type, bool showClosebutton = true);
void displayTabMessage(const QString& text, MessageWidget::MessageType type); void displayTabMessage(const QString& text, MessageWidget::MessageType type, bool showClosebutton = true);
void hideGlobalMessage(); void hideGlobalMessage();
void showYubiKeyPopup(); void showYubiKeyPopup();
void hideYubiKeyPopup(); void hideYubiKeyPopup();