Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add Microsoft Edge support for Linux (#7100)

Browse Source
This commit is contained in:
Sami Vänttinen 2021-11-05 05:02:02 +02:00 committed by GitHub
parent 3b1acd0831
commit bb88ad6e8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/browser/BrowserSettingsWidget.cpp
View File

@ -139,12 +139,6 @@ void BrowserSettingsWidget::loadSettings()
m_ui->snapWarningLabel->setVisible(false); m_ui->snapWarningLabel->setVisible(false);
#endif #endif
// TODO: Enable Edge support when Linux version is released
#ifdef Q_OS_LINUX
m_ui->edgeSupport->setChecked(false);
m_ui->edgeSupport->setEnabled(false);
#endif
#ifdef KEEPASSXC_DIST_SNAP #ifdef KEEPASSXC_DIST_SNAP
// Disable settings that will not work // Disable settings that will not work
m_ui->useCustomProxy->setChecked(false); m_ui->useCustomProxy->setChecked(false);

4
src/browser/NativeMessageInstaller.cpp
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2017 Sami Vänttinen <sami.vanttinen@protonmail.com> * Copyright (C) 2017 Sami Vänttinen <sami.vanttinen@protonmail.com>
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org> * Copyright (C) 2021 KeePassXC Team <team@keepassxc.org>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -70,7 +70,7 @@ namespace
const QString TARGET_DIR_TOR_BROWSER = QStringLiteral( const QString TARGET_DIR_TOR_BROWSER = QStringLiteral(
"/torbrowser/tbb/x86_64/tor-browser_en-US/Browser/TorBrowser/Data/Browser/.mozilla/native-messaging-hosts"); "/torbrowser/tbb/x86_64/tor-browser_en-US/Browser/TorBrowser/Data/Browser/.mozilla/native-messaging-hosts");
const QString TARGET_DIR_BRAVE = QStringLiteral("/BraveSoftware/Brave-Browser/NativeMessagingHosts"); const QString TARGET_DIR_BRAVE = QStringLiteral("/BraveSoftware/Brave-Browser/NativeMessagingHosts");
const QString TARGET_DIR_EDGE = QStringLiteral("/microsoftedge/NativeMessagingHosts"); const QString TARGET_DIR_EDGE = QStringLiteral("/microsoft-edge/NativeMessagingHosts");
#endif #endif
} // namespace } // namespace