Diff of /trunk/src/gpxview.h

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

revision 2 by harbaum, Sat Jun 20 11:44:14 2009 UTC revision 128 by harbaum, Tue Sep 29 07:31:18 2009 UTC
# Line 25  Line 25 
25  #define USE_BREAD_CRUMB_TRAIL  #define USE_BREAD_CRUMB_TRAIL
26  #else  #else
27  // these are on maemo fremantle  // these are on maemo fremantle
28    #include <hildon/hildon-button.h>
29    #include <hildon/hildon-text-view.h>
30    #include <hildon/hildon-window-stack.h>
31    #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
34    #define MENU_GPXLIST   0
35    #define MENU_CACHELIST 1
36    #define MENU_CACHE     2
37    #endif
38  #endif  #endif
39    
40    #ifdef BCT
41    #include "bct.h"
42  #endif  #endif
43    
44  #include "config.h"  #include "config.h"
# Line 43  Line 54 
54    
55  #ifdef USE_MAEMO  #ifdef USE_MAEMO
56  #include <hildon/hildon-program.h>  #include <hildon/hildon-program.h>
 #include <hildon/hildon-text-view.h>  
57  #include <hildon/hildon-file-chooser-dialog.h>  #include <hildon/hildon-file-chooser-dialog.h>
58  #include <hildon/hildon-file-system-model.h>  #include <hildon/hildon-file-system-model.h>
59  #include <hildon/hildon-bread-crumb-trail.h>  #include <hildon/hildon-bread-crumb-trail.h>
# Line 55  Line 65 
65  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
66  #define USE_PANNABLE_AREA  #define USE_PANNABLE_AREA
67  #include <hildon/hildon-pannable-area.h>  #include <hildon/hildon-pannable-area.h>
68    /* panning a gtkhtml view currently doesn't work well */
69    #define PANNABLE_HTML
70  #endif  #endif
71  #endif  #endif
72    
# Line 97  typedef struct { Line 109  typedef struct {
109    pos_t gps;                  /* saved last gps position */    pos_t gps;                  /* saved last gps position */
110    
111    char *image_path;           /* path to cache images in */    char *image_path;           /* path to cache images in */
   gboolean load_images;       /* load images and cache them */  
112    
113    int search;                 /* "search in" items */    int search;                 /* "search in" items */
114    char *search_str;    char *search_str;
# Line 138  typedef struct { Line 149  typedef struct {
149    GtkTextBuffer *active_buffer;    GtkTextBuffer *active_buffer;
150  #endif  #endif
151    
152    #ifdef USE_STACKABLE_WINDOW
153      GtkWidget *export_menu, *tools_menu;
154    #endif
155    
156    /* save result here to be able to "goto" it */    /* save result here to be able to "goto" it */
157    pos_t geomath;    pos_t geomath;
158    
# Line 169  typedef struct { Line 184  typedef struct {
184    HildonProgram *program;    HildonProgram *program;
185    HildonWindow *window;    HildonWindow *window;
186    osso_context_t *osso_context;    osso_context_t *osso_context;
187    GtkWidget *bct;  #else
188    gpx_t *search_results;    GtkWidget *window;
189    #endif
190    
191    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
192    /* reference to enable/disable these while walking the crumb trail */    /* reference to enable/disable these while walking the crumb trail */
193    GtkWidget *menu_import, *menu_export;    GtkWidget *menu_import, *menu_export;
194    GtkWidget *menu_search;    GtkWidget *menu_search;
195    
196      GtkWidget *bct;
197    #endif
198    
199    /* keep track of current "path" in the bread crumb trail */    /* keep track of current "path" in the bread crumb trail */
200    gpx_t *cur_gpx;    gpx_t *cur_gpx;
201    cache_t *cur_cache;    cache_t *cur_cache;
202    
203  #else    gpx_t *search_results;
204    GtkWidget *window;  
205    #ifdef ENABLE_OSM_GPS_MAP
206      struct {
207        struct map_context_s *context;
208        int source;
209        int zoom;
210        pos_t pos;
211      } map;
212  #endif  #endif
213    
214    GtkWidget *vbox;    GtkWidget *vbox;
215  } appdata_t;  } appdata_t;
216    
# Line 201  typedef struct { Line 229  typedef struct {
229  #include "precpos.h"  #include "precpos.h"
230  #include "garmin_export.h"  #include "garmin_export.h"
231    
232    #ifdef ENABLE_OSM_GPS_MAP
233    #include "map-tool.h"
234    #endif
235    
236  #ifdef USE_MAEMO  #ifdef USE_MAEMO
237  #include "dbus.h"  #include "dbus.h"
238  #endif  #endif
# Line 231  extern void main_after_settings_redraw(a Line 263  extern void main_after_settings_redraw(a
263  #include <stdarg.h>  #include <stdarg.h>
264  extern void errorf(const char *fmt, ...);  extern void errorf(const char *fmt, ...);
265  extern gboolean on_window_key_press(GtkWidget *widget,  extern gboolean on_window_key_press(GtkWidget *widget,
266                                      GdkEventKey *event, gpointer data);                                      GdkEventKey *event, appdata_t *appdata);
267    #ifdef USE_STACKABLE_WINDOW
268    HildonAppMenu *menu_create(appdata_t *appdata, int mode);
269    #endif
270    
271  #endif // GPXVIEW_H  #endif // GPXVIEW_H
Legend:
Removed from v.2  
changed lines
  Added in v.128