Fix end type combo box

diff --git a/src/live_effects/lpe-line_segment.cpp b/src/live_effects/lpe-line_segment.cpp
index fa8c6dc03f9e781c5c62f7f7acf1886d79e2da12..9a7d3cfbca60ac56a042c9f9eedf1566a4072f15 100644 (file)
--- a/src/live_effects/lpe-line_segment.cpp
+++ b/src/live_effects/lpe-line_segment.cpp
@@ -24,10 +24,10 @@ namespace Inkscape {
 namespace LivePathEffect {
 
 static const Util::EnumData<EndType> EndTypeData[] = {
-    {END_OPEN_BOTH    , N_("Open both"), "open_both"},
-    {END_OPEN_LEFT    , N_("Open left"), "open_left"},
-    {END_OPEN_RIGHT   , N_("Open right"), "open_right"},
     {END_CLOSED       , N_("Closed"), "closed"},
+    {END_OPEN_INITIAL , N_("Open start"), "open_start"},
+    {END_OPEN_FINAL   , N_("Open end"), "open_end"},
+    {END_OPEN_BOTH    , N_("Open both"), "open_both"},
 };
 static const Util::EnumDataConverter<EndType> EndTypeConverter(EndTypeData, sizeof(EndTypeData)/sizeof(*EndTypeData));
 
@@ -66,11 +66,11 @@ LPELineSegment::doEffect_path (std::vector<Geom::Path> const & path_in)
         return path_in;
     }
 
-    if (end_type == END_OPEN_RIGHT || end_type == END_OPEN_BOTH) {
+    if (end_type == END_OPEN_INITIAL || end_type == END_OPEN_BOTH) {
         A = intersections[0];
     }
 
-    if (end_type == END_OPEN_LEFT || end_type == END_OPEN_BOTH) {
+    if (end_type == END_OPEN_FINAL || end_type == END_OPEN_BOTH) {
         B = intersections[1];
     }
 

diff --git a/src/live_effects/lpe-line_segment.h b/src/live_effects/lpe-line_segment.h
index ed57d17fe277d6553ed1452f581807fee27b0897..3a8e895e3c50f1f7358f80324f9d2cc6f80e7e77 100644 (file)
--- a/src/live_effects/lpe-line_segment.h
+++ b/src/live_effects/lpe-line_segment.h
@@ -22,8 +22,8 @@ namespace LivePathEffect {
 
 enum EndType {
     END_CLOSED,
-    END_OPEN_LEFT,
-    END_OPEN_RIGHT,
+    END_OPEN_INITIAL,
+    END_OPEN_FINAL,
     END_OPEN_BOTH
 };
 

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 5a967a1c438dbe2c8c6ae42581bf3653e179d3f1..76ebb4ee128976b57e2b06c5ebbb69c5517216c5 100644 (file)
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -4915,13 +4915,13 @@ sp_line_segment_build_list(GObject *tbl)
     {
         GtkTreeIter iter;
         gtk_list_store_append( model, &iter );
-        gtk_list_store_set( model, &iter, 0, _("Open both"), 1, 3, -1 );
-        gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter, 0, _("Closed"), 1, 0, -1 );
         gtk_list_store_append( model, &iter );
-        gtk_list_store_set( model, &iter, 0, _("Open left"), 1, 1, -1 );
+        gtk_list_store_set( model, &iter, 0, _("Open start"), 1, 1, -1 );
         gtk_list_store_append( model, &iter );
-        gtk_list_store_set( model, &iter, 0, _("Open right"), 1, 2, -1 );
+        gtk_list_store_set( model, &iter, 0, _("Open end"), 1, 2, -1 );
+        gtk_list_store_append( model, &iter );
+        gtk_list_store_set( model, &iter, 0, _("Open both"), 1, 3, -1 );
     }
 
     g_object_set_data(tbl, "line_segment_list_blocked", GINT_TO_POINTER(FALSE));