From f293da6bc4f0f631c086d35666e3e8bfef19b8f2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 10 Jan 2011 21:23:14 +0000 Subject: Rewrite with UI/engine split. Note some things aren't quite working right again yet... git-svn-id: http://svn.drobilla.net/lad/trunk/machina@2821 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/NodeView.hpp | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) (limited to 'src/gui/NodeView.hpp') diff --git a/src/gui/NodeView.hpp b/src/gui/NodeView.hpp index 0de7d6f..a70e821 100644 --- a/src/gui/NodeView.hpp +++ b/src/gui/NodeView.hpp @@ -15,23 +15,26 @@ * along with Machina. If not, see . */ -#ifndef MACHINA_NODEVIEW_H -#define MACHINA_NODEVIEW_H +#ifndef MACHINA_NODEVIEW_HPP +#define MACHINA_NODEVIEW_HPP #include "flowcanvas/Ellipse.hpp" -#include "machina/Node.hpp" +#include "client/ClientObject.hpp" -class NodeView : public FlowCanvas::Ellipse { +#include "machina/types.hpp" + +class NodeView + : public FlowCanvas::Ellipse + , public Machina::Client::ClientObject::View { public: - NodeView(Gtk::Window* window, - SharedPtr canvas, - SharedPtr node, - const std::string& name, - double x, - double y); + NodeView(Gtk::Window* window, + SharedPtr canvas, + SharedPtr node, + double x, + double y); - SharedPtr node() { return _node; } + SharedPtr node() { return _node; } void show_label(bool show); @@ -40,13 +43,20 @@ public: private: void handle_click(GdkEventButton* ev); void on_double_click(GdkEventButton* ev); + void on_property(Machina::URIInt key, const Raul::Atom& value); + void on_action_property(Machina::URIInt key, const Raul::Atom& value); void set_selected(bool selected); - Gtk::Window* _window; - SharedPtr _node; - uint32_t _default_border_color; - uint32_t _old_color; + bool node_is(Machina::URIInt key); + + Gtk::Window* _window; + SharedPtr _node; + uint32_t _default_border_color; + uint32_t _old_color; + + SharedPtr _enter_action; + sigc::connection _enter_action_connection; }; -#endif // MACHINA_NODEVIEW_H +#endif // MACHINA_NODEVIEW_HPP -- cgit v1.2.1