Fix shortcut creation.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a5dee4a19467e74468b6816c5249109df7086d7..7f2eac8935db648fe35312c21d362eb38d28c0d7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,9 +70,9 @@ find_package(KF5 ${KDE_FRAMEWORKS_MIN_VERSION} REQUIRED COMPONENTS
 add_subdirectory(doc)
 add_subdirectory(src)
 
-# Make it possible to use the PO files fetched by the fetch-translations step.
-ki18n_install(po)
-kdoctools_install(po)
+# Install the PO files.  These should be enabled once there are PO translations.
+#ki18n_install(po)
+#kdoctools_install(po)
 
 # Generate a summary.
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

diff --git a/src/com.stoutner.privacybrowser.appdata.xml b/src/com.stoutner.privacybrowser.appdata.xml
index 614251454b96bd3e842f3f79804498e8b8da3f50..7d8e67798c34fede2245439b534bfcf1774f1030 100644 (file)
--- a/src/com.stoutner.privacybrowser.appdata.xml
+++ b/src/com.stoutner.privacybrowser.appdata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2022-2023 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser PC <https://www.stoutner.com/privacy-browser-pc>.
 
@@ -14,6 +14,7 @@
   along with Privacy Browser PC.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <!-- The XML specification can be found at <https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html>. -->
+<!-- The file can be validated using `appstreamcli validate com.stoutner.privacybrowser.appdata.xml`. -->
 <component type="desktop-application">
     <id>com.stoutner.privacybrowser</id>
 
@@ -21,7 +22,14 @@
 
     <name>Privacy Browser</name>
 
-    <summary>A web browser that respects your privacy.</summary>
+    <summary>A web browser that respects your privacy</summary>
+
+    <description>
+        <p>
+            Privacy Browser is a web browser based on Qt WebEngine with a focus on privacy and security.
+            Features like JavaScript and cookies are disabled by default but are easy to automatically enable on-the-fly or by domain.
+        </p>
+    </description>
 
     <categories>
         <category>Network</category>
@@ -36,24 +44,30 @@
     <launchable type="desktop-id">com.stoutner.privacybrowser.desktop</launchable>
 
     <releases>
-        <release version="0.1.1" date="2022-03-01"/>
-        <release version="0.1" date="2022-01-22"/>
+        <release version="0.1" date="2023-03-09">
+            <description>
+                <p>Initial release.</p>
+            </description>
+        </release>
     </releases>
 
     <provides>
-        <binary>privacy-browser</binary>
+        <binary>privacybrowser</binary>
     </provides>
 
     <project_license>GPL-3.0-or-later</project_license>
 
     <developer_name>Soren Stoutner</developer_name>
 
-    <!-- TODO -->
     <screenshots>
         <screenshot type="default">
-            <image type="source"></image>
+            <image type="source">https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blob_plain;f=doc/privacybrowser.png;hb=HEAD</image>
+            <caption>The main Privacy Browser window.</caption>
         </screenshot>
     </screenshots>
 
     <update_contact>soren@stoutner.com</update_contact>
+
+    <!-- This content rating was generated from <https://hughsie.github.io/oars/generate.html>. -->
+    <content_rating type="oars-1.0" />
 </component>

diff --git a/src/com.stoutner.privacybrowser.desktop b/src/com.stoutner.privacybrowser.desktop
index ddf69a33835dc633ed97b347a4ac993f5ca4d634..a2eff84584140027f6fd6eba2a7728e9a324242c 100644 (file)
--- a/src/com.stoutner.privacybrowser.desktop
+++ b/src/com.stoutner.privacybrowser.desktop
@@ -1,4 +1,4 @@
-# Copyright 2022 Soren Stoutner <soren@stoutner.com>.
+# Copyright 2022-2023 Soren Stoutner <soren@stoutner.com>.
 #
 # This file is part of Privacy Browser PC <https://www.stoutner.com/privacy-browser-pc>.
 #
@@ -16,6 +16,7 @@
 # along with Privacy Browser PC.  If not, see <http://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`.
 [Desktop Entry]
 # Set the type.
 Type=Application
@@ -30,7 +31,7 @@ GenericName=Web Browser
 Categories=Network;WebBrowser;
 
 # Set the icon.
-Icon=privacybrowser.svg
+Icon=privacybrowser
 
 # Set the executable with the optional URL argument.
 Exec=privacybrowser %u
@@ -38,7 +39,7 @@ Exec=privacybrowser %u
 # Specify the WM class, which groups windows of the same application together.
 StartupWMClass=privacybrowser
 
-# TODO.  Set the document path.
+# Set the handbook docbook path.
 X-DocPath=privacybrowser/index.html
 
 # Enumerate the supported MIME types.

diff --git a/src/privacybrowser.1 b/src/privacybrowser.1
index 6b78a3857b13dccb4a77cb3cb6f269ce85d23687..4da7859e44e47314fbd67f05c7e0619b737471c0 100644 (file)
--- a/src/privacybrowser.1
+++ b/src/privacybrowser.1
@@ -20,7 +20,7 @@
 
 .\" Section Header - Name.
 .SH NAME
-Privacy Browser \- a web browser that respects your privacy
+privacybrowser \- a web browser that respects your privacy
 
 
 .\" Section Header - Synopsis.

diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp
index f1dd59e3ea8b3bb8963130687c54d97e591df78e..16496885749257add512aa99426a68f447b52627 100644 (file)
--- a/src/windows/BrowserWindow.cpp
+++ b/src/windows/BrowserWindow.cpp
@@ -223,28 +223,28 @@ BrowserWindow::BrowserWindow(bool firstWindow) : KXmlGuiWindow()
     QKeySequence ctrlSemicolonKeySequence = QKeySequence(i18nc("The cookies dialog key sequence.", "Ctrl+;"));
 
     // Set the action key sequences.
-    newTabActionPointer->setShortcut(ctrlTKeySequence);
-    newWindowActionPointer->setShortcut(ctrlNKeySequence);
-    printPreviewActionPointer->setShortcut(ctrlShiftPKeySequence);
-    userAgentPrivacyBrowserActionPointer->setShortcut(ctrlAltPKeySequence);
-    userAgentWebEngineDefaultActionPointer->setShortcut(ctrlAltWKeySequence);
-    userAgentFirefoxLinuxActionPointer->setShortcut(ctrlAltFKeySequence);
-    userAgentChromiumLinuxActionPointer->setShortcut(ctrlAltCKeySequence);
-    userAgentFirefoxWindowsActionPointer->setShortcut(ctrlAltShiftFKeySequence);
-    userAgentChromeWindowsActionPointer->setShortcut(ctrlAltShiftCKeySequence);
-    userAgentEdgeWindowsActionPointer->setShortcut(ctrlAltEKeySequence);
-    userAgentSafariMacosActionPointer->setShortcut(ctrlAltSKeySequence);
-    userAgentCustomActionPointer->setShortcut(altShiftCKeySequence);
-    zoomFactorActionPointer->setShortcut(ctrlAltZKeySequence);
-    searchEngineMojeekActionPointer->setShortcut(ctrlShiftMKeySequence);
-    searchEngineMonoclesActionPointer->setShortcut(ctrlShiftOKeySequence);
-    searchEngineMetagerActionPointer->setShortcut(ctrlShiftEKeySequence);
-    searchEngineGoogleActionPointer->setShortcut(ctrlShiftGKeySequence);
-    searchEngineBingActionPointer->setShortcut(ctrlShiftBKeySequence);
-    searchEngineYahooActionPointer->setShortcut(ctrlShiftYKeySequence);
-    searchEngineCustomActionPointer->setShortcut(ctrlShiftCKeySequence);
-    domainSettingsActionPointer->setShortcut(ctrlDKeySequence);
-    cookiesActionPointer->setShortcut(ctrlSemicolonKeySequence);
+    actionCollectionPointer->setDefaultShortcut(newTabActionPointer, ctrlTKeySequence);
+    actionCollectionPointer->setDefaultShortcut(newWindowActionPointer, ctrlNKeySequence);
+    actionCollectionPointer->setDefaultShortcut(printPreviewActionPointer, ctrlShiftPKeySequence);
+    actionCollectionPointer->setDefaultShortcut(userAgentPrivacyBrowserActionPointer, ctrlAltPKeySequence);
+    actionCollectionPointer->setDefaultShortcut(userAgentWebEngineDefaultActionPointer, ctrlAltWKeySequence);
+    actionCollectionPointer->setDefaultShortcut(userAgentFirefoxLinuxActionPointer, ctrlAltFKeySequence);
+    actionCollectionPointer->setDefaultShortcut(userAgentChromiumLinuxActionPointer, ctrlAltCKeySequence);
+    actionCollectionPointer->setDefaultShortcut(userAgentFirefoxWindowsActionPointer, ctrlAltShiftFKeySequence);
+    actionCollectionPointer->setDefaultShortcut(userAgentChromeWindowsActionPointer, ctrlAltShiftCKeySequence);
+    actionCollectionPointer->setDefaultShortcut(userAgentEdgeWindowsActionPointer, ctrlAltEKeySequence);
+    actionCollectionPointer->setDefaultShortcut(userAgentSafariMacosActionPointer, ctrlAltSKeySequence);
+    actionCollectionPointer->setDefaultShortcut(userAgentCustomActionPointer, altShiftCKeySequence);
+    actionCollectionPointer->setDefaultShortcut(zoomFactorActionPointer, ctrlAltZKeySequence);
+    actionCollectionPointer->setDefaultShortcut(searchEngineMojeekActionPointer, ctrlShiftMKeySequence);
+    actionCollectionPointer->setDefaultShortcut(searchEngineMonoclesActionPointer, ctrlShiftOKeySequence);
+    actionCollectionPointer->setDefaultShortcut(searchEngineMetagerActionPointer, ctrlShiftEKeySequence);
+    actionCollectionPointer->setDefaultShortcut(searchEngineGoogleActionPointer, ctrlShiftGKeySequence);
+    actionCollectionPointer->setDefaultShortcut(searchEngineBingActionPointer, ctrlShiftBKeySequence);
+    actionCollectionPointer->setDefaultShortcut(searchEngineYahooActionPointer, ctrlShiftYKeySequence);
+    actionCollectionPointer->setDefaultShortcut(searchEngineCustomActionPointer, ctrlShiftCKeySequence);
+    actionCollectionPointer->setDefaultShortcut(domainSettingsActionPointer, ctrlDKeySequence);
+    actionCollectionPointer->setDefaultShortcut(cookiesActionPointer, ctrlSemicolonKeySequence);
 
     // Execute the actions.
     connect(newTabActionPointer, SIGNAL(triggered()), tabWidgetPointer, SLOT(addTab()));