index 84de2fb86573eec2ce80011bd371066525d1f75d..383d11f57b0e54a0559bd418c21ce9e09bf2fa6b 100644 (file)
#include "sp-item.h"
#include "widgets/icon.h"
#include <gtkmm/widget.h>
#include "sp-item.h"
#include "widgets/icon.h"
#include <gtkmm/widget.h>
-#include <gtkmm/spinbutton.h>
#include "prefs-utils.h"
#include "xml/repr.h"
#include "svg/css-ostringstream.h"
#include "prefs-utils.h"
#include "xml/repr.h"
#include "svg/css-ostringstream.h"
LayersPanel* LayersPanel::instance = 0;
LayersPanel* LayersPanel::instance = 0;
-LayersPanel& LayersPanel::getInstance()
+LayersPanel*
+LayersPanel::create(Inkscape::UI::Dialog::Behavior::BehaviorFactory behavior_factory)
{
if ( !instance ) {
{
if ( !instance ) {
- instance = new LayersPanel();
+ instance = new LayersPanel(behavior_factory);
}
}
- return *instance;
+ return instance;
}
enum {
}
enum {
{
// Make sure selected layer hasn't changed since the action was triggered
if ( _pending
{
// 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;
int val = _pending->_actionCode;
// SPObject* target = _pending->_target;
_selectedConnection.block();
if ( _mgr && _mgr->includes( root ) ) {
SPObject* target = _desktop->currentLayer();
_selectedConnection.block();
if ( _mgr && _mgr->includes( root ) ) {
SPObject* target = _desktop->currentLayer();
- _store->clear(); // TODO BIG FIX
+ _store->clear();
#if DUMP_LAYERS
g_message("root:%p {%s} [%s]", root, root->id, root->label() );
#if DUMP_LAYERS
g_message("root:%p {%s} [%s]", root, root->id, root->label() );
_mgr->setCurrentLayer( inTree );
}
} else {
_mgr->setCurrentLayer( inTree );
}
} else {
- _mgr->setCurrentLayer( _desktop->doc()->root ); // TODO BIG FIX
+ _mgr->setCurrentLayer( _desktop->doc()->root );
}
}
}
}
}
}
if ( inTree->repr ) {
SPCSSAttr *css = sp_repr_css_attr(inTree->repr, "style");
if ( css ) {
if ( inTree->repr ) {
SPCSSAttr *css = sp_repr_css_attr(inTree->repr, "style");
if ( css ) {
- _opacity.set_value( sp_repr_css_double_property( css, "opacity", 1.0 ) );
+ _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();
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;
}
break;
row[_model->_colLocked] = newValue;
item->setLocked( newValue );
item->updateRepr();
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;
}
}
break;
}
if ( _desktop && layer && !_opacityConnection.blocked() ) {
_opacityConnection.block();
if ( _desktop && layer && !_opacityConnection.blocked() ) {
_opacityConnection.block();
-
Gtk::Adjustment* adj = _opacity.get_adjustment();
SPCSSAttr *css = sp_repr_css_attr_new();
Inkscape::CSSOStringStream os;
Gtk::Adjustment* adj = _opacity.get_adjustment();
SPCSSAttr *css = sp_repr_css_attr_new();
Inkscape::CSSOStringStream os;
- os << CLAMP( adj->get_value(), 0.0, 1.0 );
+ 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 );
sp_repr_css_set_property( css, "opacity", os.str().c_str() );
sp_desktop_apply_css_recursive( layer, css, true );
sp_repr_css_attr_unref( css );
sp_repr_css_attr_unref( css );
- sp_document_maybe_done( _desktop->doc(), "layers:opacity" );
+ sp_document_maybe_done( _desktop->doc(), "layers:opacity", SP_VERB_DIALOG_LAYERS,
+ _("Change layer opacity"));
_opacityConnection.unblock();
}
_opacityConnection.unblock();
}
/**
* Constructor
*/
/**
* 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),
_maxNestDepth(20),
_mgr(0),
_desktop(0),
_scroller.set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC );
_scroller.set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC );
- _opacityBox.pack_start( *manage( new Gtk::Label(_("Opacity:"))), Gtk::PACK_SHRINK );
+ _opacityBox.pack_start( *manage( new Gtk::Label(_("Opacity, %:"))), Gtk::PACK_SHRINK );
_opacity.set_draw_value(false);
_opacity.set_draw_value(false);
- _opacity.set_value(1.0);
- _opacity.set_range(0.0, 1.0);
- _opacity.set_increments(0.01, 0.1);
+ _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 );
_opacityBox.pack_start( _opacity, Gtk::PACK_EXPAND_WIDGET );
- Gtk::SpinButton* spinBtn = manage( new Gtk::SpinButton(*_opacity.get_adjustment(), 0.0, 3) );
+ _spinBtn.configure(*_opacity.get_adjustment(), 0, 1);
- _opacityBox.pack_end( *spinBtn, Gtk::PACK_SHRINK );
+ _spinBtn.set_width_chars(5);
+ _opacityBox.pack_end( _spinBtn, Gtk::PACK_SHRINK );
_watching.push_back( &_opacityBox );
_watching.push_back( &_opacityBox );
- _getContents()->pack_start( _scroller, Gtk::PACK_EXPAND_WIDGET );
+ get_vbox()->pack_start( _scroller, Gtk::PACK_EXPAND_WIDGET );
- _getContents()->pack_end(_opacityBox, Gtk::PACK_SHRINK);
- _getContents()->pack_end(_buttonsRow, Gtk::PACK_SHRINK);
+ 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) );
_opacityConnection = _opacity.get_adjustment()->signal_value_changed().connect( sigc::mem_fun(*this, &LayersPanel::_opacityChanged) );
}
g_signal_connect( G_OBJECT(INKSCAPE), "activate_desktop", G_CALLBACK( layers_panel_activated ), this );
}
g_signal_connect( G_OBJECT(INKSCAPE), "activate_desktop", G_CALLBACK( layers_panel_activated ), this );
-
-
setDesktop( targetDesktop );
setDesktop( targetDesktop );
-
-
show_all_children();
show_all_children();
- restorePanelPrefs();
+ // restorePanelPrefs();
}
LayersPanel::~LayersPanel()
}
LayersPanel::~LayersPanel()
_desktop = SP_ACTIVE_DESKTOP;
if ( _desktop ) {
_desktop = SP_ACTIVE_DESKTOP;
if ( _desktop ) {
- setLabel( _desktop->doc()->name );
+ //setLabel( _desktop->doc()->name );
_mgr = _desktop->layer_manager;
if ( _mgr ) {
_mgr = _desktop->layer_manager;
if ( _mgr ) {