X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/8a13dbd288251737a636b04c5f15876a1814d28f..0fa0c0b718943c7e50719fe516de88c3fd3ab6a8:/src/vikwindow.c?ds=sidebyside

diff --git a/src/vikwindow.c b/src/vikwindow.c
index 2d2bbf36..4818ee17 100644
--- a/src/vikwindow.c
+++ b/src/vikwindow.c
@@ -82,7 +82,7 @@ static void newwindow_cb ( GtkAction *a, VikWindow *vw );
 
 // Signals
 static void open_window ( VikWindow *vw, GSList *files );
-static void statusbar_update ( VikWindow *vw, const gchar *message );
+static void statusbar_update ( VikWindow *vw, const gchar *message, vik_statusbar_type_t vs_type );
 static void destroy_window ( GtkWidget *widget,
                              gpointer   data );
 
@@ -266,9 +266,9 @@ VikStatusbar * vik_window_get_statusbar ( VikWindow *vw )
 /**
  * For signalling the update from a background thread
  */
-void vik_window_signal_statusbar_update (VikWindow *vw, const gchar* message )
+void vik_window_signal_statusbar_update (VikWindow *vw, const gchar* message, vik_statusbar_type_t vs_type)
 {
-  g_signal_emit ( G_OBJECT(vw), window_signals[VW_STATUSBAR_UPDATE_SIGNAL], 0, message );
+  g_signal_emit ( G_OBJECT(vw), window_signals[VW_STATUSBAR_UPDATE_SIGNAL], 0, message, vs_type );
 }
 
 /**
@@ -277,19 +277,20 @@ void vik_window_signal_statusbar_update (VikWindow *vw, const gchar* message )
 static gboolean statusbar_idle_update ( gpointer indata )
 {
   gpointer *data = indata;
-  vik_statusbar_set_message ( data[0], VIK_STATUSBAR_ITEMS, data[1] );
+  vik_statusbar_set_message ( data[0], GPOINTER_TO_INT(data[2]), data[1] );
   return FALSE;
 }
 
 /**
  * Update statusbar in the main thread
  */
-void vik_window_statusbar_update ( VikWindow *vw, const gchar* message )
+static void window_statusbar_update ( VikWindow *vw, const gchar* message, vik_statusbar_type_t vs_type )
 {
   // ATM we know the message has been statically allocated so this is OK (no need to handle any freeing)
-  static gpointer data[2];
+  static gpointer data[3];
   data[0] = vw->viking_vs;
   data[1] = (gchar*) message;
+  data[2] = GINT_TO_POINTER(vs_type);
   g_idle_add ( (GSourceFunc) statusbar_idle_update, data );
 }
 
@@ -301,9 +302,9 @@ static void destroy_window ( GtkWidget *widget,
       gtk_main_quit ();
 }
 
-static void statusbar_update ( VikWindow *vw, const gchar *message )
+static void statusbar_update ( VikWindow *vw, const gchar *message, vik_statusbar_type_t vs_type )
 {
-  vik_window_statusbar_update ( vw, message );
+  window_statusbar_update ( vw, message, vs_type );
 }
 
 VikWindow *vik_window_new_window ()
@@ -319,7 +320,7 @@ VikWindow *vik_window_new_window ()
     g_signal_connect (G_OBJECT (vw), "openwindow",
 		      G_CALLBACK (open_window), NULL);
     g_signal_connect (G_OBJECT (vw), "statusbarupdate",
-		      G_CALLBACK (statusbar_update), NULL);
+		      G_CALLBACK (statusbar_update), vw);
 
     gtk_widget_show_all ( GTK_WIDGET(vw) );
 
@@ -390,7 +391,7 @@ static void window_class_init ( VikWindowClass *klass )
 
   window_signals[VW_NEWWINDOW_SIGNAL] = g_signal_new ( "newwindow", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (VikWindowClass, newwindow), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
   window_signals[VW_OPENWINDOW_SIGNAL] = g_signal_new ( "openwindow", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (VikWindowClass, openwindow), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-  window_signals[VW_STATUSBAR_UPDATE_SIGNAL] = g_signal_new ( "statusbarupdate", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (VikWindowClass, statusbarupdate), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
+  window_signals[VW_STATUSBAR_UPDATE_SIGNAL] = g_signal_new ( "statusbarupdate", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (VikWindowClass, statusbarupdate), NULL, NULL, gtk_marshal_VOID__POINTER_UINT, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_UINT);
 
   object_class = G_OBJECT_CLASS (klass);
 
@@ -488,9 +489,12 @@ static gboolean key_press_event( VikWindow *vw, GdkEventKey *event, gpointer dat
       return vw->vt->tools[vw->vt->active_tool].ti.key_press(vl, event, vw->vt->tools[vw->vt->active_tool].state);
   }
 
-  // No layer - but enable window tool keypress processing - these should be able to handle a NULL layer
-  if ( vw->vt->tools[vw->vt->active_tool].ti.key_press ) {
-    return vw->vt->tools[vw->vt->active_tool].ti.key_press ( vl, event, vw->vt->tools[vw->vt->active_tool].state );
+  // Ensure called only on window tools (i.e. not on any of the Layer tools since the layer is NULL)
+  if ( vw->current_tool < TOOL_LAYER ) {
+    // No layer - but enable window tool keypress processing - these should be able to handle a NULL layer
+    if ( vw->vt->tools[vw->vt->active_tool].ti.key_press ) {
+      return vw->vt->tools[vw->vt->active_tool].ti.key_press ( vl, event, vw->vt->tools[vw->vt->active_tool].state );
+    }
   }
 
   /* Restore Main Menu via Escape key if the user has hidden it */
@@ -2212,6 +2216,12 @@ static gboolean save_file_as ( GtkAction *a, VikWindow *vw )
     gtk_window_set_transient_for ( GTK_WINDOW(vw->save_dia), GTK_WINDOW(vw) );
     gtk_window_set_destroy_with_parent ( GTK_WINDOW(vw->save_dia), TRUE );
   }
+  // Auto append / replace extension with '.vik' to the suggested file name as it's going to be a Viking File
+  gchar* auto_save_name = strdup ( vw->filename ? a_file_basename ( vw->filename ) : _("Untitled") );
+  if ( ! check_file_ext ( auto_save_name, ".vik" ) )
+    auto_save_name = g_strconcat ( auto_save_name, ".vik", NULL );
+
+  gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER(vw->save_dia), auto_save_name);
 
   while ( gtk_dialog_run ( GTK_DIALOG(vw->save_dia) ) == GTK_RESPONSE_ACCEPT )
   {
@@ -2224,6 +2234,7 @@ static gboolean save_file_as ( GtkAction *a, VikWindow *vw )
       break;
     }
   }
+  g_free ( auto_save_name );
   gtk_widget_hide ( vw->save_dia );
   return rv;
 }