Make splitting a track consistant in that it never asks the user the name of the...

. Avoid this extra step as it can be unnecessary. Changing the track names can be performed later if necessary.
. Multiple same named tracks are now allowed anyway

diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c
index ed52216e0f389a10dda1632747e677bec43b224d..01b4d91cccce1794b98ee01bc5addcc597a29e01 100644 (file)
--- a/src/viktrwlayer.c
+++ b/src/viktrwlayer.c
@@ -3892,8 +3892,7 @@ static void trw_layer_merge_by_timestamp ( gpointer pass_along[6] )
 }
 
 /**
- * Split a track at the currently selected trackpoint,
- *  asking the user for the new name
+ * Split a track at the currently selected trackpoint
  */
 static void trw_layer_split_at_selected_trackpoint ( VikTrwLayer *vtl )
 {
@@ -3902,8 +3901,7 @@ static void trw_layer_split_at_selected_trackpoint ( VikTrwLayer *vtl )
 
   if ( vtl->current_tpl->next && vtl->current_tpl->prev ) {
     gchar *name = get_new_unique_sublayer_name(vtl, VIK_TRW_LAYER_SUBLAYER_TRACK, vtl->current_tp_track->name);
-    if ( ( name = a_dialog_new_track ( VIK_GTK_WINDOW_FROM_LAYER(vtl), vtl->tracks, name ) ) )
-    {
+    if ( name ) {
       VikTrack *tr = vik_track_new ();
       GList *newglist = g_list_alloc ();
       newglist->prev = NULL;

diff --git a/src/viktrwlayer_propwin.c b/src/viktrwlayer_propwin.c
index c1374782febccfbf89dd6002e43ce7c3d29e1168..e14d912663de6c86c57973368a31dcbf0e334c17 100644 (file)
--- a/src/viktrwlayer_propwin.c
+++ b/src/viktrwlayer_propwin.c
@@ -2704,7 +2704,7 @@ static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widg
       break;
     case VIK_TRW_LAYER_PROPWIN_SPLIT:
       {
-        /* get new tracks, add them, resolve naming conflicts (free if cancel), and delete old. old can still exist on clipboard. */
+        /* get new tracks, add them and then the delete old one. old can still exist on clipboard. */
         guint ntracks;
        
         VikTrack **tracks = vik_track_split_into_segments(tr, &ntracks);
@@ -2712,25 +2712,10 @@ static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widg
         guint i;
         for ( i = 0; i < ntracks; i++ )
         {
-          g_assert ( tracks[i] );
-          new_tr_name = g_strdup_printf("%s #%d", widgets->tr->name, i+1);
-          /* if ( (wp_exists) && (! overwrite) ) */
-          /* don't need to upper case new_tr_name because old tr name was uppercase */
-          if ( vik_trw_layer_get_track(vtl, new_tr_name ) && 
-             ( ! a_dialog_yes_or_no ( VIK_GTK_WINDOW_FROM_LAYER(vtl), "The track \"%s\" exists, do you wish to overwrite it?", new_tr_name ) ) )
-          {
-            gchar *new_new_tr_name = a_dialog_new_track ( VIK_GTK_WINDOW_FROM_LAYER(vtl), vik_trw_layer_get_tracks(vtl), NULL );
-            g_free ( new_tr_name );
-            if (new_new_tr_name)
-              new_tr_name = new_new_tr_name;
-            else
-            {
-              new_tr_name = NULL;
-              vik_track_free ( tracks[i] );
-            }
-          }
-          if ( new_tr_name )
-            vik_trw_layer_add_track ( vtl, new_tr_name, tracks[i] );
+          if ( tracks[i] ) {
+           new_tr_name = g_strdup_printf("%s #%d", widgets->tr->name, i+1);
+           vik_trw_layer_add_track ( vtl, new_tr_name, tracks[i] );
+         }
         }
         if ( tracks )
         {