// Add the standard actions.
KStandardAction::print(tabWidgetPointer, SLOT(print()), actionCollectionPointer);
- KStandardAction::printPreview(tabWidgetPointer, SLOT(printPreview()), actionCollectionPointer);
+ QAction *printPreviewActionPointer = KStandardAction::printPreview(tabWidgetPointer, SLOT(printPreview()), actionCollectionPointer);
KStandardAction::quit(qApp, SLOT(closeAllWindows()), actionCollectionPointer);
KStandardAction::redisplay(this, SLOT(refresh()), actionCollectionPointer);
fullScreenActionPointer = KStandardAction::fullScreen(this, SLOT(toggleFullScreen()), this, actionCollectionPointer);
// Add the custom actions.
QAction *newTabActionPointer = actionCollectionPointer->addAction(QLatin1String("new_tab"));
QAction *newWindowActionPointer = actionCollectionPointer->addAction(QLatin1String("new_window"));
+ QAction *reloadAndBypassCacheActionPointer = actionCollectionPointer->addAction(QLatin1String("reload_and_bypass_cache"));
+ viewSourceActionPointer = actionCollectionPointer->addAction(QLatin1String("view_source"));
+ QAction *viewSourceInNewTabActionPointer = actionCollectionPointer->addAction(QLatin1String("view_source_in_new_tab"));
userAgentPrivacyBrowserActionPointer = actionCollectionPointer->addAction(QLatin1String("user_agent_privacy_browser"));
userAgentWebEngineDefaultActionPointer = actionCollectionPointer->addAction(QLatin1String("user_agent_webengine_default"));
userAgentFirefoxLinuxActionPointer = actionCollectionPointer->addAction(QLatin1String("user_agent_firefox_linux"));
localStorageActionPointer->setCheckable(true);
domStorageActionPointer->setCheckable(true);
findCaseSensitiveActionPointer->setCheckable(true);
+ viewSourceActionPointer->setCheckable(true);
userAgentPrivacyBrowserActionPointer->setCheckable(true);
userAgentWebEngineDefaultActionPointer->setCheckable(true);
userAgentFirefoxLinuxActionPointer->setCheckable(true);
UserAgentHelper *userAgentHelperPointer = new UserAgentHelper();
// Set the action text.
+ viewSourceActionPointer->setText(i18nc("View source action", "View Source"));
+ viewSourceInNewTabActionPointer->setText(i18nc("View source in new tab action", "View Source in New Tab"));
newTabActionPointer->setText(i18nc("New tab action", "New Tab"));
newWindowActionPointer->setText(i18nc("New window action", "New Window"));
+ reloadAndBypassCacheActionPointer->setText(i18nc("Reload and bypass cache action", "Reload and Bypass Cache"));
userAgentPrivacyBrowserActionPointer->setText(userAgentHelperPointer->PRIVACY_BROWSER_TRANSLATED);
userAgentWebEngineDefaultActionPointer->setText(userAgentHelperPointer->WEB_ENGINE_DEFAULT_TRANSLATED);
userAgentFirefoxLinuxActionPointer->setText(userAgentHelperPointer->FIREFOX_LINUX_TRANSLATED);
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")));
+ reloadAndBypassCacheActionPointer->setIcon(QIcon::fromTheme(QLatin1String("view-refresh")));
+ viewSourceActionPointer->setIcon(QIcon::fromTheme(QLatin1String("view-choose"), QIcon::fromTheme(QLatin1String("accessories-text-editor"))));
+ viewSourceInNewTabActionPointer->setIcon(QIcon::fromTheme(QLatin1String("view-choose"), QIcon::fromTheme(QLatin1String("accessories-text-editor"))));
+ 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.
QKeySequence ctrlTKeySequence = QKeySequence(i18nc("The open new tab key sequence.", "Ctrl+T"));
QKeySequence ctrlNKeySequence = QKeySequence(i18nc("The open new window key sequence.", "Ctrl+N"));
+ QKeySequence ctrlF5KeySequence = QKeySequence(i18nc("The reload and bypass cache key sequence.", "Ctrl+F5"));
+ QKeySequence ctrlUKeySequence = QKeySequence(i18nc("The view source key sequence.", "Ctrl+U"));
+ QKeySequence ctrlShiftUKeySequence = QKeySequence(i18nc("The view source in new tab key sequence.", "Ctrl+Shift+U"));
+ QKeySequence ctrlShiftPKeySequence = QKeySequence(i18nc("The print preview key sequence.", "Ctrl+Shift+P"));
+ QKeySequence ctrlAltPKeySequence = QKeySequence(i18nc("The Privacy Browser user agent key sequence.", "Ctrl+Alt+P"));
+ QKeySequence ctrlAltWKeySequence = QKeySequence(i18nc("The WebEngine Default user agent key sequence.", "Ctrl+Alt+W"));
+ QKeySequence ctrlAltFKeySequence = QKeySequence(i18nc("The Firefox on Linux user agent key sequence.", "Ctrl+Alt+F"));
+ QKeySequence ctrlAltCKeySequence = QKeySequence(i18nc("The Chromium on Linux user agent key sequence.", "Ctrl+Alt+C"));
+ QKeySequence ctrlAltShiftFKeySequence = QKeySequence(i18nc("The Firefox on Windows user agent key sequence.", "Ctrl+Alt+Shift+F"));
+ QKeySequence ctrlAltShiftCKeySequence = QKeySequence(i18nc("The Chrome on Windows user agent key sequence.", "Ctrl+Alt+Shift+C"));
+ QKeySequence ctrlAltEKeySequence = QKeySequence(i18nc("The Edge on Windows user agent key sequence.", "Ctrl+Alt+E"));
+ QKeySequence ctrlAltSKeySequence = QKeySequence(i18nc("The Safari on macOS user agent key sequence.", "Ctrl+Alt+S"));
+ QKeySequence altShiftCKeySequence = QKeySequence(i18nc("The custom user agent key sequence.", "Alt+Shift+C"));
+ QKeySequence ctrlAltZKeySequence = QKeySequence(i18nc("The zoom factor key sequence.", "Ctrl+Alt+Z"));
+ QKeySequence ctrlShiftMKeySequence = QKeySequence(i18nc("The Mojeek search engine key sequence.", "Ctrl+Shift+M"));
+ QKeySequence ctrlShiftOKeySequence = QKeySequence(i18nc("The Monocles search engine key sequence.", "Ctrl+Shift+O"));
+ QKeySequence ctrlShiftEKeySequence = QKeySequence(i18nc("The MetaGer search engine key sequence.", "Ctrl+Shift+E"));
+ QKeySequence ctrlShiftGKeySequence = QKeySequence(i18nc("The Google search engine key sequence.", "Ctrl+Shift+G"));
+ QKeySequence ctrlShiftBKeySequence = QKeySequence(i18nc("The Bing search engine key sequence.", "Ctrl+Shift+B"));
+ QKeySequence ctrlShiftYKeySequence = QKeySequence(i18nc("The Yahoo search engine key sequence.", "Ctrl+Shift+Y"));
+ QKeySequence ctrlShiftCKeySequence = QKeySequence(i18nc("The custom search engine key sequence.", "Ctrl+Shift+C"));
+ QKeySequence ctrlDKeySequence = QKeySequence(i18nc("The domain settings key sequence.", "Ctrl+D"));
+ QKeySequence ctrlSemicolonKeySequence = QKeySequence(i18nc("The cookies dialog key sequence.", "Ctrl+;"));
// Set the action key sequences.
- newTabActionPointer->setShortcut(ctrlTKeySequence);
- newWindowActionPointer->setShortcut(ctrlNKeySequence);
+ actionCollectionPointer->setDefaultShortcut(newTabActionPointer, ctrlTKeySequence);
+ actionCollectionPointer->setDefaultShortcut(newWindowActionPointer, ctrlNKeySequence);
+ actionCollectionPointer->setDefaultShortcut(reloadAndBypassCacheActionPointer, ctrlF5KeySequence);
+ actionCollectionPointer->setDefaultShortcut(viewSourceActionPointer, ctrlUKeySequence);
+ actionCollectionPointer->setDefaultShortcut(viewSourceInNewTabActionPointer, ctrlShiftUKeySequence);
+ 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()));
connect(newWindowActionPointer, SIGNAL(triggered()), this, SLOT(newWindow()));
+ connect(reloadAndBypassCacheActionPointer, SIGNAL(triggered()), this, SLOT(reloadAndBypassCache()));
+ connect(viewSourceActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewSource()));
+ connect(viewSourceInNewTabActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewSourceInNewTab()));
connect(zoomFactorActionPointer, SIGNAL(triggered()), this, SLOT(getZoomFactorFromUser()));
connect(cookiesActionPointer, SIGNAL(triggered()), this, SLOT(showCookiesDialog()));
connect(domainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(showDomainSettingsDialog()));
findTextLineEditPointer->setClearButtonEnabled(true);
// Add an edit or add domain settings action to the URL line edit.
- QAction *addOrEditDomainSettingsActionPointer = urlLineEditPointer->addAction(QIcon::fromTheme("settings-configure"), QLineEdit::TrailingPosition);
+ QAction *addOrEditDomainSettingsActionPointer = urlLineEditPointer->addAction(QIcon::fromTheme("settings-configure", QIcon::fromTheme(QLatin1String("preferences-desktop"))),
+ QLineEdit::TrailingPosition);
// Add or edit the current domain settings.
connect(addOrEditDomainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(addOrEditDomainSettings()));
domainSettingsDialogPointer = new DomainSettingsDialog(DomainSettingsDialog::EDIT_DOMAIN, currentDomainSettingsName);
}
- // Set the dialog window title.
- domainSettingsDialogPointer->setWindowTitle(i18nc("The domain settings dialog title", "Domain Settings"));
-
- // Set the modality.
- domainSettingsDialogPointer->setWindowModality(Qt::WindowModality::WindowModal);;
+ // Reload the tabs when domain settings are updated.
+ connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), tabWidgetPointer, SLOT(applyDomainSettingsAndReload()));
// Show the dialog.
domainSettingsDialogPointer->show();
-
- // Reload the tabs when domain settings are updated.
- connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), tabWidgetPointer, SLOT(applyDomainSettingsAndReload()));
}
void BrowserWindow::back() const
}
else if (!findTextLineEditPointer->text().isEmpty()) // Find text is populated.
{
- // Clear the text in the line edit.
+ // Clear the find text line edit.
findTextLineEditPointer->clear();
// Clear the search in the WebEngine.
tabWidgetPointer->refresh();
}
+void BrowserWindow::reloadAndBypassCache() const
+{
+ // Remove the focus from the URL line edit.
+ urlLineEditPointer->clearFocus();
+
+ // Refresh the web page.
+ tabWidgetPointer->refresh();
+}
+
void BrowserWindow::showCookiesDialog()
{
// Remove the focus from the URL line edit.
// Instantiate the domain settings dialog.
DomainSettingsDialog *domainSettingsDialogPointer = new DomainSettingsDialog();
- // Show the dialog.
- domainSettingsDialogPointer->show();
-
// Reload the tabs when domain settings are updated.
connect(domainSettingsDialogPointer, SIGNAL(domainSettingsUpdated()), tabWidgetPointer, SLOT(applyDomainSettingsAndReload()));
+
+ // Show the dialog.
+ domainSettingsDialogPointer->show();
}
void BrowserWindow::showFindTextActions() const
// Add each dictionary to the spell check list widget.
foreach(QString dictionaryString, dictionariesStringList)
{
- // Create a new list widget item pointer named after the dictionary string.
- QListWidgetItem *listWidgetItemPointer = new QListWidgetItem(dictionaryString, spellCheckListWidgetPointer);
+ // Create a new list widget item pointer.
+ QListWidgetItem *listWidgetItemPointer = new QListWidgetItem();
- // Set the list widget item pointer to be checkable.
- listWidgetItemPointer->setFlags(listWidgetItemPointer->flags() | Qt::ItemIsUserCheckable);
+ // Create a dictionary check box widget with the name of the dictionary string.
+ QCheckBox *dictionaryCheckBoxWidget = new QCheckBox(dictionaryString);
// Check the language if it is currently enabled.
if (enabledSpellCheckLanguagesList.contains(dictionaryString))
- listWidgetItemPointer->setCheckState(Qt::Checked);
+ dictionaryCheckBoxWidget->setCheckState(Qt::Checked);
else
- listWidgetItemPointer->setCheckState(Qt::Unchecked);
+ dictionaryCheckBoxWidget->setCheckState(Qt::Unchecked);
- // Add the list widget item to the widget.
+ // Add the list widget item to the spell check list widget.
spellCheckListWidgetPointer->addItem(listWidgetItemPointer);
+
+ // Set the list widget item check box widget.
+ spellCheckListWidgetPointer->setItemWidget(listWidgetItemPointer, dictionaryCheckBoxWidget);
}
// Get a handle for the KConfig skeleton.
// 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.
// Get the language item.
QListWidgetItem *languageItemPointer = spellCheckListWidgetPointer->item(i);
+ // Get the language check box.
+ QCheckBox *languageCheckBoxPointer = qobject_cast<QCheckBox*>(spellCheckListWidgetPointer->itemWidget(languageItemPointer));
+
// Add the item to the enabled languages if it is checked.
- if (languageItemPointer->checkState() == Qt::Checked)
- newSpellCheckLanguages.append(languageItemPointer->text());
+ if (languageCheckBoxPointer->checkState() == Qt::Checked)
+ {
+ // Get the text.
+ QString languageString = languageCheckBoxPointer->text();
+
+ // Remove all instances of `&`, which may have been added automatically when creating the check box text.
+ languageString.remove(QChar('&'));
+
+ // Add the language string to the list.
+ newSpellCheckLanguages.append(languageString);
+ }
}
// Update the spell check languages.
}
}
+void BrowserWindow::toggleViewSource() const
+{
+ // Get the current URL.
+ QString url = urlLineEditPointer->text();
+
+ // Toggle the URL.
+ if (url.startsWith(QLatin1String("view-source:"))) // The source is currently being viewed.
+ {
+ // Remove `view-source:` from the URL.
+ url = url.remove(0, 12);
+ }
+ else // The source is not currently being viewed.
+ {
+ // Prepend `view-source:` from the URL.
+ url = url.prepend(QLatin1String("view-source:"));
+ }
+
+ // Make it so.
+ loadUrlFromLineEdit(url);
+}
+
+void BrowserWindow::toggleViewSourceInNewTab() const
+{
+ // Get the current URL.
+ QString url = urlLineEditPointer->text();
+
+ // Toggle the URL.
+ if (url.startsWith(QLatin1String("view-source:"))) // The source is currently being viewed.
+ {
+ // Remove `view-source:` from the URL.
+ url = url.remove(0, 12);
+ }
+ else // The source is not currently being viewed.
+ {
+ // Prepend `view-source:` from the URL.
+ url = url.prepend(QLatin1String("view-source:"));
+ }
+
+ // Add the new tab. `true` removes the URL line edit focus, `false` does not open a background tab.
+ tabWidgetPointer->addTab(true, false, url);
+}
+
void BrowserWindow::updateCookiesAction(const int numberOfCookies) const
{
// Update the action text.
// 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);
// 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/document-save-as.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);
// 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"));
}
// 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"));
}
// 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"));
}
// 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"));
}
// 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"));
}
// 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"));
}
// 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"));
// 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"));
}
// 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"));
}
// 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"));
}
// 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"));
}
// 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"));
}
// 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"));
}
// 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"));
}
// 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"));
}
// 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"));
void BrowserWindow::updateUrlLineEdit(const QUrl &newUrl)
{
+ // Get the new URL string.
+ QString newUrlString = newUrl.toString();
+
+ // Update the view source checkbox.
+ viewSourceActionPointer->setChecked(newUrlString.startsWith(QLatin1String("view-source:")));
+
// Update the URL line edit if it does not have focus.
if (!urlLineEditPointer->hasFocus())
{
- // Get the new URL string.
- QString newUrlString = newUrl.toString();
-
// Update the URL line edit.
urlLineEditPointer->setText(newUrlString);
projects / PrivacyBrowserPC.git / blobdiff