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 142 by harbaum, Mon Oct 26 10:40:06 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 134  typedef struct { Line 145  typedef struct {
145  #ifndef NO_COPY_N_PASTE  #ifndef NO_COPY_N_PASTE
146    /* do enable/disable the edit entries */    /* do enable/disable the edit entries */
147    GtkWidget *menu_cut, *menu_copy, *menu_paste;    GtkWidget *menu_cut, *menu_copy, *menu_paste;
   GtkClipboard *clipboard;     /* clipboard for copy/paste */  
148    GtkTextBuffer *active_buffer;    GtkTextBuffer *active_buffer;
149  #endif  #endif
150    
151      GtkClipboard *clipboard;     /* clipboard for copy/paste */
152    
153    #ifdef USE_STACKABLE_WINDOW
154      GtkWidget *export_menu, *tools_menu;
155    #endif
156    
157    /* save result here to be able to "goto" it */    /* save result here to be able to "goto" it */
158    pos_t geomath;    pos_t geomath;
159    
# Line 164  typedef struct { Line 180  typedef struct {
180    
181    gboolean cachelist_disable_screensaver;    gboolean cachelist_disable_screensaver;
182    gboolean goto_disable_screensaver;    gboolean goto_disable_screensaver;
   gboolean cachelist_update;  
183    
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      gboolean cachelist_update;
192    
193    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
194    /* reference to enable/disable these while walking the crumb trail */    /* reference to enable/disable these while walking the crumb trail */
195    GtkWidget *menu_import, *menu_export;    GtkWidget *menu_import, *menu_export;
196    GtkWidget *menu_search;    GtkWidget *menu_search;
197    
198      GtkWidget *bct;
199    #endif
200    
201    /* keep track of current "path" in the bread crumb trail */    /* keep track of current "path" in the bread crumb trail */
202    gpx_t *cur_gpx;    gpx_t *cur_gpx;
203    cache_t *cur_cache;    cache_t *cur_cache;
204    
205  #else    gpx_t *search_results;
206    GtkWidget *window;  
207    #ifdef ENABLE_OSM_GPS_MAP
208      struct {
209        struct map_context_s *context;
210        int source;
211        int zoom;
212        pos_t pos;
213      } map;
214  #endif  #endif
215    
216    GtkWidget *vbox;    GtkWidget *vbox;
217  } appdata_t;  } appdata_t;
218    
# Line 201  typedef struct { Line 231  typedef struct {
231  #include "precpos.h"  #include "precpos.h"
232  #include "garmin_export.h"  #include "garmin_export.h"
233    
234    #ifdef ENABLE_OSM_GPS_MAP
235    #include "map-tool.h"
236    #endif
237    
238  #ifdef USE_MAEMO  #ifdef USE_MAEMO
239  #include "dbus.h"  #include "dbus.h"
240  #endif  #endif
# Line 231  extern void main_after_settings_redraw(a Line 265  extern void main_after_settings_redraw(a
265  #include <stdarg.h>  #include <stdarg.h>
266  extern void errorf(const char *fmt, ...);  extern void errorf(const char *fmt, ...);
267  extern gboolean on_window_key_press(GtkWidget *widget,  extern gboolean on_window_key_press(GtkWidget *widget,
268                                      GdkEventKey *event, gpointer data);                                      GdkEventKey *event, appdata_t *appdata);
269    #ifdef USE_STACKABLE_WINDOW
270    HildonAppMenu *menu_create(appdata_t *appdata, int mode);
271    #endif
272    void cachelist_goto_cache(appdata_t *appdata, cache_t *cache);
273    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx);
274    
275  #endif // GPXVIEW_H  #endif // GPXVIEW_H
Legend:
Removed from v.2  
changed lines
  Added in v.142