Implement opening web pages in other browsers. https://redmine.stoutner.com/issues...

[PrivacyBrowserPC.git] / src / widgets / TabWidget.cpp

diff --git a/src/widgets/TabWidget.cpp b/src/widgets/TabWidget.cpp
index e98ac31c38e6c3da93d1dddd114e6d45685e37d4..c7de2207b00b40a977c0c236c4d53fe083b72218 100644 (file)
--- a/src/widgets/TabWidget.cpp
+++ b/src/widgets/TabWidget.cpp
@@ -453,11 +453,11 @@ PrivacyWebEngineView* TabWidget::addTab(const bool removeUrlLineEditFocus, const
     webEngineSettingsPointer->setAttribute(QWebEngineSettings::PluginsEnabled, true);
 
     // Update the blocked requests action.
-    connect(privacyWebEngineViewPointer, &PrivacyWebEngineView::requestBlocked, [this, privacyWebEngineViewPointer] (const int blockedRequests)
+    connect(privacyWebEngineViewPointer, &PrivacyWebEngineView::requestBlocked, [this, privacyWebEngineViewPointer] (const QVector<int> blockedRequestsVector)
     {
         // Update the blocked requests action if the specified privacy WebEngine view is the current privacy WebEngine view.
         if (privacyWebEngineViewPointer == currentPrivacyWebEngineViewPointer)
-            emit blockedRequestsUpdated(blockedRequests);
+            emit blockedRequestsUpdated(blockedRequestsVector);
     });
 
     // Update the cookies action.
@@ -1185,6 +1185,33 @@ void TabWidget::toggleDomStorage() const
     currentPrivacyWebEngineViewPointer->reload();
 }
 
+void TabWidget::toggleEasyList() const
+{
+    // Toggle EasyList.
+    currentPrivacyWebEngineViewPointer->easyListEnabled = !currentPrivacyWebEngineViewPointer->easyListEnabled;
+
+    // Reload the website.
+    currentPrivacyWebEngineViewPointer->reload();
+}
+
+void TabWidget::toggleEasyPrivacy() const
+{
+    // Toggle EasyPrivacy.
+    currentPrivacyWebEngineViewPointer->easyPrivacyEnabled = !currentPrivacyWebEngineViewPointer->easyPrivacyEnabled;
+
+    // Reload the website.
+    currentPrivacyWebEngineViewPointer->reload();
+}
+
+void TabWidget::toggleFanboysAnnoyanceList() const
+{
+    // Toggle Fanboy's Annoyance List.
+    currentPrivacyWebEngineViewPointer->fanboysAnnoyanceListEnabled = !currentPrivacyWebEngineViewPointer->fanboysAnnoyanceListEnabled;
+
+    // Reload the website.
+    currentPrivacyWebEngineViewPointer->reload();
+}
+
 void TabWidget::toggleFindCaseSensitive(const QString &text)
 {
     // Toggle find case sensitive.
@@ -1224,6 +1251,24 @@ void TabWidget::toggleLocalStorage()
     currentPrivacyWebEngineViewPointer->reload();
 }
 
+void TabWidget::toggleUltraList() const
+{
+    // Toggle UltraList.
+    currentPrivacyWebEngineViewPointer->ultraListEnabled = !currentPrivacyWebEngineViewPointer->ultraListEnabled;
+
+    // Reload the website.
+    currentPrivacyWebEngineViewPointer->reload();
+}
+
+void TabWidget::toggleUltraPrivacy() const
+{
+    // Toggle UltraPrivacy.
+    currentPrivacyWebEngineViewPointer->ultraPrivacyEnabled = !currentPrivacyWebEngineViewPointer->ultraPrivacyEnabled;
+
+    // Reload the website.
+    currentPrivacyWebEngineViewPointer->reload();
+}
+
 void TabWidget::updateDownloadDirectory(QString newDownloadDirectory) const
 {
     // Remove the file name from the save file path.
@@ -1245,6 +1290,11 @@ void TabWidget::updateUiFromWebEngineView(const PrivacyWebEngineView *privacyWeb
     if (privacyWebEngineViewPointer == currentPrivacyWebEngineViewPointer)
     {
         // Update the UI.
+        emit easyListStatusChanged(currentPrivacyWebEngineViewPointer->easyListEnabled);
+        emit easyPrivacyStatusChanged(currentPrivacyWebEngineViewPointer->easyPrivacyEnabled);
+        emit fanboysAnnoyanceListStatusChanged(currentPrivacyWebEngineViewPointer->fanboysAnnoyanceListEnabled);
+        emit ultraListStatusChanged(currentPrivacyWebEngineViewPointer->ultraListEnabled);
+        emit ultraPrivacyStatusChanged(currentPrivacyWebEngineViewPointer->ultraPrivacyEnabled);
         emit updateDefaultZoomFactor(currentPrivacyWebEngineViewPointer->defaultZoomFactor);
         emit updateDomainSettingsIndicator(currentPrivacyWebEngineViewPointer->domainSettingsName != QLatin1String(""));
         emit updateJavaScriptAction(currentWebEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled));
@@ -1272,10 +1322,15 @@ void TabWidget::updateUiWithTabSettings()
     DevToolsWebEngineView *devToolsWebEngineViewPointer = qTabWidgetPointer->currentWidget()->findChild<DevToolsWebEngineView *>();
 
     // Update the actions.
-    emit blockedRequestsUpdated(currentPrivacyWebEngineViewPointer->blockedRequests);
+    emit easyListStatusChanged(currentPrivacyWebEngineViewPointer->easyListEnabled);
+    emit easyPrivacyStatusChanged(currentPrivacyWebEngineViewPointer->easyPrivacyEnabled);
+    emit fanboysAnnoyanceListStatusChanged(currentPrivacyWebEngineViewPointer->fanboysAnnoyanceListEnabled);
+    emit ultraListStatusChanged(currentPrivacyWebEngineViewPointer->ultraListEnabled);
+    emit ultraPrivacyStatusChanged(currentPrivacyWebEngineViewPointer->ultraPrivacyEnabled);
+    emit blockedRequestsUpdated(currentPrivacyWebEngineViewPointer->blockedRequestsVector);
     emit cookiesChanged(currentPrivacyWebEngineViewPointer->cookieListPointer->size());
-    emit updateDefaultZoomFactor(currentPrivacyWebEngineViewPointer->defaultZoomFactor);
     emit updateBackAction(currentWebEngineHistoryPointer->canGoBack());
+    emit updateDefaultZoomFactor(currentPrivacyWebEngineViewPointer->defaultZoomFactor);
     emit updateDeveloperToolsAction(devToolsWebEngineViewPointer->isVisible());
     emit updateDomStorageAction(currentWebEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled));
     emit updateForwardAction(currentWebEngineHistoryPointer->canGoForward());
@@ -1348,3 +1403,4 @@ void TabWidget::useNativeKdeDownloader(QUrl &downloadUrl, QString &suggestedFile
     // Show the dialog.
     saveFileDialogPointer->show();
 }
+