diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2008-08-18 16:22:33 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2008-08-18 16:22:33 +0000 |
| commit | 34dc05c290b2436f4c23c8c86f048bc1d0f7d6e2 (patch) | |
| tree | 14be27056b9c6c3aef01a771bfe9a6d3362de12d /src | |
| parent | since all values are 0..1, shifting gamma up must use power<1 so that the val... (diff) | |
| download | inkscape-34dc05c290b2436f4c23c8c86f048bc1d0f7d6e2.tar.gz inkscape-34dc05c290b2436f4c23c8c86f048bc1d0f7d6e2.zip | |
Fix end type combo box
(bzr r6696)
Diffstat (limited to 'src')
| -rw-r--r-- | src/live_effects/lpe-line_segment.cpp | 10 | ||||
| -rw-r--r-- | src/live_effects/lpe-line_segment.h | 4 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/live_effects/lpe-line_segment.cpp b/src/live_effects/lpe-line_segment.cpp index fa8c6dc03..9a7d3cfbc 100644 --- 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 ed57d17fe..3a8e895e3 100644 --- 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 5a967a1c4..76ebb4ee1 100644 --- 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)); |