--- trunk/src/appdata.h	2008/12/24 14:17:20	28
+++ trunk/src/appdata.h	2009/04/28 09:10:17	169
@@ -20,6 +20,9 @@
 #ifndef APPDATA_H
 #define APPDATA_H
 
+/* this define will enable preliminary API 0.6 support */
+#define API06
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -27,8 +30,6 @@
 #include <locale.h>
 #include <libintl.h>
 
-#include "version.h"
-
 #define LOCALEDIR "/usr/share/locale"
 
 #define _(String) gettext(String)
@@ -42,6 +43,19 @@
 #define GTK_FM_OK  GTK_RESPONSE_OK
 #define HILDON_ENTRY_NO_AUTOCAP(a) \
   hildon_gtk_entry_set_input_mode(GTK_ENTRY(a),HILDON_GTK_INPUT_MODE_FULL)
+
+#ifndef HILDON_HARDKEY_FULLSCREEN
+#define HILDON_HARDKEY_FULLSCREEN GDK_F6
+#endif
+
+#ifndef HILDON_HARDKEY_INCREASE
+#define HILDON_HARDKEY_INCREASE GDK_F7
+#endif
+
+#ifndef HILDON_HARDKEY_DECREASE
+#define HILDON_HARDKEY_DECREASE GDK_F8
+#endif
+
 #else
 #define GTK_FM_OK  GTK_RESPONSE_ACCEPT
 #define HILDON_ENTRY_NO_AUTOCAP(a)
@@ -58,6 +72,7 @@
 #include "osm.h"
 
 #include "canvas.h"
+#include "undo.h"
 
 #ifdef USE_HILDON
 #include "dbus.h"
@@ -101,12 +116,12 @@
   } dialog_again;
 
   struct {
-    char *import_path;
     GtkWidget *menu_track;
     GtkWidget *menu_item_import;
     GtkWidget *menu_item_export;
     GtkWidget *menu_item_clear;
-    GtkWidget *menu_item_gps;
+    GtkWidget *menu_item_enable_gps;
+    GtkWidget *menu_item_follow_gps;
     struct track_s *track;
     guint handler_id;
     canvas_item_t *gps_item;      // the purple curcle
@@ -119,8 +134,10 @@
 
   GtkWidget *menu_osm;
   GtkWidget *menu_item_osm_upload;
-  GtkWidget *menu_item_osm_diff;
+  GtkWidget *menu_item_osm_undo;
+  GtkWidget *menu_item_osm_save_changes;
   GtkWidget *menu_item_osm_undo_changes;
+  GtkWidget *menu_item_osm_relations;
 
   GtkWidget *menu_wms;
   GtkWidget *menu_item_wms_clear;
@@ -132,15 +149,17 @@
   GtkWidget *menu_item_map_no_icons;
   GtkWidget *menu_item_map_no_antialias;
 
+  undo_t undo;
+
 } appdata_t;
 
+#include "settings.h"
 #include "map.h"
 #include "map_hl.h"
 #include "osm_api.h"
 #include "statusbar.h"
 #include "area_edit.h"
 #include "project.h"
-#include "settings.h"
 #include "diff.h"
 #include "iconbar.h"
 #include "icon.h"
@@ -155,5 +174,7 @@
 #include "josm_elemstyles.h"
 #include "style.h"
 #include "net_io.h"
+#include "banner.h"
+#include "list.h"
 
 #endif // APPDATA_H