Fix displaying of the URL when opening a new tab from a link. https://redmine.stoutn...

diff --git a/src/com.stoutner.privacybrowser.desktop b/src/com.stoutner.privacybrowser.desktop
index 6132f6ffb2bfc40a86749ce2501f65df0687f14f..ab648560163ffabbe36e9c5f5c288b773c119c97 100644 (file)
--- a/src/com.stoutner.privacybrowser.desktop
+++ b/src/com.stoutner.privacybrowser.desktop
@@ -1,19 +1,20 @@
-# Copyright 2022-2023 Soren Stoutner <soren@stoutner.com>.
+# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2022-2024 Soren Stoutner <soren@stoutner.com>
 #
-# This file is part of Privacy Browser PC <https://www.stoutner.com/privacy-browser-pc>.
+# This file is part of Privacy Browser PC <https://www.stoutner.com/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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
 #
-# Privacy Browser PC is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
 #
-# You should have received a copy of the GNU General Public License
-# along with Privacy Browser PC.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # The specification for the .desktop file can be found at <https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html>.
 # The file can be validated by running `desktop-file-validate com.stoutner.privacybrowser.desktop`.
@@ -44,3 +45,6 @@ X-DocPath=privacybrowser/index.html
 
 # Enumerate the supported MIME types.
 MimeType=text/html;application/xml;application/xhtml+xml;application/x-mimearchive;x-scheme-handler/http;x-scheme-handler/https;
+
+# Set the keywords, which are used for searching in addition to the Name and GenericName.
+Keywords=HTTP;HTTPS

diff --git a/src/privacybrowser.1 b/src/privacybrowser.1
index 82464c4de161ce2abd1957dc555d547d5129c061..773b878435b39880d8b0a07af9e7e314134f453c 100644 (file)
--- a/src/privacybrowser.1
+++ b/src/privacybrowser.1
@@ -1,19 +1,20 @@
-.\" Copyright 2023-2024 Soren Stoutner <soren@stoutner.com>.
+.\" SPDX-License-Identifier: GPL-3.0-or-later
+.\" SPDX-FileCopyrightText: 2023-2024 Soren Stoutner <soren@stoutner.com>
 .\"
 .\" This file is part of Privacy Browser PC <https://www.stoutner.com/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
-.\" the Free Software Foundation, either version 3 of the License, or
-.\" (at your option) any later version.
+.\" This program is free software: you can redistribute it and/or modify it
+.\" under the terms of the GNU General Public License as published by the Free
+.\" Software Foundation, either version 3 of the License, or (at your option)
+.\" any later version.
 .\"
-.\" Privacy Browser PC is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
+.\" This program is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+.\" more details.
 .\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with Privacy Browser PC.  If not, see <https://www.gnu.org/licenses/>.
+.\" You should have received a copy of the GNU General Public License along with
+.\" this program.  If not, see <https://www.gnu.org/licenses/>.
 
 .\" Title Header.
 .TH "Privacy Browser" 1 "30 September 2024" "version 0.6.2" "Privacy Browser User Manual"
@@ -90,6 +91,11 @@ Bugs in currently implemented features may be reported at:
 https://redmine.stoutner.com/projects/privacy-browser-pc/issues
 
 
+.\" Section Header - See Also.
+.SH "SEE ALSO"
+Additional documentation is available by pressing F1 inside of Privacy Browser.
+
+
 .\" Section Header - Author.
 .SH AUTHOR
 Soren Stoutner <soren@stoutner.com>

diff --git a/src/widgets/PrivacyWebEngineView.cpp b/src/widgets/PrivacyWebEngineView.cpp
index fd6f897c2fb2443b17d46b96f03fe30400d99ff6..1b5d2e793710c30fb4ba89e3dd74e0a5c645957f 100644 (file)
--- a/src/widgets/PrivacyWebEngineView.cpp
+++ b/src/widgets/PrivacyWebEngineView.cpp
@@ -1,20 +1,20 @@
-/*
- * Copyright 2022-2024 Soren Stoutner <soren@stoutner.com>.
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2022-2024 Soren Stoutner <soren@stoutner.com>
  *
  * This file is part of Privacy Browser PC <https://www.stoutner.com/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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
  *
- * Privacy Browser PC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Privacy Browser PC.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 // Application headers.
@@ -66,6 +66,9 @@ PrivacyWebEngineView::PrivacyWebEngineView(QWidget *parentWidgetPointer) : QWebE
 
     // Store the link URL whenever a link is hovered.
     connect(privacyWebEnginePagePointer, SIGNAL(linkHovered(const QString)), this, SLOT(saveHoveredLink(const QString)));
+
+    // Store the URL when it changes.
+    connect(this, SIGNAL(urlChanged(const QUrl&)), this, SLOT(storeUpdatedUrl(const QUrl&)));
 }
 
 void PrivacyWebEngineView::addCookieToList(const QNetworkCookie &cookie) const
@@ -420,3 +423,9 @@ void PrivacyWebEngineView::storeRequest(RequestStruct *requestStructPointer)
         emit(requestBlocked(blockedRequestsVector));
     }
 }
+
+void PrivacyWebEngineView::storeUpdatedUrl(const QUrl &newUrl)
+{
+    // Store the new URL string (which changes when a new page is loaded as the current URL text.  This is important when loading a new tab from a link.  <https://redmine.stoutner.com/issues/1228>
+    currentUrlText = newUrl.toString();
+}

diff --git a/src/widgets/PrivacyWebEngineView.h b/src/widgets/PrivacyWebEngineView.h
index 18f87f445888b60d3fc162b76c8269dc8613f8f7..32256426a26817429074beb847a05fe9f4ea8ce4 100644 (file)
--- a/src/widgets/PrivacyWebEngineView.h
+++ b/src/widgets/PrivacyWebEngineView.h
@@ -1,20 +1,20 @@
-/*
- * Copyright 2022-2024 Soren Stoutner <soren@stoutner.com>.
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2022-2024 Soren Stoutner <soren@stoutner.com>
  *
  * This file is part of Privacy Browser PC <https://www.stoutner.com/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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
  *
- * Privacy Browser PC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Privacy Browser PC.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef PRIVACY_WEBENGINE_VIEW_H
@@ -96,6 +96,7 @@ private Q_SLOTS:
     void openWithFirefox() const;
     void saveHoveredLink(const QString &hoveredLink);
     void storeRequest(RequestStruct *requestStructPointer);
+    void storeUpdatedUrl(const QUrl &newUrl);
 
 private:
     // The private variables.