Diff of /trunk/src/gpxview.h

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

revision 129 by harbaum, Tue Sep 29 14:30:16 2009 UTC revision 280 by harbaum, Fri May 21 19:28:16 2010 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 49  Line 51 
51  #include <locale.h>  #include <locale.h>
52  #include <libintl.h>  #include <libintl.h>
53    
54    #ifndef _
55  #define _(String) gettext(String)  #define _(String) gettext(String)
56    #endif
57  #define N_(String) (String)  #define N_(String) (String)
58    
59  #ifdef USE_MAEMO  #ifdef USE_MAEMO
# Line 114  typedef struct { Line 118  typedef struct {
118    char *search_str;    char *search_str;
119    int search_days;    int search_days;
120    
121      struct proxy_s *proxy;      /* proxy settings */
122    
123    int gpxlist_items;    int gpxlist_items;
124    int cachelist_items;    int cachelist_items;
   guint cachelist_handler_id; /* update timer */  
125    gboolean cachelist_hide_found;    gboolean cachelist_hide_found;
126    
127    /* geotext related */    /* geotext related */
# Line 128  typedef struct { Line 133  typedef struct {
133    GtkWidget    *gpxview;    GtkWidget    *gpxview;
134    GConfClient *gconf_client;    GConfClient *gconf_client;
135    
   pos_t manual_goto;  
136    gboolean compass_locked;    gboolean compass_locked;
137    int compass_damping;    int compass_damping;
138    
139      gboolean disable_gcvote;
140    
141    struct gps_state *gps_state;    struct gps_state *gps_state;
142    
143    /* 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 145  typedef struct { Line 151  typedef struct {
151  #ifndef NO_COPY_N_PASTE  #ifndef NO_COPY_N_PASTE
152    /* do enable/disable the edit entries */    /* do enable/disable the edit entries */
153    GtkWidget *menu_cut, *menu_copy, *menu_paste;    GtkWidget *menu_cut, *menu_copy, *menu_paste;
   GtkClipboard *clipboard;     /* clipboard for copy/paste */  
154    GtkTextBuffer *active_buffer;    GtkTextBuffer *active_buffer;
155  #endif  #endif
156    
157      GtkClipboard *clipboard;     /* clipboard for copy/paste */
158    
159  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
160    GtkWidget *export_menu, *tools_menu;    GtkWidget *export_menu, *tools_menu;
161  #endif  #endif
# Line 172  typedef struct { Line 179  typedef struct {
179    
180  #ifdef USE_MAEMO  #ifdef USE_MAEMO
181    gboolean fullscreen;    gboolean fullscreen;
182    #ifdef ENABLE_MAEMO_MAPPER
183    pos_t mmpos;                /* position received from Maemo Mapper */    pos_t mmpos;                /* position received from Maemo Mapper */
184    gboolean mmpos_valid;    gboolean mmpos_valid;
185    #endif
186    
187    gboolean mmpoi_dontlaunch;    gboolean mmpoi_dontlaunch;
188    
# Line 200  typedef struct { Line 209  typedef struct {
209    /* keep track of current "path" in the bread crumb trail */    /* keep track of current "path" in the bread crumb trail */
210    gpx_t *cur_gpx;    gpx_t *cur_gpx;
211    cache_t *cur_cache;    cache_t *cur_cache;
212      struct cache_context_s *cache_context;
213    
214    gpx_t *search_results;    gpx_t *search_results;
215    
# Line 209  typedef struct { Line 219  typedef struct {
219      int source;      int source;
220      int zoom;      int zoom;
221      pos_t pos;      pos_t pos;
222        gboolean dpix;
223    } map;    } map;
224  #endif  #endif
225    
226      /* username is also used to detect own caches (by log entry) */
227      char *username;
228    
229      /* stuff to call geotoad */
230      struct {
231        char *password, *filename;
232        float distance, lat, lon;
233        int flags;
234        gboolean no_owned_found;
235      } gt;
236    
237    #ifdef ESPEAK
238      /* espeak handling */
239      struct {
240        gboolean enabled;
241        int sample_rate;  // or init error
242      } espeak;
243    #endif
244    
245    #ifndef USE_STACKABLE_WINDOW
246    GtkWidget *vbox;    GtkWidget *vbox;
247    #endif
248  } appdata_t;  } appdata_t;
249    
250  /* all includes that rely on appdata_t go here ... */  /* all includes that rely on appdata_t go here ... */
# Line 221  typedef struct { Line 253  typedef struct {
253  #include "gconf.h"  #include "gconf.h"
254  #include "html.h"  #include "html.h"
255  #include "icons.h"  #include "icons.h"
256    #include "gcvote.h"
257  #include "cache.h"  #include "cache.h"
258  #include "geomath.h"  #include "geomath.h"
259  #include "geotext.h"  #include "geotext.h"
# Line 229  typedef struct { Line 262  typedef struct {
262  #include "mm_poi.h"  #include "mm_poi.h"
263  #include "precpos.h"  #include "precpos.h"
264  #include "garmin_export.h"  #include "garmin_export.h"
265    #include "geotoad.h"
266    #include "about.h"
267    
268  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
269  #include "map-tool.h"  #include "map-tool.h"
# Line 268  extern gboolean on_window_key_press(GtkW Line 303  extern gboolean on_window_key_press(GtkW
303  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
304  HildonAppMenu *menu_create(appdata_t *appdata, int mode);  HildonAppMenu *menu_create(appdata_t *appdata, int mode);
305  #endif  #endif
306    void cachelist_goto_cache(appdata_t *appdata, cache_t *cache);
307    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx);
308    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx);
309    void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx);
310    void gpxlist_add(appdata_t *appdata, gpx_t *new);
311    void cachelist_redraw(appdata_t *appdata);
312    
313  #endif // GPXVIEW_H  #endif // GPXVIEW_H

Legend:
Removed from v.129  
changed lines
  Added in v.280