[gnote/tabbed: 19/19] Make search notes widget actionless




commit 9e534117c59bff1808f370ca6f08888326c3a669
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Tue Nov 2 14:18:15 2021 +0200

    Make search notes widget actionless

 src/searchnoteswidget.cpp | 48 -----------------------------------------------
 src/searchnoteswidget.hpp |  7 -------
 2 files changed, 55 deletions(-)
---
diff --git a/src/searchnoteswidget.cpp b/src/searchnoteswidget.cpp
index ed7bbcf6..1cbf7a32 100644
--- a/src/searchnoteswidget.cpp
+++ b/src/searchnoteswidget.cpp
@@ -1406,18 +1406,12 @@ void SearchNotesWidget::foreground()
 
   m_open_note_accel = win->keybinder().add_accelerator(sigc::mem_fun(*this, 
&SearchNotesWidget::on_open_note), GDK_KEY_O, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
   m_open_note_new_window_accel = win->keybinder().add_accelerator(sigc::mem_fun(*this, 
&SearchNotesWidget::on_open_note_new_window), GDK_KEY_W, Gdk::MOD1_MASK, Gtk::ACCEL_VISIBLE);
-  auto & manager(m_gnote.action_manager());
-  register_callbacks();
-  m_callback_changed_cid = manager.signal_main_window_search_actions_changed
-    .connect(sigc::mem_fun(*this, &SearchNotesWidget::callbacks_changed));
 }
 
 void SearchNotesWidget::background()
 {
   EmbeddableWidget::background();
   save_position();
-  unregister_callbacks();
-  m_callback_changed_cid.disconnect();
   MainWindow *win = dynamic_cast<MainWindow*>(host());
   if(!win) {
     return;
@@ -1444,17 +1438,6 @@ void SearchNotesWidget::set_initial_focus()
   }
 }
 
-std::vector<PopoverWidget> SearchNotesWidget::get_popover_widgets()
-{
-  std::vector<PopoverWidget> popover_widgets;
-  popover_widgets.reserve(20);
-  m_gnote.action_manager().signal_build_main_window_search_popover(popover_widgets);
-  for(unsigned i = 0; i < popover_widgets.size(); ++i) {
-    popover_widgets[i].secondary_order = i;
-  }
-  return popover_widgets;
-}
-
 void SearchNotesWidget::on_settings_changed()
 {
   if(m_note_list_context_menu) {
@@ -1547,35 +1530,4 @@ void SearchNotesWidget::on_rename_notebook()
   m_notebooksTree->set_cursor(selected_row[0], *m_notebooksTree->get_column(0), true);
 }
 
-void SearchNotesWidget::callbacks_changed()
-{
-  unregister_callbacks();
-  register_callbacks();
-  signal_popover_widgets_changed();
-}
-
-void SearchNotesWidget::register_callbacks()
-{
-  MainWindow *win = dynamic_cast<MainWindow*>(host());
-  if(!win) {
-    return;
-  }
-  auto & manager(m_gnote.action_manager());
-  auto cbacks = manager.get_main_window_search_callbacks();
-  for(auto & cback : cbacks) {
-    auto action = win->find_action(cback.first);
-    if(action) {
-      m_action_cids.push_back(action->signal_activate().connect(cback.second));
-    }
-  }
-}
-
-void SearchNotesWidget::unregister_callbacks()
-{
-  for(auto & cid : m_action_cids) {
-    cid.disconnect();
-  }
-  m_action_cids.clear();
-}
-
 }
diff --git a/src/searchnoteswidget.hpp b/src/searchnoteswidget.hpp
index e2ccb789..ca2bb911 100644
--- a/src/searchnoteswidget.hpp
+++ b/src/searchnoteswidget.hpp
@@ -42,7 +42,6 @@ class SearchNotesWidget
   : public Gtk::Paned
   , public EmbeddableWidget
   , public SearchableItem
-  , public HasActions
 {
 public:
   SearchNotesWidget(IGnote & g, NoteManagerBase & m);
@@ -53,7 +52,6 @@ public:
   virtual void size_internals() override;
   virtual void set_initial_focus() override;
   virtual void perform_search(const Glib::ustring & search_text) override;
-  virtual std::vector<PopoverWidget> get_popover_widgets() override;
 
   void select_all_notes_notebook();
   void new_note();
@@ -125,9 +123,6 @@ private:
   void on_sorting_changed();
   void parse_sorting_setting(const Glib::ustring & sorting);
   void on_rename_notebook();
-  void callbacks_changed();
-  void register_callbacks();
-  void unregister_callbacks();
 
   class RecentSearchColumnTypes
     : public Gtk::TreeModelColumnRecord
@@ -184,8 +179,6 @@ private:
   Glib::ustring m_search_text;
   int m_sort_column_id;
   Gtk::SortType m_sort_column_order;
-  std::vector<sigc::connection> m_action_cids;
-  sigc::connection m_callback_changed_cid;
 
   static Glib::RefPtr<Gdk::Pixbuf> get_note_icon(IconManager &);
 };


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]