![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index ff18c82b463d0b678357d8f7fe6c3b2735c14cb9..c41d8ccb48615e50481d740bfd3c48812892ead7 100644 (file)
#include <gtk/gtkstock.h>
#include <gtk/gtkmain.h>
+#include <gtkmm/icontheme.h>
+
#include "inkscape.h"
#include "layers-panel.h"
#include "sp-object.h"
#include "sp-item.h"
#include "widgets/icon.h"
+#include "ui/widget/imagetoggler.h"
#include <gtkmm/widget.h>
#include "prefs-utils.h"
#include "xml/repr.h"
namespace UI {
namespace Dialogs {
-LayersPanel* LayersPanel::instance = 0;
-
LayersPanel&
LayersPanel::getInstance()
{
- if ( !instance ) {
- instance = new LayersPanel();
- }
-
- return *instance;
+ return *new LayersPanel();
}
enum {
BUTTON_BOTTOM,
BUTTON_UP,
BUTTON_DOWN,
-// BUTTON_DUPLICATE,
- BUTTON_DELETE
-};
-
-class ImageToggler : public Gtk::CellRendererPixbuf {
-public:
- ImageToggler( char const* on, char const* off) :
- Glib::ObjectBase(typeid(ImageToggler)),
- Gtk::CellRendererPixbuf(),
- _pixOnName(on),
- _pixOffName(off),
- _property_active(*this, "active", false),
- _property_activatable(*this, "activatable", true),
- _property_pixbuf_on(*this, "pixbuf_on", Glib::RefPtr<Gdk::Pixbuf>(0)),
- _property_pixbuf_off(*this, "pixbuf_off", Glib::RefPtr<Gdk::Pixbuf>(0))
- {
- property_mode() = Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
-
- Gtk::Widget* thingie = sp_icon_get_icon(_pixOnName.c_str(), Inkscape::ICON_SIZE_DECORATION);
- if ( thingie ) {
- if ( SP_IS_ICON(thingie->gobj()) ) {
- SPIcon* icon = SP_ICON(thingie->gobj());
- sp_icon_fetch_pixbuf( icon );
- _property_pixbuf_on = Glib::wrap( icon->pb, true );
- }
- delete thingie;
- }
- thingie = sp_icon_get_icon(_pixOffName.c_str(), Inkscape::ICON_SIZE_DECORATION);
- if ( thingie ) {
- if ( SP_IS_ICON(thingie->gobj()) ) {
- SPIcon* icon = SP_ICON(thingie->gobj());
- sp_icon_fetch_pixbuf( icon );
- _property_pixbuf_off = Glib::wrap( icon->pb, true );
- }
- delete thingie;
- }
- property_pixbuf() = _property_pixbuf_off.get_value();
- }
-
- sigc::signal<void, const Glib::ustring&> signal_toggled()
- {
- return _signal_toggled;
- }
-
- sigc::signal<void, GdkEvent const *> signal_pre_toggle()
- {
- return _signal_pre_toggle;
- }
-
- Glib::PropertyProxy<bool> property_active() { return _property_active.get_proxy(); }
- Glib::PropertyProxy<bool> property_activatable() { return _property_activatable.get_proxy(); }
- Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_on();
- Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_off();
-// virtual Glib::PropertyProxy_Base _property_renderable(); //override
-
-protected:
-
- virtual void get_size_vfunc( Gtk::Widget& widget,
- const Gdk::Rectangle* cell_area,
- int* x_offset,
- int* y_offset,
- int* width,
- int* height ) const
- {
- Gtk::CellRendererPixbuf::get_size_vfunc( widget, cell_area, x_offset, y_offset, width, height );
-
- if ( width ) {
- *width += (*width) >> 1;
- }
- if ( height ) {
- *height += (*height) >> 1;
- }
- }
-
-
- virtual void 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 )
- {
- property_pixbuf() = _property_active.get_value() ? _property_pixbuf_on : _property_pixbuf_off;
- Gtk::CellRendererPixbuf::render_vfunc( window, widget, background_area, cell_area, expose_area, flags );
- }
-
- virtual bool activate_vfunc(GdkEvent* event,
- Gtk::Widget& /*widget*/,
- const Glib::ustring& path,
- const Gdk::Rectangle& /*background_area*/,
- const Gdk::Rectangle& /*cell_area*/,
- Gtk::CellRendererState /*flags*/)
- {
- _signal_pre_toggle.emit(event);
- _signal_toggled.emit(path);
-
- return false;
- }
-
-
-private:
- Glib::ustring _pixOnName;
- Glib::ustring _pixOffName;
-
- Glib::Property<bool> _property_active;
- Glib::Property<bool> _property_activatable;
- Glib::Property< Glib::RefPtr<Gdk::Pixbuf> > _property_pixbuf_on;
- Glib::Property< Glib::RefPtr<Gdk::Pixbuf> > _property_pixbuf_off;
-
- sigc::signal<void, const Glib::ustring&> _signal_toggled;
- sigc::signal<void, GdkEvent const *> _signal_pre_toggle;
+ BUTTON_DUPLICATE,
+ BUTTON_DELETE,
+ BUTTON_SOLO
};
class LayersPanel::InternalUIBounce
if ( data )
{
LayersPanel* panel = reinterpret_cast<LayersPanel*>(data);
- panel->setDesktop( SP_ACTIVE_DESKTOP );
+ panel->setDesktop(panel->getDesktop());
}
return FALSE;
_fireAction( SP_VERB_LAYER_LOWER );
}
break;
+ case BUTTON_DUPLICATE:
+ {
+ _fireAction( SP_VERB_LAYER_DUPLICATE );
+ }
+ break;
case BUTTON_DELETE:
{
_fireAction( SP_VERB_LAYER_DELETE );
}
+ case BUTTON_SOLO:
+ {
+ _fireAction( SP_VERB_LAYER_SOLO );
+ }
break;
}
sensitiveNonTop = (Inkscape::next_layer(inTree->parent, inTree) != 0);
sensitiveNonBottom = (Inkscape::previous_layer(inTree->parent, inTree) != 0);
- if ( inTree->repr ) {
- SPCSSAttr *css = sp_repr_css_attr(inTree->repr, "style");
- if ( css ) {
- _opacityConnection.block();
- _opacity.set_value( sp_repr_css_double_property( css, "opacity", 1.0 ) * 100 );
- _opacityConnection.unblock();
- }
- }
}
}
row[_model->_colVisible] = newValue;
item->setHidden( !newValue );
item->updateRepr();
- sp_document_done( _desktop->doc() , SP_VERB_DIALOG_LAYERS,
+ sp_document_done( _desktop->doc() , SP_VERB_DIALOG_LAYERS,
newValue? _("Unhide layer") : _("Hide layer"));
}
break;
row[_model->_colLocked] = newValue;
item->setLocked( newValue );
item->updateRepr();
- sp_document_done( _desktop->doc() , SP_VERB_DIALOG_LAYERS,
+ sp_document_done( _desktop->doc() , SP_VERB_DIALOG_LAYERS,
newValue? _("Lock layer") : _("Unlock layer"));
}
break;
@@ -676,35 +566,6 @@ bool LayersPanel::_rowSelectFunction( Glib::RefPtr<Gtk::TreeModel> const & /*mod
return val;
}
-
-void LayersPanel::_opacityChanged()
-{
- SPObject* layer = _selectedLayer();
-
- if ( _desktop && layer && !_opacityConnection.blocked() ) {
- _opacityConnection.block();
-
- Gtk::Adjustment* adj = _opacity.get_adjustment();
- SPCSSAttr *css = sp_repr_css_attr_new();
-
- Inkscape::CSSOStringStream os;
- os << CLAMP( adj->get_value() / 100, 0.0, 1.0 );
- sp_repr_css_set_property( css, "opacity", os.str().c_str() );
-
- sp_desktop_apply_css_recursive( layer, css, true );
- layer->updateRepr();
-
- sp_repr_css_attr_unref( css );
-
- sp_document_maybe_done( _desktop->doc(), "layers:opacity", SP_VERB_DIALOG_LAYERS,
- _("Change layer opacity"));
-
- _opacityConnection.unblock();
- }
-}
-
-
-
/**
* Constructor
*/
_desktop(0),
_model(0),
_pending(0),
- _toggleEvent(0)
+ _toggleEvent(0),
+ _compositeSettings(SP_VERB_DIALOG_LAYERS, "layers", UI::Widget::SimpleFilterModifier::BLEND)
{
_maxNestDepth = prefs_get_int_attribute_limited("dialogs.layers", "maxDepth", 20, 1, 1000);
_tree.set_model( _store );
_tree.set_headers_visible(false);
- ImageToggler* eyeRenderer = manage( new ImageToggler("visible", "hidden") );
+ Inkscape::UI::Widget::ImageToggler *eyeRenderer = manage( new Inkscape::UI::Widget::ImageToggler("visible", "hidden") );
int visibleColNum = _tree.append_column("vis", *eyeRenderer) - 1;
eyeRenderer->signal_pre_toggle().connect( sigc::mem_fun(*this, &LayersPanel::_preToggle) );
eyeRenderer->signal_toggled().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_toggled), (int)COL_VISIBLE) );
col->add_attribute( eyeRenderer->property_active(), _model->_colVisible );
}
- ImageToggler * renderer = manage( new ImageToggler("width_height_lock", "lock_unlocked") );
+ Inkscape::UI::Widget::ImageToggler * renderer = manage( new Inkscape::UI::Widget::ImageToggler("width_height_lock", "lock_unlocked") );
int lockedColNum = _tree.append_column("lock", *renderer) - 1;
renderer->signal_pre_toggle().connect( sigc::mem_fun(*this, &LayersPanel::_preToggle) );
renderer->signal_toggled().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_toggled), (int)COL_LOCKED) );
_tree.set_expander_column( *_tree.get_column(nameColNum) );
+ _compositeSettings.setSubject(&_subject);
_selectedConnection = _tree.get_selection()->signal_changed().connect( sigc::mem_fun(*this, &LayersPanel::_pushTreeSelectionToCurrent) );
_tree.get_selection()->set_select_function( sigc::mem_fun(*this, &LayersPanel::_rowSelectFunction) );
_scroller.add( _tree );
_scroller.set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC );
+ _scroller.set_shadow_type(Gtk::SHADOW_IN);
+ _watching.push_back( &_compositeSettings );
- _opacityBox.pack_start( *manage( new Gtk::Label(_("Opacity, %:"))), Gtk::PACK_SHRINK );
-
- _opacity.set_draw_value(false);
- _opacity.set_value(100.0);
- _opacity.set_range(0.0, 100.0);
- _opacity.set_increments(1, 10);
- _opacityBox.pack_start( _opacity, Gtk::PACK_EXPAND_WIDGET );
-
- _spinBtn.configure(*_opacity.get_adjustment(), 0, 1);
+ _layersPage.pack_start( _scroller, Gtk::PACK_EXPAND_WIDGET );
+ _layersPage.pack_end(_compositeSettings, Gtk::PACK_SHRINK);
+ _layersPage.pack_end(_buttonsRow, Gtk::PACK_SHRINK);
- _spinBtn.set_width_chars(5);
- _opacityBox.pack_end( _spinBtn, Gtk::PACK_SHRINK );
- _watching.push_back( &_opacityBox );
+ _notebook.append_page(_layersPage, _("Layers"));
- _getContents()->pack_start( _scroller, Gtk::PACK_EXPAND_WIDGET );
+ _getContents()->pack_start(_notebook, Gtk::PACK_EXPAND_WIDGET);
- _getContents()->pack_end(_opacityBox, Gtk::PACK_SHRINK);
- _getContents()->pack_end(_buttonsRow, Gtk::PACK_SHRINK);
-
- _opacityConnection = _opacity.get_adjustment()->signal_value_changed().connect( sigc::mem_fun(*this, &LayersPanel::_opacityChanged) );
-
- SPDesktop* targetDesktop = SP_ACTIVE_DESKTOP;
+ SPDesktop* targetDesktop = getDesktop();
_buttonsRow.set_child_min_width( 16 );
// -------------------------------------------------------
{
_watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_RENAME, 0, "Rename", (int)BUTTON_RENAME ) );
+ _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_DUPLICATE, 0, "Duplicate", (int)BUTTON_DUPLICATE ) );
_watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_NEW, 0, "New", (int)BUTTON_NEW ) );
+ _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_SOLO, 0, "Solo", (int)BUTTON_SOLO ) );
_popupMenu.items().push_back( Gtk::Menu_Helpers::SeparatorElem() );
LayersPanel::~LayersPanel()
{
+ _compositeSettings.setSubject(NULL);
+
if ( _model )
{
delete _model;
void LayersPanel::setDesktop( SPDesktop* desktop )
{
+ Panel::setDesktop(desktop);
+
if ( desktop != _desktop ) {
_layerChangedConnection.disconnect();
_layerUpdatedConnection.disconnect();
_desktop = 0;
}
- _desktop = SP_ACTIVE_DESKTOP;
+ _desktop = getDesktop();
if ( _desktop ) {
//setLabel( _desktop->doc()->name );