Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-31 18:26:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Deconflict snapshot warning with http deprecation warning

Browse Source
This commit is contained in:
Jonathan White 2018-01-27 23:10:03 -05:00 committed by Janek Bevendorff
parent 3e2443a861
commit 5b72407746
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/MainWindow.cpp
View File

@ -420,8 +420,8 @@ MainWindow::MainWindow()
} }
#ifdef WITH_XC_HTTP #ifdef WITH_XC_HTTP
if (config()->get("Http/Enabled", false).toBool() && config()->get("Http/DeprecationNoticeShown", 0).toInt() < 3) { if (config()->get("Http/Enabled", false).toBool() && config()->get("Http/DeprecationNoticeShown", 0).toInt() < 3) {
// show message after tab widget dismissed all messages // show message after global widget dismissed all messages
connect(m_ui->tabWidget, SIGNAL(messageDismissGlobal()), this, SLOT(showKeePassHTTPDeprecationNotice())); connect(m_ui->globalMessageWidget, SIGNAL(hideAnimationFinished()), this, SLOT(showKeePassHTTPDeprecationNotice()));
} }
#endif #endif
@ -430,6 +430,9 @@ MainWindow::MainWindow()
"There is a high risk of corruption, maintain a backup of your databases.\n" "There is a high risk of corruption, maintain a backup of your databases.\n"
"This version is not meant for production use."), "This version is not meant for production use."),
MessageWidget::Warning, -1); MessageWidget::Warning, -1);
#else
// Show the HTTP deprecation message if enabled above
emit m_ui->globalMessageWidget->hideAnimationFinished();
#endif #endif
} }
@ -448,7 +451,7 @@ void MainWindow::showKeePassHTTPDeprecationNotice()
MessageWidget::Warning, true, -1); MessageWidget::Warning, true, -1);
config()->set("Http/DeprecationNoticeShown", warningNum + 1); config()->set("Http/DeprecationNoticeShown", warningNum + 1);
disconnect(m_ui->tabWidget, SIGNAL(messageDismissGlobal()), this, SLOT(showKeePassHTTPDeprecationNotice())); disconnect(m_ui->globalMessageWidget, SIGNAL(hideAnimationFinished()), this, SLOT(showKeePassHTTPDeprecationNotice()));
} }
void MainWindow::appExit() void MainWindow::appExit()