X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=src%2Fwindows%2FBrowserWindow.h;h=722fc1c81686c84b30fb5e2c791b96cdfb2fb4ea;hb=234200f6e94439df6133a8eb61552a68dc9b3a5e;hp=92cdc8eca691bbf59c283e7c1b5cc104383cdcf3;hpb=f18185adbdce9891be0cbd2197838441aaa5ed3e;p=PrivacyBrowserPC.git

diff --git a/src/windows/BrowserWindow.h b/src/windows/BrowserWindow.h
index 92cdc8e..722fc1c 100644
--- a/src/windows/BrowserWindow.h
+++ b/src/windows/BrowserWindow.h
@@ -41,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;
@@ -71,13 +71,15 @@ private Q_SLOTS:
     void refresh() const;
     void reloadAndBypassCache() const;
     void showAddBookmarkDialog() const;
-    void showBookmarkContextMenu(const QPoint&) const;
+    void showAddFolderDialog() 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 toggleDomStorage() const;
     void toggleFindCaseSensitive() const;
     void toggleJavaScript() const;
@@ -106,10 +108,14 @@ private Q_SLOTS:
 
 private:
     // The private variables.
-    QList<QAction*> bookmarksMenuCurrentActionList;
+    QAction *bookmarkedActionPointer;
+    QList<QPair<QMenu *, QAction *> *> bookmarksMenuActionList;
     QMenu *bookmarksMenuPointer;
-    QList<QAction*> bookmarksToolBarCurrentActionList;
+    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;
@@ -171,5 +177,12 @@ private:
     QPushButton *zoomMinusButtonPointer;
     QAction *zoomOutActionPointer;
     QPushButton *zoomPlusButtonPointer;
+
+    // The private functions.
+    void addFinalBookmarkFolderMenuEntries(QMenu *menuPointer, double folderId);
+    void populateBookmarksMenuSubfolders(const double folderId, QMenu *menuPointer);
+    void populateBookmarksToolBar();
+    void populateBookmarksToolBarSubfolders(const double folderId, QMenu *menuPointer);
+    void updateBookmarkedAction() const;
 };
 #endif