From 5870c7f7a201fce804eac49fbbbe624d88a38cf0 Mon Sep 17 00:00:00 2001
From: "Charles J. Cliffe" <cj@cubicproductions.com>
Date: Sat, 17 Dec 2016 21:14:13 -0500
Subject: [PATCH] Remove / clear recent entries

---
 src/BookmarkMgr.cpp                 |  6 ++++
 src/BookmarkMgr.h                   |  1 +
 src/forms/Bookmark/BookmarkView.cpp | 48 +++++++++++++++++++++++++++--
 src/forms/Bookmark/BookmarkView.h   |  7 +++--
 4 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/BookmarkMgr.cpp b/src/BookmarkMgr.cpp
index 42d722a..e9d6036 100644
--- a/src/BookmarkMgr.cpp
+++ b/src/BookmarkMgr.cpp
@@ -294,6 +294,12 @@ BookmarkList BookmarkMgr::getRecents() {
 }
 
 
+void BookmarkMgr::clearRecents() {
+    std::lock_guard < std::mutex > lock(busy_lock);
+    
+    recents.erase(recents.begin(),recents.end());
+}
+
 
 void BookmarkMgr::trimRecents() {
     if (recents.size() > BOOKMARK_RECENTS_MAX) {
diff --git a/src/BookmarkMgr.h b/src/BookmarkMgr.h
index 58cdecc..c49ceea 100644
--- a/src/BookmarkMgr.h
+++ b/src/BookmarkMgr.h
@@ -62,6 +62,7 @@ public:
     void addRecent(BookmarkEntry *be);
     void removeRecent(BookmarkEntry *be);
     BookmarkList getRecents();
+    void clearRecents();
 
     
 protected:
diff --git a/src/forms/Bookmark/BookmarkView.cpp b/src/forms/Bookmark/BookmarkView.cpp
index c15dd50..cb175aa 100644
--- a/src/forms/Bookmark/BookmarkView.cpp
+++ b/src/forms/Bookmark/BookmarkView.cpp
@@ -14,7 +14,8 @@
 #define BOOKMARK_VIEW_STR_ADD_GROUP "Add Group"
 #define BOOKMARK_VIEW_STR_ADD_GROUP_DESC "Enter Group Name"
 #define BOOKMARK_VIEW_STR_UNNAMED "Unnamed"
-
+#define BOOKMARK_VIEW_STR_CLEAR_RECENT "Clear Recents"
+#define BOOKMARK_VIEW_STR_RENAME_GROUP "Rename Group"
 
 BookmarkViewVisualDragItem::BookmarkViewVisualDragItem(wxString labelValue) : wxDialog(NULL, wxID_ANY, L"", wxPoint(20,20), wxSize(-1,-1), wxSTAY_ON_TOP | wxALL ) {
     
@@ -505,6 +506,17 @@ void BookmarkView::doRemoveActive(DemodulatorInstance *demod) {
 }
 
 
+void BookmarkView::doRemoveRecent(BookmarkEntry *be) {
+    wxGetApp().getBookmarkMgr().removeRecent(be);
+    wxGetApp().getBookmarkMgr().updateActiveList();
+}
+
+void BookmarkView::doClearRecents() {
+    wxGetApp().getBookmarkMgr().clearRecents();
+    wxGetApp().getBookmarkMgr().updateActiveList();
+}
+
+
 void BookmarkView::updateBookmarkChoices() {
     if (!bookmarkChoices.empty()) {
         bookmarkChoices.erase(bookmarkChoices.begin(),bookmarkChoices.end());
@@ -677,6 +689,7 @@ void BookmarkView::recentSelection(BookmarkEntry *bmSel) {
     
     addBookmarkChoice(m_buttonPanel);
     addButton(m_buttonPanel, "Activate Recent", wxCommandEventHandler( BookmarkView::onActivateRecent ));
+    addButton(m_buttonPanel, "Remove Recent", wxCommandEventHandler( BookmarkView::onRemoveRecent ));
     
     showProps();
     showButtons();
@@ -695,7 +708,7 @@ void BookmarkView::groupSelection(std::string groupName) {
 //    m_labelLabel->Show();
     
     addButton(m_buttonPanel, "Remove Group", wxCommandEventHandler( BookmarkView::onRemoveGroup ));
-    addButton(m_buttonPanel, "Rename Group", wxCommandEventHandler( BookmarkView::onRenameGroup ));
+    addButton(m_buttonPanel, BOOKMARK_VIEW_STR_RENAME_GROUP, wxCommandEventHandler( BookmarkView::onRenameGroup ));
     
 //    showProps();
 
@@ -717,7 +730,14 @@ void BookmarkView::bookmarkBranchSelection() {
 
 
 void BookmarkView::recentBranchSelection() {
+    clearButtons();
     hideProps();
+    
+    addButton(m_buttonPanel, BOOKMARK_VIEW_STR_CLEAR_RECENT, wxCommandEventHandler( BookmarkView::onClearRecents ));
+    
+    showButtons();
+    refreshLayout();
+
     this->Layout();
 }
 
@@ -871,6 +891,28 @@ void BookmarkView::onActivateRecent( wxCommandEvent& event ) {
 }
 
 
+void BookmarkView::onRemoveRecent ( wxCommandEvent& event ) {
+    if (editingLabel) {
+        return;
+    }
+    
+    TreeViewItem *curSel = itemToTVI(m_treeView->GetSelection());
+    
+    if (curSel && curSel->type == TreeViewItem::TREEVIEW_ITEM_TYPE_RECENT) {
+        wxGetApp().getBookmarkMgr().removeRecent(curSel->bookmarkEnt);
+        m_treeView->Delete(m_treeView->GetSelection());
+        wxGetApp().getBookmarkMgr().updateActiveList();
+    }
+}
+
+void BookmarkView::onClearRecents ( wxCommandEvent& event ) {
+    if (editingLabel) {
+        return;
+    }
+    doClearRecents();
+}
+
+
 void BookmarkView::onAddGroup( wxCommandEvent& event ) {
     wxString stringVal = wxGetTextFromUser(BOOKMARK_VIEW_STR_ADD_GROUP_DESC, BOOKMARK_VIEW_STR_ADD_GROUP, "");
     if (stringVal.ToStdString() != "") {
@@ -903,7 +945,7 @@ void BookmarkView::onRenameGroup( wxCommandEvent& event ) {
     }
     
     wxString stringVal = "";
-    stringVal = wxGetTextFromUser("Rename Group", "New Group Name", curSel->groupName);
+    stringVal = wxGetTextFromUser(BOOKMARK_VIEW_STR_RENAME_GROUP, "New Group Name", curSel->groupName);
     
     std::string newGroupName = stringVal.ToStdString();
     
diff --git a/src/forms/Bookmark/BookmarkView.h b/src/forms/Bookmark/BookmarkView.h
index 78db1fc..c31d29c 100644
--- a/src/forms/Bookmark/BookmarkView.h
+++ b/src/forms/Bookmark/BookmarkView.h
@@ -96,7 +96,9 @@ protected:
     void doBookmarkRecent(std::string group, BookmarkEntry *be);
     void doMoveBookmark(BookmarkEntry *be, std::string group);
     void doRemoveActive(DemodulatorInstance *demod);
-        
+    void doRemoveRecent(BookmarkEntry *be);
+    void doClearRecents();
+    
     void updateBookmarkChoices();
     void addBookmarkChoice(wxWindow *parent);    
     void onBookmarkChoice( wxCommandEvent &event );
@@ -106,13 +108,14 @@ protected:
     
     void onActivateBookmark( wxCommandEvent& event );
     void onActivateRecent( wxCommandEvent& event );
+    void onRemoveRecent ( wxCommandEvent& event );
+    void onClearRecents ( wxCommandEvent& event );
     
     void onAddGroup( wxCommandEvent& event );
     void onRemoveGroup( wxCommandEvent& event );
     void onRenameGroup( wxCommandEvent& event );
     
     TreeViewItem *itemToTVI(wxTreeItemId item);
-
     
     std::atomic_bool mouseInView;