KActionCollection *actionCollectionPointer = this->actionCollection();
// Add the standard actions.
+ QAction *backActionPointer = KStandardAction::back(this, SLOT(back()), actionCollectionPointer);
+ QAction *forwardActionPointer = KStandardAction::forward(this, SLOT(forward()), actionCollectionPointer);
+ KStandardAction::home(this, SLOT(home()), actionCollectionPointer);
KStandardAction::openNew(this, SLOT(fileNew()), actionCollectionPointer);
KStandardAction::quit(qApp, SLOT(closeAllWindows()), actionCollectionPointer);
KStandardAction::preferences(this, SLOT(settingsConfigure()), actionCollectionPointer);
+ KStandardAction::redisplay(this, SLOT(refresh()), actionCollectionPointer);
// Add the custom actions.
userAgentPrivacyBrowserActionPointer = actionCollectionPointer->addAction(QStringLiteral("user_agent_privacy_browser"));
searchEngineBingActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_bing"));
searchEngineYahooActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_yahoo"));
searchEngineCustomActionPointer = actionCollectionPointer->addAction(QStringLiteral("search_engine_custom"));
- backActionPointer = actionCollectionPointer->addAction(QStringLiteral("back"));
- forwardActionPointer = actionCollectionPointer->addAction(QStringLiteral("forward"));
- refreshActionPointer = actionCollectionPointer->addAction(QStringLiteral("refresh"));
- homeActionPointer = actionCollectionPointer->addAction(QStringLiteral("home"));
javaScriptActionPointer = actionCollectionPointer->addAction(QStringLiteral("javascript"));
+ localStorageActionPointer = actionCollectionPointer->addAction(QStringLiteral("local_storage"));
domainSettingsActionPointer = actionCollectionPointer->addAction(QStringLiteral("domain_settings"));
// Create the action groups
searchEngineGoogleActionPointer->setText(i18nc("Search engine", "Google"));
searchEngineBingActionPointer->setText(i18nc("Search engine", "Bing"));
searchEngineYahooActionPointer->setText(i18nc("Search engine", "Yahoo"));
- backActionPointer->setText(i18nc("Back button", "Back"));
- forwardActionPointer->setText(i18nc("Forward button", "Forward"));
- refreshActionPointer->setText(i18nc("Refresh button", "Refresh"));
- homeActionPointer->setText(i18nc("Home button", "Home"));
javaScriptActionPointer->setText(i18nc("JavaScript button", "JavaScript"));
+ localStorageActionPointer->setText(i18nc("Local Storage Button", "Local Storage"));
domainSettingsActionPointer->setText(i18nc("Domain Settings button", "Domain Settings"));
// Set the action icons.
- backActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("arrow-left")));
- forwardActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("arrow-right")));
- refreshActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")));
- homeActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("home")));
+ userAgentPrivacyBrowserActionPointer->setIcon(QIcon(":/icons/privacy-mode"));
+ userAgentFirefoxLinuxActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("firefox-esr")));
+ userAgentChromiumLinuxActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("chromium")));
+ userAgentFirefoxWindowsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("firefox-esr")));
+ userAgentChromeWindowsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("chromium")));
+ userAgentEdgeWindowsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("user-group-properties")));
+ userAgentSafariMacosActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("user-group-properties")));
+ userAgentCustomActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("user-group-properties")));
+ searchEngineMojeekActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("search")));
+ searchEngineMonoclesActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("search")));
+ searchEngineMetagerActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("search")));
+ searchEngineGoogleActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("im-google")));
+ searchEngineBingActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("search")));
+ searchEngineYahooActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("im-yahoo")));
+ searchEngineCustomActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("search")));
+ zoomFactorActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("zoom")));
domainSettingsActionPointer->setIcon(QIcon::fromTheme(QStringLiteral("network-server-symbolic")));
// Update the on-the-fly menus.
- connect(browserViewPointer, SIGNAL(userAgentUpdated(QString)), this, SLOT(updateOnTheFlyUserAgent(QString)));
- connect(browserViewPointer, SIGNAL(zoomFactorUpdated(double)), this, SLOT(updateOnTheFlyZoomFactor(double)));
- connect(browserViewPointer, SIGNAL(searchEngineUpdated(QString)), this, SLOT(updateOnTheFlySearchEngine(QString)));
+ connect(browserViewPointer, SIGNAL(updateUserAgentActions(QString)), this, SLOT(updateUserAgentActions(QString)));
+ connect(browserViewPointer, SIGNAL(updateZoomFactorAction(double)), this, SLOT(updateZoomFactorAction(double)));
+ connect(browserViewPointer, SIGNAL(updateSearchEngineActions(QString)), this, SLOT(updateSearchEngineActions(QString)));
// Apply the on-the-fly settings when selected.
connect(userAgentActionGroupPointer, SIGNAL(triggered(QAction*)), browserViewPointer, SLOT(applyOnTheFlyUserAgent(QAction*)));
connect(zoomFactorActionPointer, SIGNAL(triggered()), this, SLOT(getZoomFactorFromUser()));
// Connect the URL toolbar actions.
- connect(backActionPointer, SIGNAL(triggered()), this, SLOT(back()));
- connect(forwardActionPointer, SIGNAL(triggered()), this, SLOT(forward()));
- connect(refreshActionPointer, SIGNAL(triggered()), this, SLOT(refresh()));
- connect(homeActionPointer, SIGNAL(triggered()), this, SLOT(home()));
connect(javaScriptActionPointer, SIGNAL(triggered()), this, SLOT(toggleJavaScript()));
+ connect(localStorageActionPointer, SIGNAL(triggered()), this, SLOT(toggleLocalStorage()));
connect(domainSettingsActionPointer, SIGNAL(triggered()), this, SLOT(openDomainSettings()));
// Update the URL toolbar actions.
connect(browserViewPointer, SIGNAL(updateBackAction(bool)), backActionPointer, SLOT(setEnabled(bool)));
connect(browserViewPointer, SIGNAL(updateForwardAction(bool)), forwardActionPointer, SLOT(setEnabled(bool)));
connect(browserViewPointer, SIGNAL(updateJavaScriptAction(bool)), this, SLOT(updateJavaScriptAction(bool)));
+ connect(browserViewPointer, SIGNAL(updateLocalStorageAction(bool)), this, SLOT(updateLocalStorageAction(bool)));
// Setup the GUI based on the browser_ui.rc file.
setupGUI(StandardWindowOption::Default, ("browser_ui.rc"));
urlLineEditPointer = new KLineEdit();
// Populate the URL toolbar.
- urlToolBarPointer->addWidget(urlLineEditPointer);
- urlToolBarPointer->addAction(javaScriptActionPointer);
- urlToolBarPointer->addAction(domainSettingsActionPointer);
+ urlToolBarPointer->insertWidget(javaScriptActionPointer, urlLineEditPointer);
// Load a new URL from the URL line edit.
connect(urlLineEditPointer, SIGNAL(returnKeyPressed(const QString)), this, SLOT(loadUrlFromLineEdit(const QString)));
// Get a handle for the status bar.
QStatusBar *statusBarPointer = statusBar();
+ // Create a progress bar.
+ progressBarPointer = new QProgressBar();
+
+ // Add the progress bar to to the status bar.
+ statusBarPointer->addPermanentWidget(progressBarPointer);
+
// Update the status bar with the URL when a link is hovered.
connect(browserViewPointer, SIGNAL(linkHovered(QString)), statusBarPointer, SLOT(showMessage(QString)));
+ // Update the progress bar.
+ connect(browserViewPointer, SIGNAL(showProgressBar(const int)), this, SLOT(showProgressBar(const int)));
+ connect(browserViewPointer, SIGNAL(hideProgressBar()), progressBarPointer, SLOT(hide()));
+
// Get the URL line edit palettes.
noDomainSettingsPalette = urlLineEditPointer->palette();
domainSettingsPalette = urlLineEditPointer->palette();
browserViewPointer->applyOnTheFlyZoomFactor(newZoomFactor);
// Update the on-the-fly action text.
- updateOnTheFlyZoomFactor(newZoomFactor);
+ updateZoomFactorAction(newZoomFactor);
}
}
browserViewPointer->refresh();
}
-void BrowserWindow::toggleJavaScript() const
+void BrowserWindow::showProgressBar(const int &progress) const
{
- // Remove the focus from the URL line edit.
- urlLineEditPointer->clearFocus();
+ // Set the progress bar value.
+ progressBarPointer->setValue(progress);
- // Toggle JavaScript.
- browserViewPointer->toggleJavaScript();
+ // Show the progress bar.
+ progressBarPointer->show();
+}
+
+QSize BrowserWindow::sizeHint() const
+{
+ // Return the default window size.
+ return QSize(1500, 1200);
}
void BrowserWindow::settingsConfigure()
}
}
+void BrowserWindow::toggleJavaScript() const
+{
+ // Remove the focus from the URL line edit.
+ urlLineEditPointer->clearFocus();
+
+ // Toggle JavaScript.
+ browserViewPointer->toggleJavaScript();
+}
+
+void BrowserWindow::toggleLocalStorage() const
+{
+ // Remove the focus from the URL line edit.
+ urlLineEditPointer->clearFocus();
+
+ // Toggle JavaScript.
+ browserViewPointer->toggleLocalStorage();
+}
+
void BrowserWindow::updateDomainSettingsIndicator(const bool &status) const
{
// Set the domain palette according to the status.
else javaScriptActionPointer->setIcon(QIcon(":/icons/privacy-mode"));
}
-void BrowserWindow::updateOnTheFlySearchEngine(const QString &searchEngine) const
+void BrowserWindow::updateLocalStorageAction(const bool &isEnabled) const
+{
+ // Set the icon according to the status.
+ if (isEnabled) localStorageActionPointer->setIcon(QIcon::fromTheme("disk-quota-low"));
+ else localStorageActionPointer->setIcon(QIcon::fromTheme("disk-quota"));
+}
+
+void BrowserWindow::updateSearchEngineActions(const QString &searchEngine) const
{
// Initialize the custom search engine flag.
bool customSearchEngine = false;
}
}
-void BrowserWindow::updateOnTheFlyUserAgent(const QString &userAgent) const
+void BrowserWindow::updateUserAgentActions(const QString &userAgent) const
{
// Initialize the custom user agent flag.
bool customUserAgent = false;
}
}
-void BrowserWindow::updateOnTheFlyZoomFactor(const double &zoomFactor)
+void BrowserWindow::updateZoomFactorAction(const double &zoomFactor)
{
// Set the current zoom factor.
- currentZoomFactor = Settings::zoomFactor();
+ 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());
projects / PrivacyBrowserPC.git / blobdiff