Diff of /trunk/src/gpxview.h

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

revision 126 by harbaum, Mon Sep 28 19:01:03 2009 UTC revision 167 by harbaum, Mon Nov 9 07:50:37 2009 UTC
# Line 35  Line 35 
35  #define MENU_CACHELIST 1  #define MENU_CACHELIST 1
36  #define MENU_CACHE     2  #define MENU_CACHE     2
37  #endif  #endif
38  #else  #endif
39  #define MY_BCT   /* use custom breadcrumbtrail */  
40    #ifdef BCT
41  #include "bct.h"  #include "bct.h"
42  #endif  #endif
43    
# Line 113  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 131  typedef struct { Line 134  typedef struct {
134    gboolean compass_locked;    gboolean compass_locked;
135    int compass_damping;    int compass_damping;
136    
137      gboolean disable_gcvote;
138    
139    struct gps_state *gps_state;    struct gps_state *gps_state;
140    
141    /* keep track of all html views so zoom events can be delivered */    /* keep track of all html views so zoom events can be delivered */
# Line 144  typedef struct { Line 149  typedef struct {
149  #ifndef NO_COPY_N_PASTE  #ifndef NO_COPY_N_PASTE
150    /* do enable/disable the edit entries */    /* do enable/disable the edit entries */
151    GtkWidget *menu_cut, *menu_copy, *menu_paste;    GtkWidget *menu_cut, *menu_copy, *menu_paste;
   GtkClipboard *clipboard;     /* clipboard for copy/paste */  
152    GtkTextBuffer *active_buffer;    GtkTextBuffer *active_buffer;
153  #endif  #endif
154    
155      GtkClipboard *clipboard;     /* clipboard for copy/paste */
156    
157  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
158    GtkWidget *export_menu, *tools_menu;    GtkWidget *export_menu, *tools_menu;
159  #endif  #endif
# Line 178  typedef struct { Line 184  typedef struct {
184    
185    gboolean cachelist_disable_screensaver;    gboolean cachelist_disable_screensaver;
186    gboolean goto_disable_screensaver;    gboolean goto_disable_screensaver;
   gboolean cachelist_update;  
187    
188    HildonProgram *program;    HildonProgram *program;
189    HildonWindow *window;    HildonWindow *window;
# Line 187  typedef struct { Line 192  typedef struct {
192    GtkWidget *window;    GtkWidget *window;
193  #endif  #endif
194    
195  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)    gboolean cachelist_update;
196    
197    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
198    /* reference to enable/disable these while walking the crumb trail */    /* reference to enable/disable these while walking the crumb trail */
199    GtkWidget *menu_import, *menu_export;    GtkWidget *menu_import, *menu_export;
200    GtkWidget *menu_search;    GtkWidget *menu_search;
201    
202      GtkWidget *bct;
203    #endif
204    
205    /* keep track of current "path" in the bread crumb trail */    /* keep track of current "path" in the bread crumb trail */
206    gpx_t *cur_gpx;    gpx_t *cur_gpx;
207    cache_t *cur_cache;    cache_t *cur_cache;
208    
   GtkWidget *bct;  
 #endif  
   
209    gpx_t *search_results;    gpx_t *search_results;
210    
211  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
# Line 219  typedef struct { Line 226  typedef struct {
226  #include "gconf.h"  #include "gconf.h"
227  #include "html.h"  #include "html.h"
228  #include "icons.h"  #include "icons.h"
229    #include "gcvote.h"
230  #include "cache.h"  #include "cache.h"
231  #include "geomath.h"  #include "geomath.h"
232  #include "geotext.h"  #include "geotext.h"
# Line 266  extern gboolean on_window_key_press(GtkW Line 274  extern gboolean on_window_key_press(GtkW
274  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
275  HildonAppMenu *menu_create(appdata_t *appdata, int mode);  HildonAppMenu *menu_create(appdata_t *appdata, int mode);
276  #endif  #endif
277    void cachelist_goto_cache(appdata_t *appdata, cache_t *cache);
278    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx);
279    
280  #endif // GPXVIEW_H  #endif // GPXVIEW_H
Legend:
Removed from v.126  
changed lines
  Added in v.167