Diff of /trunk/src/main.c

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

revision 21 by harbaum, Sun Jul 5 17:38:06 2009 UTC revision 143 by harbaum, Mon Oct 26 19:55:00 2009 UTC
# Line 35  Line 35 
35    
36  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
37    
38  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
39  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
40                        gpointer user_data);                        gpointer user_data);
41    
# Line 95  void errorf(const char *fmt, ...) { Line 95  void errorf(const char *fmt, ...) {
95    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
96                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
97                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
98                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
99                             buf);                             GTK_MESSAGE_ERROR,
100    #else
101                               GTK_MESSAGE_OTHER,
102    #endif
103                               GTK_BUTTONS_CLOSE, buf);
104    
105    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
106    
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 142  gpx_t *choose_file(appdata_t *appdata, g
142    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
143    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
144      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
145    
146        if(filename) {
147          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
148    
149      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
150            gpx = gpx_parse(dialog, filename);
151      if(!whole_dir)        else {
152        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
153      else {          if(strlastchr(filename) == '/')
154        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
155        if(strlastchr(filename) == '/')  
156          filename[strlen(filename)] = 0;          gpx = gpx_parse_dir(dialog, filename);
   
       gpx = gpx_parse_dir(dialog, filename);  
     }  
   
     gpx_busy_dialog_destroy(dialog);  
   
     /* save path if gpx was successfully loaded */  
     if(gpx) {  
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r && !whole_dir) {  
         *r = 0;  
         if(appdata->path) free(appdata->path);  
         appdata->path = strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
157        }        }
158    
159          gpx_busy_dialog_destroy(dialog);
160    
161          /* save path if gpx was successfully loaded */
162          if(gpx) {
163            char *r = strrchr(filename, '/');
164    
165            /* there is a delimiter, use everything left of it as path */
166            if(r && !whole_dir) {
167              *r = 0;
168              if(appdata->path) free(appdata->path);
169              appdata->path = strdup(filename);
170              /* restore path ... just in case ... */
171              *r = '/';
172            }
173    
174            if(whole_dir)
175              appdata->path = strdup(filename);
176          } else
177            errorf(_("Load error"));
178    
179        if(whole_dir)        g_free (filename);
180          appdata->path = strdup(filename);      } else {
181    #ifndef USE_MAEMO
182          errorf(_("Error accessing the file."));
183    #else
184          errorf(_("Error accessing the file. This may happen if the file "
185                   "resides on a remote file system. Please copy the file onto "
186                   "the device (e.g. onto the memory card) and try again."));
187    #endif
188      }      }
   
     g_free (filename);  
189    }    }
190    
191    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 194  enum { Line 209  enum {
209    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
210  } ;  } ;
211    
212  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
213    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
214        cache_dialog(appdata, cache);
215    #else
216        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
217        appdata->cur_view = cache_view(appdata, cache);
218        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
219        gtk_widget_show_all(appdata->vbox);
220    
221        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
222    #endif
223    }
224    
225    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
226                                     GtkTreePath        *path,                                     GtkTreePath        *path,
227                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
228                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 230  void cachelist_view_onRowActivated(GtkTr
230    GtkTreeIter   iter;    GtkTreeIter   iter;
231    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
232    
233    #ifdef USE_MAEMO
234      /* check if a cache is already selected and ignore click if yes */
235      /* (was probably a double click) */
236      if(appdata->cur_cache) return;
237    #endif
238    
239    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
240      cache_t *cache;      cache_t *cache;
241      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
242  #ifndef USE_BREAD_CRUMB_TRAIL      cachelist_goto_cache(appdata, cache);
     cache_dialog(appdata, cache);  
 #else  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = cache_view(appdata, cache);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
 #endif  
243    }    }
244  }  }
245    
# Line 257  static GtkWidget *cachelist_create(appda Line 282  static GtkWidget *cachelist_create(appda
282                                     cache_t *sel_cache);                                     cache_t *sel_cache);
283    
284  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
 #ifndef USE_MAEMO  
   //  gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
   //  appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
   //  gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
   // gtk_widget_show_all(appdata->vbox);  
 #else  
   
285    if(!appdata->cur_view) {    if(!appdata->cur_view) {
286      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
287      return;      return;
# Line 281  void cachelist_redraw(appdata_t *appdata Line 299  void cachelist_redraw(appdata_t *appdata
299    if(redraw) {    if(redraw) {
300      GtkWidget *container = appdata->vbox;      GtkWidget *container = appdata->vbox;
301    
     printf("redraw %d\n", redraw);  
   
302  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
303      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
304      container = hildon_window_stack_peek(stack);      container = hildon_window_stack_peek(stack);
# Line 309  void cachelist_redraw(appdata_t *appdata Line 325  void cachelist_redraw(appdata_t *appdata
325    
326      gtk_widget_show_all(container);      gtk_widget_show_all(container);
327    }    }
 #endif  
328  }  }
329    
330    
# Line 317  static gboolean cachelist_update(gpointe Line 332  static gboolean cachelist_update(gpointe
332    
333    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
334    
 #ifdef USE_MAEMO  
335    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
336    
337    if(appdata->cur_cache)    if(appdata->cur_cache)
338      return TRUE;      return TRUE;
339    
340    #ifdef USE_MAEMO
341    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
342      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
343        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
344    #endif
345    
346    if(appdata->cachelist_update)    if(appdata->cachelist_update)
347      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
348    
349    return TRUE;    return TRUE;
350  }  }
# Line 576  void on_cachelist_destroy(GtkWidget *wid Line 591  void on_cachelist_destroy(GtkWidget *wid
591    }    }
592    appdata->cur_gpx = NULL;    appdata->cur_gpx = NULL;
593    
594    #ifdef ENABLE_OSM_GPS_MAP
595      map_update(appdata);
596    #endif
597    
598    /* restore cur_view */    /* restore cur_view */
599    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
600  }  }
# Line 587  void cachelist_dialog(appdata_t *appdata Line 606  void cachelist_dialog(appdata_t *appdata
606    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
607    
608    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
609    char *title = g_strdup_printf("GPXView - %s", gpx->name);    char *title = g_strdup_printf("%s - GPXView", gpx->name);
610    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
611    g_free(title);    g_free(title);
612    
# Line 602  void cachelist_dialog(appdata_t *appdata Line 621  void cachelist_dialog(appdata_t *appdata
621                     G_CALLBACK(on_cachelist_destroy), appdata);                     G_CALLBACK(on_cachelist_destroy), appdata);
622    
623    gtk_widget_show_all(window);    gtk_widget_show_all(window);
624    
625    #ifdef ENABLE_OSM_GPS_MAP
626      map_update(appdata);
627    #endif
628  }  }
629  #endif  #endif
630  #endif  #endif
# Line 705  static void gpxlist_close(appdata_t *app Line 728  static void gpxlist_close(appdata_t *app
728    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
729  }  }
730    
731    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
732    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
733    #ifdef USE_STACKABLE_WINDOW
734      if(!appdata->cur_gpx)
735    #endif
736        cachelist_dialog(appdata, gpx);
737    #ifdef USE_STACKABLE_WINDOW
738      else
739        printf("selected gpx, but cachelist window already present\n");
740    #endif
741    #else
742      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
743      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
744      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
745      gtk_widget_show_all(appdata->vbox);
746    
747      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
748    #endif
749    }
750    
751  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
752                            GtkTreePath        *path,                            GtkTreePath        *path,
753                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 713  static void gpxlist_view_onRowActivated( Line 756  static void gpxlist_view_onRowActivated(
756    GtkTreeIter   iter;    GtkTreeIter   iter;
757    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
758    
759    #ifdef USE_MAEMO
760      /* check if a cache is already selected and ignore click if yes */
761      /* (was probably a double click) */
762      if(appdata->cur_gpx) return;
763    #endif
764    
765    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
766      gpx_t *gpx;      gpx_t *gpx;
767      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 729  static void gpxlist_view_onRowActivated( Line 778  static void gpxlist_view_onRowActivated(
778        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
779                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
780                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
781                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   /* this doesn't fix the text selection issues ... */
782    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >=5)
783                     GTK_MESSAGE_OTHER,
784    #else
785                     GTK_MESSAGE_QUESTION,
786    #endif
787                     GTK_BUTTONS_CANCEL,
788                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
789                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
790    
# Line 741  static void gpxlist_view_onRowActivated( Line 796  static void gpxlist_view_onRowActivated(
796        if(gpx->closed)        if(gpx->closed)
797          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
798    
799        gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));        gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
800    
801        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
802        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
# Line 810  static void gpxlist_view_onRowActivated( Line 865  static void gpxlist_view_onRowActivated(
865    
866          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
867        }        }
868  #ifndef USE_BREAD_CRUMB_TRAIL  
869  #ifdef USE_STACKABLE_WINDOW        gpxlist_goto_cachelist(appdata, gpx);
       if(!appdata->cur_gpx)  
 #endif  
         cachelist_dialog(appdata, gpx);  
 #ifdef USE_STACKABLE_WINDOW  
       else  
         printf("selected gpx, but cachelist window already present\n");  
 #endif  
 #else  
       gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
       appdata->cur_view = cachelist_create(appdata, gpx, NULL);  
       gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
       gtk_widget_show_all(appdata->vbox);  
   
       crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);  
 #endif  
870      }      }
871    }    }
872  }  }
# Line 881  static GtkWidget *gpxlist_create_view_an Line 921  static GtkWidget *gpxlist_create_view_an
921    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
922                    -1, "Icon", renderer,                    -1, "Icon", renderer,
923                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
924                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
925            /* at least one entry needs to be sensitive. */
926            /* This is the delete icon if the PANNABLE_AREA is used */
927                      "sensitive", GPXLIST_COL_OPEN,
928    #endif
929                    NULL);                    NULL);
930    
931    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 937  static GtkWidget *gpxlist_create_view_an Line 981  static GtkWidget *gpxlist_create_view_an
981    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
982                    -1, "Del", renderer,                    -1, "Del", renderer,
983                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
984                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
985                    NULL);                    NULL);
986  #endif  #endif
987    
# Line 957  static GtkWidget *gpxlist_create_view_an Line 1001  static GtkWidget *gpxlist_create_view_an
1001      GtkTreeIter         iter;      GtkTreeIter         iter;
1002      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
1003      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1004    
1005      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1006        sel_iter = iter;        sel_iter = iter;
1007        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 1017  static void gpxlist_add(appdata_t *appda Line 1061  static void gpxlist_add(appdata_t *appda
1061    
1062  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1063    
1064    typedef struct {
1065      appdata_t *appdata;
1066      GtkWidget *dialog;
1067    } about_context_t;
1068    
1069    #ifdef ENABLE_BROWSER_INTERFACE
1070    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1071      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1072      browser_url(context->appdata,
1073                  "https://www.paypal.com/cgi-bin/webscr"
1074                  "?cmd=_s-xclick&hosted_button_id=7400558");
1075    }
1076    #endif
1077    
1078  static void  static void
1079  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1080    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1081    
1082    gtk_about_dialog_set_name(about, "GPXView");    context.appdata = (appdata_t *)data;
   gtk_about_dialog_set_version(about, VERSION);  
1083    
1084  #ifdef ENABLE_LIBLOCATION  #ifdef ENABLE_LIBLOCATION
1085    char *uses = "uses liblocation";    char *uses = "uses liblocation";
# Line 1032  cb_menu_about(GtkWidget *window, gpointe Line 1089  cb_menu_about(GtkWidget *window, gpointe
1089    char *uses = "uses gpsd";    char *uses = "uses gpsd";
1090  #endif  #endif
1091    
1092    char *str = g_strdup_printf("%s\n\n(%s)",    const gchar *authors[] = {
1093                        _("GPXView (c) 2008-2009 by\n"      "Till Harbaum <till@harbaum.org>",
1094                          "Till Harbaum <till@harbaum.org>\n"      "John Stowers <john.stowers@gmail.com>",
1095                          "Mailing list: gpxview-users@garage.maemo.org"),      NULL };
1096                        _(uses)  
1097                        );    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1098                            "name", "GPXView",
1099    gtk_about_dialog_set_copyright(about, str);                          "version", VERSION,
1100    g_free(str);                          "copyright", _("Copyright 2008-2009"),
1101                            "authors", authors,
1102    gtk_about_dialog_set_website(about,                          "website", _("http://www.harbaum.org/till/maemo"),
1103         _("http://www.harbaum.org/till/maemo"));                          "comments", _(uses),
1104                            NULL);
1105    gtk_about_dialog_set_comments(about,  
1106         _("Geocaching.com GPX file viewer"));  #ifdef ENABLE_BROWSER_INTERFACE
1107      /* add a way to donate to the project */
1108    gtk_widget_show_all(GTK_WIDGET(about));    GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1109    gtk_dialog_run(GTK_DIALOG(about));  
1110    gtk_widget_destroy(GTK_WIDGET(about));    GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1111      gtk_box_pack_start(GTK_BOX(hbox),
1112                         gtk_label_new(_("Do you like GPXView?")),
1113                         FALSE, FALSE, 0);
1114    
1115      GtkWidget *button = gtk_button_new();
1116      gtk_button_set_image(GTK_BUTTON(button),
1117                           icon_get_widget(ICON_MISC, 8));
1118      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1119      g_signal_connect(button, "clicked",
1120                       G_CALLBACK(on_paypal_button_clicked), &context);
1121      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1122    
1123      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1124      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1125                                  alignment);
1126    
1127      gtk_widget_show_all(alignment);
1128    #endif
1129    
1130      gtk_dialog_run(GTK_DIALOG(context.dialog));
1131      gtk_widget_destroy(context.dialog);
1132  }  }
1133    
1134  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1399  cb_menu_search(GtkWidget *window, gpoint Line 1477  cb_menu_search(GtkWidget *window, gpoint
1477    
1478        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1479    
1480  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1481        gpx_t *found =        gpx_t *found =
1482          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1483    
# Line 1433  cb_menu_search(GtkWidget *window, gpoint Line 1511  cb_menu_search(GtkWidget *window, gpoint
1511      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1512  }  }
1513    
1514  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1515    
1516  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1517  static void  static void
# Line 1493  static void Line 1571  static void
1571  cb_menu_export_log(GtkWidget *widget, gpointer data) {  cb_menu_export_log(GtkWidget *widget, gpointer data) {
1572    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1573    notes_log_export(appdata);    notes_log_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1574  }  }
1575    
1576  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1577  static void  static void
1578  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1579    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1580    mmpoi_export(appdata);    mmpoi_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1581  }  }
1582  #endif  #endif
1583    
# Line 1513  static void Line 1585  static void
1585  cb_menu_export_garmin(GtkWidget *widget, gpointer data) {  cb_menu_export_garmin(GtkWidget *widget, gpointer data) {
1586    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1587    garmin_export(appdata);    garmin_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1588  }  }
1589    
1590    #ifdef ENABLE_OSM_GPS_MAP
1591    static void
1592    cb_menu_map(GtkWidget *window, gpointer data) {
1593      map((appdata_t *)data);
1594    }
1595    #endif
1596    
1597  static void  static void
1598  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1599    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1600  }  }
1601    
1602  static void  static void
1603  cb_menu_geotext(GtkWidget *window, gpointer data) {  cb_menu_geotext(GtkWidget *window, gpointer data) {
1604    geotext_dialog((appdata_t *)data);    geotext_dialog((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1605  }  }
1606    
1607  static void  static void
1608  cb_menu_precpos(GtkWidget *window, gpointer data) {  cb_menu_precpos(GtkWidget *window, gpointer data) {
1609    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1610  }  }
1611    
1612  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1613  static GtkWidget *export_menu_create(appdata_t *appdata) {  typedef struct {
1614    GtkWidget *button;    char *label, *desc;
1615    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    GtkSignalFunc activate_cb;
1616    } menu_entry_t;
   button = hildon_button_new_with_text(  
             HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Export to Maemo Mapper"),  
             _("Save a Maemo Mapper POI file"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_mmpoi), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1617    
1618    button = hildon_button_new_with_text(  typedef struct {
1619              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    const char *title;
1620              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    const menu_entry_t *menu;
1621              _("Export Field Notes"),    int len;
1622              _("Save a Garmin Field Notes file"));  } submenu_t;
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_log), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1623    
1624    button = hildon_button_new_with_text(  #define COLUMNS  1
             HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Export Garmin GPX"),  
             _("Save modified waypoints in GPX file"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_garmin), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1625    
1626    gtk_widget_show_all(GTK_WIDGET(menu));  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1627    
1628    return GTK_WIDGET(menu);    /* force closing of submenu dialog */
1629      gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1630      gtk_widget_hide(menu);
1631    
1632      /* let gtk clean up */
1633      while(gtk_events_pending())
1634        gtk_main_iteration();
1635  }  }
1636    
1637  /* the export submenu */  static GtkWidget *app_submenu_create(appdata_t *appdata,
1638  void on_export_clicked(GtkButton *button, appdata_t *appdata) {                                       const submenu_t *submenu) {
   if(!appdata->export_menu)  
     appdata->export_menu = export_menu_create(appdata);  
1639    
1640    /* draw a popup menu */    /* create a oridinary dialog box */
1641    hildon_app_menu_popup(HILDON_APP_MENU(appdata->export_menu),    GtkWidget *dialog = gtk_dialog_new();
1642                          GTK_WINDOW(hildon_window_stack_peek(    gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1643                      hildon_window_stack_get_default())));    gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1644  }    gtk_window_set_transient_for(GTK_WINDOW(dialog),
1645                                   GTK_WINDOW(appdata->window));
1646      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1647    
1648  static GtkWidget *tools_menu_create(appdata_t *appdata) {    GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1649    GtkWidget *button;    int x = 0, y = 0;
   HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());  
1650    
1651    /* the following doesn't have an effect */    const menu_entry_t *menu_entries = submenu->menu;
1652    //  gtk_window_set_title(GTK_WINDOW(menu), "Tools");    while(menu_entries->label) {
1653        GtkWidget *button = NULL;
1654    
1655    button = hildon_button_new_with_text(      button = hildon_button_new_with_text(
1656              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1657              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1658              _("Geomath"),              _(menu_entries->label), _(menu_entries->desc));
             _("Geocoordinate calculation"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_geomath), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1659    
1660        /* try to center both texts */
1661        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1662        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1663    
1664    button = hildon_button_new_with_text(      g_signal_connect(button, "clicked",
1665              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,                       G_CALLBACK(on_submenu_entry_clicked), dialog);
1666              HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
1667              _("Geotext"),      g_signal_connect(button, "clicked",
1668              _("Text analysis"));                       menu_entries->activate_cb, appdata);
1669    g_signal_connect(button, "clicked",  
1670                     G_CALLBACK(cb_menu_geotext), appdata);      gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1671    hildon_app_menu_append(menu, GTK_BUTTON(button));  
1672        x++;
1673        if(x == COLUMNS) { x = 0; y++; }
1674    
1675    button = hildon_button_new_with_text(      menu_entries++;
1676              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    }
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Precise Position"),  
             _("Calculate a precise GPS position"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_precpos), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1677    
1678    gtk_widget_show_all(GTK_WIDGET(menu));    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1679    
1680      return dialog;
1681    }
1682    
1683    /* popup the dialog shaped submenu */
1684    static void submenu_popup(GtkWidget *menu) {
1685      gtk_widget_show_all(menu);
1686      gtk_dialog_run(GTK_DIALOG(menu));
1687      gtk_widget_hide(menu);
1688    }
1689    
1690    static void submenu_cleanup(GtkWidget *menu) {
1691      gtk_widget_destroy(menu);
1692    }
1693    
1694    static const menu_entry_t submenu_export_entries[] = {
1695    #ifdef ENABLE_MAEMO_MAPPER
1696      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1697        G_CALLBACK(cb_menu_export_mmpoi)  },
1698    #endif
1699      { "Export Field Notes",      "Save a Garmin Field Notes file",
1700        G_CALLBACK(cb_menu_export_log)    },
1701      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1702        G_CALLBACK(cb_menu_export_garmin) },
1703      { NULL, NULL, NULL }
1704    };
1705    
1706    static const submenu_t submenu_export = {
1707      "Export", submenu_export_entries,
1708      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1709    };
1710    
1711    /* the export submenu */
1712    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1713      if(!appdata->export_menu)
1714        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1715    
1716    return GTK_WIDGET(menu);    submenu_popup(appdata->export_menu);
1717  }  }
1718    
1719    static const menu_entry_t submenu_tools_entries[] = {
1720      { "Geomath",          "Geocoordinate calculation",
1721        G_CALLBACK(cb_menu_geomath) },
1722      { "Geotext",          "Text analysis",
1723        G_CALLBACK(cb_menu_geotext) },
1724      { "Precise Position", "Calculate a precise GPS position",
1725        G_CALLBACK(cb_menu_precpos) },
1726      { NULL, NULL, NULL }
1727    };
1728    
1729    static const submenu_t submenu_tools = {
1730      "Tools", submenu_tools_entries,
1731      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1732    };
1733    
1734  /* the tools submenu */  /* the tools submenu */
1735  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1736    if(!appdata->tools_menu)    if(!appdata->tools_menu)
1737      appdata->tools_menu = tools_menu_create(appdata);      appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1738    
1739    /* draw a popup menu */    submenu_popup(appdata->tools_menu);
   hildon_app_menu_popup(HILDON_APP_MENU(appdata->tools_menu),  
                         GTK_WINDOW(hildon_window_stack_peek(  
                     hildon_window_stack_get_default())));  
1740  }  }
1741    
   
1742  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
1743    GtkWidget *button;    GtkWidget *button;
1744    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
# Line 1668  HildonAppMenu *menu_create(appdata_t *ap Line 1764  HildonAppMenu *menu_create(appdata_t *ap
1764      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1765                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1766      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1767    
   if(mode == MENU_GPXLIST) {  
1768      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1769      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1770                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1687  HildonAppMenu *menu_create(appdata_t *ap Line 1781  HildonAppMenu *menu_create(appdata_t *ap
1781                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1782    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1783    
1784    #ifdef ENABLE_OSM_GPS_MAP
1785        button = gtk_button_new_with_label(_("Map"));
1786        g_signal_connect_after(button, "clicked",
1787                               G_CALLBACK(cb_menu_map), appdata);
1788        hildon_app_menu_append(menu, GTK_BUTTON(button));
1789    #endif
1790    
1791  #ifdef HILDON_HELP  #ifdef HILDON_HELP
1792    button = gtk_button_new_with_label(_("Help"));    button = gtk_button_new_with_label(_("Help"));
1793    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
# Line 1704  void menu_create(appdata_t *appdata) { Line 1805  void menu_create(appdata_t *appdata) {
1805    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1806    menu = gtk_menu_new();    menu = gtk_menu_new();
1807    
1808  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1809    appdata->menu_import =    appdata->menu_import =
1810  #endif  #endif
1811    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1734  void menu_create(appdata_t *appdata) { Line 1835  void menu_create(appdata_t *appdata) {
1835    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1836  #endif  #endif
1837    
1838  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1839    appdata->menu_export =    appdata->menu_export =
1840  #endif  #endif
1841      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1742  void menu_create(appdata_t *appdata) { Line 1843  void menu_create(appdata_t *appdata) {
1843    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1844    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1845    
1846  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1847    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1848    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1849    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1759  void menu_create(appdata_t *appdata) { Line 1860  void menu_create(appdata_t *appdata) {
1860    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1861                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1862    
1863  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1864    appdata->menu_search =    appdata->menu_search =
1865  #endif  #endif
1866    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1768  void menu_create(appdata_t *appdata) { Line 1869  void menu_create(appdata_t *appdata) {
1869    
1870    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1871    
 #ifndef NO_COPY_N_PASTE  
1872    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1873    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1874    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1875    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1876    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1799  void menu_create(appdata_t *appdata) { Line 1897  void menu_create(appdata_t *appdata) {
1897    
1898    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1899    
1900    #ifdef ENABLE_OSM_GPS_MAP
1901      item = gtk_menu_item_new_with_label( _("Map") );
1902      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1903      g_signal_connect(item, "activate",
1904                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1905    #endif
1906    
1907    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1908    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1909    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1863  void cleanup(appdata_t *appdata) { Line 1968  void cleanup(appdata_t *appdata) {
1968    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
1969    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
1970    
1971    #ifdef USE_STACKABLE_WINDOW
1972      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
1973      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
1974    #endif
1975    
1976    gnome_vfs_shutdown();    gnome_vfs_shutdown();
1977    icons_free();    icons_free();
1978    gps_release(appdata);    gps_release(appdata);
# Line 1891  void cleanup(appdata_t *appdata) { Line 2001  void cleanup(appdata_t *appdata) {
2001    puts("everything is gone");    puts("everything is gone");
2002  }  }
2003    
2004  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2005    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2006    
2007    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 1954  gboolean on_window_key_press(GtkWidget * Line 2064  gboolean on_window_key_press(GtkWidget *
2064    return handled;    return handled;
2065  }  }
2066    
2067  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2068  typedef struct {  typedef struct {
2069    int level;    int level;
2070    appdata_t *appdata;    appdata_t *appdata;
# Line 2046  crumb_back(gpointer data) { Line 2156  crumb_back(gpointer data) {
2156    
2157    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2158    g_free(data);    g_free(data);
2159    
2160    #ifdef ENABLE_OSM_GPS_MAP
2161      map_update(crumb->appdata);
2162    #endif
2163  }  }
2164    
2165  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2086  static void crumb_add(appdata_t *appdata Line 2200  static void crumb_add(appdata_t *appdata
2200  #endif  #endif
2201    }    }
2202    
2203    #ifdef USE_BREAD_CRUMB_TRAIL
2204    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2205                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2206    #else
2207      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2208    #endif
2209    
2210    #ifdef ENABLE_OSM_GPS_MAP
2211      map_update(appdata);
2212    #endif
2213  }  }
2214  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2215    
# Line 2099  void main_after_settings_redraw(appdata_ Line 2221  void main_after_settings_redraw(appdata_
2221      return;      return;
2222    }    }
2223    
 #ifndef USE_MAEMO  
   // in non-maemo setup this can only affect the main screen as  
   // the menu is blocked while a dialog is open. also the main  
   // screen is always present  
   if(appdata->gpxlist_items != appdata->cur_items) {  
     /* re-do the main screen */  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   }  
 #else  
2224    /* a cache screen cannot be changed from the settings and thus doesn't */    /* a cache screen cannot be changed from the settings and thus doesn't */
2225    /* need to be redrawn */    /* need to be redrawn */
2226    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2165  void main_after_settings_redraw(appdata_ Line 2275  void main_after_settings_redraw(appdata_
2275    
2276      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2277    }    }
 #endif // USE_MAEMO  
2278  }  }
2279    
2280  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2194  int main(int argc, char *argv[]) { Line 2303  int main(int argc, char *argv[]) {
2303      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2304    }    }
2305    
2306    #ifdef ENABLE_MAEMO_MAPPER
2307    dbus_register(&appdata);    dbus_register(&appdata);
2308  #endif  #endif
2309    #endif
2310    
2311    icons_init();    icons_init();
2312    
# Line 2219  int main(int argc, char *argv[]) { Line 2330  int main(int argc, char *argv[]) {
2330    /* Create a Window. */    /* Create a Window. */
2331    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2332    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2333    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2334  #endif  #endif
2335    
2336  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2232  int main(int argc, char *argv[]) { Line 2343  int main(int argc, char *argv[]) {
2343    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2344                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2345    
2346      /* prepare clipboard */
2347      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2348      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2349    
2350    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2351    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2352  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2353    menu_create(&appdata);    menu_create(&appdata);
2354  #else  #else
# Line 2248  int main(int argc, char *argv[]) { Line 2362  int main(int argc, char *argv[]) {
2362    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2363    
2364    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2365    #else
2366    #ifdef BCT
2367      /* on non-hildon machines we use some custom made breadcrumbtrail */
2368      /* replacement */
2369      appdata.bct = bct_new();
2370      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2371    #endif
2372    #endif
2373    
2374    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2375    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2376  #endif  #endif
2377    
Legend:
Removed from v.21  
changed lines
  Added in v.143