Fix missing icons on Gnome. https://redmine.stoutner.com/issues/993

[PrivacyBrowserPC.git] / src / windows / BrowserWindow.cpp

diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp
index fcca8e8f70351ef7c91b544ee524861b72ff9b1f..6347ec404cadf44203b22dc6d0867663714cc00c 100644 (file)
--- a/src/windows/BrowserWindow.cpp
+++ b/src/windows/BrowserWindow.cpp
@@ -172,30 +172,36 @@ BrowserWindow::BrowserWindow(bool firstWindow) : KXmlGuiWindow()
     findCaseSensitiveActionPointer->setText(i18nc("Find Case Sensitive action", "Find Case Sensitive"));
     hideFindTextActionPointer->setText(i18nc("Hide Find Text action", "Hide Find Text"));
 
-    // Set the action icons.
+    // Set the action icons.  Gnome doesn't contain some of the icons that KDE has.
+    // The toolbar icons don't pick up unless the size is explicit, probably because the toolbar ends up being an intermediate size.
     newTabActionPointer->setIcon(QIcon::fromTheme(QLatin1String("tab-new")));
     newWindowActionPointer->setIcon(QIcon::fromTheme(QLatin1String("window-new")));
-    userAgentPrivacyBrowserActionPointer->setIcon(QIcon(":/icons/privacy-mode"));
-    userAgentWebEngineDefaultActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties")));
-    userAgentFirefoxLinuxActionPointer->setIcon(QIcon::fromTheme(QLatin1String("firefox-esr")));
-    userAgentChromiumLinuxActionPointer->setIcon(QIcon::fromTheme(QLatin1String("chromium")));
-    userAgentFirefoxWindowsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("firefox-esr")));
-    userAgentChromeWindowsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("chromium")));
-    userAgentEdgeWindowsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties")));
-    userAgentSafariMacosActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties")));
-    userAgentCustomActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties")));
-    searchEngineMojeekActionPointer->setIcon(QIcon::fromTheme(QLatin1String("search")));
-    searchEngineMonoclesActionPointer->setIcon(QIcon::fromTheme(QLatin1String("search")));
-    searchEngineMetagerActionPointer->setIcon(QIcon::fromTheme(QLatin1String("search")));
-    searchEngineGoogleActionPointer->setIcon(QIcon::fromTheme(QLatin1String("im-google")));
-    searchEngineBingActionPointer->setIcon(QIcon::fromTheme(QLatin1String("search")));
-    searchEngineYahooActionPointer->setIcon(QIcon::fromTheme(QLatin1String("im-yahoo")));
-    searchEngineCustomActionPointer->setIcon(QIcon::fromTheme(QLatin1String("search")));
-    zoomFactorActionPointer->setIcon(QIcon::fromTheme(QLatin1String("zoom")));
-    domainSettingsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("settings-configure")));
-    cookiesActionPointer->setIcon(QIcon::fromTheme(QLatin1String("preferences-web-browser-cookies")));
-    domStorageActionPointer->setIcon(QIcon::fromTheme(QLatin1String("code-class")));
-    findCaseSensitiveActionPointer->setIcon(QIcon::fromTheme(QLatin1String("format-text-lowercase")));
+    userAgentPrivacyBrowserActionPointer->setIcon(QIcon(":/icons/privacy-mode.svg"));
+    userAgentWebEngineDefaultActionPointer->setIcon(QIcon::fromTheme(QLatin1String("qtlogo"), QIcon::fromTheme(QLatin1String("user-group-properties"),
+                                                                                                               QIcon::fromTheme(QLatin1String("contact-new")))));
+    userAgentFirefoxLinuxActionPointer->setIcon(QIcon::fromTheme(QLatin1String("firefox-esr"), QIcon::fromTheme(QLatin1String("user-group-properties"),
+                                                                                                                QIcon::fromTheme(QLatin1String("contact-new")))));
+    userAgentChromiumLinuxActionPointer->setIcon(QIcon::fromTheme(QLatin1String("chromium"), QIcon::fromTheme(QLatin1String("user-group-properties"),
+                                                                                                              QIcon::fromTheme(QLatin1String("contact-new")))));
+    userAgentFirefoxWindowsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("firefox-esr"), QIcon::fromTheme(QLatin1String("user-group-properties"),
+                                                                                                                  QIcon::fromTheme(QLatin1String("contact-new")))));
+    userAgentChromeWindowsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("chromium"), QIcon::fromTheme(QLatin1String("user-group-properties"),
+                                                                                                              QIcon::fromTheme(QLatin1String("contact-new")))));
+    userAgentEdgeWindowsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))));
+    userAgentSafariMacosActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))));
+    userAgentCustomActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))));
+    searchEngineMojeekActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find")));
+    searchEngineMonoclesActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find")));
+    searchEngineMetagerActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find")));
+    searchEngineGoogleActionPointer->setIcon(QIcon::fromTheme(QLatin1String("im-google"), QIcon::fromTheme(QLatin1String("edit-find"))));
+    searchEngineBingActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find")));
+    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")));
+    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"))));
+    domStorageActionPointer->setIcon(QIcon::fromTheme(QLatin1String("code-class"), QIcon(QLatin1String("/usr/share/icons/gnome/32x32/actions/gtk-unindent-ltr.png"))));
+    findCaseSensitiveActionPointer->setIcon(QIcon::fromTheme(QLatin1String("format-text-lowercase"), QIcon::fromTheme(QLatin1String("/usr/share/icons/gnome/32x32/apps/fonts.png"))));
     hideFindTextActionPointer->setIcon(QIcon::fromTheme(QLatin1String("window-close-symbolic")));
 
     // Create the key sequences.
@@ -788,9 +794,24 @@ void BrowserWindow::showSettingsDialog()
     // Instantiate a settings config dialog from the settings.kcfg file.
     configDialogPointer = new KConfigDialog(this, QLatin1String("settings"), kConfigSkeletonPointer);
 
+    // Create a settings icon string.
+    QString settingsIconString;
+
+    // Get a settings icon that matches the theme.
+    if (QIcon::hasThemeIcon("breeze-settings"))
+    {
+        // KDE uses breeze-settings.
+        settingsIconString = QLatin1String("breeze-settings");
+    }
+    else
+    {
+        // Gnome uses preferences-desktop.
+        settingsIconString = QLatin1String("preferences-desktop");
+    }
+
     // Add the settings widgets as config dialog pages.
-    configDialogPointer->addPage(privacySettingsWidgetPointer, i18nc("Settings tab title", "Privacy"), QLatin1String("privacy-browser"));
-    configDialogPointer->addPage(generalSettingsWidgetPointer, i18nc("Settings tab title", "General"), QLatin1String("breeze-settings"));
+    configDialogPointer->addPage(privacySettingsWidgetPointer, i18nc("Settings tab title", "Privacy"), QLatin1String("privacybrowser"));
+    configDialogPointer->addPage(generalSettingsWidgetPointer, i18nc("Settings tab title", "General"), settingsIconString);
     configDialogPointer->addPage(spellCheckSettingsWidgetPointer, i18nc("Settings tab title", "Spell Check"), QLatin1String("tools-check-spelling"));
 
     // Get handles for the buttons.
@@ -1006,9 +1027,9 @@ void BrowserWindow::updateJavaScriptAction(const bool &isEnabled)
 
     // Set the icon according to the status.
     if (javaScriptEnabled)
-        javaScriptActionPointer->setIcon(QIcon(QStringLiteral(":/icons/javascript-warning")));
+        javaScriptActionPointer->setIcon(QIcon(QLatin1String(":/icons/javascript-warning.svg")));
     else
-        javaScriptActionPointer->setIcon(QIcon(QStringLiteral(":/icons/privacy-mode")));
+        javaScriptActionPointer->setIcon(QIcon(QLatin1String(":/icons/privacy-mode.svg")));
 
     // Set the action checked status.
     javaScriptActionPointer->setChecked(javaScriptEnabled);
@@ -1022,11 +1043,11 @@ void BrowserWindow::updateLocalStorageAction(const bool &isEnabled)
     // Update the local storage status.
     localStorageEnabled = isEnabled;
 
-    // Update the icon.
+    // Update the icon.  On Gnome, the toolbar icons don't pick up unless the size is explicit, probably because the toolbar ends up being an intermediate size.
     if (localStorageEnabled)
-        localStorageActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("disk-quota-high")));
+        localStorageActionPointer->setIcon(QIcon::fromTheme(QLatin1String("disk-quota-high"), QIcon(QLatin1String("/usr/share/icons/gnome/32x32/actions/filesaveas.png"))));
     else
-        localStorageActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("disk-quota")));
+        localStorageActionPointer->setIcon(QIcon::fromTheme(QLatin1String("disk-quota"), QIcon(QLatin1String("/usr/share/icons/gnome/32x32/apps/kfm.png"))));
 
     // Set the action checked status.
     localStorageActionPointer->setChecked(localStorageEnabled);
@@ -1045,6 +1066,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const
         // Check the Mojeek user agent action.
         searchEngineMojeekActionPointer->setChecked(true);
 
+        // Update the search engine menu action icon.
+        searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find")));
+
         // Update the search engine menu action text.
         searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Mojeek"));
     }
@@ -1053,6 +1077,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const
         // Check the Monocles user agent action.
         searchEngineMonoclesActionPointer->setChecked(true);
 
+        // Update the search engine menu action icon.
+        searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find")));
+
         // Update the search engine menu action text.
         searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Monocles"));
     }
@@ -1061,6 +1088,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const
         // Check the MetaGer user agent action.
         searchEngineMetagerActionPointer->setChecked(true);
 
+        // Update the search engine menu action icon.
+        searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find")));
+
         // Update the search engine menu action text.
         searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - MetaGer"));
     }
@@ -1069,6 +1099,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const
         // Check the Google user agent action.
         searchEngineGoogleActionPointer->setChecked(true);
 
+        // Update the search engine menu action icon.
+        searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("im-google"), QIcon::fromTheme(QLatin1String("edit-find"))));
+
         // Update the search engine menu action text.
         searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Google"));
     }
@@ -1077,6 +1110,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const
         // Check the Bing user agent action.
         searchEngineBingActionPointer->setChecked(true);
 
+        // Update the search engine menu action icon.
+        searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find")));
+
         // Update the search engine menu action text.
         searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Bing"));
     }
@@ -1085,6 +1121,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const
         // Check the Yahoo user agent action.
         searchEngineYahooActionPointer->setChecked(true);
 
+        // Update the search engine menu action icon.
+        searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("im-yahoo"), QIcon::fromTheme(QLatin1String("edit-find"))));
+
         // Update the search engine menu action text.
         searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Yahoo"));
     }
@@ -1093,6 +1132,9 @@ void BrowserWindow::updateSearchEngineActions(const QString &searchEngine, const
         // Check the user agent.
         searchEngineCustomActionPointer->setChecked(true);
 
+        // Update the search engine menu action icon.
+        searchEngineMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find")));
+
         // Update the search engine menu action text.
         searchEngineMenuActionPointer->setText(i18nc("The main search engine menu action", "Search Engine - Custom"));
 
@@ -1134,6 +1176,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool
         // Check the Privacy Browser user agent action.
         userAgentPrivacyBrowserActionPointer->setChecked(true);
 
+        // Update the user agent menu action icon.
+        userAgentMenuActionPointer->setIcon(QIcon(":/icons/privacy-mode.svg"));
+
         // Update the user agent menu action text.
         userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Privacy Browser"));
     }
@@ -1142,6 +1187,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool
         // check the WebEngine default user agent action.
         userAgentWebEngineDefaultActionPointer->setChecked(true);
 
+        // Update the user agent menu action icon.
+        userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("qtlogo"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new")))));
+
         // Update the user agent menu action text.
         userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - WebEngine default"));
     }
@@ -1150,6 +1198,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool
         // Check the Firefox on Linux user agent action.
         userAgentFirefoxLinuxActionPointer->setChecked(true);
 
+        // Update the user agent menu action icon.
+        userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("firefox-esr"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new")))));
+
         // Update the user agent menu action text.
         userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Firefox on Linux"));
     }
@@ -1158,6 +1209,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool
         // Check the Chromium on Linux user agent action.
         userAgentChromiumLinuxActionPointer->setChecked(true);
 
+        // Update the user agent menu action icon.
+        userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("chromium"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new")))));
+
         // Update the user agent menu action text.
         userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Chromium on Linux"));
     }
@@ -1166,6 +1220,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool
         // Check the Firefox on Windows user agent action.
         userAgentFirefoxWindowsActionPointer->setChecked(true);
 
+        // Update the user agent menu action icon.
+        userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("firefox-esr"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new")))));
+
         // Update the user agent menu action text.
         userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Firefox on Windows"));
     }
@@ -1174,6 +1231,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool
         // Check the Chrome on Windows user agent action.
         userAgentChromeWindowsActionPointer->setChecked(true);
 
+        // Update the user agent menu action icon.
+        userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("chromium"), QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new")))));
+
         // Update the user agent menu action text.
         userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Chrome on Windows"));
     }
@@ -1182,6 +1242,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool
         // Check the Edge on Windows user agent action.
         userAgentEdgeWindowsActionPointer->setChecked(true);
 
+        // Update the user agent menu action icon.
+        userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))));
+
         // Update the user agent menu action text.
         userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Edge on Windows"));
     }
@@ -1190,6 +1253,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool
         // Check the Safari on macOS user agent action.
         userAgentSafariMacosActionPointer->setChecked(true);
 
+        // Update the user agent menu action icon.
+        userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))));
+
         // Update the user agent menu action text.
         userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Safari on macOS"));
     }
@@ -1198,6 +1264,9 @@ void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool
         // Check the user agent.
         userAgentCustomActionPointer->setChecked(true);
 
+        // Update the user agent menu action icon.
+        userAgentMenuActionPointer->setIcon(QIcon::fromTheme(QLatin1String("user-group-properties"), QIcon::fromTheme(QLatin1String("contact-new"))));
+
         // Update the user agent menu action text.
         userAgentMenuActionPointer->setText(i18nc("The main user agent menu action", "User Agent - Custom"));