X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=src%2Fwindows%2FBrowserWindow.h;h=143e35f1571ecbec87eba2f136f937358bea7577;hb=77398618a48027f56c9bbd95e8a02245d79f6884;hp=49cb198307f40c7e6ddc2cc6b0005834a84b1e80;hpb=7c6edb3608791950c6146ac242e2b6f493ca8e8c;p=PrivacyBrowserPC.git diff --git a/src/windows/BrowserWindow.h b/src/windows/BrowserWindow.h index 49cb198..143e35f 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; @@ -49,9 +49,12 @@ 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 addBookmark() const; void addOrEditDomainSettings() const; void back() const; void clearUrlLineEditFocus() const; @@ -64,19 +67,23 @@ private Q_SLOTS: void fullScreenRequested(const bool toggleOn); void getZoomFactorFromUser(); void hideFindTextActions() const; + void hideProgressBar() const; void home() const; void incrementZoom(); void loadUrlFromLineEdit(const QString &url) const; void newWindow() const; - void populateBookmarks(); + void populateBookmarksInAllWindows() const; void refresh() const; void reloadAndBypassCache() const; + void showBookmarkContextMenu(const QPoint &point); void showCookiesDialog(); - void showDownloadLocationBrowseDialog() const; + void showDownloadDirectoryBrowseDialog() 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; @@ -105,10 +112,15 @@ private Q_SLOTS: private: // The private variables. - QList bookmarksMenuCurrentActionList; + KActionCollection *actionCollectionPointer; + QAction *bookmarkedActionPointer; + QList *> bookmarksMenuActionList; QMenu *bookmarksMenuPointer; - QList bookmarksToolBarCurrentActionList; + QList *> bookmarksMenuSubmenuList; + QList bookmarksToolBarActionList; + QList *> bookmarksToolBarMenuList; KToolBar *bookmarksToolBarPointer; + QList *> bookmarksToolBarSubfolderActionList; bool bookmarksToolBarIsVisible = false; bool bookmarksToolBarUninitialized = true; KConfigDialog *configDialogPointer; @@ -119,8 +131,10 @@ private: bool customSearchEngineEnabled; bool customUserAgentEnabled; double defaultZoomFactor; + QAction *developerToolsActionPointer; QAction *domStorageActionPointer; - QComboBox *downloadLocationComboBoxPointer; + QComboBox *downloadDirectoryComboBoxPointer; + QList *> finalBookmarkFolderMenuActionList; QAction *findCaseSensitiveActionPointer; QAction *findNextActionPointer; QAction *findPreviousActionPointer; @@ -139,6 +153,7 @@ private: QPalette normalBackgroundPalette; QPalette positiveBackgroundPalette; QProgressBar *progressBarPointer; + QAction *refreshActionPointer; QLabel *searchEngineLabelPointer; QAction *searchEngineMenuActionPointer; QAction *searchEngineMojeekActionPointer; @@ -148,6 +163,7 @@ private: QAction *searchEngineBingActionPointer; QAction *searchEngineYahooActionPointer; QAction *searchEngineCustomActionPointer; + QAction *stopActionPointer; QLabel *userAgentLabelPointer; QAction *userAgentMenuActionPointer; QAction *userAgentPrivacyBrowserActionPointer; @@ -170,5 +186,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