Diff of /trunk/src/gpxview.h

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

revision 48 by harbaum, Fri Aug 7 07:57:33 2009 UTC revision 228 by harbaum, Thu Dec 3 20:07:13 2009 UTC
# Line 24  Line 24 
24  #if MAEMO_VERSION_MAJOR < 5  #if MAEMO_VERSION_MAJOR < 5
25  #define USE_BREAD_CRUMB_TRAIL  #define USE_BREAD_CRUMB_TRAIL
26  #else  #else
27    #define FREMANTLE
28    
29  // these are on maemo fremantle  // these are on maemo fremantle
30  #include <hildon/hildon-button.h>  #include <hildon/hildon-button.h>
31  #include <hildon/hildon-text-view.h>  #include <hildon/hildon-text-view.h>
# Line 37  Line 39 
39  #endif  #endif
40  #endif  #endif
41    
42    #ifdef BCT
43    #include "bct.h"
44    #endif
45    
46  #include "config.h"  #include "config.h"
47    
48  #include <string.h>  #include <string.h>
# Line 110  typedef struct { Line 116  typedef struct {
116    char *search_str;    char *search_str;
117    int search_days;    int search_days;
118    
119      struct proxy_s *proxy;      /* proxy settings */
120    
121    int gpxlist_items;    int gpxlist_items;
122    int cachelist_items;    int cachelist_items;
123    guint cachelist_handler_id; /* update timer */    guint cachelist_handler_id; /* update timer */
# Line 124  typedef struct { Line 132  typedef struct {
132    GtkWidget    *gpxview;    GtkWidget    *gpxview;
133    GConfClient *gconf_client;    GConfClient *gconf_client;
134    
   pos_t manual_goto;  
135    gboolean compass_locked;    gboolean compass_locked;
136    int compass_damping;    int compass_damping;
137    
138      gboolean disable_gcvote;
139    
140    struct gps_state *gps_state;    struct gps_state *gps_state;
141    
142    /* 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 141  typedef struct { Line 150  typedef struct {
150  #ifndef NO_COPY_N_PASTE  #ifndef NO_COPY_N_PASTE
151    /* do enable/disable the edit entries */    /* do enable/disable the edit entries */
152    GtkWidget *menu_cut, *menu_copy, *menu_paste;    GtkWidget *menu_cut, *menu_copy, *menu_paste;
   GtkClipboard *clipboard;     /* clipboard for copy/paste */  
153    GtkTextBuffer *active_buffer;    GtkTextBuffer *active_buffer;
154  #endif  #endif
155    
156      GtkClipboard *clipboard;     /* clipboard for copy/paste */
157    
158  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
159    GtkWidget *export_menu, *tools_menu;    GtkWidget *export_menu, *tools_menu;
160  #endif  #endif
# Line 175  typedef struct { Line 185  typedef struct {
185    
186    gboolean cachelist_disable_screensaver;    gboolean cachelist_disable_screensaver;
187    gboolean goto_disable_screensaver;    gboolean goto_disable_screensaver;
   gboolean cachelist_update;  
188    
189    HildonProgram *program;    HildonProgram *program;
190    HildonWindow *window;    HildonWindow *window;
191    osso_context_t *osso_context;    osso_context_t *osso_context;
192    GtkWidget *bct;  #else
193    gpx_t *search_results;    GtkWidget *window;
194    #endif
195    
196      gboolean cachelist_update;
197    
198  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
199    /* reference to enable/disable these while walking the crumb trail */    /* reference to enable/disable these while walking the crumb trail */
200    GtkWidget *menu_import, *menu_export;    GtkWidget *menu_import, *menu_export;
201    GtkWidget *menu_search;    GtkWidget *menu_search;
202    
203      GtkWidget *bct;
204  #endif  #endif
205    
206    /* keep track of current "path" in the bread crumb trail */    /* keep track of current "path" in the bread crumb trail */
207    gpx_t *cur_gpx;    gpx_t *cur_gpx;
208    cache_t *cur_cache;    cache_t *cur_cache;
209      struct cache_context_s *cache_context;
210    
211  #else    gpx_t *search_results;
   GtkWidget *window;  
 #endif  
212    
213  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
214    struct {    struct {
215        struct map_context_s *context;
216        int source;
217      int zoom;      int zoom;
218      pos_t pos;      pos_t pos;
219    } map;    } map;
220  #endif  #endif
221    
222      /* username is also used to detect own caches (by log entry) */
223      char *username;
224    
225      /* stuff to call geotoad */
226      struct {
227        char *password, *filename;
228        float distance, lat, lon;
229        int flags;
230      } gt;
231    
232    GtkWidget *vbox;    GtkWidget *vbox;
233  } appdata_t;  } appdata_t;
234    
# Line 213  typedef struct { Line 238  typedef struct {
238  #include "gconf.h"  #include "gconf.h"
239  #include "html.h"  #include "html.h"
240  #include "icons.h"  #include "icons.h"
241    #include "gcvote.h"
242  #include "cache.h"  #include "cache.h"
243  #include "geomath.h"  #include "geomath.h"
244  #include "geotext.h"  #include "geotext.h"
# Line 221  typedef struct { Line 247  typedef struct {
247  #include "mm_poi.h"  #include "mm_poi.h"
248  #include "precpos.h"  #include "precpos.h"
249  #include "garmin_export.h"  #include "garmin_export.h"
250    #include "geotoad.h"
251    #include "about.h"
252    
253  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
254  #include "map-tool.h"  #include "map-tool.h"
# Line 260  extern gboolean on_window_key_press(GtkW Line 288  extern gboolean on_window_key_press(GtkW
288  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
289  HildonAppMenu *menu_create(appdata_t *appdata, int mode);  HildonAppMenu *menu_create(appdata_t *appdata, int mode);
290  #endif  #endif
291    void cachelist_goto_cache(appdata_t *appdata, cache_t *cache);
292    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx);
293    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx);
294    void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx);
295    void gpxlist_add(appdata_t *appdata, gpx_t *new);
296    void cachelist_redraw(appdata_t *appdata);
297    
298  #endif // GPXVIEW_H  #endif // GPXVIEW_H
Legend:
Removed from v.48  
changed lines
  Added in v.228