[gnote] Remove Gtk::Action for open note in new window



commit 7168a6050ceb590fd210a0aaec68ab0c202ded5c
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Wed May 19 23:08:16 2021 +0300

    Remove Gtk::Action for open note in new window

 src/searchnoteswidget.cpp | 23 +++++++++++++----------
 src/searchnoteswidget.hpp |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/src/searchnoteswidget.cpp b/src/searchnoteswidget.cpp
index e5621957..c4a9cf7e 100644
--- a/src/searchnoteswidget.cpp
+++ b/src/searchnoteswidget.cpp
@@ -55,6 +55,7 @@ Glib::RefPtr<Gdk::Pixbuf> SearchNotesWidget::get_note_icon(IconManager & manager
 SearchNotesWidget::SearchNotesWidget(IGnote & g, NoteManagerBase & m)
   : m_accel_group(Gtk::AccelGroup::create())
   , m_open_note_menu_item(nullptr)
+  , m_open_note_new_window_menu_item(nullptr)
   , m_delete_note_menu_item(nullptr)
   , m_no_matches_box(NULL)
   , m_gnote(g)
@@ -137,10 +138,6 @@ Glib::ustring SearchNotesWidget::get_name() const
 
 void SearchNotesWidget::make_actions()
 {
-  m_open_note_new_window_action = Gtk::Action::create("OpenNoteNewWindowAction", _("Open In New _Window"));
-  m_open_note_new_window_action->signal_activate()
-    .connect(sigc::mem_fun(*this, &SearchNotesWidget::on_open_note_new_window));
-
   m_delete_notebook_action = Gtk::Action::create("DeleteNotebookAction", _("_Delete"));
   m_delete_notebook_action->signal_activate().connect(sigc::mem_fun(*this, 
&SearchNotesWidget::on_delete_notebook));
 
@@ -794,7 +791,9 @@ void SearchNotesWidget::on_selection_changed()
     if(m_open_note_menu_item) {
       m_open_note_menu_item->property_sensitive() = false;
     }
-    m_open_note_new_window_action->property_sensitive() = false;
+    if(m_open_note_new_window_menu_item) {
+      m_open_note_new_window_menu_item->property_sensitive() = false;
+    }
     if(m_delete_note_menu_item) {
       m_delete_note_menu_item->property_sensitive() = false;
     }
@@ -803,7 +802,9 @@ void SearchNotesWidget::on_selection_changed()
     if(m_open_note_menu_item) {
       m_open_note_menu_item->property_sensitive() = true;
     }
-    m_open_note_new_window_action->property_sensitive() = true;
+    if(m_open_note_new_window_menu_item) {
+      m_open_note_new_window_menu_item->property_sensitive() = true;
+    }
     if(m_delete_note_menu_item) {
       m_delete_note_menu_item->property_sensitive() = true;
     }
@@ -1307,10 +1308,11 @@ Gtk::Menu *SearchNotesWidget::get_note_list_context_menu()
       m_note_list_context_menu->add(*m_open_note_menu_item);
     }
 
-    item = manage(new Gtk::MenuItem);
-    item->set_related_action(m_open_note_new_window_action);
-    item->add_accelerator("activate", m_accel_group, GDK_KEY_W, Gdk::MOD1_MASK, Gtk::ACCEL_VISIBLE);
-    m_note_list_context_menu->add(*item);
+    m_open_note_new_window_menu_item = manage(new Gtk::MenuItem(_("Open In New _Window"), true));
+    m_open_note_new_window_menu_item->signal_activate()
+      .connect(sigc::mem_fun(*this, &SearchNotesWidget::on_open_note_new_window));
+    m_open_note_new_window_menu_item->add_accelerator("activate", m_accel_group, GDK_KEY_W, Gdk::MOD1_MASK, 
Gtk::ACCEL_VISIBLE);
+    m_note_list_context_menu->add(*m_open_note_new_window_menu_item);
 
     m_delete_note_menu_item = manage(new Gtk::MenuItem(_("_Delete"), true));
     m_delete_note_menu_item->signal_activate().connect(sigc::mem_fun(*this, 
&SearchNotesWidget::delete_selected_notes));
@@ -1469,6 +1471,7 @@ void SearchNotesWidget::on_settings_changed()
     delete m_note_list_context_menu;
     m_note_list_context_menu = NULL;
     m_open_note_menu_item = nullptr;
+    m_open_note_new_window_menu_item = nullptr;
     m_delete_note_menu_item = nullptr;
   }
 }
diff --git a/src/searchnoteswidget.hpp b/src/searchnoteswidget.hpp
index 974ad7af..27e4ce5c 100644
--- a/src/searchnoteswidget.hpp
+++ b/src/searchnoteswidget.hpp
@@ -159,7 +159,7 @@ private:
 
   Glib::RefPtr<Gtk::AccelGroup> m_accel_group;
   Gtk::MenuItem *m_open_note_menu_item;
-  Glib::RefPtr<Gtk::Action> m_open_note_new_window_action;
+  Gtk::MenuItem *m_open_note_new_window_menu_item;
   Gtk::MenuItem *m_delete_note_menu_item;
   Glib::RefPtr<Gtk::Action> m_delete_notebook_action;
   Glib::RefPtr<Gtk::Action> m_rename_notebook_action;


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