diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-18 01:48:11 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-18 01:48:11 +0000 |
commit | 8b63f9cac7b034c4bbe0c28fd595cc0852b39938 (patch) | |
tree | aab02cd1559c0b04a366961be10f996a0d810751 /libs | |
parent | 1fed50f817e1912aea12dcb514f60fe740031f37 (diff) |
modified patch from lincoln to show/control rec-enable status in track/bus list
git-svn-id: svn://localhost/ardour2/branches/3.0@5216 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/route.cc | 2 | ||||
-rw-r--r-- | libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc | 115 | ||||
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h | 73 | ||||
-rw-r--r-- | libs/gtkmm2ext/wscript | 1 |
4 files changed, 189 insertions, 2 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index b2c3d27766..739a2840ad 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -2316,8 +2316,6 @@ Route::put_control_outs_at (Placement p) _processors.insert(loc, _control_outs); - cerr << _name << " moved control outs to " << enum_2_string (p) << endl; - processors_changed (); /* EMIT SIGNAL */ _session.set_dirty (); } diff --git a/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc b/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc new file mode 100644 index 0000000000..d3f02a50f8 --- /dev/null +++ b/libs/gtkmm2ext/cell_renderer_pixbuf_toggle.cc @@ -0,0 +1,115 @@ +/* + Copyright (C) 2009 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + $Id: cell_renderer_toggle_pixbuf.cc $ +*/ + +#include <iostream> +#include <gtkmm.h> + +#include <gtkmm2ext/cell_renderer_pixbuf_toggle.h> + +using namespace std; +using namespace Gtk; +using namespace Gdk; +using namespace Glib; +using namespace Gtkmm2ext; + + +CellRendererPixbufToggle::CellRendererPixbufToggle() : + Glib::ObjectBase( typeid(CellRendererPixbufToggle) ), + Gtk::CellRenderer(), + property_pixbuf_(*this, "pixbuf"), + property_active_(*this, "active", false) +{ + property_mode() = Gtk::CELL_RENDERER_MODE_ACTIVATABLE; + property_xpad() = 2; + property_ypad() = 2; + property_sensitive() = false; +} + +Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > +CellRendererPixbufToggle::property_pixbuf() +{ + return property_pixbuf_.get_proxy(); +} + +Glib::PropertyProxy<bool> +CellRendererPixbufToggle::property_active() +{ + return property_active_.get_proxy(); +} + +// Overridden methods of the parent CellRenderer +Glib::PropertyProxy_Base +CellRendererPixbufToggle::_property_renderable() +{ + return property_pixbuf(); +} + +bool +CellRendererPixbufToggle::activate_vfunc(GdkEvent*, Gtk::Widget&, const Glib::ustring& path, const Gdk::Rectangle&, const Gdk::Rectangle&, Gtk::CellRendererState) +{ + signal_toggled_(path); + return true; +} + + + +void +CellRendererPixbufToggle::render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window, Gtk::Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, Gtk::CellRendererState flags) +{ + int offset_width = 0; + int offset_height = 0; + + if(property_active() == true){ + + offset_width = cell_area.get_x() + (int)(cell_area.get_width() - inactive_pixbuf->get_width())/2; + offset_height = cell_area.get_y() + (int)(cell_area.get_height() - inactive_pixbuf->get_height())/2; + + window->draw_pixbuf (RefPtr<GC>(), active_pixbuf, 0, 0, offset_width, offset_height, -1, -1, Gdk::RGB_DITHER_NORMAL, 0, 0); + } + else { + offset_width = cell_area.get_x() + (int)(cell_area.get_width() - inactive_pixbuf->get_width())/2; + offset_height = cell_area.get_y() + (int)(cell_area.get_height() - inactive_pixbuf->get_height())/2; + + window->draw_pixbuf (RefPtr<GC>(), inactive_pixbuf, 0, 0, offset_width, offset_height, -1, -1, Gdk::RGB_DITHER_NORMAL, 0, 0); + } +} + +void +CellRendererPixbufToggle::get_size_vfunc (Gtk::Widget& widget, const Gdk::Rectangle* cell_area, int* x_offset, int* y_offset, int* width, int* height) const +{ +//cerr << "cell_renderer_pixbuf_toggle get_size" << endl; + +} + +void +CellRendererPixbufToggle::set_active_pixbuf(Glib::RefPtr<Gdk::Pixbuf> pixbuf){ + active_pixbuf = pixbuf; +} + +void +CellRendererPixbufToggle::set_inactive_pixbuf(Glib::RefPtr<Gdk::Pixbuf> pixbuf){ + inactive_pixbuf = pixbuf; +} + +CellRendererPixbufToggle::SignalToggled& +CellRendererPixbufToggle::signal_toggled() +{ + return signal_toggled_; +} diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h new file mode 100644 index 0000000000..74f5e59a52 --- /dev/null +++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h @@ -0,0 +1,73 @@ +/* + Copyright (C) 2000-2009 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifndef __gtkmm2ext_cell_renderer_pixbuf_toggle_h__ +#define __gtkmm2ext_cell_renderer_pixbuf_toggle_h__ + +#include <gtkmm/drawingarea.h> +#include <gtkmm/adjustment.h> +#include <gtkmm/widget.h> +#include <gdkmm.h> + +using namespace Gtk; + +namespace Gtkmm2ext { + +class CellRendererPixbufToggle : public Gtk::CellRenderer +{ + public: + + CellRendererPixbufToggle(); + virtual ~CellRendererPixbufToggle(){}; + + virtual void render_vfunc (const Glib::RefPtr<Gdk::Drawable>& window, Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, Gtk::CellRendererState flags); + + virtual void get_size_vfunc (Gtk::Widget& widget, const Gdk::Rectangle* cell_area, int* x_offset, int* y_offset, int* width, int* height) const; + + virtual bool activate_vfunc(GdkEvent*, Gtk::Widget&, const Glib::ustring& path, const Gdk::Rectangle&, const Gdk::Rectangle&, Gtk::CellRendererState); + + Glib::PropertyProxy_Base _property_renderable(); + + Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf(); + Glib::PropertyProxy<bool> property_active(); + + void set_active_pixbuf(Glib::RefPtr<Gdk::Pixbuf> pixbuf); + void set_inactive_pixbuf(Glib::RefPtr<Gdk::Pixbuf> pixbuf); + + typedef sigc::signal<void, const Glib::ustring&> SignalToggled; + + SignalToggled& signal_toggled(); + + protected: + + private: + Glib::Property< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_; + Glib::Property<bool> property_active_; + + Glib::RefPtr<Gdk::Pixbuf> active_pixbuf; + Glib::RefPtr<Gdk::Pixbuf> inactive_pixbuf; + + //void on_cell_toggled(const Glib::ustring& path_string); + + SignalToggled signal_toggled_; +}; + +} // namespace + +#endif /* __gtkmm2ext_cell_renderer_pixbuf_toggle_h__ */ diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript index 81c0dfbacd..ec1fd3282c 100644 --- a/libs/gtkmm2ext/wscript +++ b/libs/gtkmm2ext/wscript @@ -40,6 +40,7 @@ def build(bld): auto_spin.cc barcontroller.cc binding_proxy.cc + cell_renderer_pixbuf_toggle.cc choice.cc click_box.cc dndtreeview.cc |