Experimental merge of Ponyscape features into trunk (will not compile)

(bzr r13090.1.2)

4 files changed, 33 insertions, 1 deletions

diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 2cfe97db8..fbd9a6538 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -616,6 +616,18 @@ SPGroup::LayerMode SPGroup::layerDisplayMode(unsigned int dkey) const {
     }
 }
 
+void SPGroup::setExpanded(bool isexpanded) {
+    if ( _expanded != isexpanded ){
+        _expanded = isexpanded;
+    }
+}
+
+void SPGroup::setInsertBottom(bool insertbottom) {
+    if ( _insertBottom != insertbottom) {
+        _insertBottom = insertbottom;
+    }
+}
+
 void SPGroup::setLayerDisplayMode(unsigned int dkey, SPGroup::LayerMode mode) {
     if ( layerDisplayMode(dkey) != mode ) {
         _display_modes[dkey] = mode;
diff --git a/src/sp-item-group.h b/src/sp-item-group.h
index 2004a72b8..68bbd083a 100644
--- a/src/sp-item-group.h
+++ b/src/sp-item-group.h
@@ -35,12 +35,20 @@ public:
 
     enum LayerMode { GROUP, LAYER, MASK_HELPER };
 
+    bool _expanded;
+    bool _insertBottom;
     LayerMode _layer_mode;
     std::map<unsigned int, LayerMode> _display_modes;
 
     LayerMode layerMode() const { return _layer_mode; }
     void setLayerMode(LayerMode mode);
 
+    bool expanded() const { return _expanded; }
+    void setExpanded(bool isexpanded);
+    
+    bool insertBottom() const { return _insertBottom; }
+    void setInsertBottom(bool insertbottom);
+
     LayerMode effectiveLayerMode(unsigned int display_key) const {
         if ( _layer_mode == LAYER ) {
             return LAYER;
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 31e73db29..5023a8813 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -57,6 +57,8 @@
 
 //#define DUMP_LAYERS 1
 
+guint get_group0_keyval(GdkEventKey *event);
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
@@ -414,7 +416,7 @@ bool ObjectsPanel::_checkForUpdated(const Gtk::TreeIter& iter, SPObject* obj)
         row[_model->_colLocked] = item ? !item->isSensitive() : false;
         row[_model->_colType] = group ? (group->layerMode() == SPGroup::LAYER ? 2 : 1) : 0;
         row[_model->_colHighlight] = item ? (item->isHighlightSet() ? item->highlight_color() : item->highlight_color() & 0xffffff00) : 0;
-        row[_model->_colClipMask] = item ? (item->clip_ref && item->clip_ref->getObject() ? (item->clip_ref->getObject()->inverse ? 3 : 1) : (item->mask_ref && item->mask_ref->getObject() ? 2 : 0)) : 0;
+        row[_model->_colClipMask] = item ? (item->clip_ref && item->clip_ref->getObject() ?  1 : (item->mask_ref && item->mask_ref->getObject() ? 2 : 0)) : 0;
         row[_model->_colInsertOrder] = group ? (group->insertBottom() ? 2 : 1) : 0;
 
         return true;
@@ -2035,6 +2037,14 @@ void ObjectsPanel::setDesktop( SPDesktop* desktop )
 } //namespace UI
 } //namespace Inkscape
 
+guint get_group0_keyval(GdkEventKey *event) {
+    guint keyval = 0;
+    gdk_keymap_translate_keyboard_state(gdk_keymap_get_for_display(
+            gdk_display_get_default()), event->hardware_keycode,
+            (GdkModifierType) event->state, 0 /*event->key.group*/, &keyval,
+            NULL, NULL, NULL);
+    return keyval;
+}
 
 /*
   Local Variables:
diff --git a/src/verbs.h b/src/verbs.h
index 0f764eb29..b8a0b1fd5 100644
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -289,6 +289,8 @@ enum {
     SP_VERB_DIALOG_INPUT,
     SP_VERB_DIALOG_EXTENSIONEDITOR,
     SP_VERB_DIALOG_LAYERS,
+    SP_VERB_DIALOG_OBJECTS,
+    SP_VERB_DIALOG_TAGS,
     SP_VERB_DIALOG_LIVE_PATH_EFFECT,
     SP_VERB_DIALOG_FILTER_EFFECTS,
     SP_VERB_DIALOG_SVG_FONTS,