X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=src%2Fdialogs%2FRequestsDialog.cpp;h=43e18097b6cf74268bc99681a5d012eb80333b2a;hb=HEAD;hp=0d240e7ef6ff3bc1790405629ecaff850b516360;hpb=a44e607fb5398c80c5de2629017865ae749e8fbf;p=PrivacyBrowserPC.git

diff --git a/src/dialogs/RequestsDialog.cpp b/src/dialogs/RequestsDialog.cpp
index 0d240e7..2ed1ba4 100644
--- a/src/dialogs/RequestsDialog.cpp
+++ b/src/dialogs/RequestsDialog.cpp
@@ -56,14 +56,14 @@ RequestsDialog::RequestsDialog(QWidget *parentWidgetPointer, QList<RequestStruct
     QTableWidgetItem *requestMethodHeaderItemPointer = new QTableWidgetItem(i18nc("Request method header", "Request Method"));
     QTableWidgetItem *navigationTypeHeaderItemPointer = new QTableWidgetItem(i18nc("Navigation type header", "Navigation Type"));
     QTableWidgetItem *resourceTypeHeaderItemPointer = new QTableWidgetItem(i18nc("Resource type header", "Resource Type"));
-    QTableWidgetItem *urlHeaderItemPointer = new QTableWidgetItem(i18nc("Request URL header", "URL"));
+    QTableWidgetItem *requestUrlHeaderItemPointer = new QTableWidgetItem(i18nc("Request URL header", "Request URL"));
 
     // Set the horizontal headers.
     tableWidgetPointer->setHorizontalHeaderItem(0, dispositionHeaderItemPointer);
     tableWidgetPointer->setHorizontalHeaderItem(1, requestMethodHeaderItemPointer);
     tableWidgetPointer->setHorizontalHeaderItem(2, navigationTypeHeaderItemPointer);
     tableWidgetPointer->setHorizontalHeaderItem(3, resourceTypeHeaderItemPointer);
-    tableWidgetPointer->setHorizontalHeaderItem(4, urlHeaderItemPointer);
+    tableWidgetPointer->setHorizontalHeaderItem(4, requestUrlHeaderItemPointer);
 
     // Create the palette.
     QPalette negativePalette = QPalette();
@@ -90,7 +90,7 @@ RequestsDialog::RequestsDialog(QWidget *parentWidgetPointer, QList<RequestStruct
         QTableWidgetItem *requestMethodItemPointer = new QTableWidgetItem(requestStructPointer->requestMethodString);
         QTableWidgetItem *navigationTypeItemPointer = new QTableWidgetItem(globalFilterListHelperPointer->getNavigationTypeString(requestStructPointer->navigationTypeInt));
         QTableWidgetItem *resourceTypeItemPointer = new QTableWidgetItem(globalFilterListHelperPointer->getResourceTypeString(requestStructPointer->resourceTypeInt));
-        QTableWidgetItem *urlItemPointer = new QTableWidgetItem(requestStructPointer->urlString);
+        QTableWidgetItem *requestUrlItemPointer = new QTableWidgetItem(requestStructPointer->urlString);
 
         // Create a request struct byte array.
         QByteArray *requestStructByteArrayPointer = new QByteArray();
@@ -100,14 +100,39 @@ RequestsDialog::RequestsDialog(QWidget *parentWidgetPointer, QList<RequestStruct
 
         // Populate the request struct data stream.
         requestStructDataStream << requestStructPointer->dispositionInt;
-        requestStructDataStream << requestStructPointer->entryStruct.appliedEntry;
         requestStructDataStream << requestStructPointer->entryStruct.originalEntry;
+        requestStructDataStream << requestStructPointer->entryStruct.originalFilterOptions;
+        requestStructDataStream << requestStructPointer->entryStruct.appliedEntryList;
+        requestStructDataStream << requestStructPointer->entryStruct.appliedFilterOptionsList;
+        requestStructDataStream << requestStructPointer->entryStruct.domainList;
+        requestStructDataStream << requestStructPointer->entryStruct.finalMatch;
+        requestStructDataStream << requestStructPointer->entryStruct.hasRequestOptions;
+        requestStructDataStream << requestStructPointer->entryStruct.initialMatch;
+        requestStructDataStream << requestStructPointer->entryStruct.domain;
+        requestStructDataStream << requestStructPointer->entryStruct.font;
+        requestStructDataStream << requestStructPointer->entryStruct.image;
+        requestStructDataStream << requestStructPointer->entryStruct.mainFrame;
+        requestStructDataStream << requestStructPointer->entryStruct.media;
+        requestStructDataStream << requestStructPointer->entryStruct.object;
+        requestStructDataStream << requestStructPointer->entryStruct.other;
+        requestStructDataStream << requestStructPointer->entryStruct.ping;
+        requestStructDataStream << requestStructPointer->entryStruct.script;
+        requestStructDataStream << requestStructPointer->entryStruct.styleSheet;
+        requestStructDataStream << requestStructPointer->entryStruct.subFrame;
+        requestStructDataStream << requestStructPointer->entryStruct.thirdParty;
+        requestStructDataStream << requestStructPointer->entryStruct.xmlHttpRequest;
         requestStructDataStream << requestStructPointer->filterListTitle;
+        requestStructDataStream << requestStructPointer->isThirdPartyRequest;
+        requestStructDataStream << requestStructPointer->matchedUrlType;
         requestStructDataStream << requestStructPointer->navigationTypeInt;
         requestStructDataStream << requestStructPointer->requestMethodString;
         requestStructDataStream << requestStructPointer->resourceTypeInt;
         requestStructDataStream << requestStructPointer->sublistInt;
+        requestStructDataStream << requestStructPointer->truncatedUrlString;
+        requestStructDataStream << requestStructPointer->truncatedUrlStringWithSeparators;
         requestStructDataStream << requestStructPointer->urlString;
+        requestStructDataStream << requestStructPointer->urlStringWithSeparators;
+        requestStructDataStream << requestStructPointer->webPageUrlString;
 
         // Add the request struct to the disposition item.
         dispositionItemPointer->setData(Qt::UserRole, *requestStructByteArrayPointer);
@@ -120,7 +145,7 @@ RequestsDialog::RequestsDialog(QWidget *parentWidgetPointer, QList<RequestStruct
             requestMethodItemPointer->setBackground(negativeBackgroundBrush);
             navigationTypeItemPointer->setBackground(negativeBackgroundBrush);
             resourceTypeItemPointer->setBackground(negativeBackgroundBrush);
-            urlItemPointer->setBackground(negativeBackgroundBrush);
+            requestUrlItemPointer->setBackground(negativeBackgroundBrush);
         }
         else if (requestStructPointer->dispositionInt == FilterListHelper::ALLOWED)  // The request was allowed.
         {
@@ -129,7 +154,7 @@ RequestsDialog::RequestsDialog(QWidget *parentWidgetPointer, QList<RequestStruct
             requestMethodItemPointer->setBackground(positiveBackgroundBrush);
             navigationTypeItemPointer->setBackground(positiveBackgroundBrush);
             resourceTypeItemPointer->setBackground(positiveBackgroundBrush);
-            urlItemPointer->setBackground(positiveBackgroundBrush);
+            requestUrlItemPointer->setBackground(positiveBackgroundBrush);
         }
 
         // Add the entries to the table.
@@ -137,7 +162,7 @@ RequestsDialog::RequestsDialog(QWidget *parentWidgetPointer, QList<RequestStruct
         tableWidgetPointer->setItem(rowCounter, 1, requestMethodItemPointer);
         tableWidgetPointer->setItem(rowCounter, 2, navigationTypeItemPointer);
         tableWidgetPointer->setItem(rowCounter, 3, resourceTypeItemPointer);
-        tableWidgetPointer->setItem(rowCounter, 4, urlItemPointer);
+        tableWidgetPointer->setItem(rowCounter, 4, requestUrlItemPointer);
 
         // Increment the row counter.
         ++rowCounter;
@@ -158,23 +183,14 @@ RequestsDialog::RequestsDialog(QWidget *parentWidgetPointer, QList<RequestStruct
     // Connect the buttons.
     connect(dialogButtonBoxPointer, SIGNAL(rejected()), this, SLOT(close()));
 
-    // Open the request detail dialog when
+    // Open the request detail dialog when a cell is clicked.
     connect(tableWidgetPointer, SIGNAL(cellClicked(int, int)), this, SLOT(showRequestDetailDialog(int)));
 }
 
 void RequestsDialog::showRequestDetailDialog(int row)
 {
-    // Get the first table widget item in the row.
-    QTableWidgetItem *rowFirstTableWidgetItemPointer = tableWidgetPointer->item(row, 0);
-
-    // Get the data variant.
-    QVariant dataVariant = rowFirstTableWidgetItemPointer->data(Qt::UserRole);
-
-    // Get the request struct byte array from the data variant.
-    QByteArray requestStructByteArray = dataVariant.toByteArray();
-
     // Instantiate the request details dialog.
-    RequestDetailDialog *requestDetailDialogPointer = new RequestDetailDialog(this, requestStructByteArray);
+    RequestDetailDialog *requestDetailDialogPointer = new RequestDetailDialog(this, tableWidgetPointer, row);
 
     // Show the dialog.
     requestDetailDialogPointer->show();