Merge lp:~chr0x07/inkscape/0.92.fixes.2 into lp:inkscape/0.92.x

[chr[]]

Support Raise and Lower (z-order) for non-overlapping objects

To generate CNC data with inkscape we want to order objects by z-order

bugfixes object manager panel:

- It uses raise/lower which is clearly a bug

- polish behavior regarding collapsing/expanding the tree: in drawings with many objects in groups it is annoying if it opens group just by selecting them. Expand group as they are entered via double click

- disable search function which eats many keystrokes: use ctrl+f to use it

- fix some memory leaks

- fix: speed up inkscape startup time
 (due to missing icons / non cached icons)
 (~2 seconds left: stroke-panel/arrow marker ....)

Note: this no more modifies default key strokes, you can assign the keystrokes you like to the new functions.

[chr[] (chr0x07)]

I have no idea why CMakeScripts/InstallMSYS2.cmake made it into the diff

[Patrick Storz (ede123)]

Could you maybe just "bzr revert CMakeScripts/InstallMSYS2.cmake"?

I guess this has to do with Bazaar storing something like an inode number for each file, so even if a file has the same content it will show as a conflict (stupid, but that's just the way bzr is ;-) )

I recently had to explicitly delete and recreate that file as it was impossible to merge changes from trunk otherwise (bzr insisted it were different files, even when the content was identical, because they were created "individually" after branching 0.92.x)

[chr[] (chr0x07)]

so, the diff looks all right now

[Mc (mc...)]

review: Approve

=== modified file 'share/icons/icons.svg'
--- share/icons/icons.svg	2016-12-15 13:03:33 +0000
+++ share/icons/icons.svg	2017-05-17 23:30:53 +0000
@@ -4323,4 +4323,28 @@
 </g>
 </g>
 </g>
+<g id="object-clipped" transform="translate(238.8904,209.8666)">
+<rect transform="rotate(90)" style="opacity:1;vector-effect:none;fill:#9ab8d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" id="rect5272" width="16.00001" height="15.99999" x="159.1449" y="-92.158638" />
+<path d="m -98.444747,-168.45699 a 12.6149,12.6149 0 0 1 13.078074,12.08243 l -12.60403,0.52356 z" sodipodi:end="6.24167" sodipodi:start="4.674802" sodipodi:ry="12.6149" sodipodi:rx="12.6149" sodipodi:cy="-155.851" sodipodi:cx="-97.970703" sodipodi:type="arc" id="path5274" style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.99335549;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.20000005;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" transform="rotate(-177.7077)" />
+<rect y="-91.658653" x="159.6449" height="15" width="15" id="rect5276" style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#c80000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" transform="rotate(90)" />
+</g>
+<g transform="matrix(1.034469,0,0,1.034469,199.9323,-218.0428)" id="object-masked" style="stroke-width:0.96667951">
+<g style="stroke-width:0.96667659" transform="matrix(1.000013,0,0,0.9999918,121.4104,415.3122)" id="g5284">
+<path style="opacity:1;vector-effect:none;fill:#9ab8d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.45001554;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" d="m 13.55417,167.1658 v -14.5 h 14.5 z" id="path5280" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" />
+<path style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.45001554;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" d="m 28.05417,152.6658 v 14.5 h -14.5 z" id="path5282" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" />
+</g>
+<g style="stroke-width:2.00240207" id="g5290" transform="matrix(-0.4827649,0,0,-0.4827546,152.2584,652.4268)">
+<path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" id="path5286" d="m 13.55417,167.1658 v -14.5 h 14.5 z" style="opacity:1;vector-effect:none;fill:#9ab8d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.00360346;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+<path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" id="path5288" d="m 28.05417,152.6658 v 14.5 h -14.5 z" style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.00360346;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+</g>
+<rect y="-149.465" x="567.97681" height="14.50019" width="14.49988" id="rect5292" style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.96667951;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" transform="rotate(90)" />
+</g>
+<g style="opacity:1;stroke-width:0.96774209" transform="matrix(1.033333,0,0,1.033333,166.9413,-217.5105)" id="object-clip-mask">
+<path style="opacity:1;vector-effect:none;fill:#9ab8d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.45161366;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" d="m 190.0319,582.7473 v -15 h 15 z" id="path5296" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" />
+<path style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.98349819;fill-rule:nonzero;stroke:none;stroke-width:1.45161366;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" d="m 205.0318,567.7474 v 15 h -15 z" id="path5298" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" />
+<path transform="rotate(-177.7077)" style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:0.99335549;fill-rule:nonzero;stroke:#000000;stroke-width:0.96774209;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.20000005;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" id="path5300" sodipodi:type="arc" sodipodi:cx="-227.3363" sodipodi:cy="-559.35199" sodipodi:rx="12.6149" sodipodi:ry="12.6149" sodipodi:start="4.674802" sodipodi:end="6.24167" d="m -227.81035,-571.95798 a 12.6149,12.6149 0 0 1 13.07808,12.08243 l -12.60403,0.52356 z" />
+<path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" id="path5302" d="m 194.0319,578.7472 v -6.9999 h 7 z" style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.45161378;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+<rect transform="rotate(90)" style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#c80000;stroke-width:0.96774209;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" id="rect5304" width="14.5" height="14.5" x="567.99731" y="-204.78191" />
+<path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" id="path5306" d="m 201.0319,571.7473 v 6.9999 h -7 z" style="opacity:1;vector-effect:none;fill:#9ab8d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.45161378;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+</g>
 </svg>

=== modified file 'src/live_effects/lpe-bspline.cpp'
--- src/live_effects/lpe-bspline.cpp	2016-01-05 15:30:09 +0000
+++ src/live_effects/lpe-bspline.cpp	2017-05-17 23:30:53 +0000
@@ -168,6 +168,7 @@
         doBSplineFromWidget(curve, weight_ammount/100.0);
         gchar *str = sp_svg_write_path(curve->get_pathvector());
         path->getRepr()->setAttribute("inkscape:original-d", str);
+        g_free(str);
     }
 }
 

=== modified file 'src/live_effects/parameter/path.cpp'
--- src/live_effects/parameter/path.cpp	2016-07-02 00:27:56 +0000
+++ src/live_effects/parameter/path.cpp	2017-05-17 23:30:53 +0000
@@ -242,8 +242,9 @@
         r.lpe_key = param_key;
         Geom::PathVector stored_pv =  _pathvector;
         param_write_to_repr("M0,0 L1,0");
-        const char *svgd = sp_svg_write_path(stored_pv);
+        gchar *svgd = sp_svg_write_path(stored_pv);
         param_write_to_repr(svgd);
+        g_free(svgd);
     } else {
         r.item = ref.getObject();
     }

=== modified file 'src/path-chemistry.cpp'
--- src/path-chemistry.cpp	2016-04-08 13:26:55 +0000
+++ src/path-chemistry.cpp	2017-05-17 23:30:53 +0000
@@ -250,8 +250,9 @@
                 repr->setAttribute("inkscape:original-d", str);
             else
                 repr->setAttribute("d", str);
+            str = sp_svg_transform_write(transform);
+            repr->setAttribute("transform", str);
             g_free(str);
-            repr->setAttribute("transform", sp_svg_transform_write(transform));
             
             // add the new repr to the parent
             parent->appendChild(repr);

=== modified file 'src/selection-chemistry.cpp'
--- src/selection-chemistry.cpp	2017-02-22 13:10:40 +0000
+++ src/selection-chemistry.cpp	2017-05-17 23:30:53 +0000
@@ -1115,6 +1115,63 @@
                        C_("Undo action", "Lower"));
 }
 
+void sp_selection_stack_down(Inkscape::Selection *selection, SPDesktop *desktop)
+{
+    SPDocument *document = selection->layers()->getDocument();
+    std::vector<SPItem*> selected = selection->itemList();
+
+    if (selected.empty()) {
+        selection_display_message(desktop, Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to stack down."));
+        return;
+    }
+
+    /* Construct direct-ordered list of selected children. */
+    std::vector<SPItem*> items(selected);
+    sort(items.begin(),items.end(),sp_item_repr_compare_position_bool);
+
+    for (std::vector<SPItem*>::const_iterator item=items.begin();item!=items.end();++item) {
+        SPItem *item_obj = *item;
+        if(!item_obj->lowerOne()) {
+            DocumentUndo::cancel(document);
+            selection_display_message(desktop, Inkscape::WARNING_MESSAGE, _("We hit bottom."));
+            return;
+        }
+    }
+
+    DocumentUndo::done(document, SP_VERB_SELECTION_STACK_DOWN,
+           //TRANSLATORS: "Lower" means "to lower an object" in the undo history
+           C_("Undo action", "stack down"));
+}
+
+void sp_selection_stack_up(Inkscape::Selection *selection, SPDesktop *desktop)
+{
+    SPDocument *document = selection->layers()->getDocument();
+    std::vector<SPItem*> selected = selection->itemList();
+
+    if (selected.empty()) {
+        selection_display_message(desktop, Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to stack up."));
+        return;
+    }
+
+    /* Construct direct-ordered list of selected children. */
+    std::vector<SPItem*> items(selected);
+    sort(items.begin(),items.end(),sp_item_repr_compare_position_bool);
+    bool cancel = false;
+
+    for (std::vector<SPItem*>::const_reverse_iterator item=items.rbegin();item!=items.rend();++item) {
+        SPItem *item_obj = *item;
+        if (!item_obj->raiseOne()) {
+            DocumentUndo::cancel(document);
+            selection_display_message(desktop, Inkscape::WARNING_MESSAGE, _("We hit top."));
+            return;
+        }
+    }
+
+    DocumentUndo::done(document, SP_VERB_SELECTION_STACK_UP,
+       //TRANSLATORS: "Lower" means "to lower an object" in the undo history
+       C_("Undo action", "stack up"));
+}
+
 void sp_selection_lower_to_bottom(Inkscape::Selection *selection, SPDesktop *desktop)
 {
     SPDocument *document = selection->layers()->getDocument();
@@ -3175,8 +3232,11 @@
     the_parent_repr->appendChild(clone);
 
     if( single_group && transform.isTranslation() ) {
-        if( !transform.isIdentity() )
-            clone->setAttribute("transform", sp_svg_transform_write( transform ));
+        if( !transform.isIdentity() ) {
+            gchar *c = sp_svg_transform_write( transform );
+            clone->setAttribute("transform", c);
+            g_free(c);
+        }
     }
 
     // Change selection to new <use> element.

=== modified file 'src/selection-chemistry.h'
--- src/selection-chemistry.h	2016-04-14 18:19:03 +0000
+++ src/selection-chemistry.h	2017-05-17 23:30:53 +0000
@@ -79,8 +79,10 @@
 void sp_selection_ungroup_pop_selection(Inkscape::Selection *selection, SPDesktop *desktop);
 
 void sp_selection_raise(Inkscape::Selection *selection, SPDesktop *desktop);
+void sp_selection_stack_up(Inkscape::Selection *selection, SPDesktop *desktop);
 void sp_selection_raise_to_top(Inkscape::Selection *selection, SPDesktop *desktop);
 void sp_selection_lower(Inkscape::Selection *selection, SPDesktop *desktop);
+void sp_selection_stack_down(Inkscape::Selection *selection, SPDesktop *desktop);
 void sp_selection_lower_to_bottom(Inkscape::Selection *selection, SPDesktop *desktop);
 
 SPCSSAttr *take_style_from_item (SPObject *object);

=== modified file 'src/sp-item-group.cpp'
--- src/sp-item-group.cpp	2016-08-29 06:01:18 +0000
+++ src/sp-item-group.cpp	2017-05-17 23:30:53 +0000
@@ -598,6 +598,7 @@
                     Geom::Affine ttrans = ctrans.inverse() * SP_ITEM(text)->transform * ctrans;
                     gchar *affinestr = sp_svg_transform_write(ttrans);
                     nrepr->setAttribute("transform", affinestr);
+                    g_free(affinestr);
                 }
             } else {
                 nrepr->setAttribute("transform", affinestr);

=== modified file 'src/sp-item.cpp'
--- src/sp-item.cpp	2017-01-17 10:28:55 +0000
+++ src/sp-item.cpp	2017-05-17 23:30:53 +0000
@@ -318,17 +318,19 @@
     }
 }
 
-void SPItem::raiseOne() {
+bool SPItem::raiseOne() {
     SPObject *next_higher=std::find_if<SPObject::SiblingIterator>(
         next, NULL, &is_item
     );
     if (next_higher) {
         Inkscape::XML::Node *ref = next_higher->getRepr();
         getRepr()->parent()->changeOrder(getRepr(), ref);
+        return true;
     }
+    return false;
 }
 
-void SPItem::lowerOne() {
+bool SPItem::lowerOne() {
     using Inkscape::Util::MutableList;
     using Inkscape::Util::reverse_list;
 
@@ -343,7 +345,9 @@
         ++next_lower;
         Inkscape::XML::Node *ref = ( next_lower ? next_lower->getRepr() : NULL );
         getRepr()->parent()->changeOrder(getRepr(), ref);
+        return true;
     }
+    return false;
 }
 
 void SPItem::lowerToBottom() {

=== modified file 'src/sp-item.h'
--- src/sp-item.h	2015-03-16 20:22:36 +0000
+++ src/sp-item.h	2017-05-17 23:30:53 +0000
@@ -212,8 +212,8 @@
 
     Geom::Affine getRelativeTransform(SPObject const *obj) const;
 
-    void raiseOne();
-    void lowerOne();
+    bool raiseOne();
+    bool lowerOne();
     void raiseToTop();
     void lowerToBottom();
 

=== modified file 'src/sp-pattern.cpp'
--- src/sp-pattern.cpp	2016-09-06 10:44:16 +0000
+++ src/sp-pattern.cpp	2017-05-17 23:30:53 +0000
@@ -374,8 +374,9 @@
     }
     _pattern_transform_set = true;
 
-    Glib::ustring c = sp_svg_transform_write(_pattern_transform);
+    gchar *c = sp_svg_transform_write(_pattern_transform);
     getRepr()->setAttribute("patternTransform", c);
+    g_free(c);
 }
 
 const gchar *SPPattern::produce(const std::vector<Inkscape::XML::Node *> &reprs, Geom::Rect bounds,
@@ -392,8 +393,9 @@
     sp_repr_set_svg_double(repr, "height", bounds.dimensions()[Geom::Y]);
     //TODO: Maybe is better handle it in sp_svg_transform_write
     if(transform != Geom::Affine()){ 
-        Glib::ustring t = sp_svg_transform_write(transform);
+        gchar *t = sp_svg_transform_write(transform);
         repr->setAttribute("patternTransform", t);
+        g_free(t);
     }
     defsrepr->appendChild(repr);
     const gchar *pat_id = repr->attribute("id");

=== modified file 'src/ui/dialog/objects.cpp'
--- src/ui/dialog/objects.cpp	2016-11-07 16:26:09 +0000
+++ src/ui/dialog/objects.cpp	2017-05-17 23:30:53 +0000
@@ -34,6 +34,7 @@
 #include "helper/action.h"
 #include "inkscape.h"
 #include "layer-manager.h"
+#include "shortcuts.h"
 #include "preferences.h"
 #include "selection.h"
 #include "sp-clippath.h"
@@ -319,11 +320,13 @@
         SPRoot* root = document->getRoot();
         if ( root ) {
             _selectedConnection.block();
+            _documentChangedCurrentLayer.block();
             //Clear the tree store
             _store->clear();
             //Add all items recursively
             _addObject( root, 0 );
             _selectedConnection.unblock();
+            _documentChangedCurrentLayer.unblock();
             //Set the tree selection
             _objectsSelected(_desktop->selection);
             //Handle button sensitivity
@@ -362,13 +365,17 @@
                 row[_model->_colLocked] = !item->isSensitive();
                 row[_model->_colType] = group ? (group->layerMode() == SPGroup::LAYER ? 2 : 1) : 0;
                 row[_model->_colHighlight] = item->isHighlightSet() ? item->highlight_color() : item->highlight_color() & 0xffffff00;
-                row[_model->_colClipMask] = item->clip_ref && item->clip_ref->getObject() ? 1 : (item->mask_ref && item->mask_ref->getObject() ? 2 : 0);
+                row[_model->_colClipMask] = item ? (
+                    (item->clip_ref && item->clip_ref->getObject() ? 1 : 0) |
+                    (item->mask_ref && item->mask_ref->getObject() ? 2 : 0)
+                ) : 0;
                 //row[_model->_colInsertOrder] = group ? (group->insertBottom() ? 2 : 1) : 0;
 
                 //If our parent object is a group and it's expanded, expand the tree
                 if (SP_IS_GROUP(obj) && SP_GROUP(obj)->expanded())
                 {
                     _tree.expand_to_path( _store->get_path(iter) );
+                    _tree.collapse_row( _store->get_path(iter) );
                 }
 
                 //Add an object watcher to the item
@@ -426,7 +433,10 @@
         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() ?  1 : (item->mask_ref && item->mask_ref->getObject() ? 2 : 0)) : 0;
+        row[_model->_colClipMask] = item ? (
+            (item->clip_ref && item->clip_ref->getObject() ? 1 : 0) |
+            (item->mask_ref && item->mask_ref->getObject() ? 2 : 0)
+        ) : 0;
         //row[_model->_colInsertOrder] = group ? (group->insertBottom() ? 2 : 1) : 0;
 
         return true;
@@ -486,13 +496,13 @@
             _setCompositingValues(item);
             setOpacity = false;
         }
-        _store->foreach(sigc::bind<SPItem *, bool>( sigc::mem_fun(*this, &ObjectsPanel::_checkForSelected), item, (*i)==items.back()));
+        _store->foreach(sigc::bind<SPItem *, bool>( sigc::mem_fun(*this, &ObjectsPanel::_checkForSelected), item, (*i)==items.back(), false));
     }
     if (!item) {
         if (_desktop->currentLayer() && SP_IS_ITEM(_desktop->currentLayer())) {
             item = SP_ITEM(_desktop->currentLayer());
             _setCompositingValues(item);
-            _store->foreach(sigc::bind<SPItem *, bool>( sigc::mem_fun(*this, &ObjectsPanel::_checkForSelected), item, true));
+            _store->foreach(sigc::bind<SPItem *, bool>( sigc::mem_fun(*this, &ObjectsPanel::_checkForSelected), item, false, true));
         }
     }
     _selectedConnection.unblock();
@@ -559,7 +569,7 @@
  * @param scrollto Whether to scroll to the item
  * @return Whether to continue searching the tree
  */
-bool ObjectsPanel::_checkForSelected(const Gtk::TreePath &path, const Gtk::TreeIter& iter, SPItem* item, bool scrollto)
+bool ObjectsPanel::_checkForSelected(const Gtk::TreePath &path, const Gtk::TreeIter& iter, SPItem* item, bool scrollto, bool expand)
 {
     bool stopGoing = false;
 
@@ -568,13 +578,16 @@
     {
         //We found the item!  Expand to the path and select it in the tree.
         _tree.expand_to_path( path );
+        if (!expand)
+            // but don't expand itself, just the path
+            _tree.collapse_row(path);
 
         Glib::RefPtr<Gtk::TreeSelection> select = _tree.get_selection();
 
         select->select(iter);
         if (scrollto) {
             //Scroll to the item in the tree
-            _tree.scroll_to_row(path);
+            _tree.scroll_to_row(path, 0.5);
         }
 
         stopGoing = true;
@@ -591,6 +604,7 @@
     if ( _desktop && _desktop->currentRoot() ) {
         //block connections for selection and compositing values to prevent interference
         _selectionChangedConnection.block();
+        _documentChangedCurrentLayer.block();
     
         //Clear the selection and then iterate over the tree selection, pushing each item to the desktop
         _desktop->selection->clear();
@@ -598,6 +612,7 @@
         _tree.get_selection()->selected_foreach_iter( sigc::bind<bool *>(sigc::mem_fun(*this, &ObjectsPanel::_selected_row_callback), &setOpacity));
         //unblock connections
         _selectionChangedConnection.unblock();
+        _documentChangedCurrentLayer.unblock();
         
         _checkTreeSelection();
     }
@@ -696,53 +711,63 @@
  */
 bool ObjectsPanel::_handleKeyEvent(GdkEventKey *event)
 {
-
+    if (!_desktop)
+        return false;
+
+    unsigned int shortcut;
+    shortcut = Inkscape::UI::Tools::get_group0_keyval(event) |
+        ( event->state & GDK_SHIFT_MASK ?
+          SP_SHORTCUT_SHIFT_MASK : 0 ) |
+        ( event->state & GDK_CONTROL_MASK ?
+          SP_SHORTCUT_CONTROL_MASK : 0 ) |
+        ( event->state & GDK_MOD1_MASK ?
+          SP_SHORTCUT_ALT_MASK : 0 );
+
+    switch (shortcut) {
+        // how to get users key binding for the action “start-interactive-search” ??
+        // ctrl+f is just the default
+        case GDK_KEY_f | SP_SHORTCUT_CONTROL_MASK:
+            return false;
+            break;
+        // shall we slurp ctrl+w to close panel?
+
+        // defocus:
+        case GDK_KEY_Escape:
+            if (_desktop->canvas) {
+                gtk_widget_grab_focus (GTK_WIDGET(_desktop->canvas));
+                return true;
+            }
+            break;
+    }
+
+    // invoke user defined shortcuts first
+    bool done = sp_shortcut_invoke(shortcut, _desktop);
+    if (done)
+        return true;
+
+    // handle events for the treeview
     bool empty = _desktop->selection->isEmpty();
 
     switch (Inkscape::UI::Tools::get_group0_keyval(event)) {
         case GDK_KEY_Return:
         case GDK_KEY_KP_Enter:
-        case GDK_KEY_F2:
         {
-            Gtk::TreeModel::iterator iter = _tree.get_selection()->get_selected();
-            if (iter && !_text_renderer->property_editable()) {
+            Gtk::TreeModel::Path path;
+            Gtk::TreeViewColumn *focus_column = 0;
+
+            _tree.get_cursor(path, focus_column);
+            if (focus_column == _name_column && !_text_renderer->property_editable()) {
                 //Rename item
-                Gtk::TreeModel::Path *path = new Gtk::TreeModel::Path(iter);
                 _text_renderer->property_editable() = true;
-                _tree.set_cursor(*path, *_name_column, true);
+                _tree.set_cursor(path, *_name_column, true);
                 grab_focus();
                 return true;
             }
-        }
-        break;
-        case GDK_KEY_Home:
-            //Move item(s) to top of containing group/layer
-            _fireAction( empty ? SP_VERB_LAYER_TO_TOP : SP_VERB_SELECTION_TO_FRONT );
-            break;
-        case GDK_KEY_End:
-            //Move item(s) to bottom of containing group/layer
-            _fireAction( empty ? SP_VERB_LAYER_TO_BOTTOM : SP_VERB_SELECTION_TO_BACK );
-            break;
-        case GDK_KEY_Page_Up:
-        {
-            //Move item(s) up in containing group/layer
-            int ch = event->state & GDK_SHIFT_MASK ? SP_VERB_LAYER_MOVE_TO_NEXT : SP_VERB_SELECTION_RAISE;
-            _fireAction( empty ? SP_VERB_LAYER_RAISE : ch );
-            break;
-        }
-        case GDK_KEY_Page_Down:
-        {
-            //Move item(s) down in containing group/layer
-            int ch = event->state & GDK_SHIFT_MASK ? SP_VERB_LAYER_MOVE_TO_PREV : SP_VERB_SELECTION_LOWER;
-            _fireAction( empty ? SP_VERB_LAYER_LOWER : ch );
-            break;
-        }
-
-        //TODO: Handle Ctrl-A, etc.
-        default:
             return false;
+            break;
+        }
     }
-    return true;
+    return false;
 }
 
 /**
@@ -1186,7 +1211,7 @@
                 }
                 else
                 {
-                    _fireAction( SP_VERB_SELECTION_RAISE );
+                    _fireAction( SP_VERB_SELECTION_STACK_UP );
                 }
             }
             break;
@@ -1198,7 +1223,7 @@
                 }
                 else
                 {
-                    _fireAction( SP_VERB_SELECTION_LOWER );
+                    _fireAction( SP_VERB_SELECTION_STACK_DOWN );
                 }
             }
             break;
@@ -1746,6 +1771,8 @@
     //Set the expander and search columns
     _tree.set_expander_column( *_tree.get_column(nameColNum) );
     _tree.set_search_column(_model->_colLabel);
+    // use ctrl+f to start search
+    _tree.set_enable_search(false);
 
     //Set up the tree selection
     _tree.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
@@ -1914,8 +1941,8 @@
 
         _popupMenu.append(*Gtk::manage(new Gtk::SeparatorMenuItem()));
 
-        _watchingNonTop.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_RAISE, "gtk-go-up", _("Up"), (int)BUTTON_UP ) );
-        _watchingNonBottom.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_LOWER, "gtk-go-down", _("Down"), (int)BUTTON_DOWN ) );
+        _watchingNonTop.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_STACK_UP, "gtk-go-up", _("Up"), (int)BUTTON_UP ) );
+        _watchingNonBottom.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_STACK_DOWN, "gtk-go-down", _("Down"), (int)BUTTON_DOWN ) );
 
         _popupMenu.append(*Gtk::manage(new Gtk::SeparatorMenuItem()));
         
@@ -2054,6 +2081,7 @@
 
     if ( desktop != _desktop ) {
         _documentChangedConnection.disconnect();
+        _documentChangedCurrentLayer.disconnect();
         _selectionChangedConnection.disconnect();
         if ( _desktop ) {
             _desktop = 0;
@@ -2063,6 +2091,9 @@
         if ( _desktop ) {
             //Connect desktop signals
             _documentChangedConnection = _desktop->connectDocumentReplaced( sigc::mem_fun(*this, &ObjectsPanel::setDocument));
+
+            _documentChangedCurrentLayer = _desktop->connectCurrentLayerChanged( sigc::mem_fun(*this, &ObjectsPanel::_objectsChanged));
+
             _selectionChangedConnection = _desktop->selection->connectChanged( sigc::mem_fun(*this, &ObjectsPanel::_objectsSelected));
             
             setDocument(_desktop, _desktop->doc());

=== modified file 'src/ui/dialog/objects.h'
--- src/ui/dialog/objects.h	2015-06-18 09:36:24 +0000
+++ src/ui/dialog/objects.h	2017-05-17 23:30:53 +0000
@@ -77,6 +77,9 @@
     //Connection for when the document changes
     sigc::connection _documentChangedConnection;
     
+    //Connection for when the active layer changes
+    sigc::connection _documentChangedCurrentLayer;
+
     //Connection for when the active selection in the document changes
     sigc::connection _selectionChangedConnection;
 
@@ -226,7 +229,7 @@
     bool _checkForUpdated(const Gtk::TreeIter& iter, SPObject* obj);
 
     void _objectsSelected(Selection *sel);
-    bool _checkForSelected(const Gtk::TreePath& path, const Gtk::TreeIter& iter, SPItem* item, bool scrollto);
+    bool _checkForSelected(const Gtk::TreePath& path, const Gtk::TreeIter& iter, SPItem* item, bool scrollto, bool expand);
 
     void _objectsChanged(SPObject *obj);
     void _addObject( SPObject* obj, Gtk::TreeModel::Row* parentRow );

=== modified file 'src/ui/widget/clipmaskicon.cpp'
--- src/ui/widget/clipmaskicon.cpp	2015-04-27 23:38:31 +0000
+++ src/ui/widget/clipmaskicon.cpp	2017-05-17 23:30:53 +0000
@@ -27,13 +27,13 @@
 ClipMaskIcon::ClipMaskIcon() :
     Glib::ObjectBase(typeid(ClipMaskIcon)),
     Gtk::CellRendererPixbuf(),
-    _pixClipName(INKSCAPE_ICON("path-intersection")),
-    _pixInverseName(INKSCAPE_ICON("path-difference")),
-    _pixMaskName(INKSCAPE_ICON("mask-intersection")),
+    _pixClipName(INKSCAPE_ICON("object-clipped")),
+    _pixMaskName(INKSCAPE_ICON("object-masked")),
+    _pixBothName(INKSCAPE_ICON("object-clip-mask")),
     _property_active(*this, "active", 0),
     _property_pixbuf_clip(*this, "pixbuf_on", Glib::RefPtr<Gdk::Pixbuf>(0)),
-    _property_pixbuf_inverse(*this, "pixbuf_on", Glib::RefPtr<Gdk::Pixbuf>(0)),
-    _property_pixbuf_mask(*this, "pixbuf_off", Glib::RefPtr<Gdk::Pixbuf>(0))
+    _property_pixbuf_mask(*this, "pixbuf_off", Glib::RefPtr<Gdk::Pixbuf>(0)),
+    _property_pixbuf_both(*this, "pixbuf_on", Glib::RefPtr<Gdk::Pixbuf>(0))
 {
     
     property_mode() = Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
@@ -43,22 +43,22 @@
     if (!icon_theme->has_icon(_pixClipName)) {
         Inkscape::queueIconPrerender( INKSCAPE_ICON(_pixClipName.data()), Inkscape::ICON_SIZE_DECORATION );
     }
-    if (!icon_theme->has_icon(_pixInverseName)) {
-        Inkscape::queueIconPrerender( INKSCAPE_ICON(_pixInverseName.data()), Inkscape::ICON_SIZE_DECORATION );
-    }
     if (!icon_theme->has_icon(_pixMaskName)) {
         Inkscape::queueIconPrerender( INKSCAPE_ICON(_pixMaskName.data()), Inkscape::ICON_SIZE_DECORATION );
     }
+    if (!icon_theme->has_icon(_pixBothName)) {
+        Inkscape::queueIconPrerender( INKSCAPE_ICON(_pixBothName.data()), Inkscape::ICON_SIZE_DECORATION );
+    }
 
     if (icon_theme->has_icon(_pixClipName)) {
         _property_pixbuf_clip = icon_theme->load_icon(_pixClipName, phys, (Gtk::IconLookupFlags)0);
     }
-    if (icon_theme->has_icon(_pixInverseName)) {
-        _property_pixbuf_inverse = icon_theme->load_icon(_pixInverseName, phys, (Gtk::IconLookupFlags)0);
-    }
     if (icon_theme->has_icon(_pixMaskName)) {
         _property_pixbuf_mask = icon_theme->load_icon(_pixMaskName, phys, (Gtk::IconLookupFlags)0);
     }
+    if (icon_theme->has_icon(_pixBothName)) {
+        _property_pixbuf_both = icon_theme->load_icon(_pixBothName, phys, (Gtk::IconLookupFlags)0);
+    }
 
     property_pixbuf() = Glib::RefPtr<Gdk::Pixbuf>(0);
 }
@@ -137,7 +137,7 @@
             property_pixbuf() = _property_pixbuf_mask;
             break;
         case 3:
-            property_pixbuf() = _property_pixbuf_inverse;
+            property_pixbuf() = _property_pixbuf_both;
             break;
         default:
             property_pixbuf() = Glib::RefPtr<Gdk::Pixbuf>(0);

=== modified file 'src/ui/widget/clipmaskicon.h'
--- src/ui/widget/clipmaskicon.h	2014-10-08 02:22:03 +0000
+++ src/ui/widget/clipmaskicon.h	2017-05-17 23:30:53 +0000
@@ -71,13 +71,13 @@
     int phys;
     
     Glib::ustring _pixClipName;
-    Glib::ustring _pixInverseName;
     Glib::ustring _pixMaskName;
+    Glib::ustring _pixBothName;
     
     Glib::Property<int> _property_active;
     Glib::Property< Glib::RefPtr<Gdk::Pixbuf> > _property_pixbuf_clip;
-    Glib::Property< Glib::RefPtr<Gdk::Pixbuf> > _property_pixbuf_inverse;
     Glib::Property< Glib::RefPtr<Gdk::Pixbuf> > _property_pixbuf_mask;
+    Glib::Property< Glib::RefPtr<Gdk::Pixbuf> > _property_pixbuf_both;
     
 };
 

=== modified file 'src/verbs.cpp'
--- src/verbs.cpp	2016-11-02 22:44:54 +0000
+++ src/verbs.cpp	2017-05-17 23:30:53 +0000
@@ -1144,6 +1144,12 @@
         case SP_VERB_SELECTION_LOWER:
             sp_selection_lower(selection, dt);
             break;
+        case SP_VERB_SELECTION_STACK_UP:
+            sp_selection_stack_up(selection, dt);
+            break;
+        case SP_VERB_SELECTION_STACK_DOWN:
+            sp_selection_stack_down(selection, dt);
+            break;
         case SP_VERB_SELECTION_GROUP:
             sp_selection_group(selection, dt);
             break;
@@ -2558,6 +2564,14 @@
                       N_("Raise selection one step"), INKSCAPE_ICON("selection-raise")),
     new SelectionVerb(SP_VERB_SELECTION_LOWER, "SelectionLower", N_("_Lower"),
                       N_("Lower selection one step"), INKSCAPE_ICON("selection-lower")),
+
+
+    new SelectionVerb(SP_VERB_SELECTION_STACK_UP, "SelectionStackUp", N_("_Stack up"),
+                      N_("Stack selection one step up"), INKSCAPE_ICON("layer-lower")),
+    new SelectionVerb(SP_VERB_SELECTION_STACK_DOWN, "SelectionStackDown", N_("_Stack down"),
+                      N_("Stack selection one step down"), INKSCAPE_ICON("layer-raise")),
+
+
     new SelectionVerb(SP_VERB_SELECTION_GROUP, "SelectionGroup", N_("_Group"),
                       N_("Group selected objects"), INKSCAPE_ICON("object-group")),
     new SelectionVerb(SP_VERB_SELECTION_UNGROUP, "SelectionUnGroup", N_("_Ungroup"),

=== modified file 'src/verbs.h'
--- src/verbs.h	2016-04-14 18:19:03 +0000
+++ src/verbs.h	2017-05-17 23:30:53 +0000
@@ -114,6 +114,8 @@
     SP_VERB_SELECTION_TO_BACK,
     SP_VERB_SELECTION_RAISE,
     SP_VERB_SELECTION_LOWER,
+    SP_VERB_SELECTION_STACK_UP,
+    SP_VERB_SELECTION_STACK_DOWN,
     SP_VERB_SELECTION_GROUP,
     SP_VERB_SELECTION_UNGROUP,
     SP_VERB_SELECTION_UNGROUP_POP_SELECTION,

=== modified file 'src/widgets/stroke-marker-selector.cpp'
--- src/widgets/stroke-marker-selector.cpp	2014-12-23 09:25:08 +0000
+++ src/widgets/stroke-marker-selector.cpp	2017-05-17 23:30:53 +0000
@@ -60,8 +60,13 @@
     set_cell_data_func(image_renderer, sigc::mem_fun(*this, &MarkerComboBox::prepareImageRenderer));
     gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(gobj()), MarkerComboBox::separator_cb, NULL, NULL);
 
+    Glib::ustring no_marker("no-marker");
+    Glib::RefPtr<Gtk::IconTheme> iconTheme = Gtk::IconTheme::get_default();
+    if (!iconTheme->has_icon(no_marker)) {
+        Inkscape::queueIconPrerender( INKSCAPE_ICON(no_marker.data()), Inkscape::ICON_SIZE_SMALL_TOOLBAR );
+    }
     empty_image = new Gtk::Image( Glib::wrap(
-        sp_pixbuf_new( Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("no-marker") ) ) );
+        sp_pixbuf_new( Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON(no_marker.data()) ) ) );
 
     sandbox = ink_markers_preview_doc ();
     desktop = SP_ACTIVE_DESKTOP;
@@ -77,6 +82,7 @@
 MarkerComboBox::~MarkerComboBox() {
     delete combo_id;
     delete sandbox;
+    delete empty_image;
 
     if (doc) {
         modified_connection.disconnect();
@@ -399,7 +405,7 @@
         gchar const *markid = repr->attribute("inkscape:stockid") ? repr->attribute("inkscape:stockid") : repr->attribute("id");
 
         // generate preview
-        Gtk::Image *prv = create_marker_image (22, repr->attribute("id"), source, drawing, visionkey);
+        Gtk::Image *prv = create_marker_image (24, repr->attribute("id"), source, drawing, visionkey);
         prv->show();
 
         // Add history before separator, others after
@@ -430,14 +436,14 @@
 MarkerComboBox::update_marker_image(gchar const *mname)
 {
     gchar *cache_name = g_strconcat(combo_id, mname, NULL);
-    Glib::ustring key = svg_preview_cache.cache_key(doc->getURI(), cache_name, 22);
+    Glib::ustring key = svg_preview_cache.cache_key(doc->getURI(), cache_name, 24);
     g_free (cache_name);
     svg_preview_cache.remove_preview_from_cache(key);
 
     Inkscape::Drawing drawing;
     unsigned const visionkey = SPItem::display_key_new(1);
     drawing.setRoot(sandbox->getRoot()->invoke_show(drawing, visionkey, SP_ITEM_SHOW_DISPLAY));
-    Gtk::Image *prv = create_marker_image(22, mname, doc, drawing, visionkey);
+    Gtk::Image *prv = create_marker_image(24, mname, doc, drawing, visionkey);
     if (prv) {
         prv->show();
     }