Add tooltip to new zoom level combo

[andy/viking.git] / src / vikwindow.c

diff --git a/src/vikwindow.c b/src/vikwindow.c
index d8d5306a366679ffe4c8abeac3f696674223dccb..22bb63cdf440715d45c839dfaf9e97340c60d7de 100644 (file)
--- a/src/vikwindow.c
+++ b/src/vikwindow.c
@@ -344,7 +344,7 @@ static void open_window ( VikWindow *vw, GSList *files )
     if (vw != NULL && check_file_magic_vik ( file_name ) ) {
       VikWindow *newvw = vik_window_new_window ();
       if (newvw)
-       vik_window_open_file ( newvw, file_name, change_fn );
+        vik_window_open_file ( newvw, file_name, TRUE );
     }
     else {
       vik_window_open_file ( vw, file_name, change_fn );
@@ -450,6 +450,9 @@ static GtkWidget *create_zoom_combo_all_levels ()
   gtk_combo_box_append_text ( combo, "8192");
   gtk_combo_box_append_text ( combo, "16384");
   gtk_combo_box_append_text ( combo, "32768");
+  /* Create tooltip */
+  GtkTooltips *tooltips = gtk_tooltips_new ();
+  gtk_tooltips_set_tip ( tooltips, GTK_WIDGET (combo), _("Select zoom level"), NULL);
   return zoom_combo;
 }
 
@@ -828,8 +831,21 @@ static void draw_mouse_motion (VikWindow *vw, GdkEventMotion *event)
 
   vik_viewport_screen_to_coord ( vw->viking_vvp, event->x, event->y, &coord );
   vik_coord_to_utm ( &coord, &utm );
-  a_coords_utm_to_latlon ( &utm, &ll );
-  a_coords_latlon_to_string ( &ll, &lat, &lon );
+
+  if ( vik_viewport_get_drawmode ( vw->viking_vvp ) == VIK_VIEWPORT_DRAWMODE_UTM ) {
+    // Reuse lat for the first part (Zone + N or S, and lon for the second part (easting and northing) of a UTM format:
+    //  ZONE[N|S] EASTING NORTHING
+    lat = g_malloc(4*sizeof(gchar));
+    // NB zone is stored in a char but is an actual number
+    g_snprintf (lat, 4, "%d%c", utm.zone, utm.letter);
+    lon = g_malloc(16*sizeof(gchar));
+    g_snprintf (lon, 16, "%d %d", (gint)utm.easting, (gint)utm.northing);
+  }
+  else {
+    a_coords_utm_to_latlon ( &utm, &ll );
+    a_coords_latlon_to_string ( &ll, &lat, &lon );
+  }
+
   /* Change interpolate method according to scale */
   zoom = vik_viewport_get_zoom(vw->viking_vvp);
   if (zoom > 2.0)
@@ -2330,11 +2346,28 @@ static void load_file ( GtkAction *a, VikWindow *vw )
     else {
       files = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER(vw->open_dia) );
       gboolean change_fn = newwindow && (g_slist_length(files)==1); /* only change fn if one file */
-      
+      gboolean first_vik_file = TRUE;
       cur_file = files;
       while ( cur_file ) {
+
         gchar *file_name = cur_file->data;
-        vik_window_open_file ( vw, file_name, change_fn );
+        if ( newwindow && check_file_magic_vik ( file_name ) ) {
+          // Load first of many .vik files in current window
+          if ( first_vik_file ) {
+            vik_window_open_file ( vw, file_name, TRUE );
+            first_vik_file = FALSE;
+          }
+          else {
+            // Load each subsequent .vik file in a separate window
+            VikWindow *newvw = vik_window_new_window ();
+            if (newvw)
+              vik_window_open_file ( newvw, file_name, TRUE );
+          }
+        }
+        else
+          // Other file types
+          vik_window_open_file ( vw, file_name, change_fn );
+
         g_free (file_name);
         cur_file = g_slist_next (cur_file);
       }
@@ -3405,7 +3438,7 @@ gpointer vik_window_get_selected_track ( VikWindow *vw )
   return vw->selected_track;
 }
 
-void vik_window_set_selected_track ( VikWindow *vw, gpointer *vt, gpointer vtl, gpointer name )
+void vik_window_set_selected_track ( VikWindow *vw, gpointer *vt, gpointer vtl )
 {
   vw->selected_track = vt;
   vw->containing_vtl = vtl;
@@ -3439,7 +3472,7 @@ gpointer vik_window_get_selected_waypoint ( VikWindow *vw )
   return vw->selected_waypoint;
 }
 
-void vik_window_set_selected_waypoint ( VikWindow *vw, gpointer *vwp, gpointer vtl, gpointer name )
+void vik_window_set_selected_waypoint ( VikWindow *vw, gpointer *vwp, gpointer vtl )
 {
   vw->selected_waypoint = vwp;
   vw->containing_vtl    = vtl;