![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 4af154062b004563b70255de2cc2da51a3e5f028..c41d8ccb48615e50481d740bfd3c48812892ead7 100644 (file)
#include <glibmm/i18n.h>
#include <gtk/gtkstock.h>
+#include <gtk/gtkmain.h>
+
+#include <gtkmm/icontheme.h>
#include "inkscape.h"
#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 "ui/widget/imagetoggler.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
namespace UI {
namespace Dialogs {
-LayersPanel* LayersPanel::instance = 0;
-
-LayersPanel& LayersPanel::getInstance()
+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;
- }
-
- 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 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_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;
+ BUTTON_DUPLICATE,
+ BUTTON_DELETE,
+ BUTTON_SOLO
};
class LayersPanel::InternalUIBounce
SPObject* _target;
};
-static gboolean layers_panel_activated( GtkObject *object, GdkEvent * /*event*/, gpointer data )
+static gboolean layers_panel_activated( GtkObject */*object*/, GdkEvent * /*event*/, gpointer data )
{
if ( data )
{
LayersPanel* panel = reinterpret_cast<LayersPanel*>(data);
- panel->setDesktop( SP_ACTIVE_DESKTOP );
+ panel->setDesktop(panel->getDesktop());
}
return FALSE;
{
// 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;
_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;
}
_store->foreach( sigc::bind<SPObject*>(sigc::mem_fun(*this, &LayersPanel::_checkForUpdated), layer) );
}
-bool LayersPanel::_checkForUpdated(const Gtk::TreePath &path, const Gtk::TreeIter& iter, SPObject* layer)
+bool LayersPanel::_checkForUpdated(const Gtk::TreePath &/*path*/, const Gtk::TreeIter& iter, SPObject* layer)
{
bool stopGoing = false;
Gtk::TreeModel::Row row = *iter;
@@ -397,6 +329,7 @@ bool LayersPanel::_checkForSelected(const Gtk::TreePath &path, const Gtk::TreeIt
_tree.expand_to_path( path );
Glib::RefPtr<Gtk::TreeSelection> select = _tree.get_selection();
+
select->select(iter);
stopGoing = true;
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();
}
}
@@ -446,6 +381,7 @@ void LayersPanel::_addLayer( SPDocument* doc, SPObject* layer, Gtk::TreeModel::R
Glib::RefPtr<Gtk::TreeSelection> select = _tree.get_selection();
select->select(iter);
+
_checkTreeSelection();
}
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);
+
}
}
+
for ( std::vector<Gtk::Widget*>::iterator it = _watching.begin(); it != _watching.end(); ++it ) {
(*it)->set_sensitive( sensitive );
}
}
}
+void LayersPanel::_preToggle( GdkEvent const *event )
+{
+ if ( _toggleEvent ) {
+ gdk_event_free(_toggleEvent);
+ _toggleEvent = 0;
+ }
+
+ if ( event && (event->type == GDK_BUTTON_PRESS) ) {
+ // Make a copy so we can keep it around.
+ _toggleEvent = gdk_event_copy(const_cast<GdkEvent*>(event));
+ }
+}
+
void LayersPanel::_toggled( Glib::ustring const& str, int targetCol )
{
Gtk::TreeModel::Children::iterator iter = _tree.get_model()->get_iter(str);
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;
}
void LayersPanel::_handleButtonEvent(GdkEventButton* evt)
{
+ // TODO - fix to a better is-popup function
if ( (evt->type == GDK_BUTTON_PRESS) && (evt->button == 3) ) {
}
}
-void LayersPanel::_handleRowChange( Gtk::TreeModel::Path const& path, Gtk::TreeModel::iterator const& iter )
+void LayersPanel::_handleRowChange( Gtk::TreeModel::Path const& /*path*/, Gtk::TreeModel::iterator const& iter )
{
Gtk::TreeModel::Row row = *iter;
if ( row ) {
@@ -585,16 +538,46 @@ void LayersPanel::_handleRowChange( Gtk::TreeModel::Path const& path, Gtk::TreeM
}
}
+bool LayersPanel::_rowSelectFunction( Glib::RefPtr<Gtk::TreeModel> const & /*model*/, Gtk::TreeModel::Path const & /*path*/, bool currentlySelected )
+{
+ bool val = true;
+ if ( !currentlySelected && _toggleEvent )
+ {
+ GdkEvent* event = gtk_get_current_event();
+ if ( event ) {
+ // (keep these checks separate, so we know when to call gdk_event_free()
+ if ( event->type == GDK_BUTTON_PRESS ) {
+ GdkEventButton const* target = reinterpret_cast<GdkEventButton const*>(_toggleEvent);
+ GdkEventButton const* evtb = reinterpret_cast<GdkEventButton const*>(event);
+
+ if ( (evtb->window == target->window)
+ && (evtb->send_event == target->send_event)
+ && (evtb->time == target->time)
+ && (evtb->state == target->state)
+ )
+ {
+ // Ooooh! It's a magic one
+ val = false;
+ }
+ }
+ gdk_event_free(event);
+ }
+ }
+ return val;
+}
+
/**
* Constructor
*/
LayersPanel::LayersPanel() :
- Inkscape::UI::Widget::Panel( Glib::ustring(), "dialogs.layers" ),
+ UI::Widget::Panel("", "dialogs.layers", SP_VERB_DIALOG_LAYERS),
_maxNestDepth(20),
_mgr(0),
_desktop(0),
_model(0),
- _pending(0)
+ _pending(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) );
eyeRenderer->property_activatable() = true;
Gtk::TreeViewColumn* col = _tree.get_column(visibleColNum);
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) );
renderer->property_activatable() = true;
col = _tree.get_column(lockedColNum);
_tree.set_expander_column( *_tree.get_column(nameColNum) );
+ _compositeSettings.setSubject(&_subject);
- _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) );
_tree.signal_button_press_event().connect_notify( sigc::mem_fun(*this, &LayersPanel::_handleButtonEvent) );
_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);
+ _scroller.set_shadow_type(Gtk::SHADOW_IN);
+
+ _watching.push_back( &_compositeSettings );
+
+ _layersPage.pack_start( _scroller, Gtk::PACK_EXPAND_WIDGET );
+ _layersPage.pack_end(_compositeSettings, Gtk::PACK_SHRINK);
+ _layersPage.pack_end(_buttonsRow, Gtk::PACK_SHRINK);
- SPDesktop* targetDesktop = SP_ACTIVE_DESKTOP;
+ _notebook.append_page(_layersPage, _("Layers"));
+
+ _getContents()->pack_start(_notebook, Gtk::PACK_EXPAND_WIDGET);
+
+ 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() );
}
g_signal_connect( G_OBJECT(INKSCAPE), "activate_desktop", G_CALLBACK( layers_panel_activated ), this );
-
-
setDesktop( targetDesktop );
-
-
show_all_children();
- restorePanelPrefs();
+ // restorePanelPrefs();
}
LayersPanel::~LayersPanel()
{
+ _compositeSettings.setSubject(NULL);
+
if ( _model )
{
delete _model;
}
+
+ if ( _toggleEvent )
+ {
+ gdk_event_free( _toggleEvent );
+ _toggleEvent = 0;
+ }
}
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 );
+ //setLabel( _desktop->doc()->name );
_mgr = _desktop->layer_manager;
if ( _mgr ) {