Diff of /trunk/src/appdata.h

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

revision 39 by harbaum, Fri Jan 16 20:01:07 2009 UTC revision 190 by harbaum, Mon Jul 6 19:17:24 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 38  Line 36 
36  #include <hildon/hildon-program.h>  #include <hildon/hildon-program.h>
37  #include <hildon/hildon-file-chooser-dialog.h>  #include <hildon/hildon-file-chooser-dialog.h>
38  #include <hildon/hildon-file-system-model.h>  #include <hildon/hildon-file-system-model.h>
39    #include <hildon/hildon-defines.h>
40  #include <libosso.h>      /* required for screen saver timeout */  #include <libosso.h>      /* required for screen saver timeout */
41  #define GTK_FM_OK  GTK_RESPONSE_OK  #define GTK_FM_OK  GTK_RESPONSE_OK
42  #define HILDON_ENTRY_NO_AUTOCAP(a) \  #define HILDON_ENTRY_NO_AUTOCAP(a) \
43    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)
44    
45  #else  #else
46  #define GTK_FM_OK  GTK_RESPONSE_ACCEPT  #define GTK_FM_OK  GTK_RESPONSE_ACCEPT
47  #define HILDON_ENTRY_NO_AUTOCAP(a)  #define HILDON_ENTRY_NO_AUTOCAP(a)
# Line 58  Line 58 
58  #include "osm.h"  #include "osm.h"
59    
60  #include "canvas.h"  #include "canvas.h"
61    #include "undo.h"
62    
63  #ifdef USE_HILDON  #ifdef USE_HILDON
64  #include "dbus.h"  #include "dbus.h"
# Line 101  typedef struct appdata_s { Line 102  typedef struct appdata_s {
102    } dialog_again;    } dialog_again;
103    
104    struct {    struct {
105      char *import_path;      GtkWidget *submenu_track;
106      GtkWidget *menu_track;      GtkWidget *menu_item_track_import;
107      GtkWidget *menu_item_import;      GtkWidget *menu_item_track_export;
108      GtkWidget *menu_item_export;      GtkWidget *menu_item_track_clear;
109      GtkWidget *menu_item_clear;      GtkWidget *menu_item_track_enable_gps;
110      GtkWidget *menu_item_gps;      GtkWidget *menu_item_track_follow_gps;
111      struct track_s *track;      struct track_s *track;
112      guint handler_id;      guint handler_id;
113      canvas_item_t *gps_item;      // the purple curcle      canvas_item_t *gps_item;      // the purple curcle
114    } track;    } track;
115    
116    GtkWidget *menu_item_project_close;  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
117    GtkWidget *menu_item_view_fullscreen;    GtkWidget *menu_item_view_fullscreen;
118    #endif
119    
120    GtkWidget *menu_view;    GtkWidget *submenu_view;
121    
122    GtkWidget *menu_osm;    GtkWidget *submenu_map;
123    GtkWidget *menu_item_osm_upload;    GtkWidget *menu_item_map_upload;
124    GtkWidget *menu_item_osm_diff;    GtkWidget *menu_item_map_undo;
125    GtkWidget *menu_item_osm_undo_changes;    GtkWidget *menu_item_map_save_changes;
126      GtkWidget *menu_item_map_undo_changes;
127      GtkWidget *menu_item_map_relations;
128    
129    GtkWidget *menu_wms;    GtkWidget *submenu_wms;
130    GtkWidget *menu_item_wms_clear;    GtkWidget *menu_item_wms_clear;
131    GtkWidget *menu_item_wms_adjust;    GtkWidget *menu_item_wms_adjust;
132    
   GtkWidget *menu_map;  
133    GtkWidget *menu_item_map_hide_sel;    GtkWidget *menu_item_map_hide_sel;
134    GtkWidget *menu_item_map_show_all;    GtkWidget *menu_item_map_show_all;
135    GtkWidget *menu_item_map_no_icons;    GtkWidget *menu_item_map_no_icons;
136    GtkWidget *menu_item_map_no_antialias;  
137    #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
138      /* submenues are seperate menues under fremantle */
139      GtkWidget *app_menu_view, *app_menu_wms, *app_menu_track;
140    #endif
141    
142      undo_t undo;
143    
144  } appdata_t;  } appdata_t;
145    
146    #include "settings.h"
147  #include "map.h"  #include "map.h"
148  #include "map_hl.h"  #include "map_hl.h"
149  #include "osm_api.h"  #include "osm_api.h"
150  #include "statusbar.h"  #include "statusbar.h"
151  #include "area_edit.h"  #include "area_edit.h"
152  #include "project.h"  #include "project.h"
 #include "settings.h"  
153  #include "diff.h"  #include "diff.h"
154  #include "iconbar.h"  #include "iconbar.h"
155  #include "icon.h"  #include "icon.h"
# Line 155  typedef struct appdata_s { Line 164  typedef struct appdata_s {
164  #include "josm_elemstyles.h"  #include "josm_elemstyles.h"
165  #include "style.h"  #include "style.h"
166  #include "net_io.h"  #include "net_io.h"
167  #include "qnd_xml.h"  #include "banner.h"
168    #include "list.h"
169    
170  #endif // APPDATA_H  #endif // APPDATA_H
Legend:
Removed from v.39  
changed lines
  Added in v.190