X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fdialogs%2FDomainSettingsDialog.cpp;fp=src%2Fdialogs%2FDomainSettingsDialog.cpp;h=76477ecf8ccceab21f23aad2005282f5d064ada2;hp=151a0b4926be9930962306e38fc1beeebfcd3e52;hb=cd1c3d0483b9026736fdcb151d90dda872d8a400;hpb=588db73b94af7b596b0e532f4557aa8b6c41f5c3

diff --git a/src/dialogs/DomainSettingsDialog.cpp b/src/dialogs/DomainSettingsDialog.cpp
index 151a0b4..76477ec 100644
--- a/src/dialogs/DomainSettingsDialog.cpp
+++ b/src/dialogs/DomainSettingsDialog.cpp
@@ -21,7 +21,7 @@
 #include "DomainSettingsDialog.h"
 #include "Settings.h"
 #include "ui_DomainSettingsDialog.h"
-#include "helpers/DomainsDatabaseHelper.h"
+#include "databases/DomainsDatabase.h"
 #include "helpers/UserAgentHelper.h"
 
 // Qt toolkit headers.
@@ -70,10 +70,10 @@ DomainSettingsDialog::DomainSettingsDialog(const int &startType, const QString &
     resetButtonPointer = dialogButtonBoxPointer->button(QDialogButtonBox::StandardButton::Reset);
 
     // Create a table model.
-    domainsTableModelPointer = new QSqlTableModel(nullptr, QSqlDatabase::database(DomainsDatabaseHelper::CONNECTION_NAME));
+    domainsTableModelPointer = new QSqlTableModel(nullptr, QSqlDatabase::database(DomainsDatabase::CONNECTION_NAME));
 
     // Set the table for the model.
-    domainsTableModelPointer->setTable(DomainsDatabaseHelper::DOMAINS_TABLE);
+    domainsTableModelPointer->setTable(DomainsDatabase::DOMAINS_TABLE);
 
     // Set the edit strategy to be manual.
     domainsTableModelPointer->setEditStrategy(QSqlTableModel::EditStrategy::OnManualSubmit);
@@ -102,7 +102,7 @@ DomainSettingsDialog::DomainSettingsDialog(const int &startType, const QString &
         case SHOW_ALL_DOMAINS:
         {
             // Select the first entry in the list view.
-            domainsListViewPointer->setCurrentIndex(domainsTableModelPointer->index(0, domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::DOMAIN_NAME)));
+            domainsListViewPointer->setCurrentIndex(domainsTableModelPointer->index(0, domainsTableModelPointer->fieldIndex(DomainsDatabase::DOMAIN_NAME)));
 
             // Populate the domain settings.
             domainSelected(domainsSelectionModelPointer->currentIndex());
@@ -121,8 +121,8 @@ DomainSettingsDialog::DomainSettingsDialog(const int &startType, const QString &
         case EDIT_DOMAIN:
         {
             // Find the index for the new domain.  `1` returns the first match.
-            QModelIndexList newDomainIndex = domainsTableModelPointer->match(domainsTableModelPointer->index(0, domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::DOMAIN_NAME)),
-                                                                        Qt::DisplayRole, domainName, 1, Qt::MatchWrap);
+            QModelIndexList newDomainIndex = domainsTableModelPointer->match(domainsTableModelPointer->index(0, domainsTableModelPointer->fieldIndex(DomainsDatabase::DOMAIN_NAME)),
+                                                                             Qt::DisplayRole, domainName, 1, Qt::MatchWrap);
 
             // Move to the new domain.
             domainsListViewPointer->setCurrentIndex(newDomainIndex[0]);
@@ -161,15 +161,15 @@ DomainSettingsDialog::DomainSettingsDialog(const int &startType, const QString &
 void DomainSettingsDialog::addDomain(const QString &domainName) const
 {
     // Create a new domain record.
-    QSqlRecord newDomainRecord = QSqlDatabase::database(DomainsDatabaseHelper::CONNECTION_NAME).record(DomainsDatabaseHelper::DOMAINS_TABLE);
+    QSqlRecord newDomainRecord = QSqlDatabase::database(DomainsDatabase::CONNECTION_NAME).record(DomainsDatabase::DOMAINS_TABLE);
 
     // Set the values for the new domain.
-    newDomainRecord.setValue(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::DOMAIN_NAME), domainName);
-    newDomainRecord.setValue(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::JAVASCRIPT), DomainsDatabaseHelper::SYSTEM_DEFAULT);
-    newDomainRecord.setValue(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::DOM_STORAGE), DomainsDatabaseHelper::SYSTEM_DEFAULT);
-    newDomainRecord.setValue(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::USER_AGENT), UserAgentHelper::SYSTEM_DEFAULT_DATABASE);
-    newDomainRecord.setValue(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::ZOOM_FACTOR), DomainsDatabaseHelper::SYSTEM_DEFAULT);
-    newDomainRecord.setValue(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::CUSTOM_ZOOM_FACTOR), 1.0);
+    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);
@@ -178,8 +178,8 @@ void DomainSettingsDialog::addDomain(const QString &domainName) const
     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(DomainsDatabaseHelper::DOMAIN_NAME)),
-                                                                        Qt::DisplayRole, domainName, -1, Qt::MatchWrap);
+    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]);
@@ -197,17 +197,17 @@ void DomainSettingsDialog::apply() const
     QModelIndex currentIndex = domainsListViewPointer->currentIndex();
 
     // Get the ID of the current index row.
-    QVariant currentId = currentIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::_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(DomainsDatabaseHelper::_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(DomainsDatabaseHelper::DOMAIN_NAME)));
+    domainsListViewPointer->setCurrentIndex(newIndexList[0].siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::DOMAIN_NAME)));
 
     // Update the UI.
     updateUi();
@@ -228,7 +228,7 @@ void DomainSettingsDialog::cancel()
 void DomainSettingsDialog::customZoomFactorChanged(const double &newValue) const
 {
     // Update the domains table model.
-    domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::CUSTOM_ZOOM_FACTOR)), newValue);
+    domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::CUSTOM_ZOOM_FACTOR)), newValue);
 
     // Update the UI.
     updateUi();
@@ -237,7 +237,7 @@ void DomainSettingsDialog::customZoomFactorChanged(const double &newValue) const
 void DomainSettingsDialog::domStorageChanged(const int &newIndex) const
 {
     // Update the domains table model.
-    domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::DOM_STORAGE)), newIndex);
+    domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::DOM_STORAGE)), newIndex);
 
     // Populate the DOM storage label.
     populateDomStorageLabel();
@@ -261,16 +261,16 @@ void DomainSettingsDialog::domainSelected(const QModelIndex &modelIndex) const
     domainNameLineEditPointer->setText(modelIndex.data().toString());
 
     // Populate the JavaScript combo box.
-    javaScriptComboBoxPointer->setCurrentIndex(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::JAVASCRIPT)).data().toInt());
+    javaScriptComboBoxPointer->setCurrentIndex(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::JAVASCRIPT)).data().toInt());
 
     // Populate the local storage combo box.
-    localStorageComboBoxPointer->setCurrentIndex(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::LOCAL_STORAGE)).data().toInt());
+    localStorageComboBoxPointer->setCurrentIndex(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::LOCAL_STORAGE)).data().toInt());
 
     // Populate the DOM storage combo box.
-    domStorageComboBoxPointer->setCurrentIndex(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::DOM_STORAGE)).data().toInt());
+    domStorageComboBoxPointer->setCurrentIndex(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::DOM_STORAGE)).data().toInt());
 
     // Get the user agent string.
-    QString userAgent = modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::USER_AGENT)).data().toString();
+    QString userAgent = modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::USER_AGENT)).data().toString();
 
     // Get the user agent index.
     int userAgentIndex = UserAgentHelper::getDomainSettingsUserAgentIndex(userAgent);
@@ -282,7 +282,7 @@ void DomainSettingsDialog::domainSelected(const QModelIndex &modelIndex) const
     if (userAgentIndex == -1) userAgentComboBoxPointer->setCurrentText(userAgent);
 
     // Get the zoom factor combo box index.
-    int zoomFactorComboBoxIndex = modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::ZOOM_FACTOR)).data().toInt();
+    int zoomFactorComboBoxIndex = modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::ZOOM_FACTOR)).data().toInt();
 
     // Populate the zoom factor combo box.
     zoomFactorComboBoxPointer->setCurrentIndex(zoomFactorComboBoxIndex);
@@ -296,7 +296,7 @@ void DomainSettingsDialog::domainSelected(const QModelIndex &modelIndex) const
     else  // Custom zoom factor is selected.
     {
         // Display the custom zoom factor from the domain settings.
-        customZoomFactorSpinBoxPointer->setValue(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::CUSTOM_ZOOM_FACTOR)).data().toDouble());
+        customZoomFactorSpinBoxPointer->setValue(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::CUSTOM_ZOOM_FACTOR)).data().toDouble());
     }
 
     // Set the initial status of the custom zoom factor spin box.
@@ -315,7 +315,7 @@ void DomainSettingsDialog::domainSelected(const QModelIndex &modelIndex) const
 void DomainSettingsDialog::javaScriptChanged(const int &newIndex) const
 {
     // Update the domains table model.
-    domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::JAVASCRIPT)), newIndex);
+    domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::JAVASCRIPT)), newIndex);
 
     // Populate the JavaScript label.
     populateJavaScriptLabel();
@@ -327,7 +327,7 @@ void DomainSettingsDialog::javaScriptChanged(const int &newIndex) const
 void DomainSettingsDialog::localStorageChanged(const int &newIndex) const
 {
     // Update the domains table model.
-    domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::LOCAL_STORAGE)), newIndex);
+    domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::LOCAL_STORAGE)), newIndex);
 
     // Poplate the local storage label.
     populateLocalStorageLabel();
@@ -354,7 +354,7 @@ void DomainSettingsDialog::populateDomStorageLabel() const
     switch (domStorageComboBoxPointer->currentIndex())
     {
         // Set the text according to the system default.
-        case (DomainsDatabaseHelper::SYSTEM_DEFAULT):
+        case (DomainsDatabase::SYSTEM_DEFAULT):
         {
             if (Settings::domStorageEnabled())
                 domStorageLabelPointer->setText(i18nc("Domain settings DOM storage label.", "DOM storage enabled"));
@@ -365,7 +365,7 @@ void DomainSettingsDialog::populateDomStorageLabel() const
         }
 
         // Set the disabled text in bold.
-        case (DomainsDatabaseHelper::DISABLED):
+        case (DomainsDatabase::DISABLED):
         {
             domStorageLabelPointer->setText(i18nc("Domain settings DOM storage label.  The <b> tags should be retained.", "<b>DOM storage disabled</b>"));
 
@@ -373,7 +373,7 @@ void DomainSettingsDialog::populateDomStorageLabel() const
         }
 
         // Set the enabled text in bold.
-        case (DomainsDatabaseHelper::ENABLED):
+        case (DomainsDatabase::ENABLED):
         {
             domStorageLabelPointer->setText(i18nc("Domain settings DOM storage label.  The <b> tags should be retained.", "<b>DOM storage enabled</b>"));
 
@@ -388,7 +388,7 @@ void DomainSettingsDialog::populateJavaScriptLabel() const
     switch (javaScriptComboBoxPointer->currentIndex())
     {
         // Set the text according to the system default.
-        case (DomainsDatabaseHelper::SYSTEM_DEFAULT):
+        case (DomainsDatabase::SYSTEM_DEFAULT):
         {
             if (Settings::javaScriptEnabled())
                 javaScriptLabelPointer->setText(i18nc("Domain settings JavaScript label.", "JavaScript enabled"));
@@ -399,7 +399,7 @@ void DomainSettingsDialog::populateJavaScriptLabel() const
         }
 
         // Set the disabled text in bold.
-        case (DomainsDatabaseHelper::DISABLED):
+        case (DomainsDatabase::DISABLED):
         {
             javaScriptLabelPointer->setText(i18nc("Domain settings JavaScript label.  The <b> tags should be retained.", "<b>JavaScript disabled</b>"));
 
@@ -407,7 +407,7 @@ void DomainSettingsDialog::populateJavaScriptLabel() const
         }
 
         // Set the enabled text in bold.
-        case (DomainsDatabaseHelper::ENABLED):
+        case (DomainsDatabase::ENABLED):
         {
             javaScriptLabelPointer->setText(i18nc("Domain settings JavaScript label.  The <b> tags should be retained.", "<b>JavaScript enabled</b>"));
 
@@ -422,7 +422,7 @@ void DomainSettingsDialog::populateLocalStorageLabel() const
     switch (localStorageComboBoxPointer->currentIndex())
     {
         // Set the text according to the system default.
-        case (DomainsDatabaseHelper::SYSTEM_DEFAULT):
+        case (DomainsDatabase::SYSTEM_DEFAULT):
         {
             if (Settings::localStorageEnabled())
                 localStorageLabelPointer->setText(i18nc("Domain settings local storage label.", "Local storage enabled"));
@@ -433,7 +433,7 @@ void DomainSettingsDialog::populateLocalStorageLabel() const
         }
 
         // Set the disabled text in bold.
-        case (DomainsDatabaseHelper::DISABLED):
+        case (DomainsDatabase::DISABLED):
         {
             localStorageLabelPointer->setText(i18nc("Domain settings local storage label.  The <b> tags should be retained.", "<b>Local storage disabled</b>"));
 
@@ -441,7 +441,7 @@ void DomainSettingsDialog::populateLocalStorageLabel() const
         }
 
         // Set the enabled text in bold.
-        case (DomainsDatabaseHelper::ENABLED):
+        case (DomainsDatabase::ENABLED):
         {
             localStorageLabelPointer->setText(i18nc("Domain settings local storage label.  The <b> tabs should be retained.", "<b>Local storage enabled</b>"));
 
@@ -574,7 +574,7 @@ void DomainSettingsDialog::updateUi() const
 void DomainSettingsDialog::userAgentChanged(const QString &updatedUserAgent) const
 {
     // Update the domains table model.
-    domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::USER_AGENT)),
+    domainsTableModelPointer->setData(domainsSelectionModelPointer->currentIndex().siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::USER_AGENT)),
                                       UserAgentHelper::getDatabaseUserAgentNameFromTranslatedName(updatedUserAgent));
 
     // Populate the user agent label.
@@ -590,7 +590,7 @@ void DomainSettingsDialog::zoomFactorComboBoxChanged(const int &newIndex) const
     QModelIndex modelIndex = domainsSelectionModelPointer->currentIndex();
 
     // Update the domains table model.
-    domainsTableModelPointer->setData(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::ZOOM_FACTOR)), newIndex);
+    domainsTableModelPointer->setData(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::ZOOM_FACTOR)), newIndex);
 
     // Populate the custom zoom factor spin box according to the zoom factor combo box.
     if (newIndex == 0)  // System default zoom factor is selected.
@@ -601,7 +601,7 @@ void DomainSettingsDialog::zoomFactorComboBoxChanged(const int &newIndex) const
     else  // Custom zoom factor is selected.
     {
         // Display the custom zoom factor from the domain settings.
-        customZoomFactorSpinBoxPointer->setValue(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabaseHelper::CUSTOM_ZOOM_FACTOR)).data().toDouble());
+        customZoomFactorSpinBoxPointer->setValue(modelIndex.siblingAtColumn(domainsTableModelPointer->fieldIndex(DomainsDatabase::CUSTOM_ZOOM_FACTOR)).data().toDouble());
     }
 
     // Update the status of the custom zoom factor spin box.