From 0668c2be94e8ea7eda2459f578bea4160eee88b3 Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Mon, 26 Feb 2018 01:34:16 +0100 Subject: [PATCH] Inform user that KeePassXC-Browser is not supported for Snaps at the moment --- src/browser/BrowserOptionDialog.cpp | 17 +++++++++++++---- src/browser/BrowserOptionDialog.ui | 3 +++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/browser/BrowserOptionDialog.cpp b/src/browser/BrowserOptionDialog.cpp index 39b514fde..693e62d26 100755 --- a/src/browser/BrowserOptionDialog.cpp +++ b/src/browser/BrowserOptionDialog.cpp @@ -47,10 +47,7 @@ BrowserOptionDialog::BrowserOptionDialog(QWidget* parent) : connect(m_ui->useCustomProxy, SIGNAL(toggled(bool)), m_ui->customProxyLocationBrowseButton, SLOT(setEnabled(bool))); connect(m_ui->customProxyLocationBrowseButton, SIGNAL(clicked()), this, SLOT(showProxyLocationFileDialog())); -#ifdef KEEPASSXC_DIST_APPIMAGE - m_ui->supportBrowserProxy->setChecked(true); - m_ui->supportBrowserProxy->setEnabled(false); -#endif + m_ui->browserGlobalWarningWidget->setVisible(false); } BrowserOptionDialog::~BrowserOptionDialog() @@ -90,6 +87,18 @@ void BrowserOptionDialog::loadSettings() m_ui->chromiumSupport->setChecked(settings.chromiumSupport()); m_ui->firefoxSupport->setChecked(settings.firefoxSupport()); m_ui->vivaldiSupport->setChecked(settings.vivaldiSupport()); + +#if defined(KEEPASSXC_DIST_APPIMAGE) + m_ui->supportBrowserProxy->setChecked(true); + m_ui->supportBrowserProxy->setEnabled(false); +#elif defined(KEEPASSXC_DIST_SNAP) + m_ui->enableBrowserSupport->setChecked(false); + m_ui->enableBrowserSupport->setEnabled(false); + m_ui->browserGlobalWarningWidget->showMessage( + tr("We're sorry, but KeePassXC-Browser is not supported for Snap releases at the moment."), MessageWidget::Warning); + m_ui->browserGlobalWarningWidget->setCloseButtonVisible(false); + m_ui->browserGlobalWarningWidget->setAutoHideTimeout(-1); +#endif } void BrowserOptionDialog::saveSettings() diff --git a/src/browser/BrowserOptionDialog.ui b/src/browser/BrowserOptionDialog.ui index 9bb0250b3..e82379452 100755 --- a/src/browser/BrowserOptionDialog.ui +++ b/src/browser/BrowserOptionDialog.ui @@ -26,6 +26,9 @@ 0 + + +