Diff of /trunk/src/gpxview.h

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

revision 1 by harbaum, Sat Jun 20 11:08:47 2009 UTC revision 32 by harbaum, Tue Jul 28 13:21:22 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    // 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
34    #define MENU_GPXLIST   0
35    #define MENU_CACHELIST 1
36    #define MENU_CACHE     2
37  #endif  #endif
38  #endif  #endif
39    
# Line 41  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 53  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 95  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 129  typedef struct { Line 138  typedef struct {
138    GtkWidget *menu_remove, *menu_close;    GtkWidget *menu_remove, *menu_close;
139  #endif  #endif
140    
141    #ifndef NO_COPY_N_PASTE
142    /* do enable/disable the edit entries */    /* do enable/disable the edit entries */
143    GtkWidget *menu_cut, *menu_copy, *menu_paste;    GtkWidget *menu_cut, *menu_copy, *menu_paste;
144    GtkClipboard *clipboard;     /* clipboard for copy/paste */    GtkClipboard *clipboard;     /* clipboard for copy/paste */
145    GtkTextBuffer *active_buffer;    GtkTextBuffer *active_buffer;
146    #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;
# Line 168  typedef struct { Line 183  typedef struct {
183    GtkWidget *bct;    GtkWidget *bct;
184    gpx_t *search_results;    gpx_t *search_results;
185    
186    #ifdef USE_BREAD_CRUMB_TRAIL
187    /* reference to enable/disable these while walking the crumb trail */    /* reference to enable/disable these while walking the crumb trail */
188    GtkWidget *menu_import, *menu_export;    GtkWidget *menu_import, *menu_export;
189    GtkWidget *menu_search;    GtkWidget *menu_search;
190    #endif
191    
192    /* keep track of current "path" in the bread crumb trail */    /* keep track of current "path" in the bread crumb trail */
193    gpx_t *cur_gpx;    gpx_t *cur_gpx;
# Line 197  typedef struct { Line 214  typedef struct {
214  #include "precpos.h"  #include "precpos.h"
215  #include "garmin_export.h"  #include "garmin_export.h"
216    
217    #ifdef ENABLE_OSM_GPS_MAP
218    #include "map-tool.h"
219    #endif
220    
221  #ifdef USE_MAEMO  #ifdef USE_MAEMO
222  #include "dbus.h"  #include "dbus.h"
223  #endif  #endif
# Line 227  extern void main_after_settings_redraw(a Line 248  extern void main_after_settings_redraw(a
248  #include <stdarg.h>  #include <stdarg.h>
249  extern void errorf(const char *fmt, ...);  extern void errorf(const char *fmt, ...);
250  extern gboolean on_window_key_press(GtkWidget *widget,  extern gboolean on_window_key_press(GtkWidget *widget,
251                                      GdkEventKey *event, gpointer data);                                      GdkEventKey *event, appdata_t *appdata);
252    #ifdef USE_STACKABLE_WINDOW
253    HildonAppMenu *menu_create(appdata_t *appdata, int mode);
254    #endif
255    
256  #endif // GPXVIEW_H  #endif // GPXVIEW_H
Legend:
Removed from v.1  
changed lines
  Added in v.32