X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdialogs%2FDomainSettingsDialog.cpp;h=0907a18c184550cc73a59722f015456bc6d04fef;hb=refs%2Fheads%2Fmaster;hp=ea5558c1fd267491dd8bfd3617bff89642611b86;hpb=06a69a2d38bf73c0c5219f94c345b19142bb1646;p=PrivacyBrowserPC.git diff --git a/src/dialogs/DomainSettingsDialog.cpp b/src/dialogs/DomainSettingsDialog.cpp index ea5558c..6c5adf5 100644 --- a/src/dialogs/DomainSettingsDialog.cpp +++ b/src/dialogs/DomainSettingsDialog.cpp @@ -1,7 +1,7 @@ /* - * Copyright © 2022 Soren Stoutner . + * Copyright 2022-2024 Soren Stoutner . * - * This file is part of Privacy Browser PC . + * This file is part of Privacy Browser PC . * * Privacy Browser PC is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,14 +27,14 @@ #include #include #include +#include // Define the public static int constants. const int DomainSettingsDialog::SHOW_ALL_DOMAINS = 0; -const int DomainSettingsDialog::ADD_DOMAIN = 1; -const int DomainSettingsDialog::EDIT_DOMAIN = 2; +const int DomainSettingsDialog::EDIT_DOMAIN = 1; // Construct the class. -DomainSettingsDialog::DomainSettingsDialog(const int &startType, const QString &domainName) : QDialog(nullptr) +DomainSettingsDialog::DomainSettingsDialog(QWidget *parentWidgetPointer, const int &startType, const QString &domainName) : QDialog(parentWidgetPointer) { // Set the window title. setWindowTitle(i18nc("The domain settings dialog window title", "Domain Settings")); @@ -67,6 +67,21 @@ DomainSettingsDialog::DomainSettingsDialog(const int &startType, const QString & userAgentWidgetPointer = domainSettingsDialogUi.userAgentWidget; userAgentComboBoxPointer = domainSettingsDialogUi.userAgentComboBox; userAgentLabelPointer = domainSettingsDialogUi.userAgentLabel; + ultraPrivacyWidgetPointer = domainSettingsDialogUi.ultraPrivacyWidget; + ultraPrivacyComboBoxPointer = domainSettingsDialogUi.ultraPrivacyComboBox; + ultraPrivacyLabelPointer = domainSettingsDialogUi.ultraPrivacyLabel; + ultraListWidgetPointer = domainSettingsDialogUi.ultraListWidget; + ultraListComboBoxPointer = domainSettingsDialogUi.ultraListComboBox; + ultraListLabelPointer = domainSettingsDialogUi.ultraListLabel; + easyPrivacyWidgetPointer = domainSettingsDialogUi.easyPrivacyWidget; + easyPrivacyComboBoxPointer = domainSettingsDialogUi.easyPrivacyComboBox; + easyPrivacyLabelPointer = domainSettingsDialogUi.easyPrivacyLabel; + easyListWidgetPointer = domainSettingsDialogUi.easyListWidget; + easyListComboBoxPointer = domainSettingsDialogUi.easyListComboBox; + easyListLabelPointer = domainSettingsDialogUi.easyListLabel; + fanboysAnnoyanceListWidgetPointer = domainSettingsDialogUi.fanboysAnnoyanceListWidget; + fanboysAnnoyanceListComboBoxPointer = domainSettingsDialogUi.fanboysAnnoyanceListComboBox; + fanboysAnnoyanceListLabelPointer = domainSettingsDialogUi.fanboysAnnoyanceListLabel; zoomFactorWidgetPointer = domainSettingsDialogUi.zoomFactorWidget; zoomFactorComboBoxPointer = domainSettingsDialogUi.zoomFactorComboBox; customZoomFactorSpinBoxPointer = domainSettingsDialogUi.customZoomFactorSpinBox; @@ -126,17 +141,6 @@ DomainSettingsDialog::DomainSettingsDialog(const int &startType, const QString & // Select the first entry in the list view. domainsListViewPointer->setCurrentIndex(domainsTableModelPointer->index(0, domainsTableModelPointer->fieldIndex(DomainsDatabase::DOMAIN_NAME))); - // Populate the domain settings. - domainSelected(domainsSelectionModelPointer->currentIndex()); - - break; - } - - case ADD_DOMAIN: - { - // Add the new domain. - addDomain(domainName); - break; } @@ -149,13 +153,13 @@ DomainSettingsDialog::DomainSettingsDialog(const int &startType, const QString & // Move to the new domain. domainsListViewPointer->setCurrentIndex(newDomainIndex[0]); - // Populate the domain settings. - domainSelected(domainsSelectionModelPointer->currentIndex()); - break; } } + // Populate the domain settings. + domainSelected(domainsSelectionModelPointer->currentIndex()); + // Handle clicks on the domains. connect(domainsListViewPointer, SIGNAL(activated(QModelIndex)), this, SLOT(domainSelected(QModelIndex))); @@ -165,6 +169,11 @@ DomainSettingsDialog::DomainSettingsDialog(const int &startType, const QString & connect(localStorageComboBoxPointer, SIGNAL(currentIndexChanged(int)), this, SLOT(localStorageChanged(int))); connect(domStorageComboBoxPointer, SIGNAL(currentIndexChanged(int)), this, SLOT(domStorageChanged(int))); connect(userAgentComboBoxPointer, SIGNAL(currentTextChanged(QString)), this, SLOT(userAgentChanged(QString))); + connect(ultraPrivacyComboBoxPointer, SIGNAL(currentIndexChanged(int)), this, SLOT(ultraPrivacyChanged(int))); + connect(ultraListComboBoxPointer, SIGNAL(currentIndexChanged(int)), this, SLOT(ultraListChanged(int))); + connect(easyPrivacyComboBoxPointer, SIGNAL(currentIndexChanged(int)), this, SLOT(easyPrivacyChanged(int))); + connect(easyListComboBoxPointer, SIGNAL(currentIndexChanged(int)), this, SLOT(easyListChanged(int))); + connect(fanboysAnnoyanceListComboBoxPointer, SIGNAL(currentIndexChanged(int)), this, SLOT(fanboysAnnoyanceListChanged(int))); connect(zoomFactorComboBoxPointer, SIGNAL(currentIndexChanged(int)), this, SLOT(zoomFactorComboBoxChanged(int))); connect(customZoomFactorSpinBoxPointer, SIGNAL(valueChanged(double)), this, SLOT(customZoomFactorChanged(double))); @@ -176,41 +185,11 @@ DomainSettingsDialog::DomainSettingsDialog(const int &startType, const QString & connect(applyButtonPointer, SIGNAL(clicked()), this, SLOT(apply())); connect(dialogButtonBoxPointer, SIGNAL(rejected()), this, SLOT(cancel())); - // Update the UI. - updateUi(); -} - -void DomainSettingsDialog::addDomain(const QString &domainName) const -{ - // Create a new domain record. - QSqlRecord newDomainRecord = QSqlDatabase::database(DomainsDatabase::CONNECTION_NAME).record(DomainsDatabase::DOMAINS_TABLE); - - // Set the values for the new domain. - newDomainRecord.setValue(domainsTableModelPointer->fieldIndex(DomainsDatabase::DOMAIN_NAME), domainName); - newDomainRecord.setValue(domainsTableModelPointer->fieldIndex(DomainsDatabase::JAVASCRIPT), DomainsDatabase::SYSTEM_DEFAULT); - newDomainRecord.setValue(domainsTableModelPointer->fieldIndex(DomainsDatabase::DOM_STORAGE), DomainsDatabase::SYSTEM_DEFAULT); - newDomainRecord.setValue(domainsTableModelPointer->fieldIndex(DomainsDatabase::USER_AGENT), UserAgentHelper::SYSTEM_DEFAULT_DATABASE); - newDomainRecord.setValue(domainsTableModelPointer->fieldIndex(DomainsDatabase::ZOOM_FACTOR), DomainsDatabase::SYSTEM_DEFAULT); - newDomainRecord.setValue(domainsTableModelPointer->fieldIndex(DomainsDatabase::CUSTOM_ZOOM_FACTOR), 1.0); - - // Insert the new domain. `-1` appends it to the end. - domainsTableModelPointer->insertRecord(-1, newDomainRecord); - - // Submit all pending changes. - domainsTableModelPointer->submitAll(); - - // Find the index for the new domain. `-1` allows for multiple entries to be returned. - QModelIndexList newDomainIndex = domainsTableModelPointer->match(domainsTableModelPointer->index(0, domainsTableModelPointer->fieldIndex(DomainsDatabase::DOMAIN_NAME)), - Qt::DisplayRole, domainName, -1, Qt::MatchWrap); - - // Move to the new domain. If there are multiple domains with the same name, the new one should be the last in the list. - domainsListViewPointer->setCurrentIndex(newDomainIndex[newDomainIndex.size() - 1]); + // Update the DOM storage status. + updateDomStorageStatus(); - // Populate the domain settings. - domainSelected(domainsSelectionModelPointer->currentIndex()); - - // Update the UI. - updateUi(); + // Update the buttons. + updateButtons(); } void DomainSettingsDialog::apply() const @@ -219,20 +198,20 @@ void DomainSettingsDialog::apply() const QModelIndex currentIndex = domainsListViewPointer->currentIndex(); // Get the ID of the current index row. - QVariant currentId = currentIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::_ID)).data(); + QVariant currentId = currentIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::ID)).data(); // Submit all pending changes. domainsTableModelPointer->submitAll(); // Find the new index for the selected id. The `1` keeps searching after the first match. - QModelIndexList newIndexList = domainsTableModelPointer->match(currentIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::_ID)), Qt::DisplayRole, currentId, + QModelIndexList newIndexList = domainsTableModelPointer->match(currentIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::ID)), Qt::DisplayRole, currentId, 1, Qt::MatchWrap); // Select the new index. domainsListViewPointer->setCurrentIndex(newIndexList[0].siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::DOMAIN_NAME))); - // Update the UI. - updateUi(); + // Update the buttons. + updateButtons(); // Emit the domain settings updated signal. emit domainSettingsUpdated(); @@ -247,25 +226,25 @@ void DomainSettingsDialog::cancel() reject(); } -void DomainSettingsDialog::customZoomFactorChanged(const double &newValue) const +void DomainSettingsDialog::customZoomFactorChanged(const double newValue) const { // Update the domains table model. domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::CUSTOM_ZOOM_FACTOR)), newValue); - // Update the UI. - updateUi(); + // Update the buttons. + updateButtons(); } -void DomainSettingsDialog::domStorageChanged(const int &newIndex) const +void DomainSettingsDialog::domStorageChanged(const int newIndex) const { // Update the domains table model. domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::DOM_STORAGE)), newIndex); // Populate the DOM storage label. - populateDomStorageLabel(); + populateLabel(DOM_STORAGE); - // Update the UI. - updateUi(); + // Update the buttons. + updateButtons(); } void DomainSettingsDialog::domainNameChanged(const QString &updatedDomainName) const @@ -273,8 +252,8 @@ void DomainSettingsDialog::domainNameChanged(const QString &updatedDomainName) c // Update the domains table model. domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex(), updatedDomainName); - // Update the UI. - updateUi(); + // Update the buttons. + updateButtons(); } void DomainSettingsDialog::domainSelected(const QModelIndex &modelIndex) const @@ -303,6 +282,13 @@ void DomainSettingsDialog::domainSelected(const QModelIndex &modelIndex) const // Set the custom user agent if specified. if (userAgentIndex == -1) userAgentComboBoxPointer->setCurrentText(userAgent); + // Populate the filter lists combo boxes. + ultraPrivacyComboBoxPointer->setCurrentIndex(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::ULTRAPRIVACY)).data().toInt()); + ultraListComboBoxPointer->setCurrentIndex(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::ULTRALIST)).data().toInt()); + easyPrivacyComboBoxPointer->setCurrentIndex(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::EASYPRIVACY)).data().toInt()); + easyListComboBoxPointer->setCurrentIndex(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::EASYLIST)).data().toInt()); + fanboysAnnoyanceListComboBoxPointer->setCurrentIndex(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::FANBOYS_ANNOYANCE_LIST)).data().toInt()); + // Get the zoom factor combo box index. int zoomFactorComboBoxIndex = modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::ZOOM_FACTOR)).data().toInt(); @@ -314,48 +300,101 @@ void DomainSettingsDialog::domainSelected(const QModelIndex &modelIndex) const { // Display the default zoom factor. customZoomFactorSpinBoxPointer->setValue(Settings::zoomFactor()); + + // Use the default palette. + zoomFactorWidgetPointer->setPalette(defaultPalette); } else // Custom zoom factor is selected. { // Display the custom zoom factor from the domain settings. customZoomFactorSpinBoxPointer->setValue(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::CUSTOM_ZOOM_FACTOR)).data().toDouble()); + + // Use the highlighted palette. + zoomFactorWidgetPointer->setPalette(highlightedPalette); } // Set the initial status of the custom zoom factor spin box. customZoomFactorSpinBoxPointer->setEnabled(zoomFactorComboBoxIndex); // Populate the labels. - populateJavaScriptLabel(); - populateLocalStorageLabel(); - populateDomStorageLabel(); + populateLabel(JAVASCRIPT); + populateLabel(LOCAL_STORAGE); + populateLabel(DOM_STORAGE); + populateLabel(ULTRAPRIVACY); + populateLabel(ULTRALIST); + populateLabel(EASYPRIVACY); + populateLabel(EASYLIST); + populateLabel(FANBOYS_ANNOYANCE_LIST); populateUserAgentLabel(userAgentComboBoxPointer->currentText()); - // Update the UI. - updateUi(); + // Update the buttons. + updateButtons(); +} + +void DomainSettingsDialog::easyListChanged(const int newIndex) const +{ + // Update the domains table model. + domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::EASYLIST)), newIndex); + + // Populate the EasyList label. + populateLabel(EASYLIST); + + // Update the buttons. + updateButtons(); +} + +void DomainSettingsDialog::easyPrivacyChanged(const int newIndex) const +{ + // Update the domains table model. + domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::EASYPRIVACY)), newIndex); + + // Populate the EasyPrivacy label. + populateLabel(EASYPRIVACY); + + // Update the buttons. + updateButtons(); +} + +void DomainSettingsDialog::fanboysAnnoyanceListChanged(const int newIndex) const +{ + // Update the domains table model. + domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::FANBOYS_ANNOYANCE_LIST)), newIndex); + + // Populate the Fanboy's Annoyance List label. + populateLabel(FANBOYS_ANNOYANCE_LIST); + + // Update the buttons. + updateButtons(); } -void DomainSettingsDialog::javaScriptChanged(const int &newIndex) const +void DomainSettingsDialog::javaScriptChanged(const int newIndex) const { // Update the domains table model. domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::JAVASCRIPT)), newIndex); // Populate the JavaScript label. - populateJavaScriptLabel(); + populateLabel(JAVASCRIPT); + + // Update the DOM storage status. + updateDomStorageStatus(); - // Update the UI. - updateUi(); + // Update the buttons. + updateButtons(); } -void DomainSettingsDialog::localStorageChanged(const int &newIndex) const +void DomainSettingsDialog::localStorageChanged(const int newIndex) const { // Update the domains table model. domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::LOCAL_STORAGE)), newIndex); - // Poplate the local storage label. - populateLocalStorageLabel(); + // Populate the local storage label. + populateLabel(LOCAL_STORAGE); + + // Update the DOM storage status. + updateDomStorageStatus(); - // Update the UI. - updateUi(); + // Update the buttons. + updateButtons(); } void DomainSettingsDialog::ok() @@ -364,142 +403,225 @@ void DomainSettingsDialog::ok() domainsTableModelPointer->submitAll(); // Emit the domain settings updated signal. - domainSettingsUpdated(); + emit domainSettingsUpdated(); // Close the dialog. accept(); } -void DomainSettingsDialog::populateDomStorageLabel() const +void DomainSettingsDialog::populateLabel(const int label) const { - // Populate the label according to the currently selected index. - switch (domStorageComboBoxPointer->currentIndex()) + // Create the label strings. + QString enabledString; + QString enabledBoldString; + QString disabledString; + QString disabledBoldString; + + // Create the system default bool. + bool systemDefaultEnabled; + + // Create the widget pointers. + QWidget *widgetPointer; + QComboBox *comboBoxPointer; + QLabel *labelPointer; + + // Populate the local variables. + switch (label) { - case (DomainsDatabase::SYSTEM_DEFAULT): + case (JAVASCRIPT): { - // Set the text according to the system default. - if (Settings::domStorageEnabled()) - domStorageLabelPointer->setText(i18nc("Domain settings DOM storage label.", "DOM storage enabled")); - else - domStorageLabelPointer->setText(i18nc("Domain settings DOM storage label.", "DOM storage disabled")); + // Populate the label strings. + enabledString = i18nc("Domain settings JavaScript label.", "JavaScript enabled"); + enabledBoldString = i18nc("Domain settings JavaScript label. The tags should be retained.", "JavaScript enabled"); + disabledString = i18nc("Domain settings JavaScript label.", "JavaScript disabled"); + disabledBoldString = i18nc("Domain settings JavaScript label. The tags should be retained.", "JavaScript disabled"); - // Reset the palette. - domStorageWidgetPointer->setPalette(defaultPalette); + // Populate the system default bool. + systemDefaultEnabled = Settings::javaScriptEnabled(); + + // Populate the widget pointers. + widgetPointer = javaScriptWidgetPointer; + comboBoxPointer = javaScriptComboBoxPointer; + labelPointer = javaScriptLabelPointer; break; } - case (DomainsDatabase::DISABLED): + case (LOCAL_STORAGE): { - // Set the disabled text in bold. - domStorageLabelPointer->setText(i18nc("Domain settings DOM storage label. The tags should be retained.", "DOM storage disabled")); + // Populate the label strings. + enabledString = i18nc("Domain settings local storage label.", "Local storage enabled"); + enabledBoldString = i18nc("Domain settings local storage label. The tags should be retained.", "Local storage enabled"); + disabledString = i18nc("Domain settings local storage label.", "Local storage disabled"); + disabledBoldString = i18nc("Domain settings local storage label. The tags should be retained.", "Local storage disabled"); - // Set the palette. - domStorageWidgetPointer->setPalette(highlightedPalette); + // Populate the system default bool. + systemDefaultEnabled = Settings::localStorageEnabled(); + + // Populate the widget pointers. + widgetPointer = localStorageWidgetPointer; + comboBoxPointer = localStorageComboBoxPointer; + labelPointer = localStorageLabelPointer; break; } - case (DomainsDatabase::ENABLED): + case (DOM_STORAGE): { - // Set the enabled text in bold. - domStorageLabelPointer->setText(i18nc("Domain settings DOM storage label. The tags should be retained.", "DOM storage enabled")); + // Populate the label strings. + enabledString = i18nc("Domain settings DOM storage label.", "DOM storage enabled"); + enabledBoldString = i18nc("Domain settings DOM storage label. The tags should be retained.", "DOM storage enabled"); + disabledString = i18nc("Domain settings DOM storage label.", "DOM storage disabled"); + disabledBoldString = i18nc("Domain settings DOM storage label. The tags should be retained.", "DOM storage disabled"); - // Set the palette. - domStorageWidgetPointer->setPalette(highlightedPalette); + // Populate the system default bool. + systemDefaultEnabled = Settings::domStorageEnabled(); + + // Populate the widget pointers. + widgetPointer = domStorageWidgetPointer; + comboBoxPointer = domStorageComboBoxPointer; + labelPointer = domStorageLabelPointer; break; } - } -} -void DomainSettingsDialog::populateJavaScriptLabel() const -{ - // Populate the label according to the currently selected index. - switch (javaScriptComboBoxPointer->currentIndex()) - { - case (DomainsDatabase::SYSTEM_DEFAULT): + case (ULTRAPRIVACY): { - // Set the text according to the system default. - if (Settings::javaScriptEnabled()) - javaScriptLabelPointer->setText(i18nc("Domain settings JavaScript label.", "JavaScript enabled")); - else - javaScriptLabelPointer->setText(i18nc("Domain settings JavaScript label.", "JavaScript disabled")); + // Populate the label strings. + enabledString = i18nc("Domain settings UltraPrivacy enabled label.", "UltraPrivacy enabled"); + enabledBoldString = i18nc("Domain settings UltraPrivacy enabled bold label. The tags should be retained.", "UltraPrivacy enabled"); + disabledString = i18nc("Domain settings UltraPrivacy disabled label.", "UltraPrivacy disabled"); + disabledBoldString = i18nc("Domain settings UltraPrivacy disabled bold label. The tags should be retained.", "UltraPrivacy disabled"); - // Reset the palette. - javaScriptWidgetPointer->setPalette(defaultPalette); + // Populate the system default bool. + systemDefaultEnabled = Settings::ultraPrivacyEnabled(); + + // Populate the widget pointers. + widgetPointer = ultraPrivacyWidgetPointer; + comboBoxPointer = ultraPrivacyComboBoxPointer; + labelPointer = ultraPrivacyLabelPointer; break; } - case (DomainsDatabase::DISABLED): + case (ULTRALIST): { - // Set the disabled text in bold. - javaScriptLabelPointer->setText(i18nc("Domain settings JavaScript label. The tags should be retained.", "JavaScript disabled")); + // Populate the label strings. + enabledString = i18nc("Domain settings UltraList enabled label.", "UltraList enabled"); + enabledBoldString = i18nc("Domain settings UltraList enabled bold label. The tags should be retained.", "UltraList enabled"); + disabledString = i18nc("Domain settings UltraList disabled label.", "UltraList disabled"); + disabledBoldString = i18nc("Domain settings UltraList disabled bold label. The tags should be retained.", "UltraList disabled"); - // Set the palette. - javaScriptWidgetPointer->setPalette(highlightedPalette); + // Populate the system default bool. + systemDefaultEnabled = Settings::ultraListEnabled(); + + // Populate the widget pointers. + widgetPointer = ultraListWidgetPointer; + comboBoxPointer = ultraListComboBoxPointer; + labelPointer = ultraListLabelPointer; break; } - case (DomainsDatabase::ENABLED): + case (EASYPRIVACY): { - // Set the enabled text in bold. - javaScriptLabelPointer->setText(i18nc("Domain settings JavaScript label. The tags should be retained.", "JavaScript enabled")); + // Populate the label strings. + enabledString = i18nc("Domain settings EasyPrivacy enabled label.", "EasyPrivacy enabled"); + enabledBoldString = i18nc("Domain settings EasyPrivacy enabled bold label. The tags should be retained.", "EasyPrivacy enabled"); + disabledString = i18nc("Domain settings EasyPrivacy disabled label.", "EasyPrivacy disabled"); + disabledBoldString = i18nc("Domain settings EasyPrivacy disabled bold label. The tags should be retained.", "EasyPrivacy disabled"); - // Set the palette. - javaScriptWidgetPointer->setPalette(highlightedPalette); + // Populate the system default bool. + systemDefaultEnabled = Settings::easyPrivacyEnabled(); + + // Populate the widget pointers. + widgetPointer = easyPrivacyWidgetPointer; + comboBoxPointer = easyPrivacyComboBoxPointer; + labelPointer = easyPrivacyLabelPointer; + + break; + } + + case (EASYLIST): + { + // Populate the label strings. + enabledString = i18nc("Domain settings EasyList enabled label.", "EasyList enabled"); + enabledBoldString = i18nc("Domain settings EasyList enabled bold label. The tags should be retained.", "EasyList enabled"); + disabledString = i18nc("Domain settings EasyList disabled label.", "EasyList disabled"); + disabledBoldString = i18nc("Domain settings EasyList disabled bold label. The tags should be retained.", "EasyList disabled"); + + // Populate the system default bool. + systemDefaultEnabled = Settings::easyListEnabled(); + + // Populate the widget pointers. + widgetPointer = easyListWidgetPointer; + comboBoxPointer = easyListComboBoxPointer; + labelPointer = easyListLabelPointer; + + break; + } + + case (FANBOYS_ANNOYANCE_LIST): + { + // Populate the label strings. + enabledString = i18nc("Domain settings Fanboy’s Annoyance List enabled label.", "Fanboy’s Annoyance List enabled"); + enabledBoldString = i18nc("Domain settings Fanboy’s Annoyance List enabled bold label. The tags should be retained.", "Fanboy’s Annoyance List enabled"); + disabledString = i18nc("Domain settings Fanboy’s Annoyance List disabled label.", "Fanboy’s Annoyance List disabled"); + disabledBoldString = i18nc("Domain settings Fanboy’s Annoyance List disabled bold label. The tags should be retained.", "Fanboy’s Annoyance List disabled"); + + // Populate the system default bool. + systemDefaultEnabled = Settings::fanboysAnnoyanceListEnabled(); + + // Populate the widget pointers. + widgetPointer = fanboysAnnoyanceListWidgetPointer; + comboBoxPointer = fanboysAnnoyanceListComboBoxPointer; + labelPointer = fanboysAnnoyanceListLabelPointer; break; } } -} -void DomainSettingsDialog::populateLocalStorageLabel() const -{ - // Populate the label according to the currently selected index. - switch (localStorageComboBoxPointer->currentIndex()) + // Populate the label and widget palette according to the currently selected combo box index. + switch (comboBoxPointer->currentIndex()) { case (DomainsDatabase::SYSTEM_DEFAULT): { // Set the text according to the system default. - if (Settings::localStorageEnabled()) - localStorageLabelPointer->setText(i18nc("Domain settings local storage label.", "Local storage enabled")); + if (systemDefaultEnabled) + labelPointer->setText(enabledString); else - localStorageLabelPointer->setText(i18nc("Domain settings local storage label.", "Local storage disabled")); + labelPointer->setText(disabledString); // Reset the palette. - localStorageWidgetPointer->setPalette(defaultPalette); + widgetPointer->setPalette(defaultPalette); break; } - case (DomainsDatabase::DISABLED): + case (DomainsDatabase::ENABLED): { - // Set the disabled text in bold. - localStorageLabelPointer->setText(i18nc("Domain settings local storage label. The tags should be retained.", "Local storage disabled")); + // Set the enabled bold text. + labelPointer->setText(enabledBoldString); // Set the palette. - localStorageWidgetPointer->setPalette(highlightedPalette); + widgetPointer->setPalette(highlightedPalette); break; } - case (DomainsDatabase::ENABLED): + case (DomainsDatabase::DISABLED): { - // Set the enabled text in bold. - localStorageLabelPointer->setText(i18nc("Domain settings local storage label. The tabs should be retained.", "Local storage enabled")); + // Set the disabled bold text. + labelPointer->setText(disabledBoldString); // Set the palette. - localStorageWidgetPointer->setPalette(highlightedPalette); + widgetPointer->setPalette(highlightedPalette); break; } } } - void DomainSettingsDialog::populateUserAgentLabel(const QString &userAgentName) const { // Populate the label according to the type. @@ -529,8 +651,8 @@ void DomainSettingsDialog::reset() const // Repopulate the domain settings. domainSelected(domainsListViewPointer->currentIndex()); - // Update the UI. - updateUi(); + // Update the buttons. + updateButtons(); } void DomainSettingsDialog::showAddMessageBox() @@ -546,7 +668,31 @@ void DomainSettingsDialog::showAddMessageBox() QLineEdit::Normal, QString(), &okClicked); // Add the new domain if the user clicked OK. - if (okClicked) addDomain(newDomainName); + if (okClicked) + { + // Add the new domain. + DomainsDatabase::addDomain(newDomainName); + + // Submit all pending changes. This reloads the model from the database, getting the new domain added above. + domainsTableModelPointer->submitAll(); + + + // Find the index for the new domain. `-1` allows for multiple entries to be returned. + QModelIndexList newDomainIndex = domainsTableModelPointer->match(domainsTableModelPointer->index(0, domainsTableModelPointer->fieldIndex(DomainsDatabase::DOMAIN_NAME)), + Qt::DisplayRole, newDomainName, -1, Qt::MatchWrap); + + // Move to the new domain. If there are multiple domains with the same name, the new one should be the last in the list. + domainsListViewPointer->setCurrentIndex(newDomainIndex[newDomainIndex.size() - 1]); + + // Populate the domain settings. + domainSelected(domainsSelectionModelPointer->currentIndex()); + + // Update the buttons. + updateButtons(); + + // Emit the domain settings updated signal. + emit domainSettingsUpdated(); + } } void DomainSettingsDialog::showDeleteMessageBox() const @@ -606,12 +752,39 @@ void DomainSettingsDialog::showDeleteMessageBox() const domainSelected(domainsListViewPointer->currentIndex()); } - // Update the Ui. - updateUi(); + // Update the buttons. + updateButtons(); + + // Emit the domain settings updated signal. + emit domainSettingsUpdated(); } } -void DomainSettingsDialog::updateUi() const +void DomainSettingsDialog::ultraListChanged(const int newIndex) const +{ + // Update the domains table model. + domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::ULTRALIST)), newIndex); + + // Populate the UltraList label. + populateLabel(ULTRALIST); + + // Update the buttons. + updateButtons(); +} + +void DomainSettingsDialog::ultraPrivacyChanged(const int newIndex) const +{ + // Update the domains table model. + domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::ULTRAPRIVACY)), newIndex); + + // Populate the UltraPrivacy label. + populateLabel(ULTRAPRIVACY); + + // Update the buttons. + updateButtons(); +} + +void DomainSettingsDialog::updateButtons() const { // Update the delete button status. deleteDomainButtonPointer->setEnabled(domainsSelectionModelPointer->hasSelection()); @@ -626,6 +799,78 @@ void DomainSettingsDialog::updateUi() const domainSettingsWidgetPointer->setVisible(domainsTableModelPointer->rowCount() > 0); } +void DomainSettingsDialog::updateDomStorageStatus() const +{ + // Instantiate tracking variables. + bool javaScriptEnabled; + bool localStorageEnabled; + + // Populate the JavaScript tracker. + switch (javaScriptComboBoxPointer->currentIndex()) + { + case (DomainsDatabase::SYSTEM_DEFAULT): + { + // Update the tracker according to the system default. + if (Settings::javaScriptEnabled()) + javaScriptEnabled = true; + else + javaScriptEnabled = false; + + break; + } + + case (DomainsDatabase::ENABLED): + { + // Update the tracker. + javaScriptEnabled = true; + + break; + } + + case (DomainsDatabase::DISABLED): + { + // Update the tracker. + javaScriptEnabled = false; + + break; + } + } + + // Populate the local storage tracker. + switch (localStorageComboBoxPointer->currentIndex()) + { + case (DomainsDatabase::SYSTEM_DEFAULT): + { + // Update the tracker according to the system default. + if (Settings::localStorageEnabled()) + localStorageEnabled = true; + else + localStorageEnabled = false; + + break; + } + + case (DomainsDatabase::ENABLED): + { + // Update the tracker. + localStorageEnabled = true; + + break; + } + + case (DomainsDatabase::DISABLED): + { + // Update the tracker. + localStorageEnabled = false; + + break; + } + } + + // Only enable DOM storage if both JavaScript and local storage are enabled. + domStorageComboBoxPointer->setEnabled(javaScriptEnabled && localStorageEnabled); +} + void DomainSettingsDialog::userAgentChanged(const QString &updatedUserAgent) const { // Update the domains table model. @@ -635,11 +880,11 @@ void DomainSettingsDialog::userAgentChanged(const QString &updatedUserAgent) con // Populate the user agent label. populateUserAgentLabel(updatedUserAgent); - // Update the UI. - updateUi(); + // Update the buttons. + updateButtons(); } -void DomainSettingsDialog::zoomFactorComboBoxChanged(const int &newIndex) const +void DomainSettingsDialog::zoomFactorComboBoxChanged(const int newIndex) const { // Get the current model index. QModelIndex modelIndex = domainsSelectionModelPointer->currentIndex(); @@ -661,13 +906,13 @@ void DomainSettingsDialog::zoomFactorComboBoxChanged(const int &newIndex) const // Display the custom zoom factor from the domain settings. customZoomFactorSpinBoxPointer->setValue(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::CUSTOM_ZOOM_FACTOR)).data().toDouble()); - // Set the palette. + // Use the highlighted palette. zoomFactorWidgetPointer->setPalette(highlightedPalette); } // Update the status of the custom zoom factor spin box. customZoomFactorSpinBoxPointer->setEnabled(newIndex); - // Update the UI. - updateUi(); + // Update the buttons. + updateButtons(); }