Diff of /trunk/src/main.c

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

revision 5 by harbaum, Tue Jun 23 12:53:07 2009 UTC revision 122 by harbaum, Mon Sep 21 13:15:25 2009 UTC
# Line 120  gpx_t *choose_file(appdata_t *appdata, g Line 120  gpx_t *choose_file(appdata_t *appdata, g
120                   HELP_ID_IMPORT, appdata->osso_context);                   HELP_ID_IMPORT, appdata->osso_context);
121  #endif  #endif
122  #else  #else
123    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Open Directory"):    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Import directory"):
124                                          _("Open File"),                                          _("Import file"),
125                          GTK_WINDOW(appdata->window),                          GTK_WINDOW(appdata->window),
126                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :
127                                          GTK_FILE_CHOOSER_ACTION_OPEN,                                          GTK_FILE_CHOOSER_ACTION_OPEN,
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 138  gpx_t *choose_file(appdata_t *appdata, g
138    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
139    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
140      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
141    
142        if(filename) {
143          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
144    
145      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
146            gpx = gpx_parse(dialog, filename);
147      if(!whole_dir)        else {
148        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
149      else {          if(strlastchr(filename) == '/')
150        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
151        if(strlastchr(filename) == '/')  
152          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 = '/';  
153        }        }
154    
155          gpx_busy_dialog_destroy(dialog);
156    
157          /* save path if gpx was successfully loaded */
158          if(gpx) {
159            char *r = strrchr(filename, '/');
160    
161            /* there is a delimiter, use everything left of it as path */
162            if(r && !whole_dir) {
163              *r = 0;
164              if(appdata->path) free(appdata->path);
165              appdata->path = strdup(filename);
166              /* restore path ... just in case ... */
167              *r = '/';
168            }
169    
170            if(whole_dir)
171              appdata->path = strdup(filename);
172          } else
173            errorf(_("Load error"));
174    
175        if(whole_dir)        g_free (filename);
176          appdata->path = strdup(filename);      } else {
177    #ifndef USE_MAEMO
178          errorf(_("Error accessing the file."));
179    #else
180          errorf(_("Error accessing the file. This may happen if the file "
181                   "resides on a remote file system. Please copy the file onto "
182                   "the device (e.g. onto the memory card) and try again."));
183    #endif
184      }      }
   
     g_free (filename);  
185    }    }
186    
187    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 213  void cachelist_view_onRowActivated(GtkTr
213    GtkTreeIter   iter;    GtkTreeIter   iter;
214    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
215    
216    #ifdef USE_MAEMO
217      /* check if a cache is already selected and ignore click if yes */
218      /* (was probably a double click) */
219      if(appdata->cur_cache) return;
220    #endif
221    
222    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
223      cache_t *cache;      cache_t *cache;
224      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
# Line 264  void cachelist_redraw(appdata_t *appdata Line 281  void cachelist_redraw(appdata_t *appdata
281    // gtk_widget_show_all(appdata->vbox);    // gtk_widget_show_all(appdata->vbox);
282  #else  #else
283    
284      if(!appdata->cur_view) {
285        printf("cachelist redraw: no active view\n");
286        return;
287      }
288    
289    g_assert(!appdata->cur_cache);    g_assert(!appdata->cur_cache);
290    int redraw = 0;    int redraw = 0;
291    if(appdata->search_results)    if(appdata->search_results)
# Line 274  void cachelist_redraw(appdata_t *appdata Line 296  void cachelist_redraw(appdata_t *appdata
296    }    }
297    
298    if(redraw) {    if(redraw) {
299      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
300    
301        printf("redraw %d\n", redraw);
302    
303    #ifdef USE_STACKABLE_WINDOW
304        HildonWindowStack *stack = hildon_window_stack_get_default();
305        container = hildon_window_stack_peek(stack);
306    #endif
307    
308        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
309      switch(redraw) {      switch(redraw) {
310      case 1:      case 1:
311        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 286  void cachelist_redraw(appdata_t *appdata Line 317  void cachelist_redraw(appdata_t *appdata
317        break;        break;
318      }      }
319    
320      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
321      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
322          gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
323        else
324    #endif
325          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
326    
327        gtk_widget_show_all(container);
328    }    }
329  #endif  #endif
330  }  }
# Line 300  static gboolean cachelist_update(gpointe Line 337  static gboolean cachelist_update(gpointe
337  #ifdef USE_MAEMO  #ifdef USE_MAEMO
338    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
339    
340      if(appdata->cur_cache)
341        return TRUE;
342    
343    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
344      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
345        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
346    
347    if(appdata->cachelist_update)    if(appdata->cachelist_update)
348      cachelist_redraw(appdata);      cachelist_redraw(appdata);
349    
350  #endif  #endif
351    
352    return TRUE;    return TRUE;
353  }  }
354    
355  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(appdata_t *appdata) {
356      printf("cachelist timer reset\n");
357    g_assert(appdata->cachelist_handler_id);    g_assert(appdata->cachelist_handler_id);
358    gtk_timeout_remove(appdata->cachelist_handler_id);    gtk_timeout_remove(appdata->cachelist_handler_id);
359    appdata->cachelist_handler_id =    appdata->cachelist_handler_id =
# Line 543  void cachelist_dialog(appdata_t *appdata Line 585  void cachelist_dialog(appdata_t *appdata
585  }  }
586  #else  #else
587  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
588    static void search_result_free(gpx_t *result);
589    
590    void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
591      if(appdata->search_results) {
592        search_result_free(appdata->search_results);
593        appdata->search_results = NULL;
594      }
595      appdata->cur_gpx = NULL;
596    
597      /* restore cur_view */
598      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
599    }
600    
601  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
602    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
603    
604    gtk_window_set_title(GTK_WINDOW(window), gpx->name);    /* store last "cur_view" in window */
605      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
606    
607    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_gpx = gpx;
608                      cachelist_create(appdata, gpx, NULL));    char *title = g_strdup_printf("%s - GPXView", gpx->name);
609      gtk_window_set_title(GTK_WINDOW(window), title);
610      g_free(title);
611    
612      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
613      gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
614    
615    
616    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
617                               menu_create(appdata, MENU_CACHELIST));                               menu_create(appdata, MENU_CACHELIST));
618    
619      g_signal_connect(G_OBJECT(window), "destroy",
620                       G_CALLBACK(on_cachelist_destroy), appdata);
621    
622    gtk_widget_show_all(window);    gtk_widget_show_all(window);
623  }  }
624  #endif  #endif
# Line 666  static void gpxlist_view_onRowActivated( Line 731  static void gpxlist_view_onRowActivated(
731    GtkTreeIter   iter;    GtkTreeIter   iter;
732    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
733    
734    #ifdef USE_MAEMO
735      /* check if a cache is already selected and ignore click if yes */
736      /* (was probably a double click) */
737      if(appdata->cur_gpx) return;
738    #endif
739    
740    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
741      gpx_t *gpx;      gpx_t *gpx;
742      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 764  static void gpxlist_view_onRowActivated( Line 835  static void gpxlist_view_onRowActivated(
835          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
836        }        }
837  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
838        cachelist_dialog(appdata, gpx);  #ifdef USE_STACKABLE_WINDOW
839          if(!appdata->cur_gpx)
840    #endif
841            cachelist_dialog(appdata, gpx);
842    #ifdef USE_STACKABLE_WINDOW
843          else
844            printf("selected gpx, but cachelist window already present\n");
845    #endif
846  #else  #else
847        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
848        appdata->cur_view = cachelist_create(appdata, gpx, NULL);        appdata->cur_view = cachelist_create(appdata, gpx, NULL);
# Line 903  static GtkWidget *gpxlist_create_view_an Line 981  static GtkWidget *gpxlist_create_view_an
981      GtkTreeIter         iter;      GtkTreeIter         iter;
982      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
983      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
984    
985      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
986        sel_iter = iter;        sel_iter = iter;
987        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 963  static void gpxlist_add(appdata_t *appda Line 1041  static void gpxlist_add(appdata_t *appda
1041    
1042  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1043    
1044    typedef struct {
1045      appdata_t *appdata;
1046      GtkWidget *dialog;
1047    } about_context_t;
1048    
1049    #ifdef ENABLE_BROWSER_INTERFACE
1050    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1051      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1052      browser_url(context->appdata,
1053                  "https://www.paypal.com/cgi-bin/webscr"
1054                  "?cmd=_s-xclick&hosted_button_id=7400558");
1055    }
1056    #endif
1057    
1058  static void  static void
1059  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1060    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1061    
1062      context.appdata = (appdata_t *)data;
1063    
1064    #ifdef ENABLE_LIBLOCATION
1065      char *uses = "uses liblocation";
1066    #elif defined(ENABLE_GPSBT)
1067      char *uses = "uses gpsbt and gpsd";
1068    #else
1069      char *uses = "uses gpsd";
1070    #endif
1071    
1072      const gchar *authors[] = {
1073        "Till Harbaum <till@harbaum.org>",
1074        "John Stowers <john.stowers@gmail.com>",
1075        NULL };
1076    
1077      context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1078                            "name", "GPXView",
1079                            "version", VERSION,
1080                            "copyright", _("Copyright 2008-2009"),
1081                            "authors", authors,
1082                            "website", _("http://www.harbaum.org/till/maemo"),
1083                            "comments", _(uses),
1084                            NULL);
1085    
1086    #ifdef ENABLE_BROWSER_INTERFACE
1087      /* add a way to donate to the project */
1088      GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1089    
1090      GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1091      gtk_box_pack_start(GTK_BOX(hbox),
1092                         gtk_label_new(_("Do you like GPXView?")),
1093                         FALSE, FALSE, 0);
1094    
1095      GtkWidget *button = gtk_button_new();
1096      gtk_button_set_image(GTK_BUTTON(button),
1097                           icon_get_widget(ICON_MISC, 8));
1098      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1099      g_signal_connect(button, "clicked",
1100                       G_CALLBACK(on_paypal_button_clicked), &context);
1101      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1102    
1103      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1104      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1105                                  alignment);
1106    
1107      gtk_widget_show_all(alignment);
1108    #endif
1109    
1110    gtk_about_dialog_set_name(about, "GPXView");    gtk_dialog_run(GTK_DIALOG(context.dialog));
1111    gtk_about_dialog_set_version(about, VERSION);    gtk_widget_destroy(context.dialog);
   gtk_about_dialog_set_copyright(about,  
          _("GPXView (c) 2008 by\n"  
          "Till Harbaum <till@harbaum.org>\n"  
          "Geocaching.com: Tantil"));  
   
   gtk_about_dialog_set_website(about,  
        _("http://www.harbaum.org/till/maemo"));  
   
   gtk_about_dialog_set_comments(about,  
        _("Geocaching.com GPX file viewer"));  
   
   gtk_widget_show_all(GTK_WIDGET(about));  
   gtk_dialog_run(GTK_DIALOG(about));  
   gtk_widget_destroy(GTK_WIDGET(about));  
1112  }  }
1113    
1114  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1328  cb_menu_search(GtkWidget *window, gpoint Line 1454  cb_menu_search(GtkWidget *window, gpoint
1454      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1455      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1456          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1457    
1458        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1459    
1460  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
1461        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        gpx_t *found =
1462            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1463    
1464        /* do search result dialog here ... */        /* do search result dialog here ... */
1465        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, found);
1466    #ifndef USE_STACKABLE_WINDOW
1467        search_result_free(found);        search_result_free(found);
1468  #else  #else
1469          appdata->search_results = found;
1470    #endif
1471    #else
1472          gpx_t *found = NULL;
1473    
1474        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1475          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1476        else        else
# Line 1359  cb_menu_search(GtkWidget *window, gpoint Line 1491  cb_menu_search(GtkWidget *window, gpoint
1491      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1492  }  }
1493    
1494  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1495    
1496  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1497  static void  static void
# Line 1415  cb_menu_paste(GtkWidget *widget, gpointe Line 1547  cb_menu_paste(GtkWidget *widget, gpointe
1547  }  }
1548  #endif  #endif
1549    
1550  #ifdef USE_STACKABLE_WINDOW  static void
1551  typedef struct {  cb_menu_export_log(GtkWidget *widget, gpointer data) {
1552    appdata_t *appdata;    appdata_t *appdata = (appdata_t*)data;
1553    GtkWidget *dialog;    notes_log_export(appdata);
1554  } appmenu_context_t;  }
1555    
1556  void on_export_mmpoi_clicked(appmenu_context_t *context) {  #ifdef ENABLE_MAEMO_MAPPER
1557    gtk_widget_destroy(context->dialog);  static void
1558    while(gtk_events_pending())  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1559      gtk_main_iteration();    appdata_t *appdata = (appdata_t*)data;
1560      mmpoi_export(appdata);
1561    }
1562    #endif
1563    
1564    mmpoi_export(context->appdata);  static void
1565    cb_menu_export_garmin(GtkWidget *widget, gpointer data) {
1566      appdata_t *appdata = (appdata_t*)data;
1567      garmin_export(appdata);
1568  }  }
1569    
1570  void on_export_garmin_clicked(appmenu_context_t *context) {  #ifdef ENABLE_OSM_GPS_MAP
1571    gtk_widget_destroy(context->dialog);  static void
1572    while(gtk_events_pending())  cb_menu_map(GtkWidget *window, gpointer data) {
1573      gtk_main_iteration();    map((appdata_t *)data);
1574    }
1575    #endif
1576    
1577    garmin_export(context->appdata);  static void
1578    cb_menu_geomath(GtkWidget *window, gpointer data) {
1579      geomath_dialog((appdata_t *)data);
1580  }  }
1581    
1582  void on_export_notes_log_clicked(appmenu_context_t *context) {  static void
1583    gtk_widget_destroy(context->dialog);  cb_menu_geotext(GtkWidget *window, gpointer data) {
1584    while(gtk_events_pending())    geotext_dialog((appdata_t *)data);
1585      gtk_main_iteration();  }
1586    
1587    notes_log_export(context->appdata);  static void
1588    cb_menu_precpos(GtkWidget *window, gpointer data) {
1589      precise_position((appdata_t *)data);
1590  }  }
1591    
1592  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  #ifdef USE_STACKABLE_WINDOW
1593    GtkWidget *but;  typedef struct {
1594    appmenu_context_t context;    char *label, *desc;
1595      GtkSignalFunc activate_cb;
1596    } menu_entry_t;
1597    
1598    context.appdata = appdata;  typedef struct {
1599    context.dialog = gtk_dialog_new();    const char *title;
1600      const menu_entry_t *menu;
1601      int len;
1602    } submenu_t;
1603    
1604    gtk_window_set_decorated(GTK_WINDOW(context.dialog), FALSE);  #define COLUMNS  1
1605    
1606    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
                                     HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
                                     _("Export to Maemo Mapper"),  
                                     _("Save a Maemo Mapper POI file"));  
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(context.dialog)->vbox), but);  
   g_signal_connect_swapped(but, "clicked",  
                            G_CALLBACK(on_export_mmpoi_clicked), &context);  
   
   but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  
                                     HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
                                     _("Export Field Notes"),  
                                     _("Save a Garmin Field Notes file"));  
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(context.dialog)->vbox), but);  
   g_signal_connect_swapped(but, "clicked",  
                    G_CALLBACK(on_export_notes_log_clicked), &context);  
   
   
   but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  
                                     HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
                                     _("Export Garmin GPX"),  
                                     _("Save a GPX file of modified points"));  
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(context.dialog)->vbox), but);  
   g_signal_connect_swapped(but, "clicked",  
                            G_CALLBACK(on_export_garmin_clicked), &context);  
   
    gtk_widget_show_all(context.dialog);  
    gint result = gtk_dialog_run(GTK_DIALOG(context.dialog));  
   
    /* user clicked outside dialog */  
    if(result == GTK_RESPONSE_DELETE_EVENT)  
      gtk_widget_destroy(context.dialog);  
 }  
1607    
1608  void on_tools_geomath_clicked(appmenu_context_t *context) {    /* force closing of submenu dialog */
1609    gtk_widget_destroy(context->dialog);    gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1610      gtk_widget_hide(menu);
1611    
1612      /* let gtk clean up */
1613    while(gtk_events_pending())    while(gtk_events_pending())
1614      gtk_main_iteration();      gtk_main_iteration();
   
   geomath_dialog(context->appdata);  
1615  }  }
1616    
1617  void on_tools_geotext_clicked(appmenu_context_t *context) {  static GtkWidget *app_submenu_create(appdata_t *appdata,
1618    gtk_widget_destroy(context->dialog);                                       const submenu_t *submenu) {
   while(gtk_events_pending())  
     gtk_main_iteration();  
1619    
1620    geotext_dialog(context->appdata);    /* create a oridinary dialog box */
1621      GtkWidget *dialog = gtk_dialog_new();
1622      gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1623      gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1624      gtk_window_set_transient_for(GTK_WINDOW(dialog),
1625                                   GTK_WINDOW(appdata->window));
1626      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1627    
1628      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1629      int x = 0, y = 0;
1630    
1631      const menu_entry_t *menu_entries = submenu->menu;
1632      while(menu_entries->label) {
1633        GtkWidget *button = NULL;
1634    
1635        button = hildon_button_new_with_text(
1636                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1637                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1638                _(menu_entries->label), _(menu_entries->desc));
1639    
1640        /* try to center both texts */
1641        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1642        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1643    
1644        g_signal_connect(button, "clicked",
1645                         G_CALLBACK(on_submenu_entry_clicked), dialog);
1646    
1647        g_signal_connect(button, "clicked",
1648                         menu_entries->activate_cb, appdata);
1649    
1650        gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1651    
1652        x++;
1653        if(x == COLUMNS) { x = 0; y++; }
1654    
1655        menu_entries++;
1656      }
1657    
1658      gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1659    
1660      return dialog;
1661  }  }
1662    
1663  void on_tools_precpos_clicked(appmenu_context_t *context) {  /* popup the dialog shaped submenu */
1664    gtk_widget_destroy(context->dialog);  static void submenu_popup(GtkWidget *menu) {
1665    while(gtk_events_pending())    gtk_widget_show_all(menu);
1666      gtk_main_iteration();    gtk_dialog_run(GTK_DIALOG(menu));
1667      gtk_widget_hide(menu);
1668    }
1669    
1670    precise_position(context->appdata);  static void submenu_cleanup(GtkWidget *menu) {
1671      gtk_widget_destroy(menu);
1672  }  }
1673    
1674  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  static const menu_entry_t submenu_export_entries[] = {
1675    GtkWidget *but;  #ifdef ENABLE_MAEMO_MAPPER
1676    appmenu_context_t context;    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1677        G_CALLBACK(cb_menu_export_mmpoi)  },
1678    #endif
1679      { "Export Field Notes",      "Save a Garmin Field Notes file",
1680        G_CALLBACK(cb_menu_export_log)    },
1681      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1682        G_CALLBACK(cb_menu_export_garmin) },
1683      { NULL, NULL, NULL }
1684    };
1685    
1686    context.appdata = appdata;  static const submenu_t submenu_export = {
1687    context.dialog = gtk_dialog_new();    "Export", submenu_export_entries,
1688      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1689    };
1690    
1691    gtk_window_set_decorated(GTK_WINDOW(context.dialog), FALSE);  /* the export submenu */
1692    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1693      if(!appdata->export_menu)
1694        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1695    
1696    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,    submenu_popup(appdata->export_menu);
1697                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,  }
1698                                      _("Geomath"),  
1699                                      _("Geocoordinate calculation"));  static const menu_entry_t submenu_tools_entries[] = {
1700    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(context.dialog)->vbox), but);    { "Geomath",          "Geocoordinate calculation",
1701    g_signal_connect_swapped(but, "clicked",      G_CALLBACK(cb_menu_geomath) },
1702                             G_CALLBACK(on_tools_geomath_clicked), &context);    { "Geotext",          "Text analysis",
1703        G_CALLBACK(cb_menu_geotext) },
1704    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,    { "Precise Position", "Calculate a precise GPS position",
1705                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,      G_CALLBACK(cb_menu_precpos) },
1706                                      _("Geotext"),    { NULL, NULL, NULL }
1707                                      _("Text analysis, letter counting etc"));  };
1708    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(context.dialog)->vbox), but);  
1709    g_signal_connect_swapped(but, "clicked",  static const submenu_t submenu_tools = {
1710                     G_CALLBACK(on_tools_geotext_clicked), &context);    "Tools", submenu_tools_entries,
1711      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1712    };
1713    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  
1714                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,  /* the tools submenu */
1715                                      _("Precise Position"),  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1716                                      _("Calculate a very precise GPS posotions"));    if(!appdata->tools_menu)
1717    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(context.dialog)->vbox), but);      appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1718    g_signal_connect_swapped(but, "clicked",  
1719                             G_CALLBACK(on_tools_precpos_clicked), &context);    submenu_popup(appdata->tools_menu);
   
    gtk_widget_show_all(context.dialog);  
    gint result = gtk_dialog_run(GTK_DIALOG(context.dialog));  
   
    /* user clicked outside dialog */  
    if(result == GTK_RESPONSE_DELETE_EVENT)  
      gtk_widget_destroy(context.dialog);  
1720  }  }
1721    
1722  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
# Line 1558  HildonAppMenu *menu_create(appdata_t *ap Line 1724  HildonAppMenu *menu_create(appdata_t *ap
1724    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1725    
1726    /* ------- */    /* ------- */
1727      button = gtk_button_new_with_label(_("About"));
1728      g_signal_connect_after(button, "clicked",
1729                             G_CALLBACK(cb_menu_about), appdata);
1730      hildon_app_menu_append(menu, GTK_BUTTON(button));
1731    
1732    button = gtk_button_new_with_label(_("Settings"));    button = gtk_button_new_with_label(_("Settings"));
1733    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1734                           appdata);                           appdata);
# Line 1569  HildonAppMenu *menu_create(appdata_t *ap Line 1740  HildonAppMenu *menu_create(appdata_t *ap
1740                             G_CALLBACK(cb_menu_add), appdata);                             G_CALLBACK(cb_menu_add), appdata);
1741      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1742    
1743      button = gtk_button_new_with_label(_("Import dir"));      button = gtk_button_new_with_label(_("Import directory"));
1744      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1745                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1746      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1747    
   if(mode == MENU_GPXLIST) {  
1748      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1749      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1750                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1592  HildonAppMenu *menu_create(appdata_t *ap Line 1761  HildonAppMenu *menu_create(appdata_t *ap
1761                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1762    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1763    
1764    button = gtk_button_new_with_label(_("About"));  #ifdef ENABLE_OSM_GPS_MAP
1765        button = gtk_button_new_with_label(_("Map"));
1766        g_signal_connect_after(button, "clicked",
1767                               G_CALLBACK(cb_menu_map), appdata);
1768        hildon_app_menu_append(menu, GTK_BUTTON(button));
1769    #endif
1770    
1771    #ifdef HILDON_HELP
1772      button = gtk_button_new_with_label(_("Help"));
1773    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
1774                           G_CALLBACK(cb_menu_about), appdata);                           G_CALLBACK(cb_menu_help), appdata);
1775    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1776    #endif
1777    
1778    gtk_widget_show(GTK_WIDGET(menu));    gtk_widget_show_all(GTK_WIDGET(menu));
1779    
1780    return menu;    return menu;
1781  }  }
1782  #else  #else
 static void  
 cb_menu_export_log(GtkWidget *widget, gpointer data) {  
   appdata_t *appdata = (appdata_t*)data;  
   notes_log_export(appdata);  
 }  
   
 #ifdef USE_MAEMO  
 static void  
 cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  
   appdata_t *appdata = (appdata_t*)data;  
   mmpoi_export(appdata);  
 }  
 #endif  
   
 static void  
 cb_menu_export_garmin(GtkWidget *widget, gpointer data) {  
   appdata_t *appdata = (appdata_t*)data;  
   garmin_export(appdata);  
 }  
   
 static void  
 cb_menu_geomath(GtkWidget *window, gpointer data) {  
   geomath_dialog((appdata_t *)data);  
 }  
   
 static void  
 cb_menu_geotext(GtkWidget *window, gpointer data) {  
   geotext_dialog((appdata_t *)data);  
 }  
   
 static void  
 cb_menu_precpos(GtkWidget *window, gpointer data) {  
   precise_position((appdata_t *)data);  
 }  
1783    
1784  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1785    GtkWidget *menu, *item;    GtkWidget *menu, *item;
# Line 1649  void menu_create(appdata_t *appdata) { Line 1793  void menu_create(appdata_t *appdata) {
1793    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1794    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1795    
1796    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1797    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1798    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1799    
1800    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1801    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1802    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1803    
# Line 1679  void menu_create(appdata_t *appdata) { Line 1823  void menu_create(appdata_t *appdata) {
1823    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1824    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1825    
1826  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1827    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1828    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1829    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1830                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1831  #endif  #endif
1832    
1833    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1834    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1835    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1836                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1837    
1838    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1839    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1840    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1841                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
# Line 1699  void menu_create(appdata_t *appdata) { Line 1843  void menu_create(appdata_t *appdata) {
1843  #ifdef USE_BREAD_CRUMB_TRAIL  #ifdef USE_BREAD_CRUMB_TRAIL
1844    appdata->menu_search =    appdata->menu_search =
1845  #endif  #endif
1846    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1847    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1848    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1849    
# Line 1736  void menu_create(appdata_t *appdata) { Line 1880  void menu_create(appdata_t *appdata) {
1880    
1881    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1882    
1883    #ifdef ENABLE_OSM_GPS_MAP
1884      item = gtk_menu_item_new_with_label( _("Map") );
1885      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1886      g_signal_connect(item, "activate",
1887                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1888    #endif
1889    
1890    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1891    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1892    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1893    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1894    
1895    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1896    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1897    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1898                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1899    
1900    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1901    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1902    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1903                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1904    
1905    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1906    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1907    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1908                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
# Line 1759  void menu_create(appdata_t *appdata) { Line 1910  void menu_create(appdata_t *appdata) {
1910    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1911    
1912  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
1913    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
1914    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1915    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
1916  #endif  #endif
1917    
1918    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
1919    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1920    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
1921    
# Line 1800  void cleanup(appdata_t *appdata) { Line 1951  void cleanup(appdata_t *appdata) {
1951    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
1952    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
1953    
1954    #ifdef USE_STACKABLE_WINDOW
1955      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
1956      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
1957    #endif
1958    
1959    gnome_vfs_shutdown();    gnome_vfs_shutdown();
1960    icons_free();    icons_free();
1961    gps_release(appdata);    gps_release(appdata);
# Line 1828  void cleanup(appdata_t *appdata) { Line 1984  void cleanup(appdata_t *appdata) {
1984    puts("everything is gone");    puts("everything is gone");
1985  }  }
1986    
1987  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
1988    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1989    
1990    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 1837  void on_window_destroy (GtkWidget *widge Line 1993  void on_window_destroy (GtkWidget *widge
1993  }  }
1994    
1995  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
1996                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
1997    int handled = FALSE;    int handled = FALSE;
1998    
1999    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1846  gboolean on_window_key_press(GtkWidget * Line 2001  gboolean on_window_key_press(GtkWidget *
2001    switch(event->keyval) {    switch(event->keyval) {
2002  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2003    
 #if 0  /* don't do this as it interferes with gtkentry fields */  
   case HILDON_HARDKEY_SELECT:  
     /* remove as long as we haven't reached the main gpx list */  
     if(appdata->cur_gpx)  
       hildon_bread_crumb_trail_pop(HILDON_BREAD_CRUMB_TRAIL(appdata->bct));  
     handled = TRUE;  
     break;  
 #endif  
   
2004  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
2005    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
2006      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 2039  static void crumb_add(appdata_t *appdata Line 2185  static void crumb_add(appdata_t *appdata
2185  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2186    
2187  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2188      printf("main after settings redraw\n");
2189    
2190      if(!appdata->cur_view) {
2191        printf("no active view\n");
2192        return;
2193      }
2194    
2195  #ifndef USE_MAEMO  #ifndef USE_MAEMO
2196    // in non-maemo setup this can only affect the main screen as    // in non-maemo setup this can only affect the main screen as
2197    // the menu is blocked while a dialog is open. also the main    // the menu is blocked while a dialog is open. also the main
# Line 2074  void main_after_settings_redraw(appdata_ Line 2227  void main_after_settings_redraw(appdata_
2227    }    }
2228    
2229    if(redraw) {    if(redraw) {
2230      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2231    
2232    #ifdef USE_STACKABLE_WINDOW
2233        HildonWindowStack *stack = hildon_window_stack_get_default();
2234        container = hildon_window_stack_peek(stack);
2235    #endif
2236    
2237        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2238      switch(redraw) {      switch(redraw) {
2239      case 1:      case 1:
2240        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 2089  void main_after_settings_redraw(appdata_ Line 2249  void main_after_settings_redraw(appdata_
2249        break;        break;
2250      }      }
2251    
2252      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2253      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2254    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2255        else
2256  #endif  #endif
2257          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2258    
2259        gtk_widget_show_all(container);
2260      }
2261    #endif // USE_MAEMO
2262  }  }
2263    
2264  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2121  int main(int argc, char *argv[]) { Line 2287  int main(int argc, char *argv[]) {
2287      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2288    }    }
2289    
2290    #ifdef ENABLE_MAEMO_MAPPER
2291    dbus_register(&appdata);    dbus_register(&appdata);
2292  #endif  #endif
2293    #endif
2294    
2295    icons_init();    icons_init();
2296    
# Line 2149  int main(int argc, char *argv[]) { Line 2317  int main(int argc, char *argv[]) {
2317    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);
2318  #endif  #endif
2319    
2320    #if MAEMO_VERSION_MAJOR == 5
2321    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2322    #endif
2323    
2324    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2325                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2326    
# Line 2158  int main(int argc, char *argv[]) { Line 2329  int main(int argc, char *argv[]) {
2329    
2330    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2331    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2332  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2333    menu_create(&appdata);    menu_create(&appdata);
2334  #else  #else
Legend:
Removed from v.5  
changed lines
  Added in v.122