X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/16c7d8fc881ea973343c5f4799b4723f49e642a3..c29a31985e639878d65faacbdac2a87431875edd:/src/dialog.h

diff --git a/src/dialog.h b/src/dialog.h
index 74b2c878..851b4025 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -26,8 +26,8 @@
 #include <gtk/gtk.h>
 
 #include "coords.h"
-#include "vikwaypoint.h"
-#include "vikcoord.h"
+
+G_BEGIN_DECLS
 
 /* most of this file is an architechtural flaw. */
 
@@ -38,7 +38,7 @@
 #define a_dialog_info_msg_extra(win,info,extra) a_dialog_msg(win,GTK_MESSAGE_INFO,info,extra)
 #define a_dialog_error_msg_extra(win,info,extra) a_dialog_msg(win,GTK_MESSAGE_ERROR,info,extra)
 
-GtkWidget *a_dialog_create_label_vbox ( gchar **texts, int label_count );
+GtkWidget *a_dialog_create_label_vbox ( gchar **texts, int label_count, gint spacing, gint padding );
 
 void a_dialog_msg ( GtkWindow *parent, gint type, const gchar *info, const gchar *extra );
 
@@ -50,23 +50,13 @@ void a_dialog_about ( GtkWindow *parent );
 gboolean a_dialog_goto_latlon ( GtkWindow *parent, struct LatLon *ll, const struct LatLon *old );
 gboolean a_dialog_goto_utm ( GtkWindow *parent, struct UTM *utm, const struct UTM *old );
 
-/* Specify if a new waypoint or not */
-/* If a new waypoint then it uses the default_name for the suggested name allowing the user to change it.
-    The name to use is returned
-   When an existing waypoint the name is shown but is not allowed to be changed and NULL is returned
- */
-gchar *a_dialog_waypoint ( GtkWindow *parent, gchar *default_name, VikWaypoint *wp, GHashTable *waypoints, VikCoordMode coord_mode, gboolean is_new, gboolean *updated );
-
-gchar *a_dialog_new_track ( GtkWindow *parent, GHashTable *tracks, gchar *default_name );
+gchar *a_dialog_new_track ( GtkWindow *parent, gchar *default_name, gboolean is_route );
 
+gchar *a_dialog_get_date ( GtkWindow *parent, const gchar *title );
 gboolean a_dialog_yes_or_no ( GtkWindow *parent, const gchar *message, const gchar *extra );
 gboolean a_dialog_custom_zoom ( GtkWindow *parent, gdouble *xmpp, gdouble *ympp );
 gboolean a_dialog_time_threshold ( GtkWindow *parent, gchar *title_text, gchar *label_text, guint *thr );
 
-/**
- * Dialog to return a positive number via a spinbox within the supplied limits
- * A return value of zero indicates the dialog was cancelled
- */
 guint a_dialog_get_positive_number ( GtkWindow *parent, gchar *title_text, gchar *label_text, guint default_num, guint min, guint max, guint step );
 
 void a_dialog_choose_dir ( GtkWidget *entry );
@@ -76,4 +66,7 @@ gboolean a_dialog_map_n_zoom(GtkWindow *parent, gchar *mapnames[], gint default_
 GList *a_dialog_select_from_list ( GtkWindow *parent, GList *names, gboolean multiple_selection_allowed, const gchar *title, const gchar *msg );
 
 void a_dialog_license ( GtkWindow *parent, const gchar *map, const gchar *license, const gchar *url);
+
+G_END_DECLS
+
 #endif