Diff of /trunk/src/appdata.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 54 by harbaum, Fri Feb 6 12:06:30 2009 UTC revision 165 by harbaum, Tue Apr 21 20:11:30 2009 UTC
# Line 20  Line 20 
20  #ifndef APPDATA_H  #ifndef APPDATA_H
21  #define APPDATA_H  #define APPDATA_H
22    
23    /* this define will enable preliminary API 0.6 support */
24    #define API06
25    
26  #include <stdio.h>  #include <stdio.h>
27  #include <stdlib.h>  #include <stdlib.h>
28  #include <string.h>  #include <string.h>
# Line 27  Line 30 
30  #include <locale.h>  #include <locale.h>
31  #include <libintl.h>  #include <libintl.h>
32    
 #include "version.h"  
   
33  #define LOCALEDIR "/usr/share/locale"  #define LOCALEDIR "/usr/share/locale"
34    
35  #define _(String) gettext(String)  #define _(String) gettext(String)
# Line 42  Line 43 
43  #define GTK_FM_OK  GTK_RESPONSE_OK  #define GTK_FM_OK  GTK_RESPONSE_OK
44  #define HILDON_ENTRY_NO_AUTOCAP(a) \  #define HILDON_ENTRY_NO_AUTOCAP(a) \
45    hildon_gtk_entry_set_input_mode(GTK_ENTRY(a),HILDON_GTK_INPUT_MODE_FULL)    hildon_gtk_entry_set_input_mode(GTK_ENTRY(a),HILDON_GTK_INPUT_MODE_FULL)
46    
47    #ifndef HILDON_HARDKEY_FULLSCREEN
48    #define HILDON_HARDKEY_FULLSCREEN GDK_F6
49    #endif
50    
51    #ifndef HILDON_HARDKEY_INCREASE
52    #define HILDON_HARDKEY_INCREASE GDK_F7
53    #endif
54    
55    #ifndef HILDON_HARDKEY_DECREASE
56    #define HILDON_HARDKEY_DECREASE GDK_F8
57    #endif
58    
59  #else  #else
60  #define GTK_FM_OK  GTK_RESPONSE_ACCEPT  #define GTK_FM_OK  GTK_RESPONSE_ACCEPT
61  #define HILDON_ENTRY_NO_AUTOCAP(a)  #define HILDON_ENTRY_NO_AUTOCAP(a)
# Line 58  Line 72 
72  #include "osm.h"  #include "osm.h"
73    
74  #include "canvas.h"  #include "canvas.h"
75    #include "undo.h"
76    
77  #ifdef USE_HILDON  #ifdef USE_HILDON
78  #include "dbus.h"  #include "dbus.h"
# Line 101  typedef struct appdata_s { Line 116  typedef struct appdata_s {
116    } dialog_again;    } dialog_again;
117    
118    struct {    struct {
     char *import_path;  
119      GtkWidget *menu_track;      GtkWidget *menu_track;
120      GtkWidget *menu_item_import;      GtkWidget *menu_item_import;
121      GtkWidget *menu_item_export;      GtkWidget *menu_item_export;
122      GtkWidget *menu_item_clear;      GtkWidget *menu_item_clear;
123      GtkWidget *menu_item_gps;      GtkWidget *menu_item_enable_gps;
124        GtkWidget *menu_item_follow_gps;
125      struct track_s *track;      struct track_s *track;
126      guint handler_id;      guint handler_id;
127      canvas_item_t *gps_item;      // the purple curcle      canvas_item_t *gps_item;      // the purple curcle
# Line 119  typedef struct appdata_s { Line 134  typedef struct appdata_s {
134    
135    GtkWidget *menu_osm;    GtkWidget *menu_osm;
136    GtkWidget *menu_item_osm_upload;    GtkWidget *menu_item_osm_upload;
137    GtkWidget *menu_item_osm_diff;    GtkWidget *menu_item_osm_undo;
138      GtkWidget *menu_item_osm_save_changes;
139    GtkWidget *menu_item_osm_undo_changes;    GtkWidget *menu_item_osm_undo_changes;
140      GtkWidget *menu_item_osm_relations;
141    
142    GtkWidget *menu_wms;    GtkWidget *menu_wms;
143    GtkWidget *menu_item_wms_clear;    GtkWidget *menu_item_wms_clear;
# Line 132  typedef struct appdata_s { Line 149  typedef struct appdata_s {
149    GtkWidget *menu_item_map_no_icons;    GtkWidget *menu_item_map_no_icons;
150    GtkWidget *menu_item_map_no_antialias;    GtkWidget *menu_item_map_no_antialias;
151    
152    struct undo_state_s *undo_state;    undo_t undo;
153    
154  } appdata_t;  } appdata_t;
155    
# Line 157  typedef struct appdata_s { Line 174  typedef struct appdata_s {
174  #include "josm_elemstyles.h"  #include "josm_elemstyles.h"
175  #include "style.h"  #include "style.h"
176  #include "net_io.h"  #include "net_io.h"
177  #include "qnd_xml.h"  #include "banner.h"
178  #include "undo.h"  #include "list.h"
179    
180  #endif // APPDATA_H  #endif // APPDATA_H
Legend:
Removed from v.54  
changed lines
  Added in v.165