Diff of /trunk/src/gpxview.h

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

revision 17 by harbaum, Mon Jun 29 08:24:41 2009 UTC revision 158 by harbaum, Wed Nov 4 14:54:52 2009 UTC
# Line 37  Line 37 
37  #endif  #endif
38  #endif  #endif
39    
40    #ifdef BCT
41    #include "bct.h"
42    #endif
43    
44  #include "config.h"  #include "config.h"
45    
46  #include <string.h>  #include <string.h>
# Line 110  typedef struct { Line 114  typedef struct {
114    char *search_str;    char *search_str;
115    int search_days;    int search_days;
116    
117      struct proxy_s *proxy;      /* proxy settings */
118    
119    int gpxlist_items;    int gpxlist_items;
120    int cachelist_items;    int cachelist_items;
121    guint cachelist_handler_id; /* update timer */    guint cachelist_handler_id; /* update timer */
# Line 141  typedef struct { Line 147  typedef struct {
147  #ifndef NO_COPY_N_PASTE  #ifndef NO_COPY_N_PASTE
148    /* do enable/disable the edit entries */    /* do enable/disable the edit entries */
149    GtkWidget *menu_cut, *menu_copy, *menu_paste;    GtkWidget *menu_cut, *menu_copy, *menu_paste;
   GtkClipboard *clipboard;     /* clipboard for copy/paste */  
150    GtkTextBuffer *active_buffer;    GtkTextBuffer *active_buffer;
151  #endif  #endif
152    
153      GtkClipboard *clipboard;     /* clipboard for copy/paste */
154    
155    #ifdef USE_STACKABLE_WINDOW
156      GtkWidget *export_menu, *tools_menu;
157    #endif
158    
159    /* save result here to be able to "goto" it */    /* save result here to be able to "goto" it */
160    pos_t geomath;    pos_t geomath;
161    
# Line 171  typedef struct { Line 182  typedef struct {
182    
183    gboolean cachelist_disable_screensaver;    gboolean cachelist_disable_screensaver;
184    gboolean goto_disable_screensaver;    gboolean goto_disable_screensaver;
   gboolean cachelist_update;  
185    
186    HildonProgram *program;    HildonProgram *program;
187    HildonWindow *window;    HildonWindow *window;
188    osso_context_t *osso_context;    osso_context_t *osso_context;
189    GtkWidget *bct;  #else
190    gpx_t *search_results;    GtkWidget *window;
191    #endif
192    
193      gboolean cachelist_update;
194    
195  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
196    /* reference to enable/disable these while walking the crumb trail */    /* reference to enable/disable these while walking the crumb trail */
197    GtkWidget *menu_import, *menu_export;    GtkWidget *menu_import, *menu_export;
198    GtkWidget *menu_search;    GtkWidget *menu_search;
199    
200      GtkWidget *bct;
201  #endif  #endif
202    
203    /* keep track of current "path" in the bread crumb trail */    /* keep track of current "path" in the bread crumb trail */
204    gpx_t *cur_gpx;    gpx_t *cur_gpx;
205    cache_t *cur_cache;    cache_t *cur_cache;
206    
207  #else    gpx_t *search_results;
208    GtkWidget *window;  
209    #ifdef ENABLE_OSM_GPS_MAP
210      struct {
211        struct map_context_s *context;
212        int source;
213        int zoom;
214        pos_t pos;
215      } map;
216  #endif  #endif
217    
218    GtkWidget *vbox;    GtkWidget *vbox;
219  } appdata_t;  } appdata_t;
220    
# Line 201  typedef struct { Line 224  typedef struct {
224  #include "gconf.h"  #include "gconf.h"
225  #include "html.h"  #include "html.h"
226  #include "icons.h"  #include "icons.h"
227    #include "gcvote.h"
228  #include "cache.h"  #include "cache.h"
229  #include "geomath.h"  #include "geomath.h"
230  #include "geotext.h"  #include "geotext.h"
# Line 210  typedef struct { Line 234  typedef struct {
234  #include "precpos.h"  #include "precpos.h"
235  #include "garmin_export.h"  #include "garmin_export.h"
236    
237    #ifdef ENABLE_OSM_GPS_MAP
238    #include "map-tool.h"
239    #endif
240    
241  #ifdef USE_MAEMO  #ifdef USE_MAEMO
242  #include "dbus.h"  #include "dbus.h"
243  #endif  #endif
# Line 244  extern gboolean on_window_key_press(GtkW Line 272  extern gboolean on_window_key_press(GtkW
272  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
273  HildonAppMenu *menu_create(appdata_t *appdata, int mode);  HildonAppMenu *menu_create(appdata_t *appdata, int mode);
274  #endif  #endif
275    void cachelist_goto_cache(appdata_t *appdata, cache_t *cache);
276    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx);
277    
278  #endif // GPXVIEW_H  #endif // GPXVIEW_H
Legend:
Removed from v.17  
changed lines
  Added in v.158