Plugins::WebBrowser: modify bookmark

KangLin · KangLin · commit c7d7e8de21aa · 2026-01-15T09:56:03.000+08:00
diff --git a/Plugins/WebBrowser/Bookmark/FrmBookmark.cpp b/Plugins/WebBrowser/Bookmark/FrmBookmark.cpp
@@ -195,7 +195,7 @@ void CFrmBookmark::loadBookmarks()
             QStandardItem *pFolderItem = new QStandardItem(folder.getIcon(), folder.title);
             if(!pFolderItem) continue;
             pFolderItem->setData(folder.id, ID);
-            pFolderItem->setData(Folder, Type);
+            pFolderItem->setData(BookmarkType_Folder, Type);
             rootItem->appendRow(pFolderItem);
             m_folderItems[folder.id] = pFolderItem;
             continue;
@@ -209,7 +209,7 @@ void CFrmBookmark::loadBookmarks()
         QStandardItem *pFolderItem = new QStandardItem(folder.getIcon(), folder.title);
         if(!pFolderItem) continue;
         pFolderItem->setData(folder.id, ID);
-        pFolderItem->setData(Folder, Type);
+        pFolderItem->setData(BookmarkType_Folder, Type);
         (*it)->appendRow(pFolderItem);
         m_folderItems[folder.id] = pFolderItem;
     }
@@ -227,7 +227,7 @@ void CFrmBookmark::loadBookmarks()
 
         QStandardItem *bookmarkItem = new QStandardItem(bookmark.getIcon(), bookmark.title);
         bookmarkItem->setData(bookmark.id, ID);
-        bookmarkItem->setData(Bookmark, Type);
+        bookmarkItem->setData(BookmarkType_Bookmark, Type);
         bookmarkItem->setData(bookmark.url, Url);
 
         if (bookmark.isFavorite) {
@@ -264,7 +264,7 @@ void CFrmBookmark::onAddBookmark()
     QModelIndex currentIndex = m_pTreeView->currentIndex();
     if (currentIndex.isValid()) {
         int type = currentIndex.data(Type).toInt();
-        if (Folder == type) {
+        if (BookmarkType_Folder == type) {
             item.folderId = currentIndex.data(Qt::UserRole).toInt();
         }
     }
@@ -286,7 +286,7 @@ void CFrmBookmark::onAddFolder()
     QModelIndex currentIndex = m_pTreeView->currentIndex();
     if (currentIndex.isValid()) {
         int type = currentIndex.data(Type).toInt();
-        if (Folder == type) {
+        if (BookmarkType_Folder == type) {
             parentId = currentIndex.data(Qt::UserRole).toInt();
         }
     }
@@ -304,7 +304,7 @@ void CFrmBookmark::onEditBookmark()
     int type = index.data(Type).toInt();
     int id = index.data(Qt::UserRole).toInt();
 
-    if (Bookmark == type) {
+    if (BookmarkType_Bookmark == type) {
         BookmarkItem item = m_pDatabase->getBookmark(id);
         if (item.id == 0) return;
 
@@ -325,7 +325,7 @@ void CFrmBookmark::onEditBookmark()
         if (m_pDatabase->updateBookmark(item)) {
             refresh();
         }
-    } else if (Folder == type) {
+    } else if (BookmarkType_Folder == type) {
         QString oldName = index.data(Qt::DisplayRole).toString();
 
         bool ok;
@@ -348,15 +348,15 @@ void CFrmBookmark::onDeleteBookmark()
     int type = index.data(Type).toInt();
     QString name = index.data(Qt::DisplayRole).toString();
     int id = index.data(Qt::UserRole).toInt();
-    if(1 == id && Folder == type) {
+    if(1 == id && BookmarkType_Folder == type) {
         QMessageBox::warning(this, tr("Warning"), tr("The folder \"%1\" is not delete").arg(name));
         return;
     }
 
     QString message;
-    if (Bookmark == type) {
+    if (BookmarkType_Bookmark == type) {
         message = tr("Are you sure you want to delete the bookmark \"%1\"?").arg(name);
-    } else if (Folder == type) {
+    } else if (BookmarkType_Folder == type) {
         message = tr("Are you sure you want to delete the folder \"%1\"?\n"
                      "The bookmarks inside the folder will be moved to the root directory.").arg(name);
     } else {
@@ -370,9 +370,9 @@ void CFrmBookmark::onDeleteBookmark()
         );
 
     if (reply == QMessageBox::Yes) {
-        if (Bookmark == type) {
+        if (BookmarkType_Bookmark == type) {
             m_pDatabase->deleteBookmark(id);
-        } else if (Folder == type) {
+        } else if (BookmarkType_Folder == type) {
             m_pDatabase->deleteFolder(id);
         }
         refresh();
@@ -385,7 +385,7 @@ void CFrmBookmark::onSetFavorite()
     if (!index.isValid()) return;
 
     int type = index.data(Type).toInt();
-    if (type != Bookmark) return;
+    if (type != BookmarkType_Bookmark) return;
 
     int id = index.data(ID).toInt();
     BookmarkItem item = m_pDatabase->getBookmark(id);
@@ -446,7 +446,7 @@ void CFrmBookmark::onSearchTextChanged(const QString &text)
     for (const auto &bookmark : bookmarks) {
         QStandardItem *item = new QStandardItem(bookmark.getIcon(), bookmark.title);
         item->setData(bookmark.id, ID);
-        item->setData(Bookmark, Type);
+        item->setData(BookmarkType_Bookmark, Type);
         item->setData(bookmark.url, Url);
 
         // 显示路径
@@ -467,7 +467,7 @@ void CFrmBookmark::onSearchTextChanged(const QString &text)
 void CFrmBookmark::onTreeViewDoubleClicked(const QModelIndex &index)
 {
     int type = index.data(Type).toInt();
-    if (Bookmark == type) {
+    if (BookmarkType_Bookmark == type) {
         QString url = index.data(Url).toString();
         if (!url.isEmpty()) {
             emit openUrlRequested(url);
@@ -487,7 +487,7 @@ void CFrmBookmark::onCustomContextMenu(const QPoint &pos)
     int id = index.data(ID).toInt();
     int type = index.data(Type).toInt();
 
-    if (Bookmark == type) {
+    if (BookmarkType_Bookmark == type) {
         menu.addAction(QIcon::fromTheme("document-open"), tr("Open"), this, [this, index]() {
             QString url = index.data(Url).toString();
             if (!url.isEmpty()) {
@@ -502,7 +502,7 @@ void CFrmBookmark::onCustomContextMenu(const QPoint &pos)
         connect(favoriteAction, &QAction::triggered, this, &CFrmBookmark::onSetFavorite);
 
         menu.addAction(QIcon::fromTheme("edit-delete"), tr("Delete"), this, &CFrmBookmark::onDeleteBookmark);
-    } else if (Folder == type) {
+    } else if (BookmarkType_Folder == type) {
         menu.addAction(QIcon::fromTheme("Add"), tr("Add bookmark"), this, &CFrmBookmark::onAddBookmark);
         menu.addAction(QIcon::fromTheme("folder-new"), tr("Add folder"), this, &CFrmBookmark::onAddFolder);
         menu.addSeparator();
diff --git a/Plugins/WebBrowser/Bookmark/FrmBookmark.h b/Plugins/WebBrowser/Bookmark/FrmBookmark.h
@@ -42,15 +42,11 @@ private slots:
     void setupTreeView();
     void loadBookmarks();
 
-    enum emRole {
+    enum Role {
         ID = Qt::UserRole,
         Type,
         Url
     };
-    enum emType{
-        Bookmark,
-        Folder
-    };
 
 private:
     Ui::CFrmBookmark *ui;
diff --git a/Plugins/WebBrowser/FrmWebBrowser.cpp b/Plugins/WebBrowser/FrmWebBrowser.cpp
@@ -43,6 +43,7 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
     , m_pForward(nullptr)
     , m_pRefresh(nullptr)
     , m_pStop(nullptr)
+    , m_pAddBookmark(nullptr)
     , m_pFind(nullptr)
     , m_pFindNext(nullptr)
     , m_pFindPrevious(nullptr)
@@ -189,6 +190,10 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
     });
     Q_ASSERT(check);
 
+    m_pAddBookmark = m_pToolBar->addAction(
+        QIcon::fromTheme("user-bookmarks"),
+        tr("Add bookmark"), this, SLOT(slotAddBookmark()));
+
     m_pAddPage = m_pToolBar->addAction(QIcon::fromTheme("add"), tr("Add tab page"),
                                    this, [&](){
         CreateWindow(QWebEnginePage::WebBrowserTab);
@@ -615,44 +620,6 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
     m_pStop->setShortcuts(QKeySequence::Cancel);
     m_pStop->setStatusTip(m_pStop->text());
 
-    pMenu->addSeparator();
-    pMenu->addAction(tr("Bookmark"), this, [&]{
-        CFrmBookmark* pBookmark = new CFrmBookmark(m_pBookmarkDatabase);
-        if(!pBookmark) return;
-        pBookmark->setAttribute(Qt::WA_DeleteOnClose);
-        connect(this, &CFrmWebBrowser::destroyed, pBookmark, &CFrmBookmark::close);
-        connect(pBookmark, &CFrmBookmark::openUrlRequested, this, [&](const QString& url) {
-            CFrmWebView* pWeb = CurrentView();
-            if(!pWeb) {
-                pWeb = qobject_cast<CFrmWebView*>(CreateWindow(QWebEnginePage::WebBrowserTab));
-            }
-            if(pWeb)
-                pWeb->load(url);
-        });
-        pBookmark->show();
-    });
-    pMenu->addAction(tr("History"), this, [&]() {
-        CFrmHistory* pHistory = new CFrmHistory(m_pHistoryDatabase, &m_pPara->m_History);
-        if(!pHistory) return;
-        pHistory->setAttribute(Qt::WA_DeleteOnClose);
-        connect(this, &CFrmWebBrowser::destroyed, pHistory, &CFrmHistory::close);
-        connect(pHistory, &CFrmHistory::sigOpenUrl, this, [&](const QString& url) {
-            CFrmWebView* pWeb = CurrentView();
-            if(!pWeb) {
-                pWeb = qobject_cast<CFrmWebView*>(CreateWindow(QWebEnginePage::WebBrowserTab));
-            }
-            if(pWeb)
-                pWeb->load(url);
-        });
-        connect(pHistory, &CFrmHistory::sigOpenUrlInNewTab,
-                this, [&](const QString& url) {
-            auto pWeb = qobject_cast<CFrmWebView*>(CreateWindow(QWebEnginePage::WebBrowserTab));
-            if(pWeb)
-                pWeb->load(url);
-        });
-        pHistory->show();
-    });
-
     pMenu->addSeparator();
     pMenu->addAction(m_pAddPage);
     m_pAddPageIncognito = pMenu->addAction(
@@ -809,6 +776,48 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
         });
     }
 
+    pMenu->addSeparator();
+    QMenu* pMenuBookmark = new QMenu(tr("Bookmark"), pMenu);
+    pMenuBookmark->setIcon(QIcon::fromTheme("user-bookmarks"));
+    pMenu->addMenu(pMenuBookmark);
+    pMenuBookmark->addAction(m_pAddBookmark);
+    pMenuBookmark->addAction(tr("Manage Bookmark "), this, [&]{
+        CFrmBookmark* pBookmark = new CFrmBookmark(m_pBookmarkDatabase);
+        if(!pBookmark) return;
+        pBookmark->setAttribute(Qt::WA_DeleteOnClose);
+        connect(this, &CFrmWebBrowser::destroyed, pBookmark, &CFrmBookmark::close);
+        connect(pBookmark, &CFrmBookmark::openUrlRequested, this, [&](const QString& url) {
+            CFrmWebView* pWeb = CurrentView();
+            if(!pWeb) {
+                pWeb = qobject_cast<CFrmWebView*>(CreateWindow(QWebEnginePage::WebBrowserTab));
+            }
+            if(pWeb)
+                pWeb->load(url);
+        });
+        pBookmark->show();
+    });
+    pMenu->addAction(tr("History"), this, [&]() {
+        CFrmHistory* pHistory = new CFrmHistory(m_pHistoryDatabase, &m_pPara->m_History);
+        if(!pHistory) return;
+        pHistory->setAttribute(Qt::WA_DeleteOnClose);
+        connect(this, &CFrmWebBrowser::destroyed, pHistory, &CFrmHistory::close);
+        connect(pHistory, &CFrmHistory::sigOpenUrl, this, [&](const QString& url) {
+            CFrmWebView* pWeb = CurrentView();
+            if(!pWeb) {
+                pWeb = qobject_cast<CFrmWebView*>(CreateWindow(QWebEnginePage::WebBrowserTab));
+            }
+            if(pWeb)
+                pWeb->load(url);
+        });
+        connect(pHistory, &CFrmHistory::sigOpenUrlInNewTab,
+                this, [&](const QString& url) {
+                    auto pWeb = qobject_cast<CFrmWebView*>(CreateWindow(QWebEnginePage::WebBrowserTab));
+                    if(pWeb)
+                        pWeb->load(url);
+                });
+        pHistory->show();
+    });
+
     pMenu->addSeparator();
     m_pCapturePage = pMenu->addAction(
         QIcon::fromTheme("screen-shot"), tr("Capture page"),
@@ -1284,3 +1293,7 @@ void CFrmWebBrowser::slotRecordTimeout()
                               Q_ARG(QImage, image));
 }
 
+void CFrmWebBrowser::slotAddBookmark()
+{
+
+}
diff --git a/Plugins/WebBrowser/FrmWebBrowser.h b/Plugins/WebBrowser/FrmWebBrowser.h
@@ -68,6 +68,8 @@ private Q_SLOTS:
     void slotRecord();
     void slotRecordTimeout();
 
+    void slotAddBookmark();
+
 public Q_SLOTS:
     void slotFullScreen(bool bFullScreen);
 
@@ -96,6 +98,7 @@ public Q_SLOTS:
     QAction* m_pForward;
     QAction* m_pRefresh;
     QAction* m_pStop;
+    QAction* m_pAddBookmark;
     QAction* m_pFind;
     QAction* m_pFindNext;
     QAction* m_pFindPrevious;
