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 76 by harbaum, Fri Feb 13 12:02:26 2009 UTC
# 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 69  typedef struct appdata_s { Line 70  typedef struct appdata_s {
70    HildonWindow *window;    HildonWindow *window;
71    osso_context_t *osso_context;    osso_context_t *osso_context;
72    
   /* and the ability to zoom */  
   GtkWidget *fullscreen_menu_item;  
73  #else  #else
74    GtkWidget *window;    GtkWidget *window;
75  #endif  #endif
# Line 92  typedef struct appdata_s { Line 91  typedef struct appdata_s {
91    
92  #ifdef USE_HILDON  #ifdef USE_HILDON
93    dbus_mm_pos_t mmpos;    dbus_mm_pos_t mmpos;
94      GtkWidget *banner;
95  #endif  #endif
96      gboolean banner_is_grabby;
97    
98    /* flags used to prevent re-appearence of dialogs */    /* flags used to prevent re-appearence of dialogs */
99    struct {    struct {
# Line 113  typedef struct appdata_s { Line 114  typedef struct appdata_s {
114    } track;    } track;
115    
116    GtkWidget *menu_item_project_close;    GtkWidget *menu_item_project_close;
117      GtkWidget *menu_item_view_fullscreen;
118    
119    GtkWidget *menu_view;    GtkWidget *menu_view;
120    
121    GtkWidget *menu_osm;    GtkWidget *menu_osm;
122    GtkWidget *menu_item_osm_upload;    GtkWidget *menu_item_osm_upload;
123    GtkWidget *menu_item_osm_diff;    GtkWidget *menu_item_osm_undo;
124      GtkWidget *menu_item_osm_save_changes;
125      GtkWidget *menu_item_osm_undo_changes;
126      GtkWidget *menu_item_osm_relations;
127    
128    GtkWidget *menu_wms;    GtkWidget *menu_wms;
129    GtkWidget *menu_item_wms_clear;    GtkWidget *menu_item_wms_clear;
# Line 128  typedef struct appdata_s { Line 133  typedef struct appdata_s {
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    
138      undo_t undo;
139    
140  } appdata_t;  } appdata_t;
141    
# Line 152  typedef struct appdata_s { Line 160  typedef struct appdata_s {
160  #include "josm_elemstyles.h"  #include "josm_elemstyles.h"
161  #include "style.h"  #include "style.h"
162  #include "net_io.h"  #include "net_io.h"
163    #include "banner.h"
164    
165  #endif // APPDATA_H  #endif // APPDATA_H

Legend:
Removed from v.14  
changed lines
  Added in v.76