![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 2dc7c2a9e9918cf8c16079972df13ab48c4d59a2..383d11f57b0e54a0559bd418c21ce9e09bf2fa6b 100644 (file)
#include "document.h"
#include "desktop.h"
-#include "desktop-handles.h"
-#include "selection.h"
#include "sp-object.h"
#include "sp-item.h"
#include "widgets/icon.h"
#include <gtkmm/widget.h>
#include "prefs-utils.h"
+#include "xml/repr.h"
+#include "svg/css-ostringstream.h"
+#include "desktop-style.h"
//#define DUMP_LAYERS 1
LayersPanel* LayersPanel::instance = 0;
-LayersPanel& LayersPanel::getInstance()
+LayersPanel*
+LayersPanel::create(Inkscape::UI::Dialog::Behavior::BehaviorFactory behavior_factory)
{
if ( !instance ) {
- instance = new LayersPanel();
+ instance = new LayersPanel(behavior_factory);
}
- return *instance;
+ return instance;
}
enum {
{
// Make sure selected layer hasn't changed since the action was triggered
if ( _pending
- && !( (_desktop && _desktop->currentLayer())
- && (_desktop->currentLayer() != _pending->_target)
- ) ) {
+ && (
+ (_pending->_actionCode == BUTTON_NEW)
+ || !( (_desktop && _desktop->currentLayer())
+ && (_desktop->currentLayer() != _pending->_target)
+ )
+ )
+ ) {
int val = _pending->_actionCode;
// SPObject* target = _pending->_target;
SPDocument* document = _desktop->doc();
SPObject* root = document->root;
if ( root ) {
+ _selectedConnection.block();
if ( _mgr && _mgr->includes( root ) ) {
SPObject* target = _desktop->currentLayer();
_store->clear();
#endif // DUMP_LAYERS
_addLayer( document, root, 0, target, 0 );
}
+ _selectedConnection.unblock();
}
}
void LayersPanel::_pushTreeSelectionToCurrent()
{
SPObject* inTree = _selectedLayer();
- if ( inTree ) {
- SPObject* curr = _desktop->currentLayer();
- if ( curr != inTree ) {
- // TODO - move these to a function in layer-manager.cpp
- _desktop->setCurrentLayer( inTree );
- sp_desktop_selection(_desktop)->clear();
+ // TODO hunt down the possible API abuse in getting NULL
+ if ( _desktop->currentRoot() ) {
+ if ( inTree ) {
+ SPObject* curr = _desktop->currentLayer();
+ if ( curr != inTree ) {
+ _mgr->setCurrentLayer( inTree );
+ }
+ } else {
+ _mgr->setCurrentLayer( _desktop->doc()->root );
}
- } else {
- // TODO - move these to a function in layer-manager.cpp
- _desktop->setCurrentLayer( _desktop->doc()->root );
- sp_desktop_selection(_desktop)->clear();
}
}
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();
+ }
+ }
}
}
+
for ( std::vector<Gtk::Widget*>::iterator it = _watching.begin(); it != _watching.end(); ++it ) {
(*it)->set_sensitive( sensitive );
}
row[_model->_colVisible] = newValue;
item->setHidden( !newValue );
item->updateRepr();
- sp_document_done( _desktop->doc() );
+ 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_document_done( _desktop->doc() , SP_VERB_DIALOG_LAYERS,
+ newValue? _("Lock layer") : _("Unlock layer"));
}
break;
}
@@ -657,11 +676,40 @@ bool LayersPanel::_rowSelectFunction( Glib::RefPtr<Gtk::TreeModel> const & model
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
*/
-LayersPanel::LayersPanel() :
- Inkscape::UI::Widget::Panel( Glib::ustring(), "dialogs.layers" ),
+LayersPanel::LayersPanel(Inkscape::UI::Dialog::Behavior::BehaviorFactory behavior_factory) :
+ Inkscape::UI::Dialog::Dialog(behavior_factory, "dialogs.layers", SP_VERB_DIALOG_LAYERS),
_maxNestDepth(20),
_mgr(0),
_desktop(0),
_tree.set_expander_column( *_tree.get_column(nameColNum) );
- _tree.get_selection()->signal_changed().connect( sigc::mem_fun(*this, &LayersPanel::_pushTreeSelectionToCurrent) );
+ _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) );
_tree.get_model()->signal_row_changed().connect( sigc::mem_fun(*this, &LayersPanel::_handleRowChange) );
_scroller.add( _tree );
_scroller.set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC );
- _getContents()->pack_start( _scroller, Gtk::PACK_EXPAND_WIDGET );
- _getContents()->pack_end(_buttonsRow, Gtk::PACK_SHRINK);
+
+
+ _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);
+
+ _spinBtn.set_width_chars(5);
+ _opacityBox.pack_end( _spinBtn, Gtk::PACK_SHRINK );
+ _watching.push_back( &_opacityBox );
+
+ get_vbox()->pack_start( _scroller, Gtk::PACK_EXPAND_WIDGET );
+
+ get_vbox()->pack_end(_opacityBox, Gtk::PACK_SHRINK);
+ get_vbox()->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;
}
g_signal_connect( G_OBJECT(INKSCAPE), "activate_desktop", G_CALLBACK( layers_panel_activated ), this );
-
-
setDesktop( targetDesktop );
-
-
show_all_children();
- restorePanelPrefs();
+ // restorePanelPrefs();
}
LayersPanel::~LayersPanel()
_desktop = SP_ACTIVE_DESKTOP;
if ( _desktop ) {
- setLabel( _desktop->doc()->name );
+ //setLabel( _desktop->doc()->name );
_mgr = _desktop->layer_manager;
if ( _mgr ) {