Diff of /trunk/src/appdata.h

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

revision 14 by harbaum, Mon Dec 15 19:45:38 2008 UTC revision 169 by harbaum, Tue Apr 28 09:10:17 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 69  typedef struct appdata_s { Line 84  typedef struct appdata_s {
84    HildonWindow *window;    HildonWindow *window;
85    osso_context_t *osso_context;    osso_context_t *osso_context;
86    
   /* and the ability to zoom */  
   GtkWidget *fullscreen_menu_item;  
87  #else  #else
88    GtkWidget *window;    GtkWidget *window;
89  #endif  #endif
# Line 92  typedef struct appdata_s { Line 105  typedef struct appdata_s {
105    
106  #ifdef USE_HILDON  #ifdef USE_HILDON
107    dbus_mm_pos_t mmpos;    dbus_mm_pos_t mmpos;
108      GtkWidget *banner;
109  #endif  #endif
110      gboolean banner_is_grabby;
111    
112    /* flags used to prevent re-appearence of dialogs */    /* flags used to prevent re-appearence of dialogs */
113    struct {    struct {
# 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
128    } track;    } track;
129    
130    GtkWidget *menu_item_project_close;    GtkWidget *menu_item_project_close;
131      GtkWidget *menu_item_view_fullscreen;
132    
133    GtkWidget *menu_view;    GtkWidget *menu_view;
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;
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 128  typedef struct appdata_s { Line 147  typedef struct appdata_s {
147    GtkWidget *menu_item_map_hide_sel;    GtkWidget *menu_item_map_hide_sel;
148    GtkWidget *menu_item_map_show_all;    GtkWidget *menu_item_map_show_all;
149    GtkWidget *menu_item_map_no_icons;    GtkWidget *menu_item_map_no_icons;
150      GtkWidget *menu_item_map_no_antialias;
151    
152      undo_t undo;
153    
154  } appdata_t;  } appdata_t;
155    
156    #include "settings.h"
157  #include "map.h"  #include "map.h"
158  #include "map_hl.h"  #include "map_hl.h"
159  #include "osm_api.h"  #include "osm_api.h"
160  #include "statusbar.h"  #include "statusbar.h"
161  #include "area_edit.h"  #include "area_edit.h"
162  #include "project.h"  #include "project.h"
 #include "settings.h"  
163  #include "diff.h"  #include "diff.h"
164  #include "iconbar.h"  #include "iconbar.h"
165  #include "icon.h"  #include "icon.h"
# Line 152  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 "banner.h"
178    #include "list.h"
179    
180  #endif // APPDATA_H  #endif // APPDATA_H
Legend:
Removed from v.14  
changed lines
  Added in v.169