KStandardAction::print(tabWidgetPointer, SLOT(print()), actionCollectionPointer);
QAction *printPreviewActionPointer = KStandardAction::printPreview(tabWidgetPointer, SLOT(printPreview()), actionCollectionPointer);
KStandardAction::quit(qApp, SLOT(closeAllWindows()), actionCollectionPointer);
+ zoomInActionPointer = KStandardAction::zoomIn(this, SLOT(incrementZoom()), actionCollectionPointer);
+ zoomOutActionPointer = KStandardAction::zoomOut(this, SLOT(decrementZoom()), actionCollectionPointer);
KStandardAction::redisplay(this, SLOT(refresh()), actionCollectionPointer);
fullScreenActionPointer = KStandardAction::fullScreen(this, SLOT(toggleFullScreen()), this, actionCollectionPointer);
QAction *backActionPointer = KStandardAction::back(this, SLOT(back()), actionCollectionPointer);
// Add the custom actions.
QAction *newTabActionPointer = actionCollectionPointer->addAction(QLatin1String("new_tab"));
QAction *newWindowActionPointer = actionCollectionPointer->addAction(QLatin1String("new_window"));
+ zoomDefaultActionPointer = actionCollectionPointer->addAction(QLatin1String("zoom_default"));
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"));
+ 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"));
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"));
+ zoomDefaultActionPointer->setText(i18nc("Zoom default action", "Zoom Default"));
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);
localStorageActionPointer->setText(i18nc("The Local Storage action", "Local Storage"));
domStorageActionPointer->setText(i18nc("DOM Storage action", "DOM Storage"));
findCaseSensitiveActionPointer->setText(i18nc("Find Case Sensitive action", "Find Case Sensitive"));
- hideFindTextActionPointer->setText(i18nc("Hide Find Text action", "Hide Find Text"));
+ hideFindTextActionPointer->setText(i18nc("Hide Find Text action (the text should include the language-specific escape keyboard shortcut).", "Hide Find Text (Esc)"));
// 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")));
+ zoomDefaultActionPointer->setIcon(QIcon::fromTheme(QLatin1String("zoom-fit-best")));
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"))));
// 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 ctrl0KeySequence = QKeySequence(i18nc("The zoom default key sequence.", "Ctrl+0"));
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 ctrlJKeySequence = QKeySequence(i18nc("The JavaScript key sequence.", "Ctrl+J"));
+ QKeySequence ctrlLKeySequence = QKeySequence(i18nc("The local storage key sequence.", "Ctrl+L"));
+ QKeySequence ctrlDKeySequence = QKeySequence(i18nc("The DOM storage key sequence.", "Ctrl+D"));
+ QKeySequence ctrlSKeySequence = QKeySequence(i18nc("The find case sensitive key sequence.", "Ctrl+S"));
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 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 ctrlShiftDKeySequence = QKeySequence(i18nc("The domain settings key sequence.", "Ctrl+Shift+D"));
QKeySequence ctrlSemicolonKeySequence = QKeySequence(i18nc("The cookies dialog key sequence.", "Ctrl+;"));
// Set the action key sequences.
actionCollectionPointer->setDefaultShortcut(newTabActionPointer, ctrlTKeySequence);
actionCollectionPointer->setDefaultShortcut(newWindowActionPointer, ctrlNKeySequence);
+ actionCollectionPointer->setDefaultShortcut(zoomDefaultActionPointer, ctrl0KeySequence);
actionCollectionPointer->setDefaultShortcut(reloadAndBypassCacheActionPointer, ctrlF5KeySequence);
actionCollectionPointer->setDefaultShortcut(viewSourceActionPointer, ctrlUKeySequence);
actionCollectionPointer->setDefaultShortcut(viewSourceInNewTabActionPointer, ctrlShiftUKeySequence);
actionCollectionPointer->setDefaultShortcut(printPreviewActionPointer, ctrlShiftPKeySequence);
+ actionCollectionPointer->setDefaultShortcut(javaScriptActionPointer, ctrlJKeySequence);
+ actionCollectionPointer->setDefaultShortcut(localStorageActionPointer, ctrlLKeySequence);
+ actionCollectionPointer->setDefaultShortcut(domStorageActionPointer, ctrlDKeySequence);
+ actionCollectionPointer->setDefaultShortcut(findCaseSensitiveActionPointer, ctrlSKeySequence);
actionCollectionPointer->setDefaultShortcut(userAgentPrivacyBrowserActionPointer, ctrlAltPKeySequence);
actionCollectionPointer->setDefaultShortcut(userAgentWebEngineDefaultActionPointer, ctrlAltWKeySequence);
actionCollectionPointer->setDefaultShortcut(userAgentFirefoxLinuxActionPointer, ctrlAltFKeySequence);
actionCollectionPointer->setDefaultShortcut(searchEngineBingActionPointer, ctrlShiftBKeySequence);
actionCollectionPointer->setDefaultShortcut(searchEngineYahooActionPointer, ctrlShiftYKeySequence);
actionCollectionPointer->setDefaultShortcut(searchEngineCustomActionPointer, ctrlShiftCKeySequence);
- actionCollectionPointer->setDefaultShortcut(domainSettingsActionPointer, ctrlDKeySequence);
+ actionCollectionPointer->setDefaultShortcut(domainSettingsActionPointer, ctrlShiftDKeySequence);
actionCollectionPointer->setDefaultShortcut(cookiesActionPointer, ctrlSemicolonKeySequence);
// Execute the actions.
connect(newTabActionPointer, SIGNAL(triggered()), tabWidgetPointer, SLOT(addTab()));
connect(newWindowActionPointer, SIGNAL(triggered()), this, SLOT(newWindow()));
+ connect(zoomDefaultActionPointer, SIGNAL(triggered()), this, SLOT(zoomDefault()));
connect(reloadAndBypassCacheActionPointer, SIGNAL(triggered()), this, SLOT(reloadAndBypassCache()));
connect(viewSourceActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewSource()));
connect(viewSourceInNewTabActionPointer, SIGNAL(triggered()), this, SLOT(toggleViewSourceInNewTab()));
// Update the on-the-fly menus.
connect(tabWidgetPointer, SIGNAL(updateUserAgentActions(QString, bool)), this, SLOT(updateUserAgentActions(QString, bool)));
- connect(tabWidgetPointer, SIGNAL(updateZoomFactorAction(double)), this, SLOT(updateZoomFactorAction(double)));
+ connect(tabWidgetPointer, SIGNAL(updateZoomActions(double)), this, SLOT(updateZoomActions(double)));
connect(tabWidgetPointer, SIGNAL(updateSearchEngineActions(QString, bool)), this, SLOT(updateSearchEngineActions(QString, bool)));
// Apply the on-the-fly settings when selected.
// Process cookie changes.
connect(tabWidgetPointer, SIGNAL(updateCookiesAction(int)), this, SLOT(updateCookiesAction(int)));
+ // Store the default zoom factor.
+ connect(tabWidgetPointer, SIGNAL(updateDefaultZoomFactor(double)), this, SLOT(updateDefaultZoomFactor(double)));
+
// Connect the URL toolbar actions.
connect(javaScriptActionPointer, SIGNAL(triggered()), this, SLOT(toggleJavaScript()));
connect(localStorageActionPointer, SIGNAL(triggered()), this, SLOT(toggleLocalStorage()));
// Get a handle for the status bar.
QStatusBar *statusBarPointer = statusBar();
- // Create a progress bar.
+ // Create the status bar widgets.
progressBarPointer = new QProgressBar();
+ zoomMinusButtonPointer = new QPushButton();
+ currentZoomButtonPointer = new QPushButton();
+ zoomPlusButtonPointer = new QPushButton();
+
+ // Set the button icons.
+ zoomMinusButtonPointer->setIcon(QIcon::fromTheme(QStringLiteral("list-remove-symbolic")));
+ zoomPlusButtonPointer->setIcon(QIcon::fromTheme(QStringLiteral("list-add-symbolic")));
+
+ // Set the button icons to be flat (no borders).
+ zoomMinusButtonPointer->setFlat(true);
+ currentZoomButtonPointer->setFlat(true);
+ zoomPlusButtonPointer->setFlat(true);
- // Add the progress bar to to the status bar.
+ // Handle clicks on the zoom buttons.
+ connect(zoomMinusButtonPointer, SIGNAL(clicked()), this, SLOT(decrementZoom()));
+ connect(currentZoomButtonPointer, SIGNAL(clicked()), this, SLOT(getZoomFactorFromUser()));
+ connect(zoomPlusButtonPointer, SIGNAL(clicked()), this, SLOT(incrementZoom()));
+
+ // Remove the padding around the current zoom button text.
+ currentZoomButtonPointer->setStyleSheet("padding: 0px;");
+
+ // Add the widgets to the far right of the status bar.
statusBarPointer->addPermanentWidget(progressBarPointer);
+ statusBarPointer->addPermanentWidget(zoomMinusButtonPointer);
+ statusBarPointer->addPermanentWidget(currentZoomButtonPointer);
+ statusBarPointer->addPermanentWidget(zoomPlusButtonPointer);
// Update the status bar with the URL when a link is hovered.
connect(tabWidgetPointer, SIGNAL(linkHovered(QString)), statusBarPointer, SLOT(showMessage(QString)));
updateLocalStorageAction(Settings::localStorageEnabled());
updateDomStorageAction(Settings::domStorageEnabled());
updateUserAgentActions(UserAgentHelper::getUserAgentFromDatabaseName(Settings::userAgent()), true);
- updateZoomFactorAction(Settings::zoomFactor());
+ updateZoomActions(Settings::zoomFactor());
// Load the initial website if this is the first window.
if (firstWindow)
urlLineEditPointer->clearFocus();
}
+void BrowserWindow::decrementZoom()
+{
+ // Update the current zoom factor.
+ currentZoomFactor = currentZoomFactor - 0.25;
+
+ // Check to make sure the zoom factor is in the valid range (0.25 to 5.00).
+ if (currentZoomFactor < 0.25)
+ currentZoomFactor = 0.25;
+
+ // Set the new zoom factor.
+ tabWidgetPointer->applyOnTheFlyZoomFactor(currentZoomFactor);
+
+ // Update the on-the-fly action text.
+ updateZoomActions(currentZoomFactor);
+}
+
void BrowserWindow::escape() const
{
// Process the escape according to the status of the browser.
// Update the zoom factor if the user clicked OK.
if (okClicked)
{
- // Update the current zoom factor.
- currentZoomFactor = newZoomFactor;
-
// Set the new zoom factor.
tabWidgetPointer->applyOnTheFlyZoomFactor(newZoomFactor);
// Update the on-the-fly action text.
- updateZoomFactorAction(newZoomFactor);
+ updateZoomActions(newZoomFactor);
}
}
tabWidgetPointer->home();
}
+void BrowserWindow::incrementZoom()
+{
+ // Update the current zoom factor.
+ currentZoomFactor = currentZoomFactor + 0.25;
+
+ // Check to make sure the zoom factor is in the valid range (0.25 to 5.00).
+ if (currentZoomFactor > 5.0)
+ currentZoomFactor = 5.0;
+
+ // Set the new zoom factor.
+ tabWidgetPointer->applyOnTheFlyZoomFactor(currentZoomFactor);
+
+ // Update the on-the-fly action text.
+ updateZoomActions(currentZoomFactor);
+}
+
void BrowserWindow::loadUrlFromLineEdit(const QString &url) const
{
// Remove the focus from the URL line edit.
cookiesActionPointer->setText(i18nc("The Cookies action, which also displays the number of cookies", "Cookies - %1", numberOfCookies));
}
+void BrowserWindow::updateDefaultZoomFactor(const double newDefaultZoomFactor)
+{
+ // Store the new default zoom factor.
+ defaultZoomFactor = newDefaultZoomFactor;
+}
+
void BrowserWindow::updateDomStorageAction(const bool &isEnabled) const
{
// Set the action checked status.
}
}
+void BrowserWindow::updateSearchEngineLabel(const QString &searchEngineString) const
+{
+ // Update the search engine label.
+ searchEngineLabelPointer->setText(SearchEngineHelper::getSearchUrl(searchEngineString));
+}
+
+void BrowserWindow::updateUrlLineEdit(const QUrl &newUrl)
+{
+ // Get the new URL string.
+ QString newUrlString = newUrl.toString();
+
+ // Update the view source actions.
+ if (newUrlString.startsWith(QLatin1String("view-source:"))) // The source is currently being viewed.
+ {
+ // Mark the view source checkbox.
+ viewSourceActionPointer->setChecked(true);
+
+ // Update the view in new tab action text.
+ viewSourceInNewTabActionPointer->setText(i18nc("View rendered website in new tab action", "View Rendered Website in New Tab"));
+ }
+ else // The source is not currently being viewed.
+ {
+ // Unmark the view source checkbox.
+ viewSourceActionPointer->setChecked(false);
+
+ // Update the view in new tab action text.
+ viewSourceInNewTabActionPointer->setText(i18nc("View source in new tab action", "View Source in New Tab"));
+ }
+
+ // Update the URL line edit if it does not have focus.
+ if (!urlLineEditPointer->hasFocus())
+ {
+ // Update the URL line edit.
+ urlLineEditPointer->setText(newUrlString);
+
+ // Set the focus if the new URL is blank.
+ if (newUrlString == QStringLiteral(""))
+ urlLineEditPointer->setFocus();
+ }
+
+ // Store the current URL.
+ currentUrl = newUrl;
+}
+
void BrowserWindow::updateUserAgentActions(const QString &userAgent, const bool &updateCustomUserAgentStatus)
{
// Initialize the custom user agent flag.
}
}
-void BrowserWindow::updateZoomFactorAction(const double &zoomFactor)
+void BrowserWindow::updateUserAgentLabel(const QString &userAgentDatabaseName) const
{
- // Set the current zoom factor.
- currentZoomFactor = zoomFactor;
-
- // Update the zoom factor action text, formatting the double with 2 decimal places.
- zoomFactorActionPointer->setText(ki18nc("@action", "Zoom Factor - %1").subs(zoomFactor, 0, '0', 2).toString());
+ // Update the user agent label.
+ userAgentLabelPointer->setText(UserAgentHelper::getUserAgentFromDatabaseName(userAgentDatabaseName));
}
-void BrowserWindow::updateSearchEngineLabel(const QString &searchEngineString) const
+void BrowserWindow::updateWindowTitle(const QString &title)
{
- // Update the search engine label.
- searchEngineLabelPointer->setText(SearchEngineHelper::getSearchUrl(searchEngineString));
+ // Update the window title.
+ setWindowTitle(title);
}
-void BrowserWindow::updateUrlLineEdit(const QUrl &newUrl)
+void BrowserWindow::updateZoomActions(const double &zoomFactor)
{
- // Get the new URL string.
- QString newUrlString = newUrl.toString();
+ // Set the current zoom factor.
+ currentZoomFactor = zoomFactor;
- // Update the view source checkbox.
- viewSourceActionPointer->setChecked(newUrlString.startsWith(QLatin1String("view-source:")));
+ // Set the status of the default zoom action.
+ zoomDefaultActionPointer->setEnabled(currentZoomFactor != defaultZoomFactor);
- // Update the URL line edit if it does not have focus.
- if (!urlLineEditPointer->hasFocus())
- {
- // Update the URL line edit.
- urlLineEditPointer->setText(newUrlString);
+ // Set the status of the zoom in action and button.
+ zoomInActionPointer->setEnabled(currentZoomFactor <= 4.99);
+ zoomPlusButtonPointer->setEnabled(currentZoomFactor <= 4.99);
- // Set the focus if the new URL is blank.
- if (newUrlString == QStringLiteral(""))
- urlLineEditPointer->setFocus();
- }
+ // Set the status of the zoom out action and button.
+ zoomMinusButtonPointer->setEnabled(currentZoomFactor > 0.25);
+ zoomOutActionPointer->setEnabled(currentZoomFactor > 0.25);
- // Store the current URL.
- currentUrl = newUrl;
-}
-void BrowserWindow::updateUserAgentLabel(const QString &userAgentDatabaseName) const
-{
- // Update the user agent label.
- userAgentLabelPointer->setText(UserAgentHelper::getUserAgentFromDatabaseName(userAgentDatabaseName));
+ // Update the zoom factor action text, formatting the double with 2 decimal places. `0` specifies no extra field width. `'0'` sets the format to not use scientific notation.
+ zoomFactorActionPointer->setText(ki18nc("The zoom factor action", "Zoom Factor - %1").subs(zoomFactor, 0, '0', 2).toString());
+
+ // Update the status bar zoom factor label.
+ currentZoomButtonPointer->setText(ki18nc("The status bar zoom, which is just the formatted zoom factor", "%1").subs(zoomFactor, 0, '0', 2).toString());
}
-void BrowserWindow::updateWindowTitle(const QString &title)
+void BrowserWindow::zoomDefault()
{
- // Update the window title.
- setWindowTitle(title);
+ // Set the new zoom factor.
+ tabWidgetPointer->applyOnTheFlyZoomFactor(defaultZoomFactor);
+
+ // Update the on-the-fly action text.
+ updateZoomActions(defaultZoomFactor);
}
projects / PrivacyBrowserPC.git / blobdiff