X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=src%2Fwindows%2FBrowserWindow.h;h=e62b7b29c9b338a8f96981865f24b04bb1e95cf8;hb=e5ec85accb02116b08c33b574805c132475d90bc;hp=a7b78d6ec1ceb1a95473c55237b8bbab631a2868;hpb=425fed98271cd951cddef9904e5e271f0fb76fc1;p=PrivacyBrowserPC.git

diff --git a/src/windows/BrowserWindow.h b/src/windows/BrowserWindow.h
index a7b78d6..e62b7b2 100644
--- a/src/windows/BrowserWindow.h
+++ b/src/windows/BrowserWindow.h
@@ -26,6 +26,7 @@
 // KDE Frameworks headers.
 #include <KConfigDialog>
 #include <KToggleFullScreenAction>
+#include <KToolBar>
 #include <KXmlGuiWindow>
 
 // Qt toolkit headers.
@@ -40,7 +41,7 @@ class BrowserWindow : public KXmlGuiWindow
 
 public:
     // The default constructor.
-    BrowserWindow(bool firstWindow=true);
+    BrowserWindow(bool firstWindow=true, QString *initialUrlStringPointer = nullptr);
 
     // The public functions.
     QSize sizeHint() const override;
@@ -48,12 +49,17 @@ public:
     // The public variables.
     TabWidget *tabWidgetPointer;
 
+public Q_SLOTS:
+    // The public slots.
+    void populateBookmarksInThisWindow();  // This is public so that the bookmarks can be repopulated over D-Bus when changed by another instance of Privacy Browser.
+
 private Q_SLOTS:
     // The private slots.
     void addOrEditDomainSettings() const;
     void back() const;
     void clearUrlLineEditFocus() const;
     void decrementZoom();
+    void editBookmarks() const;
     void escape() const;
     void findNext() const;
     void findPrevious() const;
@@ -65,19 +71,24 @@ private Q_SLOTS:
     void incrementZoom();
     void loadUrlFromLineEdit(const QString &url) const;
     void newWindow() const;
+    void populateBookmarksInAllWindows() const;
     void refresh() const;
     void reloadAndBypassCache() const;
+    void showBookmarkContextMenu(const QPoint &point);
     void showCookiesDialog();
     void showDownloadLocationBrowseDialog() const;
     void showDomainSettingsDialog() const;
     void showFindTextActions() const;
     void showProgressBar(const int &progress) const;
     void showSettingsDialog();
+    void toggleBookmark();
+    void toggleDeveloperTools() const;
     void toggleDomStorage() const;
     void toggleFindCaseSensitive() const;
     void toggleJavaScript() const;
     void toggleLocalStorage() const;
     void toggleFullScreen();
+    void toggleViewBookmarksToolBar();
     void toggleViewSource() const;
     void toggleViewSourceInNewTab() const;
     void updateCookiesAction(const int numberOfCookies) const;
@@ -94,11 +105,23 @@ private Q_SLOTS:
     void updateSearchEngineLabel(const QString &searchEngineString) const;
     void updateUrlLineEdit(const QUrl &newUrl);
     void updateUserAgentLabel(const QString &userAgentDatabaseName) const;
+    void updateViewBookmarksToolBarCheckbox(const bool visible);
     void updateWindowTitle(const QString &title);
     void zoomDefault();
 
 private:
     // The private variables.
+    KActionCollection *actionCollectionPointer;
+    QAction *bookmarkedActionPointer;
+    QList<QPair<QMenu *, QAction *> *> bookmarksMenuActionList;
+    QMenu *bookmarksMenuPointer;
+    QList<QPair<QMenu *, QMenu *> *> bookmarksMenuSubmenuList;
+    QList<QAction*> bookmarksToolBarActionList;
+    QList<QPair<QMenu *, const double> *> bookmarksToolBarMenuList;
+    KToolBar *bookmarksToolBarPointer;
+    QList<QPair<QMenu *, QAction *> *> bookmarksToolBarSubfolderActionList;
+    bool bookmarksToolBarIsVisible = false;
+    bool bookmarksToolBarUninitialized = true;
     KConfigDialog *configDialogPointer;
     QAction *cookiesActionPointer;
     QUrl currentUrl;
@@ -107,8 +130,10 @@ private:
     bool customSearchEngineEnabled;
     bool customUserAgentEnabled;
     double defaultZoomFactor;
+    QAction *developerToolsActionPointer;
     QAction *domStorageActionPointer;
     QComboBox *downloadLocationComboBoxPointer;
+    QList<QPair<QMenu *, QAction *> *> finalBookmarkFolderMenuActionList;
     QAction *findCaseSensitiveActionPointer;
     QAction *findNextActionPointer;
     QAction *findPreviousActionPointer;
@@ -149,6 +174,7 @@ private:
     QAction *userAgentCustomActionPointer;
     KLineEdit *urlLineEditPointer;
     KToolBar *urlToolBarPointer;
+    QAction *viewBookmarksToolBarActionPointer;
     QAction *viewSourceActionPointer;
     QAction *viewSourceInNewTabActionPointer;
     QAction *zoomDefaultActionPointer;
@@ -157,5 +183,12 @@ private:
     QPushButton *zoomMinusButtonPointer;
     QAction *zoomOutActionPointer;
     QPushButton *zoomPlusButtonPointer;
+
+    // The private functions.
+    void addFinalBookmarkFolderMenuActions(QMenu *menuPointer, double folderId);
+    void populateBookmarksMenuSubfolders(const double folderId, QMenu *menuPointer);
+    void populateBookmarksToolBar();
+    void populateBookmarksToolBarSubfolders(const double folderId, QMenu *menuPointer);
+    void updateBookmarkedAction() const;
 };
 #endif