Diff of /trunk/src/appdata.h

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

revision 76 by harbaum, Fri Feb 13 12:02:26 2009 UTC revision 188 by harbaum, Mon Jul 6 14:06:59 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 102  typedef struct appdata_s { Line 113  typedef struct appdata_s {
113    } dialog_again;    } dialog_again;
114    
115    struct {    struct {
116      char *import_path;      GtkWidget *submenu_track;
117      GtkWidget *menu_track;      GtkWidget *menu_item_track_import;
118      GtkWidget *menu_item_import;      GtkWidget *menu_item_track_export;
119      GtkWidget *menu_item_export;      GtkWidget *menu_item_track_clear;
120      GtkWidget *menu_item_clear;      GtkWidget *menu_item_track_enable_gps;
121      GtkWidget *menu_item_gps;      GtkWidget *menu_item_track_follow_gps;
122      struct track_s *track;      struct track_s *track;
123      guint handler_id;      guint handler_id;
124      canvas_item_t *gps_item;      // the purple curcle      canvas_item_t *gps_item;      // the purple curcle
125    } track;    } track;
126    
127    GtkWidget *menu_item_project_close;  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
128    GtkWidget *menu_item_view_fullscreen;    GtkWidget *menu_item_view_fullscreen;
129    #endif
130    
131    GtkWidget *menu_view;    GtkWidget *submenu_view;
132    
133    GtkWidget *menu_osm;    GtkWidget *submenu_map;
134    GtkWidget *menu_item_osm_upload;    GtkWidget *menu_item_map_upload;
135    GtkWidget *menu_item_osm_undo;    GtkWidget *menu_item_map_undo;
136    GtkWidget *menu_item_osm_save_changes;    GtkWidget *menu_item_map_save_changes;
137    GtkWidget *menu_item_osm_undo_changes;    GtkWidget *menu_item_map_undo_changes;
138    GtkWidget *menu_item_osm_relations;    GtkWidget *menu_item_map_relations;
139    
140    GtkWidget *menu_wms;    GtkWidget *submenu_wms;
141    GtkWidget *menu_item_wms_clear;    GtkWidget *menu_item_wms_clear;
142    GtkWidget *menu_item_wms_adjust;    GtkWidget *menu_item_wms_adjust;
143    
   GtkWidget *menu_map;  
144    GtkWidget *menu_item_map_hide_sel;    GtkWidget *menu_item_map_hide_sel;
145    GtkWidget *menu_item_map_show_all;    GtkWidget *menu_item_map_show_all;
146    GtkWidget *menu_item_map_no_icons;    GtkWidget *menu_item_map_no_icons;
147    GtkWidget *menu_item_map_no_antialias;  
148    #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
149      /* submenues are seperate menues under fremantle */
150      GtkWidget *submenu_project;
151    #endif
152    
153    undo_t undo;    undo_t undo;
154    
155  } appdata_t;  } appdata_t;
156    
157    #include "settings.h"
158  #include "map.h"  #include "map.h"
159  #include "map_hl.h"  #include "map_hl.h"
160  #include "osm_api.h"  #include "osm_api.h"
161  #include "statusbar.h"  #include "statusbar.h"
162  #include "area_edit.h"  #include "area_edit.h"
163  #include "project.h"  #include "project.h"
 #include "settings.h"  
164  #include "diff.h"  #include "diff.h"
165  #include "iconbar.h"  #include "iconbar.h"
166  #include "icon.h"  #include "icon.h"
# Line 161  typedef struct appdata_s { Line 176  typedef struct appdata_s {
176  #include "style.h"  #include "style.h"
177  #include "net_io.h"  #include "net_io.h"
178  #include "banner.h"  #include "banner.h"
179    #include "list.h"
180    
181  #endif // APPDATA_H  #endif // APPDATA_H
Legend:
Removed from v.76  
changed lines
  Added in v.188