Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-09-26 19:31:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

Inform user that KeePassXC-Browser is not supported for Snaps at the moment

Browse source
This commit is contained in:
Janek Bevendorff 2018-02-26 01:34:16 +01:00
parent 2e9f247e29
commit 0668c2be94
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/browser/BrowserOptionDialog.cpp
View file

@ -47,10 +47,7 @@ BrowserOptionDialog::BrowserOptionDialog(QWidget* parent) :
connect(m_ui->useCustomProxy, SIGNAL(toggled(bool)), m_ui->customProxyLocationBrowseButton, SLOT(setEnabled(bool))); connect(m_ui->useCustomProxy, SIGNAL(toggled(bool)), m_ui->customProxyLocationBrowseButton, SLOT(setEnabled(bool)));
connect(m_ui->customProxyLocationBrowseButton, SIGNAL(clicked()), this, SLOT(showProxyLocationFileDialog())); connect(m_ui->customProxyLocationBrowseButton, SIGNAL(clicked()), this, SLOT(showProxyLocationFileDialog()));
#ifdef KEEPASSXC_DIST_APPIMAGE m_ui->browserGlobalWarningWidget->setVisible(false);
m_ui->supportBrowserProxy->setChecked(true);
m_ui->supportBrowserProxy->setEnabled(false);
#endif
} }
BrowserOptionDialog::~BrowserOptionDialog() BrowserOptionDialog::~BrowserOptionDialog()
@ -90,6 +87,18 @@ void BrowserOptionDialog::loadSettings()
m_ui->chromiumSupport->setChecked(settings.chromiumSupport()); m_ui->chromiumSupport->setChecked(settings.chromiumSupport());
m_ui->firefoxSupport->setChecked(settings.firefoxSupport()); m_ui->firefoxSupport->setChecked(settings.firefoxSupport());
m_ui->vivaldiSupport->setChecked(settings.vivaldiSupport()); 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() void BrowserOptionDialog::saveSettings()

3
src/browser/BrowserOptionDialog.ui
View file

@ -26,6 +26,9 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="MessageWidget" name="browserGlobalWarningWidget" native="true"/>
</item>
<item> <item>
<widget class="QCheckBox" name="enableBrowserSupport"> <widget class="QCheckBox" name="enableBrowserSupport">
<property name="toolTip"> <property name="toolTip">