Коммит 09244592 создал по автору Коул Милена Ричардовна's avatar Коул Милена Ричардовна
Просмотр файлов

fix remembering login

владелец 6b7bd559
...@@ -51,6 +51,8 @@ ...@@ -51,6 +51,8 @@
#include "browser.h" #include "browser.h"
#include "browserwindow.h" #include "browserwindow.h"
#include <QWebEngineSettings>
Browser::Browser() Browser::Browser()
{ {
// Quit application if the download manager window is the only remaining window // Quit application if the download manager window is the only remaining window
...@@ -63,13 +65,15 @@ Browser::Browser() ...@@ -63,13 +65,15 @@ Browser::Browser()
BrowserWindow *Browser::createWindow(QString vkm_link, bool offTheRecord) BrowserWindow *Browser::createWindow(QString vkm_link, bool offTheRecord)
{ {
if (offTheRecord && !m_otrProfile) { if (!offTheRecord && !m_profile) {
m_otrProfile.reset(new QWebEngineProfile); m_profile.reset(new QWebEngineProfile(
QObject::connect( QString::fromLatin1("mosvkm.%1").arg(qWebEngineChromiumVersion())));
m_otrProfile.get(), &QWebEngineProfile::downloadRequested, m_profile->settings()->setAttribute(QWebEngineSettings::PluginsEnabled, true);
&m_downloadManagerWidget, &DownloadManagerWidget::downloadRequested); m_profile->settings()->setAttribute(QWebEngineSettings::DnsPrefetchEnabled, true);
QObject::connect(m_profile.get(), &QWebEngineProfile::downloadRequested,
&m_downloadManagerWidget, &DownloadManagerWidget::downloadRequested);
} }
auto profile = offTheRecord ? m_otrProfile.get() : QWebEngineProfile::defaultProfile(); auto profile = !offTheRecord ? m_profile.get() : QWebEngineProfile::defaultProfile();
auto mainWindow = new BrowserWindow(this, profile, vkm_link, false); auto mainWindow = new BrowserWindow(this, profile, vkm_link, false);
m_windows.append(mainWindow); m_windows.append(mainWindow);
QObject::connect(mainWindow, &QObject::destroyed, [this, mainWindow]() { QObject::connect(mainWindow, &QObject::destroyed, [this, mainWindow]() {
...@@ -81,13 +85,15 @@ BrowserWindow *Browser::createWindow(QString vkm_link, bool offTheRecord) ...@@ -81,13 +85,15 @@ BrowserWindow *Browser::createWindow(QString vkm_link, bool offTheRecord)
LinkWindow *Browser::createLinkWindow(bool offTheRecord) LinkWindow *Browser::createLinkWindow(bool offTheRecord)
{ {
if (offTheRecord && !m_otrProfile) { if (!offTheRecord && !m_profile) {
m_otrProfile.reset(new QWebEngineProfile); m_profile.reset(new QWebEngineProfile(
QObject::connect( QString::fromLatin1("mosvkm.%1").arg(qWebEngineChromiumVersion())));
m_otrProfile.get(), &QWebEngineProfile::downloadRequested, m_profile->settings()->setAttribute(QWebEngineSettings::PluginsEnabled, true);
&m_downloadManagerWidget, &DownloadManagerWidget::downloadRequested); m_profile->settings()->setAttribute(QWebEngineSettings::DnsPrefetchEnabled, true);
QObject::connect(m_profile.get(), &QWebEngineProfile::downloadRequested,
&m_downloadManagerWidget, &DownloadManagerWidget::downloadRequested);
} }
auto profile = offTheRecord ? m_otrProfile.get() : QWebEngineProfile::defaultProfile(); auto profile = !offTheRecord ? m_profile.get() : QWebEngineProfile::defaultProfile();
auto mainWindow = new LinkWindow(this, profile, false); auto mainWindow = new LinkWindow(this, profile, false);
mainWindow->show(); mainWindow->show();
return mainWindow; return mainWindow;
......
...@@ -72,6 +72,6 @@ public: ...@@ -72,6 +72,6 @@ public:
private: private:
QVector<BrowserWindow*> m_windows; QVector<BrowserWindow*> m_windows;
DownloadManagerWidget m_downloadManagerWidget; DownloadManagerWidget m_downloadManagerWidget;
QScopedPointer<QWebEngineProfile> m_otrProfile; QScopedPointer<QWebEngineProfile> m_profile;
}; };
#endif // BROWSER_H #endif // BROWSER_H
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать