Additional fix for notifications on Xfce. https://redmine.stoutner.com/issues/1017

diff --git a/changelog b/changelog
index da1fc7ff0da5adc86be23b6df75f90e8e91dde34..d8447b027b8f68c8562258e6d2a7d03e5e5f1ef5 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,14 @@
+# Version 0.5 (11 October 2023)
+ * Add bookmarks.
+ * Add zoom controls to the status bar and a default zoom shortcut.
+ * Add keyboard shortcuts for the URL toolbar actions.
+ * Add an action to view page source.
+ * Change the domain settings combo boxes to list enabled above disabled.
+ * File downloads can now show the size before the download begins.
+ * Add PIE (Position Independent Executable) compiler flags.
+ * Fix a bug that sometimes allowed multiple domain settings to be created.
+ * Fix the download notification not being cleared on Xfce.
+
 # Version 0.4 (13 June 2023)
  * Add a setting to control spatial navigation.
  * Add an action to reload and bypass cache.

diff --git a/doc/index.docbook b/doc/index.docbook
index fd5d5362b53ca674b7e2a69bad33db278e8869ff..22782616cf1f696f916226cdc108ddfc57da52f9 100644 (file)
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -44,7 +44,7 @@
         <legalnotice>&FDLNotice;</legalnotice>
 
         <!-- Last update. -->
-        <date>2023-10-10</date>
+        <date>2023-10-11</date>
 
         <!-- The version of Privacy Browser this documentation is written for. -->
         <releaseinfo>&privacybrowser; version 0.5</releaseinfo>
@@ -1262,65 +1262,65 @@
                         </listitem>
                     </varlistentry>
 
-                    <!-- Add Bookmark. -->
-                    <varlistentry id="add-bookmark">
+                    <!-- View Bookmarks Toolbar. -->
+                    <varlistentry id="view-bookmarks-toolbar">
                         <term>
                             <menuchoice>
                                 <shortcut>
-                                    <keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo>
+                                    <keycombo action="simul">&Ctrl;&Alt;<keycap>B</keycap></keycombo>
                                 </shortcut>
 
                                 <guimenu>Bookmarks</guimenu>
 
-                                <guimenuitem>Add Bookmark</guimenuitem>
+                                <guimenuitem>View Bookmarks Toolbar</guimenuitem>
                             </menuchoice>
                         </term>
 
                         <listitem>
                             <para>
-                                Add a new bookmark.
+                                Toggle the visibility of the bookmarks toolbar.
                             </para>
                         </listitem>
                     </varlistentry>
 
-                    <!-- Add Folder. -->
-                    <varlistentry id="add-folder">
+                    <!-- Add Bookmark. -->
+                    <varlistentry id="add-bookmark">
                         <term>
                             <menuchoice>
                                 <shortcut>
-                                    <keycombo action="simul">&Meta;<keycap>F</keycap></keycombo>
+                                    <keycombo action="simul">&Ctrl;<keycap>B</keycap></keycombo>
                                 </shortcut>
 
                                 <guimenu>Bookmarks</guimenu>
 
-                                <guimenuitem>Add Folder</guimenuitem>
+                                <guimenuitem>Add Bookmark</guimenuitem>
                             </menuchoice>
                         </term>
 
                         <listitem>
                             <para>
-                                Add a bookmark folder.  The meta key on most keyboards is the Windows key.
+                                Add a new bookmark.
                             </para>
                         </listitem>
                     </varlistentry>
 
-                    <!-- View Bookmarks Toolbar. -->
-                    <varlistentry id="view-bookmarks-toolbar">
+                    <!-- Add Folder. -->
+                    <varlistentry id="add-folder">
                         <term>
                             <menuchoice>
                                 <shortcut>
-                                    <keycombo action="simul">&Ctrl;&Alt;<keycap>B</keycap></keycombo>
+                                    <keycombo action="simul">&Meta;<keycap>F</keycap></keycombo>
                                 </shortcut>
 
                                 <guimenu>Bookmarks</guimenu>
 
-                                <guimenuitem>View Bookmarks Toolbar</guimenuitem>
+                                <guimenuitem>Add Folder</guimenuitem>
                             </menuchoice>
                         </term>
 
                         <listitem>
                             <para>
-                                Toggle the visibility of the bookmarks toolbar.
+                                Add a bookmark folder.  The meta key on most keyboards is the Windows key.
                             </para>
                         </listitem>
                     </varlistentry>
@@ -1521,146 +1521,165 @@
             </sect2>
         </sect1>
 
-    <!-- Cookies Dialog. -->
-    <sect1 id="cookies-dialog">
-        <title>Cookies Dialog</title>
+        <!-- Cookies Dialog. -->
+        <sect1 id="cookies-dialog">
+            <title>Cookies Dialog</title>
 
-        <para>
-            The cookies dialog is accessed through <xref linkend="settings-cookies"/> (see <xref linkend="cookies"/>).
-        </para>
+            <para>
+                The cookies dialog is accessed through <xref linkend="settings-cookies"/> (see <xref linkend="cookies"/>).
+            </para>
 
-        <sect2 id="cookies-dialog-commands">
-            <title>Commands</title>
+            <sect2 id="cookies-dialog-commands">
+                <title>Commands</title>
 
-            <variablelist>
-                <!-- Add Cookie. -->
-                <varlistentry id="add-cookie">
-                    <term>
-                        <command>
-                            <keycap>A</keycap>
-                        </command>
-                    </term>
+                <variablelist>
+                    <!-- Add Cookie. -->
+                    <varlistentry id="add-cookie">
+                        <term>
+                            <command>
+                                <keycap>A</keycap>
+                            </command>
+                        </term>
 
-                    <listitem>
-                        <para>
-                            Open the add cookie dialog.
-                        </para>
-                    </listitem>
-                </varlistentry>
+                        <listitem>
+                            <para>
+                                Open the add cookie dialog.
+                            </para>
+                        </listitem>
+                    </varlistentry>
 
-                <!-- Edit Cookie. -->
-                <varlistentry id="edit-cookie">
-                    <term>
-                        <command>
-                            <keycap>E</keycap>
-                        </command>
-                    </term>
+                    <!-- Edit Cookie. -->
+                    <varlistentry id="edit-cookie">
+                        <term>
+                            <command>
+                                <keycap>E</keycap>
+                            </command>
+                        </term>
 
-                    <listitem>
-                        <para>
-                            Open the edit cookie dialog. This command is only valid if a cookie is currently selected.
-                        </para>
-                    </listitem>
-                </varlistentry>
+                        <listitem>
+                            <para>
+                                Open the edit cookie dialog. This command is only valid if a cookie is currently selected.
+                            </para>
+                        </listitem>
+                    </varlistentry>
 
-                <!-- Delete Cookies. -->
-                <varlistentry id="delete-cookies">
-                    <term>
-                        <command>
-                            <keycap>D</keycap> or <keycap>&Del;</keycap>
-                        </command>
-                    </term>
+                    <!-- Delete Cookies. -->
+                    <varlistentry id="delete-cookies">
+                        <term>
+                            <command>
+                                <keycap>D</keycap> or <keycap>&Del;</keycap>
+                            </command>
+                        </term>
 
-                    <listitem>
-                        <para>
-                            Delete the currently selected cookies. A dialog will confirm the deletion before it is processed.
-                        </para>
-                    </listitem>
-                </varlistentry>
+                        <listitem>
+                            <para>
+                                Delete the currently selected cookies. A dialog will confirm the deletion before it is processed.
+                            </para>
+                        </listitem>
+                    </varlistentry>
 
-                <!-- Delete All Cookies. -->
-                <varlistentry id="delete-all-cookie">
-                    <term>
-                        <command>
-                            <keycap>L</keycap>
-                        </command>
-                    </term>
+                    <!-- Delete All Cookies. -->
+                    <varlistentry id="delete-all-cookie">
+                        <term>
+                            <command>
+                                <keycap>L</keycap>
+                            </command>
+                        </term>
 
-                    <listitem>
-                        <para>
-                            Delete all the cookies. A dialog will confirm the deletion before it is processed.
-                        </para>
-                    </listitem>
-                </varlistentry>
+                        <listitem>
+                            <para>
+                                Delete all the cookies. A dialog will confirm the deletion before it is processed.
+                            </para>
+                        </listitem>
+                    </varlistentry>
 
-                <!-- Close. -->
-                <varlistentry id="close-cookies-dialog">
-                    <term>
-                        <command>
-                            <keycap>C</keycap> or <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
-                        </command>
-                    </term>
+                    <!-- Close. -->
+                    <varlistentry id="close-cookies-dialog">
+                        <term>
+                            <command>
+                                <keycap>C</keycap> or <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
+                            </command>
+                        </term>
 
-                    <listitem>
-                        <para>
-                            Close the cookies dialog.
-                        </para>
-                    </listitem>
-                </varlistentry>
-            </variablelist>
-        </sect2>
-    </sect1>
+                        <listitem>
+                            <para>
+                                Close the cookies dialog.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                </variablelist>
+            </sect2>
+        </sect1>
 
-    <!-- Save Dialog. -->
-    <sect1 id="save-dialog">
-        <title>Save Dialog</title>
+        <!-- Save Dialog. -->
+        <sect1 id="save-dialog">
+            <title>Save Dialog</title>
 
-        <para>
-            The save dialog pops up when a download is initiated.
-        </para>
+            <para>
+                The save dialog pops up when a download is initiated.
+            </para>
 
-        <sect2 id="save-dialog-commands">
-            <title>Commands</title>
+            <sect2 id="save-dialog-commands">
+                <title>Commands</title>
 
-            <variablelist>
-                <!-- Save. -->
-                <varlistentry id="save-dialog-save">
-                    <term>
-                        <command>
-                            <keycap>S</keycap>
-                        </command>
-                    </term>
+                <variablelist>
+                    <!-- Save. -->
+                    <varlistentry id="save-dialog-save">
+                        <term>
+                            <command>
+                                <keycap>S</keycap>
+                            </command>
+                        </term>
 
-                    <listitem>
-                        <para>
-                            Save the file.
-                        </para>
-                    </listitem>
-                </varlistentry>
+                        <listitem>
+                            <para>
+                                Save the file.
+                            </para>
+                        </listitem>
+                    </varlistentry>
 
-                <!-- Close. -->
-                <varlistentry id="save-dialog-close">
-                    <term>
-                        <command>
-                            <keycap>C</keycap> or <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
-                        </command>
-                    </term>
+                    <!-- Close. -->
+                    <varlistentry id="save-dialog-close">
+                        <term>
+                            <command>
+                                <keycap>C</keycap> or <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
+                            </command>
+                        </term>
 
-                    <listitem>
-                        <para>
-                            Close the save dialog without saving the file.
-                        </para>
-                    </listitem>
-                </varlistentry>
-            </variablelist>
-        </sect2>
-    </sect1>
+                        <listitem>
+                            <para>
+                                Close the save dialog without saving the file.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                </variablelist>
+            </sect2>
+        </sect1>
     </chapter>
 
     <!-- Changelog. -->
     <chapter id="changelog">
         <title>Changelog</title>
 
+        <!-- Version 0.5. -->
+        <sect1 id="version_0.5">
+            <title>0.5 - 11 October 2023</title>
+
+            <itemizedlist>
+                <listitem><para>Add <ulink url="https://redmine.stoutner.com/issues/968">bookmarks</ulink>.</para></listitem>
+                <listitem><para>Add <ulink url="https://redmine.stoutner.com/issues/1031">zoom controls</ulink> to the status bar and a
+                        <ulink url="https://redmine.stoutner.com/issues/1044">default zoom shortcut</ulink>.</para></listitem>
+                <listitem><para>Add <ulink url="https://redmine.stoutner.com/issues/1037">keyboard shortcuts</ulink> for the URL toolbar actions.</para></listitem>
+                <listitem><para>Add an action to <ulink url="https://redmine.stoutner.com/issues/1022">view page source</ulink>.</para></listitem>
+                <listitem><para>Change the <ulink url="https://redmine.stoutner.com/issues/1019">domain settings combo boxes</ulink> to list
+                        <code>enabled</code> above <code>disabled</code>.</para></listitem>
+                <listitem><para>File downloads can now <ulink url="https://redmine.stoutner.com/issues/869">show the size</ulink> before the download begins.</para></listitem>
+                <listitem><para>Add PIE (<ulink url="https://redmine.stoutner.com/issues/1021">Position Independent Executable</ulink>) compiler flags.</para></listitem>
+                <listitem><para>Fix a bug that sometimes allowed <ulink url="https://redmine.stoutner.com/issues/1018">multiple domain settings to be created</ulink>.</para></listitem>
+                <listitem><para>Fix the download notification <ulink url="https://redmine.stoutner.com/issues/1017">not being cleared on Xfce</ulink>.</para></listitem>
+            </itemizedlist>
+        </sect1>
+
         <!-- Version 0.4. -->
         <sect1 id="version_0.4">
             <title><ulink url="https://www.stoutner.com/privacy-browser-pc-0-4/">0.4</ulink> -

diff --git a/src/com.stoutner.privacybrowser.appdata.xml b/src/com.stoutner.privacybrowser.appdata.xml
index b9d8a0d59c7a00b543c6511b589d2aa5586127e4..63ec01c55e9476ebbda184fc7a22df64528525bc 100644 (file)
--- a/src/com.stoutner.privacybrowser.appdata.xml
+++ b/src/com.stoutner.privacybrowser.appdata.xml
@@ -44,6 +44,20 @@
     <launchable type="desktop-id">com.stoutner.privacybrowser.desktop</launchable>
 
     <releases>
+        <release version="0.5" date="2023-10-11">
+            <description>
+                <p>Add bookmarks.</p>
+                <p>Add zoom controls to the status bar and a default zoom shortcut.</p>
+                <p>Add keyboard shortcuts for the URL toolbar actions.</p>
+                <p>Add an action to view page source.</p>
+                <p>Change the domain settings combo boxes to list enabled above disabled.</p>
+                <p>File downloads can now show the size before the download begins.</p>
+                <p>Add PIE (Position Independent Executable) compiler flags.</p>
+                <p>Fix a bug that sometimes allowed multiple domain settings to be created.</p>
+                <p>Fix the download notification not being cleared on Xfce.</p>
+            </description>
+        </release>
+
         <release version="0.4" date="2023-06-13">
             <description>
                 <p>Add a setting to control spatial navigation.</p>

diff --git a/src/dialogs/AddBookmarkDialog.cpp b/src/dialogs/AddBookmarkDialog.cpp
index e69543e7ab51cb1e28a0e79b33df964af1d04d95..9f977afabdcfed2f8ece0e02b89499d5e4b01b40 100644 (file)
--- a/src/dialogs/AddBookmarkDialog.cpp
+++ b/src/dialogs/AddBookmarkDialog.cpp
@@ -45,7 +45,7 @@ AddBookmarkDialog::AddBookmarkDialog(const QString &bookmarkName, const QString
     addBookmarkDialogUi.setupUi(this);
 
     // Get handles for the widgets.
-    defaultFavoriteIconRadioButtonPointer = addBookmarkDialogUi.defaultFavoriteIconRadioButton;
+    websiteFavoriteIconRadioButtonPointer = addBookmarkDialogUi.websiteFavoriteIconRadioButton;
     customFavoriteIconRadioButtonPointer = addBookmarkDialogUi.customFavoriteIconRadioButton;
     parentFolderTreeWidgetPointer = addBookmarkDialogUi.parentFolderTreeWidget;
     bookmarkNameLineEditPointer = addBookmarkDialogUi.bookmarkNameLineEdit;
@@ -53,8 +53,9 @@ AddBookmarkDialog::AddBookmarkDialog(const QString &bookmarkName, const QString
     QPushButton *browseButtonPointer = addBookmarkDialogUi.browseButton;
     QDialogButtonBox *dialogButtonBoxPointer = addBookmarkDialogUi.dialogButtonBox;
 
-    // Set the default favorite icon.
-    defaultFavoriteIconRadioButtonPointer->setIcon(favoriteIcon);
+    // Set the icons.
+    websiteFavoriteIconRadioButtonPointer->setIcon(favoriteIcon);
+    customFavoriteIconRadioButtonPointer->setIcon(QIcon::fromTheme(QLatin1String("globe"), QIcon::fromTheme(QLatin1String("applications-internet"))));
 
     // Instantiate a folder helper.
     folderHelperPointer = new FolderHelper();
@@ -73,7 +74,7 @@ AddBookmarkDialog::AddBookmarkDialog(const QString &bookmarkName, const QString
 
     // Populate the bookmarks tree widget item.
     bookmarksTreeWidgetItemPointer->setText(folderHelperPointer->FOLDER_NAME_COLUMN, i18nc("The bookmarks root tree widget name", "Bookmarks"));
-    bookmarksTreeWidgetItemPointer->setIcon(folderHelperPointer->FOLDER_NAME_COLUMN, QIcon::fromTheme("bookmarks"));
+    bookmarksTreeWidgetItemPointer->setIcon(folderHelperPointer->FOLDER_NAME_COLUMN, QIcon::fromTheme(QLatin1String("bookmarks"), QIcon::fromTheme(QLatin1String("bookmark-new"))));
     bookmarksTreeWidgetItemPointer->setText(folderHelperPointer->FOLDER_ID_COLUMN, QLatin1String("0"));
 
     // Add the bookmarks tree widget item to the root of the tree.
@@ -125,7 +126,7 @@ void AddBookmarkDialog::addBookmark()
     QTreeWidgetItem *selectedFolderPointer = selectedFoldersList.first();
 
     // Get the favorite icon.
-    QIcon favoriteIcon = defaultFavoriteIconRadioButtonPointer->isChecked() ? defaultFavoriteIconRadioButtonPointer->icon() : customFavoriteIconRadioButtonPointer->icon();
+    QIcon favoriteIcon = websiteFavoriteIconRadioButtonPointer->isChecked() ? websiteFavoriteIconRadioButtonPointer->icon() : customFavoriteIconRadioButtonPointer->icon();
 
     // Create a bookmark struct.
     BookmarkStruct *bookmarkStructPointer = new BookmarkStruct;

diff --git a/src/dialogs/AddBookmarkDialog.h b/src/dialogs/AddBookmarkDialog.h
index 71e8165ccbd32ad0c1b0b914f053ed944b8e904a..311f1396cc68a6c220f17019c68b92134d1c32e5 100644 (file)
--- a/src/dialogs/AddBookmarkDialog.h
+++ b/src/dialogs/AddBookmarkDialog.h
@@ -57,7 +57,7 @@ private:
     QLineEdit *bookmarkNameLineEditPointer;
     QLineEdit *bookmarkUrlLineEditPointer;
     QRadioButton *customFavoriteIconRadioButtonPointer;
-    QRadioButton *defaultFavoriteIconRadioButtonPointer;
     QTreeWidget *parentFolderTreeWidgetPointer;
+    QRadioButton *websiteFavoriteIconRadioButtonPointer;
 };
 #endif

diff --git a/src/dialogs/AddFolderDialog.cpp b/src/dialogs/AddFolderDialog.cpp
index 37b88452c56473ebcef74b7c549596c6aef74a76..ec41ce36fbdfccee6c9e42f66c7f5b1c04fdef74 100644 (file)
--- a/src/dialogs/AddFolderDialog.cpp
+++ b/src/dialogs/AddFolderDialog.cpp
@@ -71,7 +71,7 @@ AddFolderDialog::AddFolderDialog(const QIcon &currentWebsiteFavoriteIcon, const
 
     // Populate the bookmarks tree widget item.
     bookmarksTreeWidgetItemPointer->setText(folderHelperPointer->FOLDER_NAME_COLUMN, i18nc("The bookmarks root tree widget name", "Bookmarks"));
-    bookmarksTreeWidgetItemPointer->setIcon(folderHelperPointer->FOLDER_NAME_COLUMN, QIcon::fromTheme("bookmarks"));
+    bookmarksTreeWidgetItemPointer->setIcon(folderHelperPointer->FOLDER_NAME_COLUMN, QIcon::fromTheme(QLatin1String("bookmarks"), QIcon::fromTheme(QLatin1String("bookmark-new"))));
     bookmarksTreeWidgetItemPointer->setText(folderHelperPointer->FOLDER_ID_COLUMN, QLatin1String("0"));
 
     // Add the bookmarks tree widget item to the root of the tree.

diff --git a/src/dialogs/BookmarksDialog.cpp b/src/dialogs/BookmarksDialog.cpp
index be150cc9e4f5d36ef3ec4d5ba4a885529a325503..0fa2b4f983f63721973139ad0b3f363d8265c789 100644 (file)
--- a/src/dialogs/BookmarksDialog.cpp
+++ b/src/dialogs/BookmarksDialog.cpp
@@ -161,7 +161,8 @@ void BookmarksDialog::populateBookmarks() const
     QList<QStandardItem*> bookmarksRootItemList;
 
     // Create the root items.
-    QStandardItem *rootItemNamePointer = new QStandardItem(QIcon::fromTheme("bookmarks"), i18nc("The bookmarks root tree widget name", "Bookmarks"));
+    QStandardItem *rootItemNamePointer = new QStandardItem(QIcon::fromTheme(QLatin1String("bookmarks"), QIcon::fromTheme(QLatin1String("bookmark-new"))),
+                                                           i18nc("The bookmarks root tree widget name", "Bookmarks"));
     QStandardItem *rootItemUrlPointer = new QStandardItem(QLatin1String(""));
     QStandardItem *rootItemDatabaseIdPonter = new QStandardItem(QLatin1String("-1"));  // The root item doesn't have a database ID.
     QStandardItem *rootItemDisplayOrderPointer = new QStandardItem(QLatin1String("-1"));  // The root item doesn't have a display order.

diff --git a/src/dialogs/CookiesDialog.cpp b/src/dialogs/CookiesDialog.cpp
index 3dc357f7e68bab2a9d05a68945dfe5e1218b3a80..4ca8c1c63a937c027923fafafec90e1d89b63e98 100644 (file)
--- a/src/dialogs/CookiesDialog.cpp
+++ b/src/dialogs/CookiesDialog.cpp
@@ -259,7 +259,7 @@ CookiesDialog::CookiesDialog(std::list<QNetworkCookie> *originalCookieListPointe
                                                                     QDialogButtonBox::ActionRole);
 
     // Set the button icons.
-    durableCookiesButtonPointer->setIcon(QIcon::fromTheme("view-visible"));
+    durableCookiesButtonPointer->setIcon(QIcon::fromTheme("view-visible", QIcon::fromTheme(QLatin1String("appointment-new"))));
 
     // Connect the buttons.
     connect(addCookieButtonPointer, SIGNAL(clicked()), this, SLOT(showAddCookieDialog()));

diff --git a/src/dialogs/EditBookmarkDialog.cpp b/src/dialogs/EditBookmarkDialog.cpp
index 6dd3f712471247b9e4bd0f33b02b723184fb3976..3a4d770eb740045e4891f8469e11f8110d7df0f8 100644 (file)
--- a/src/dialogs/EditBookmarkDialog.cpp
+++ b/src/dialogs/EditBookmarkDialog.cpp
@@ -57,6 +57,7 @@ EditBookmarkDialog::EditBookmarkDialog(const int databaseId, QIcon &currentWebsi
     // Set the favorite icons.
     currentFavoriteIconRadioButtonPointer->setIcon(bookmarkStructPointer->favoriteIcon);
     currentWebsiteFavoriteIconRadioButtonPointer->setIcon(currentWebsiteFavoriteIcon);
+    customFavoriteIconRadioButtonPointer->setIcon(QIcon::fromTheme(QLatin1String("globe"), QIcon::fromTheme(QLatin1String("applications-internet"))));
 
     // Instantiate a folder helper.
     folderHelperPointer = new FolderHelper();
@@ -75,7 +76,7 @@ EditBookmarkDialog::EditBookmarkDialog(const int databaseId, QIcon &currentWebsi
 
     // Populate the bookmarks tree widget item.
     bookmarksTreeWidgetItemPointer->setText(folderHelperPointer->FOLDER_NAME_COLUMN, i18nc("The bookmarks root tree widget name", "Bookmarks"));
-    bookmarksTreeWidgetItemPointer->setIcon(folderHelperPointer->FOLDER_NAME_COLUMN, QIcon::fromTheme("bookmarks"));
+    bookmarksTreeWidgetItemPointer->setIcon(folderHelperPointer->FOLDER_NAME_COLUMN, QIcon::fromTheme(QLatin1String("bookmarks"), QIcon::fromTheme(QLatin1String("bookmark-new"))));
     bookmarksTreeWidgetItemPointer->setText(folderHelperPointer->FOLDER_ID_COLUMN, QLatin1String("0"));
 
     // Add the bookmarks tree widget item to the root of the tree.

diff --git a/src/dialogs/EditFolderDialog.cpp b/src/dialogs/EditFolderDialog.cpp
index 4d332cea30d1061967a5e79b7ae7b206ec39adef..eb2bdcf4d4f51212533e0acbb72c9c96a1606986 100644 (file)
--- a/src/dialogs/EditFolderDialog.cpp
+++ b/src/dialogs/EditFolderDialog.cpp
@@ -74,7 +74,7 @@ EditFolderDialog::EditFolderDialog(const int databaseId, QIcon &currentWebsiteFa
 
     // Populate the bookmarks tree widget item.
     bookmarksTreeWidgetItemPointer->setText(folderHelperPointer->FOLDER_NAME_COLUMN, i18nc("The bookmarks root tree widget name", "Bookmarks"));
-    bookmarksTreeWidgetItemPointer->setIcon(folderHelperPointer->FOLDER_NAME_COLUMN, QIcon::fromTheme("bookmarks"));
+    bookmarksTreeWidgetItemPointer->setIcon(folderHelperPointer->FOLDER_NAME_COLUMN, QIcon::fromTheme(QLatin1String("bookmarks"), QIcon::fromTheme(QLatin1String("bookmark-new"))));
     bookmarksTreeWidgetItemPointer->setText(folderHelperPointer->FOLDER_ID_COLUMN, QLatin1String("0"));
 
     // Add the bookmarks tree widget item to the root of the tree.

diff --git a/src/helpers/UserAgentHelper.cpp b/src/helpers/UserAgentHelper.cpp
index 0f01bbba78113d1aa9db4f04f783bf0c7a4f2b5b..dd8d571c117ec0bc5fe86c5f9f66fddc0422e4f5 100644 (file)
--- a/src/helpers/UserAgentHelper.cpp
+++ b/src/helpers/UserAgentHelper.cpp
@@ -38,11 +38,11 @@ const QString UserAgentHelper::SAFARI_MACOS_DATABASE = QLatin1String("Safari mac
 
 // Define the public user agent constants.
 const QString UserAgentHelper::PRIVACY_BROWSER_USER_AGENT = QLatin1String("PrivacyBrowser/1.0");
-const QString UserAgentHelper::FIREFOX_LINUX_USER_AGENT = QLatin1String("Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0");
-const QString UserAgentHelper::CHROMIUM_LINUX_USER_AGENT = QLatin1String("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36");
-const QString UserAgentHelper::FIREFOX_WINDOWS_USER_AGENT = QLatin1String("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/113.0");
-const QString UserAgentHelper::CHROME_WINDOWS_USER_AGENT = QLatin1String("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36");
-const QString UserAgentHelper::EDGE_WINDOWS_USER_AGENT = QLatin1String("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36 Edg/114.0.1823.37");
+const QString UserAgentHelper::FIREFOX_LINUX_USER_AGENT = QLatin1String("Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0");
+const QString UserAgentHelper::CHROMIUM_LINUX_USER_AGENT = QLatin1String("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36");
+const QString UserAgentHelper::FIREFOX_WINDOWS_USER_AGENT = QLatin1String("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/118.0");
+const QString UserAgentHelper::CHROME_WINDOWS_USER_AGENT = QLatin1String("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36");
+const QString UserAgentHelper::EDGE_WINDOWS_USER_AGENT = QLatin1String("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 Edg/117.0.2045.60");
 const QString UserAgentHelper::SAFARI_MACOS_USER_AGENT = QLatin1String("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Safari/605.1.15");
 
 // Construct the class.

diff --git a/src/privacybrowser.1 b/src/privacybrowser.1
index 19f6e78cd474aea37804e3356536c6c31c61f374..e1eee5f4554a700ee9cbda49ffe586981399e3b1 100644 (file)
--- a/src/privacybrowser.1
+++ b/src/privacybrowser.1
@@ -16,7 +16,7 @@
 .\" along with Privacy Browser PC.  If not, see <http://www.gnu.org/licenses/>.
 
 .\" Title Header.
-.TH "Privacy Browser" 1 "13 June 2023" "version 0.4" "Privacy Browser User Manual"
+.TH "Privacy Browser" 1 "11 October 2023" "version 0.5" "Privacy Browser User Manual"
 
 .\" Section Header - Name.
 .SH NAME

diff --git a/src/ui.rcs/browserwindowui.rc b/src/ui.rcs/browserwindowui.rc
index c0e5a196febaec95eeb999728fe8e947ef196bc7..adcfa9d0c11487b734899d5f03a7e7c60f21439b 100644 (file)
--- a/src/ui.rcs/browserwindowui.rc
+++ b/src/ui.rcs/browserwindowui.rc
@@ -117,6 +117,6 @@
         <Action name="hide_find_actions" />
     </ToolBar>
 
-    <!-- The bookmarks toolbar. -->
+    <!-- The bookmarks toolbar. The newline aspect of this doesn't currently work. -->
     <ToolBar name="bookmarks_toolbar" iconText="icontextright" newline="true" hidden="true"> <text>Bookmarks Toolbar</text> </ToolBar>
 </gui>

diff --git a/src/uis/AddBookmarkDialog.ui b/src/uis/AddBookmarkDialog.ui
index 0fdaf33e20062c489f48096a1585dc59993837d3..d95486363b6a227c0c38925e5c5e9bf96792fb07 100644 (file)
--- a/src/uis/AddBookmarkDialog.ui
+++ b/src/uis/AddBookmarkDialog.ui
@@ -33,11 +33,11 @@
                                 <number>10</number>
                             </property>
 
-                            <!-- First row, default favorite icon. -->
+                            <!-- First row, website favorite icon. -->
                             <item>
-                                <widget class="QRadioButton" name="defaultFavoriteIconRadioButton">
+                                <widget class="QRadioButton" name="websiteFavoriteIconRadioButton">
                                     <property name="text">
-                                        <string>Default favorite icon</string>
+                                        <string>Website favorite icon</string>
                                     </property>
 
                                     <property name="checked">
@@ -60,10 +60,6 @@
                                         <string>Custom favorite icon</string>
                                     </property>
 
-                                    <property name="icon">
-                                        <iconset theme="globe"/>
-                                    </property>
-
                                     <property name="iconSize">
                                         <size>
                                             <height>32</height>

diff --git a/src/uis/BookmarksDialog.ui b/src/uis/BookmarksDialog.ui
index cce8b2a12319b13d641d436ccf0aeb6cff079113..fb7c4bbbd282ebe34fe39e33b5439edb4fd360fa 100644 (file)
--- a/src/uis/BookmarksDialog.ui
+++ b/src/uis/BookmarksDialog.ui
@@ -82,7 +82,7 @@
                             </property>
 
                             <property name="icon">
-                                <iconset theme="edit-entry" />
+                                <iconset theme="document-edit" />
                             </property>
                         </widget>
                     </item>

diff --git a/src/uis/CookiesDialog.ui b/src/uis/CookiesDialog.ui
index 32529cb4460ad467ff636782cdb55b8e24fea52e..c5436b184fa9cdf88ec8ad0d48bbf0f3f24e13d8 100644 (file)
--- a/src/uis/CookiesDialog.ui
+++ b/src/uis/CookiesDialog.ui
@@ -61,7 +61,7 @@
                             </property>
 
                             <property name="icon">
-                                <iconset theme="edit-entry" />
+                                <iconset theme="document-edit" />
                             </property>
                         </widget>
                     </item>
@@ -87,7 +87,7 @@
                             </property>
 
                             <property name="icon">
-                                <iconset theme="delete" />
+                                <iconset theme="edit-delete" />
                             </property>
                         </widget>
                     </item>

diff --git a/src/uis/EditBookmarkDialog.ui b/src/uis/EditBookmarkDialog.ui
index 68a84132710cd445f8705d1d7a4bffd8ceff7771..1ecfd7af6b25ccb0544168d30ffb2f641d9d5c46 100644 (file)
--- a/src/uis/EditBookmarkDialog.ui
+++ b/src/uis/EditBookmarkDialog.ui
@@ -76,10 +76,6 @@
                                         <string>Custom favorite icon</string>
                                     </property>
 
-                                    <property name="icon">
-                                        <iconset theme="globe"/>
-                                    </property>
-
                                     <property name="iconSize">
                                         <size>
                                             <height>32</height>

diff --git a/src/widgets/PrivacyWebEngineView.h b/src/widgets/PrivacyWebEngineView.h
index c0c47134fff55f5becabbdb5708294bf5e5668d5..3077681ca86030a7717883e52cc74c1d909ee18f 100644 (file)
--- a/src/widgets/PrivacyWebEngineView.h
+++ b/src/widgets/PrivacyWebEngineView.h
@@ -38,10 +38,10 @@ public:
     // The public variables.
     std::list<QNetworkCookie> *cookieListPointer = new std::list<QNetworkCookie>;
     double defaultZoomFactor = 1.00;
-    QString domainSettingsName = QStringLiteral("");
-    QIcon favoriteIcon = QIcon::fromTheme(QStringLiteral("globe"));
+    QString domainSettingsName = QLatin1String("");
+    QIcon favoriteIcon = QIcon::fromTheme(QLatin1String("globe"), QIcon::fromTheme(QLatin1String("applications-internet")));
     bool findCaseSensitive = false;
-    QString findString = QStringLiteral("");
+    QString findString = QLatin1String("");
     QWebEngineFindTextResult findTextResult = QWebEngineFindTextResult();
     bool isLoading = false;
     int loadProgressInt = -1;

diff --git a/src/widgets/TabWidget.cpp b/src/widgets/TabWidget.cpp
index 2f4582a9b2e6943af0b7c32982823315ae400aa0..84cd3aca089de34bcd188e3e5baa006508254595 100644 (file)
--- a/src/widgets/TabWidget.cpp
+++ b/src/widgets/TabWidget.cpp
@@ -936,9 +936,6 @@ void TabWidget::showSaveDialog(QWebEngineDownloadItem *webEngineDownloadItemPoin
                 // Prevent the notification from being autodeleted if it is closed.  Otherwise, the updates to the notification below cause a crash.
                 fileDownloadNotificationPointer->setAutoDelete(false);
 
-                // Display the notification.
-                fileDownloadNotificationPointer->sendEvent();
-
                 // Handle clicks on the cancel button.
                 connect(fileDownloadNotificationPointer, &KNotification::action1Activated, [webEngineDownloadItemPointer, saveFileName] ()
                 {
@@ -1003,6 +1000,9 @@ void TabWidget::showSaveDialog(QWebEngineDownloadItem *webEngineDownloadItemPoin
                     fileDownloadNotificationPointer->update();
                 });
 
+                // Display the notification.
+                fileDownloadNotificationPointer->sendEvent();
+
                 // Start the download.
                 webEngineDownloadItemPointer->accept();
             }

diff --git a/src/widgets/TabWidget.h b/src/widgets/TabWidget.h
index e036a2429f3640b1f8831856a1f678bc8f035587..41ba64c62f9e895707c096c2a185a992be2b2b15 100644 (file)
--- a/src/widgets/TabWidget.h
+++ b/src/widgets/TabWidget.h
@@ -139,7 +139,7 @@ private:
     QWebEnginePage *currentWebEnginePagePointer;
     QWebEngineProfile *currentWebEngineProfilePointer;
     QWebEngineSettings *currentWebEngineSettingsPointer;
-    QIcon defaultFavoriteIcon = QIcon::fromTheme(QStringLiteral("globe"));
+    QIcon defaultFavoriteIcon = QIcon::fromTheme(QLatin1String("globe"), QIcon::fromTheme(QLatin1String("applications-internet")));
     bool isRunningKde = false;
     QMovie *loadingFavoriteIconMoviePointer;
     QString searchEngineUrl;

diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp
index 805b592f5326375bb7e1b91a48beb8648657317c..8f8a0b0d78bfaec352cf3b2a44d2fbf9b0de3cbb 100644 (file)
--- a/src/windows/BrowserWindow.cpp
+++ b/src/windows/BrowserWindow.cpp
@@ -225,6 +225,7 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer)
     searchEngineYahooActionPointer->setIcon(QIcon::fromTheme(QLatin1String("im-yahoo"), QIcon::fromTheme(QLatin1String("edit-find"))));
     searchEngineCustomActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find")));
     zoomFactorActionPointer->setIcon(QIcon::fromTheme(QLatin1String("zoom-fit-best")));
+    editBookmarksActionPointer->setIcon(QIcon::fromTheme(QLatin1String("bookmark-edit"), QIcon::fromTheme(QLatin1String("bookmark-new"))));
     viewBookmarksToolBarActionPointer->setIcon(QIcon::fromTheme(QLatin1String("bookmarks")));
     domainSettingsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("settings-configure"), QIcon::fromTheme(QLatin1String("preferences-desktop"))));
     cookiesActionPointer->setIcon(QIcon::fromTheme(QLatin1String("preferences-web-browser-cookies"), QIcon::fromTheme(QLatin1String("appointment-new"))));
@@ -342,6 +343,8 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer)
     connect(findCaseSensitiveActionPointer, SIGNAL(triggered()), this, SLOT(toggleFindCaseSensitive()));
     connect(hideFindTextActionPointer, SIGNAL(triggered()), this, SLOT(hideFindTextActions()));
 
+
+
     // Setup the GUI based on the browserwindowui.rc file.
     setupGUI(StandardWindowOption::Default, ("browserwindowui.rc"));
 
@@ -644,7 +647,7 @@ void BrowserWindow::addFinalBookmarkFolderMenuActions(QMenu *menuPointer, double
     // Add the edit folder action to the menu if this is not the root bookmark menu.
     if (folderId != 0)
     {
-        QAction *editFolderActionPointer = menuPointer->addAction(QIcon::fromTheme(QLatin1String("edit-entry")), i18nc("The edit folder action", "Edit Folder"), [=]
+        QAction *editFolderActionPointer = menuPointer->addAction(QIcon::fromTheme(QLatin1String("document-edit")), i18nc("The edit folder action", "Edit Folder"), [=]
             {
                 // Get the current tab favorite icon.
                 QIcon currentTabFavoriteIcon = tabWidgetPointer->getCurrentTabFavoritIcon();
@@ -665,7 +668,7 @@ void BrowserWindow::addFinalBookmarkFolderMenuActions(QMenu *menuPointer, double
     }
 
     // Add the delete folder action to the menu.
-    QAction *deleteFolderActionPointer = menuPointer->addAction(QIcon::fromTheme(QLatin1String("delete")), i18nc("Delete folder context menu entry", "Delete Folder"), [=]
+    QAction *deleteFolderActionPointer = menuPointer->addAction(QIcon::fromTheme(QLatin1String("edit-delete")), i18nc("Delete folder context menu entry", "Delete Folder"), [=]
         {
             // Create an items to delete list.
             QList<int>* itemsToDeleteListPointer = new QList<int>;
@@ -1296,7 +1299,7 @@ void BrowserWindow::showBookmarkContextMenu(const QPoint &point)
             bookmarkContextMenuPointer->addSeparator();
 
             // Add the edit action to the menu.
-            bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("edit-entry")), i18nc("Edit bookmark context menu entry", "Edit"), [=]
+            bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("document-edit")), i18nc("Edit bookmark context menu entry", "Edit"), [=]
                 {
                     // Get the current tab favorite icon.
                     QIcon currentTabFavoriteIcon = tabWidgetPointer->getCurrentTabFavoritIcon();
@@ -1330,7 +1333,7 @@ void BrowserWindow::showBookmarkContextMenu(const QPoint &point)
             bookmarkContextMenuPointer->addSeparator();
 
             // Add the delete action to the menu.
-            bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("delete")), i18nc("Delete bookmark context menu entry", "Delete"), [=]
+            bookmarkContextMenuPointer->addAction(QIcon::fromTheme(QLatin1String("edit-delete")), i18nc("Delete bookmark context menu entry", "Delete"), [=]
                 {
                     // Get the parent folder ID.
                     double parentFolderId = BookmarksDatabase::getParentFolderId(databaseId);