Diff of /trunk/src/gpxview.h

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

revision 3 by harbaum, Mon Jun 22 13:05:30 2009 UTC revision 48 by harbaum, Fri Aug 7 07:57:33 2009 UTC
# Line 26  Line 26 
26  #else  #else
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>
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  #define MENU_GPXLIST   0
# Line 47  Line 50 
50    
51  #ifdef USE_MAEMO  #ifdef USE_MAEMO
52  #include <hildon/hildon-program.h>  #include <hildon/hildon-program.h>
 #include <hildon/hildon-text-view.h>  
53  #include <hildon/hildon-file-chooser-dialog.h>  #include <hildon/hildon-file-chooser-dialog.h>
54  #include <hildon/hildon-file-system-model.h>  #include <hildon/hildon-file-system-model.h>
55  #include <hildon/hildon-bread-crumb-trail.h>  #include <hildon/hildon-bread-crumb-trail.h>
# Line 59  Line 61 
61  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
62  #define USE_PANNABLE_AREA  #define USE_PANNABLE_AREA
63  #include <hildon/hildon-pannable-area.h>  #include <hildon/hildon-pannable-area.h>
64    /* panning a gtkhtml view currently doesn't work well */
65    #define PANNABLE_HTML
66  #endif  #endif
67  #endif  #endif
68    
# Line 101  typedef struct { Line 105  typedef struct {
105    pos_t gps;                  /* saved last gps position */    pos_t gps;                  /* saved last gps position */
106    
107    char *image_path;           /* path to cache images in */    char *image_path;           /* path to cache images in */
   gboolean load_images;       /* load images and cache them */  
108    
109    int search;                 /* "search in" items */    int search;                 /* "search in" items */
110    char *search_str;    char *search_str;
# Line 142  typedef struct { Line 145  typedef struct {
145    GtkTextBuffer *active_buffer;    GtkTextBuffer *active_buffer;
146  #endif  #endif
147    
148    #ifdef USE_STACKABLE_WINDOW
149      GtkWidget *export_menu, *tools_menu;
150    #endif
151    
152    /* save result here to be able to "goto" it */    /* save result here to be able to "goto" it */
153    pos_t geomath;    pos_t geomath;
154    
# Line 189  typedef struct { Line 196  typedef struct {
196  #else  #else
197    GtkWidget *window;    GtkWidget *window;
198  #endif  #endif
199    
200    #ifdef ENABLE_OSM_GPS_MAP
201      struct {
202        int zoom;
203        pos_t pos;
204      } map;
205    #endif
206    
207    GtkWidget *vbox;    GtkWidget *vbox;
208  } appdata_t;  } appdata_t;
209    
# Line 207  typedef struct { Line 222  typedef struct {
222  #include "precpos.h"  #include "precpos.h"
223  #include "garmin_export.h"  #include "garmin_export.h"
224    
225    #ifdef ENABLE_OSM_GPS_MAP
226    #include "map-tool.h"
227    #endif
228    
229  #ifdef USE_MAEMO  #ifdef USE_MAEMO
230  #include "dbus.h"  #include "dbus.h"
231  #endif  #endif
# Line 237  extern void main_after_settings_redraw(a Line 256  extern void main_after_settings_redraw(a
256  #include <stdarg.h>  #include <stdarg.h>
257  extern void errorf(const char *fmt, ...);  extern void errorf(const char *fmt, ...);
258  extern gboolean on_window_key_press(GtkWidget *widget,  extern gboolean on_window_key_press(GtkWidget *widget,
259                                      GdkEventKey *event, gpointer data);                                      GdkEventKey *event, appdata_t *appdata);
260  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
261  HildonAppMenu *menu_create(appdata_t *appdata, int mode);  HildonAppMenu *menu_create(appdata_t *appdata, int mode);
262  #endif  #endif
Legend:
Removed from v.3  
changed lines
  Added in v.48