[gnote] Use actions from host rather than action manager
- From: Aurimas Černius <aurimasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnote] Use actions from host rather than action manager
- Date: Sun, 6 Dec 2015 18:30:09 +0000 (UTC)
commit 47c12f9808a10b3446c27b0fe17cfb7a133348a0
Author: Aurimas Černius <aurisc4 gmail com>
Date: Sun Dec 6 14:31:27 2015 +0200
Use actions from host rather than action manager
src/notewindow.cpp | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/src/notewindow.cpp b/src/notewindow.cpp
index eeb7da0..65b8b5e 100644
--- a/src/notewindow.cpp
+++ b/src/notewindow.cpp
@@ -32,7 +32,6 @@
#include <gtkmm/separatormenuitem.h>
#include "debug.hpp"
-#include "iactionmanager.hpp"
#include "iconmanager.hpp"
#include "mainwindow.hpp"
#include "note.hpp"
@@ -181,11 +180,11 @@ namespace gnote {
// Don't allow deleting the "Start Here" note...
if(!m_note.is_special()) {
- m_delete_note_slot = IActionManager::obj().find_main_window_action("delete-note")->signal_activate()
+ m_delete_note_slot = current_host->find_action("delete-note")->signal_activate()
.connect(sigc::mem_fun(*this, &NoteWindow::on_delete_button_clicked));
}
- MainWindowAction::Ptr important_action = IActionManager::obj().find_main_window_action("important-note");
+ MainWindowAction::Ptr important_action = current_host->find_action("important-note");
important_action->set_state(Glib::Variant<bool>::create(m_note.is_pinned()));
m_important_note_slot = important_action->signal_change_state()
.connect(sigc::mem_fun(*this, &NoteWindow::on_pin_button_clicked));
@@ -315,8 +314,11 @@ namespace gnote {
std::vector<MainWindowAction::Ptr> NoteWindow::get_widget_actions()
{
std::vector<MainWindowAction::Ptr> res;
- IActionManager::obj().find_main_window_action("important-note");
- IActionManager::obj().find_main_window_action("delete-note");
+ EmbeddableWidgetHost *h = host();
+ if(h != NULL) {
+ h->find_action("important-note");
+ h->find_action("delete-note");
+ }
return res;
}
@@ -567,14 +569,20 @@ namespace gnote {
if(&m_note != ¬e) {
return;
}
-
IActionManager::obj().find_main_window_action("important-note")->change_state(Glib::Variant<bool>::create(pinned));
+ EmbeddableWidgetHost *h = host();
+ if(h != NULL) {
+ h->find_action("important-note")->change_state(Glib::Variant<bool>::create(pinned));
+ }
}
void NoteWindow::on_pin_button_clicked(const Glib::VariantBase & state)
{
- Glib::Variant<bool> new_state = Glib::VariantBase::cast_dynamic<Glib::Variant<bool> >(state);
- m_note.set_pinned(new_state.get());
- IActionManager::obj().find_main_window_action("important-note")->set_state(state);
+ EmbeddableWidgetHost *h = host();
+ if(h != NULL) {
+ Glib::Variant<bool> new_state = Glib::VariantBase::cast_dynamic<Glib::Variant<bool> >(state);
+ m_note.set_pinned(new_state.get());
+ h->find_action("important-note")->set_state(state);
+ }
}
void NoteWindow::on_text_button_clicked()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]