Pot and Dutch translation update

[inkscape.git] / src / ui / tool / node-tool.cpp

diff --git a/src/ui/tool/node-tool.cpp b/src/ui/tool/node-tool.cpp
index 57e57b711d2e3388b2550cfa9de77f0a631fc548..e046fb57338b67f5ce9a28878c9ebbe91379113b 100644 (file)
--- a/src/ui/tool/node-tool.cpp
+++ b/src/ui/tool/node-tool.cpp
@@ -72,7 +72,17 @@
  *   is to eventually use a common class for object and control point transforms.
  * - SelectableControlPoint: base for any type of selectable point. It can belong to only one
  *   selection.
- * 
+ *
+ * @par Functionality that resides in weird places
+ * @par
+ *
+ * This list is probably incomplete.
+ * - Curve dragging: CurveDragPoint, controlled by PathManipulator
+ * - Single handle shortcuts: MultiPathManipulator::event(), ModifierTracker
+ * - Linear and spatial grow: Node, spatial grow routed to ControlPointSelection
+ * - Committing handle actions performed with the mouse: PathManipulator
+ * - Sculpting: ControlPointSelection
+ *
  * @par Plans for the future
  * @par
  * - MultiPathManipulator should become a generic shape editor that manages all active manipulator,
@@ -550,19 +560,24 @@ void ink_node_tool_update_tip(InkNodeTool *nt, GdkEvent *event)
     unsigned sz = nt->_selected_nodes->size();
     unsigned total = nt->_selected_nodes->allPoints().size();
     if (sz != 0) {
+        char *nodestring = g_strdup_printf(
+            ngettext("<b>%u of %u</b> node selected.", "<b>%u of %u</b> nodes selected.", total),
+            sz, total);
         if (nt->_last_over) {
+            // TRANSLATORS: The %s below is where the "%u of %u nodes selected" sentence gets put
             char *dyntip = g_strdup_printf(C_("Node tool tip",
-                "<b>%u of %u nodes</b> selected. "
-                "Drag to select nodes, click to edit only this object (more: Shift)"), sz, total);
+                "%s Drag to select nodes, click to edit only this object (more: Shift)"),
+                nodestring);
             nt->_node_message_context->set(Inkscape::NORMAL_MESSAGE, dyntip);
             g_free(dyntip);
         } else {
             char *dyntip = g_strdup_printf(C_("Node tool tip",
-                "<b>%u of %u nodes</b> selected. "
-                "Drag to select nodes, click clear the selection"), sz, total);
+                "%s Drag to select nodes, click clear the selection"),
+                nodestring);
             nt->_node_message_context->set(Inkscape::NORMAL_MESSAGE, dyntip);
             g_free(dyntip);
         }
+        g_free(nodestring);
     } else if (!nt->_multipath->empty()) {
         if (nt->_last_over) {
             nt->_node_message_context->set(Inkscape::NORMAL_MESSAGE, C_("Node tool tip",
@@ -619,8 +634,14 @@ void ink_node_tool_select_point(InkNodeTool *nt, Geom::Point const &/*sel*/, Gdk
 
     if (item_clicked == NULL) { // nothing under cursor
         // if no Shift, deselect
-        if (!(event->state & GDK_SHIFT_MASK)) {
-            selection->clear();
+        // if there are nodes selected, the first click should deselect the nodes
+        // and the second should deselect the items
+        if (!state_held_shift(event->state)) {
+            if (nt->_selected_nodes->empty()) {
+                selection->clear();
+            } else {
+                nt->_selected_nodes->clear();
+            }
         }
     } else {
         if (held_shift(*event)) {