Diff of /trunk/src/gpxview.h

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

revision 8 by harbaum, Thu Jun 25 19:08:48 2009 UTC revision 126 by harbaum, Mon Sep 28 19:01:03 2009 UTC
# Line 27  Line 27 
27  // these are on maemo fremantle  // these are on maemo fremantle
28  #include <hildon/hildon-button.h>  #include <hildon/hildon-button.h>
29  #include <hildon/hildon-text-view.h>  #include <hildon/hildon-text-view.h>
30    #include <hildon/hildon-window-stack.h>
31  #define USE_HILDON_TEXT_VIEW  #define USE_HILDON_TEXT_VIEW
32  #define USE_STACKABLE_WINDOW  #define USE_STACKABLE_WINDOW
33  #define NO_COPY_N_PASTE  #define NO_COPY_N_PASTE
# Line 34  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
39    #define MY_BCT   /* use custom breadcrumbtrail */
40    #include "bct.h"
41  #endif  #endif
42    
43  #include "config.h"  #include "config.h"
# Line 60  Line 64 
64  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
65  #define USE_PANNABLE_AREA  #define USE_PANNABLE_AREA
66  #include <hildon/hildon-pannable-area.h>  #include <hildon/hildon-pannable-area.h>
67    /* panning a gtkhtml view currently doesn't work well */
68    #define PANNABLE_HTML
69  #endif  #endif
70  #endif  #endif
71    
# Line 102  typedef struct { Line 108  typedef struct {
108    pos_t gps;                  /* saved last gps position */    pos_t gps;                  /* saved last gps position */
109    
110    char *image_path;           /* path to cache images in */    char *image_path;           /* path to cache images in */
   gboolean load_images;       /* load images and cache them */  
111    
112    int search;                 /* "search in" items */    int search;                 /* "search in" items */
113    char *search_str;    char *search_str;
# Line 143  typedef struct { Line 148  typedef struct {
148    GtkTextBuffer *active_buffer;    GtkTextBuffer *active_buffer;
149  #endif  #endif
150    
151    #ifdef USE_STACKABLE_WINDOW
152      GtkWidget *export_menu, *tools_menu;
153    #endif
154    
155    /* save result here to be able to "goto" it */    /* save result here to be able to "goto" it */
156    pos_t geomath;    pos_t geomath;
157    
# Line 174  typedef struct { Line 183  typedef struct {
183    HildonProgram *program;    HildonProgram *program;
184    HildonWindow *window;    HildonWindow *window;
185    osso_context_t *osso_context;    osso_context_t *osso_context;
186    GtkWidget *bct;  #else
187    gpx_t *search_results;    GtkWidget *window;
188    #endif
189    
190  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)
191    /* reference to enable/disable these while walking the crumb trail */    /* reference to enable/disable these while walking the crumb trail */
192    GtkWidget *menu_import, *menu_export;    GtkWidget *menu_import, *menu_export;
193    GtkWidget *menu_search;    GtkWidget *menu_search;
 #endif  
194    
195    /* keep track of current "path" in the bread crumb trail */    /* keep track of current "path" in the bread crumb trail */
196    gpx_t *cur_gpx;    gpx_t *cur_gpx;
197    cache_t *cur_cache;    cache_t *cur_cache;
198    
199  #else    GtkWidget *bct;
200    GtkWidget *window;  #endif
201    
202      gpx_t *search_results;
203    
204    #ifdef ENABLE_OSM_GPS_MAP
205      struct {
206        struct map_context_s *context;
207        int source;
208        int zoom;
209        pos_t pos;
210      } map;
211  #endif  #endif
212    
213    GtkWidget *vbox;    GtkWidget *vbox;
214  } appdata_t;  } appdata_t;
215    
# Line 208  typedef struct { Line 228  typedef struct {
228  #include "precpos.h"  #include "precpos.h"
229  #include "garmin_export.h"  #include "garmin_export.h"
230    
231    #ifdef ENABLE_OSM_GPS_MAP
232    #include "map-tool.h"
233    #endif
234    
235  #ifdef USE_MAEMO  #ifdef USE_MAEMO
236  #include "dbus.h"  #include "dbus.h"
237  #endif  #endif
# Line 238  extern void main_after_settings_redraw(a Line 262  extern void main_after_settings_redraw(a
262  #include <stdarg.h>  #include <stdarg.h>
263  extern void errorf(const char *fmt, ...);  extern void errorf(const char *fmt, ...);
264  extern gboolean on_window_key_press(GtkWidget *widget,  extern gboolean on_window_key_press(GtkWidget *widget,
265                                      GdkEventKey *event, gpointer data);                                      GdkEventKey *event, appdata_t *appdata);
266  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
267  HildonAppMenu *menu_create(appdata_t *appdata, int mode);  HildonAppMenu *menu_create(appdata_t *appdata, int mode);
268  #endif  #endif
Legend:
Removed from v.8  
changed lines
  Added in v.126