Diff of /trunk/src/appdata.h

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

revision 64 by harbaum, Mon Feb 9 13:23:17 2009 UTC revision 129 by achadwick, Sat Mar 21 02:11:55 2009 UTC
# Line 27  Line 27 
27  #include <locale.h>  #include <locale.h>
28  #include <libintl.h>  #include <libintl.h>
29    
 #include "version.h"  
   
30  #define LOCALEDIR "/usr/share/locale"  #define LOCALEDIR "/usr/share/locale"
31    
32  #define _(String) gettext(String)  #define _(String) gettext(String)
# Line 42  Line 40 
40  #define GTK_FM_OK  GTK_RESPONSE_OK  #define GTK_FM_OK  GTK_RESPONSE_OK
41  #define HILDON_ENTRY_NO_AUTOCAP(a) \  #define HILDON_ENTRY_NO_AUTOCAP(a) \
42    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)
43    
44    #ifndef HILDON_HARDKEY_FULLSCREEN
45    #define HILDON_HARDKEY_FULLSCREEN GDK_F6
46    #endif
47    
48    #ifndef HILDON_HARDKEY_INCREASE
49    #define HILDON_HARDKEY_INCREASE GDK_F7
50    #endif
51    
52    #ifndef HILDON_HARDKEY_DECREASE
53    #define HILDON_HARDKEY_DECREASE GDK_F8
54    #endif
55    
56  #else  #else
57  #define GTK_FM_OK  GTK_RESPONSE_ACCEPT  #define GTK_FM_OK  GTK_RESPONSE_ACCEPT
58  #define HILDON_ENTRY_NO_AUTOCAP(a)  #define HILDON_ENTRY_NO_AUTOCAP(a)
# Line 58  Line 69 
69  #include "osm.h"  #include "osm.h"
70    
71  #include "canvas.h"  #include "canvas.h"
72    #include "undo.h"
73    
74  #ifdef USE_HILDON  #ifdef USE_HILDON
75  #include "dbus.h"  #include "dbus.h"
# Line 122  typedef struct appdata_s { Line 134  typedef struct appdata_s {
134    GtkWidget *menu_item_osm_undo;    GtkWidget *menu_item_osm_undo;
135    GtkWidget *menu_item_osm_save_changes;    GtkWidget *menu_item_osm_save_changes;
136    GtkWidget *menu_item_osm_undo_changes;    GtkWidget *menu_item_osm_undo_changes;
137      GtkWidget *menu_item_osm_relations;
138    
139    GtkWidget *menu_wms;    GtkWidget *menu_wms;
140    GtkWidget *menu_item_wms_clear;    GtkWidget *menu_item_wms_clear;
# Line 133  typedef struct appdata_s { Line 146  typedef struct appdata_s {
146    GtkWidget *menu_item_map_no_icons;    GtkWidget *menu_item_map_no_icons;
147    GtkWidget *menu_item_map_no_antialias;    GtkWidget *menu_item_map_no_antialias;
148    
149    struct undo_state_s *undo_state;    undo_t undo;
150    
151  } appdata_t;  } appdata_t;
152    
# Line 158  typedef struct appdata_s { Line 171  typedef struct appdata_s {
171  #include "josm_elemstyles.h"  #include "josm_elemstyles.h"
172  #include "style.h"  #include "style.h"
173  #include "net_io.h"  #include "net_io.h"
 #include "qnd_xml.h"  
 #include "undo.h"  
174  #include "banner.h"  #include "banner.h"
175    
176  #endif // APPDATA_H  #endif // APPDATA_H
Legend:
Removed from v.64  
changed lines
  Added in v.129