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 12 by harbaum, Fri Jun 26 20:07:33 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 264  void cachelist_redraw(appdata_t *appdata Line 264  void cachelist_redraw(appdata_t *appdata
264    // gtk_widget_show_all(appdata->vbox);    // gtk_widget_show_all(appdata->vbox);
265  #else  #else
266    
267      if(!appdata->cur_view) {
268        printf("cachelist redraw: no active view\n");
269        return;
270      }
271    
272    g_assert(!appdata->cur_cache);    g_assert(!appdata->cur_cache);
273    int redraw = 0;    int redraw = 0;
274    if(appdata->search_results)    if(appdata->search_results)
# Line 274  void cachelist_redraw(appdata_t *appdata Line 279  void cachelist_redraw(appdata_t *appdata
279    }    }
280    
281    if(redraw) {    if(redraw) {
282      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
283    
284        printf("redraw %d\n", redraw);
285    
286    #ifdef USE_STACKABLE_WINDOW
287        HildonWindowStack *stack = hildon_window_stack_get_default();
288        container = hildon_window_stack_peek(stack);
289    #endif
290    
291        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
292      switch(redraw) {      switch(redraw) {
293      case 1:      case 1:
294        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 286  void cachelist_redraw(appdata_t *appdata Line 300  void cachelist_redraw(appdata_t *appdata
300        break;        break;
301      }      }
302    
303      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
304      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
305          gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
306        else
307    #endif
308          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
309    
310        gtk_widget_show_all(container);
311    }    }
312  #endif  #endif
313  }  }
# Line 300  static gboolean cachelist_update(gpointe Line 320  static gboolean cachelist_update(gpointe
320  #ifdef USE_MAEMO  #ifdef USE_MAEMO
321    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
322    
323      if(appdata->cur_cache)
324        return TRUE;
325    
326    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
327      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
328        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
# Line 312  static gboolean cachelist_update(gpointe Line 335  static gboolean cachelist_update(gpointe
335  }  }
336    
337  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(appdata_t *appdata) {
338      printf("cachelist timer reset\n");
339    g_assert(appdata->cachelist_handler_id);    g_assert(appdata->cachelist_handler_id);
340    gtk_timeout_remove(appdata->cachelist_handler_id);    gtk_timeout_remove(appdata->cachelist_handler_id);
341    appdata->cachelist_handler_id =    appdata->cachelist_handler_id =
# Line 543  void cachelist_dialog(appdata_t *appdata Line 567  void cachelist_dialog(appdata_t *appdata
567  }  }
568  #else  #else
569  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
570    static void search_result_free(gpx_t *result);
571    
572    void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
573      if(appdata->search_results) {
574        search_result_free(appdata->search_results);
575        appdata->search_results = NULL;
576      }
577      appdata->cur_gpx = NULL;
578    
579      /* restore cur_view */
580      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
581    }
582    
583  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
584    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
585    
586    gtk_window_set_title(GTK_WINDOW(window), gpx->name);    /* store last "cur_view" in window */
587      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
588    
589    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_gpx = gpx;
590                      cachelist_create(appdata, gpx, NULL));    char *title = g_strdup_printf("GPXView - %s", gpx->name);
591      gtk_window_set_title(GTK_WINDOW(window), title);
592      g_free(title);
593    
594      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
595      gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
596    
597    
598    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
599                               menu_create(appdata, MENU_CACHELIST));                               menu_create(appdata, MENU_CACHELIST));
600    
601      g_signal_connect(G_OBJECT(window), "destroy",
602                       G_CALLBACK(on_cachelist_destroy), appdata);
603    
604    gtk_widget_show_all(window);    gtk_widget_show_all(window);
605  }  }
606  #endif  #endif
# Line 764  static void gpxlist_view_onRowActivated( Line 811  static void gpxlist_view_onRowActivated(
811          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
812        }        }
813  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
814        cachelist_dialog(appdata, gpx);  #ifdef USE_STACKABLE_WINDOW
815          if(!appdata->cur_gpx)
816    #endif
817            cachelist_dialog(appdata, gpx);
818    #ifdef USE_STACKABLE_WINDOW
819          else
820            printf("selected gpx, but cachelist window already present\n");
821    #endif
822  #else  #else
823        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
824        appdata->cur_view = cachelist_create(appdata, gpx, NULL);        appdata->cur_view = cachelist_create(appdata, gpx, NULL);
# Line 1328  cb_menu_search(GtkWidget *window, gpoint Line 1382  cb_menu_search(GtkWidget *window, gpoint
1382      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1383      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1384          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1385    
1386        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1387    
1388  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
1389        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        gpx_t *found =
1390            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1391    
1392        /* do search result dialog here ... */        /* do search result dialog here ... */
1393        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, found);
1394    #ifndef USE_STACKABLE_WINDOW
1395        search_result_free(found);        search_result_free(found);
1396  #else  #else
1397          appdata->search_results = found;
1398    #endif
1399    #else
1400          gpx_t *found = NULL;
1401    
1402        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1403          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1404        else        else
# Line 1415  cb_menu_paste(GtkWidget *widget, gpointe Line 1475  cb_menu_paste(GtkWidget *widget, gpointe
1475  }  }
1476  #endif  #endif
1477    
1478  #ifdef USE_STACKABLE_WINDOW  static void
1479  typedef struct {  cb_menu_export_log(GtkWidget *widget, gpointer data) {
1480    appdata_t *appdata;    appdata_t *appdata = (appdata_t*)data;
1481    GtkWidget *dialog;    notes_log_export(appdata);
1482  } appmenu_context_t;  }
1483    
1484  void on_export_mmpoi_clicked(appmenu_context_t *context) {  #ifdef USE_MAEMO
1485    gtk_widget_destroy(context->dialog);  static void
1486    while(gtk_events_pending())  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1487      gtk_main_iteration();    appdata_t *appdata = (appdata_t*)data;
1488      mmpoi_export(appdata);
1489    }
1490    #endif
1491    
1492    mmpoi_export(context->appdata);  static void
1493    cb_menu_export_garmin(GtkWidget *widget, gpointer data) {
1494      appdata_t *appdata = (appdata_t*)data;
1495      garmin_export(appdata);
1496  }  }
1497    
1498  void on_export_garmin_clicked(appmenu_context_t *context) {  static void
1499    gtk_widget_destroy(context->dialog);  cb_menu_geomath(GtkWidget *window, gpointer data) {
1500    while(gtk_events_pending())    geomath_dialog((appdata_t *)data);
1501      gtk_main_iteration();  }
1502    
1503    garmin_export(context->appdata);  static void
1504    cb_menu_geotext(GtkWidget *window, gpointer data) {
1505      geotext_dialog((appdata_t *)data);
1506  }  }
1507    
1508  void on_export_notes_log_clicked(appmenu_context_t *context) {  static void
1509    gtk_widget_destroy(context->dialog);  cb_menu_precpos(GtkWidget *window, gpointer data) {
1510    while(gtk_events_pending())    precise_position((appdata_t *)data);
1511      gtk_main_iteration();  }
1512    
1513    notes_log_export(context->appdata);  #ifdef USE_STACKABLE_WINDOW
1514    static void on_export_destroy(GtkWidget *widget, appdata_t *appdata) {
1515      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
1516  }  }
1517    
1518  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1519      HildonStackableWindow *view_window;
1520    GtkWidget *but;    GtkWidget *but;
   appmenu_context_t context;  
   
   context.appdata = appdata;  
   context.dialog = gtk_dialog_new();  
1521    
1522    gtk_window_set_decorated(GTK_WINDOW(context.dialog), FALSE);    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());
1523      gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Export");
1524    
1525    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,     /* store last "cur_view" in window */
1526                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,    g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);
1527                                      _("Export to Maemo Mapper"),    appdata->cur_view = NULL;
1528                                      _("Save a Maemo Mapper POI file"));  
1529    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(context.dialog)->vbox), but);    g_signal_connect(G_OBJECT(view_window), "destroy",
1530    g_signal_connect_swapped(but, "clicked",                     G_CALLBACK(on_export_destroy), appdata);
1531                             G_CALLBACK(on_export_mmpoi_clicked), &context);  
1532      GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));
1533    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  
1534                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,    but = hildon_button_new_with_text(
1535                                      _("Export Field Notes"),              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1536                                      _("Save a Garmin Field Notes file"));              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1537    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(context.dialog)->vbox), but);              _("Export to Maemo Mapper"),
1538    g_signal_connect_swapped(but, "clicked",              _("Save a Maemo Mapper POI file"));
1539                     G_CALLBACK(on_export_notes_log_clicked), &context);    g_signal_connect(but, "clicked",
1540                       G_CALLBACK(cb_menu_export_mmpoi), appdata);
1541      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1542    
1543    
1544      but = hildon_button_new_with_text(
1545                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1546                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1547                _("Export Field Notes"),
1548                _("Save a Garmin Field Notes file"));
1549      g_signal_connect(but, "clicked",
1550                       G_CALLBACK(cb_menu_export_log), appdata);
1551      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1552    
1553    
1554      but = hildon_button_new_with_text(
1555                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1556                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1557                _("Export Garmin GPX"),
1558                _("Save a GPX file containing modified waypoints"));
1559      g_signal_connect(but, "clicked",
1560                       G_CALLBACK(cb_menu_export_garmin), appdata);
1561      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1562    
1563    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));
1564                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_widget_show_all (GTK_WIDGET (view_window));
                                     _("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);  
1565  }  }
1566    
1567  void on_tools_geomath_clicked(appmenu_context_t *context) {  static void on_tools_destroy(GtkWidget *widget, appdata_t *appdata) {
1568    gtk_widget_destroy(context->dialog);    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
   while(gtk_events_pending())  
     gtk_main_iteration();  
   
   geomath_dialog(context->appdata);  
 }  
   
 void on_tools_geotext_clicked(appmenu_context_t *context) {  
   gtk_widget_destroy(context->dialog);  
   while(gtk_events_pending())  
     gtk_main_iteration();  
   
   geotext_dialog(context->appdata);  
 }  
   
 void on_tools_precpos_clicked(appmenu_context_t *context) {  
   gtk_widget_destroy(context->dialog);  
   while(gtk_events_pending())  
     gtk_main_iteration();  
   
   precise_position(context->appdata);  
1569  }  }
1570    
1571  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1572      HildonStackableWindow *view_window;
1573    GtkWidget *but;    GtkWidget *but;
   appmenu_context_t context;  
1574    
1575    context.appdata = appdata;    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());
1576    context.dialog = gtk_dialog_new();    gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Tools");
1577    
1578    gtk_window_set_decorated(GTK_WINDOW(context.dialog), FALSE);     /* store last "cur_view" in window */
1579      g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);
1580      appdata->cur_view = NULL;
1581    
1582      g_signal_connect(G_OBJECT(view_window), "destroy",
1583                       G_CALLBACK(on_tools_destroy), appdata);
1584    
1585      GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));
1586    
1587      but = hildon_button_new_with_text(
1588                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1589                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1590                _("Geomath"),
1591                _("Geocoordinate calculation"));
1592      g_signal_connect(but, "clicked",
1593                       G_CALLBACK(cb_menu_geomath), appdata);
1594      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1595    
1596    
1597      but = hildon_button_new_with_text(
1598                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1599                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1600                _("Geotext"),
1601                _("Text analysis, letter counting etc"));
1602      g_signal_connect(but, "clicked",
1603                       G_CALLBACK(cb_menu_geotext), appdata);
1604      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1605    
1606    
1607      but = hildon_button_new_with_text(
1608                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1609                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1610                _("Precise Position"),
1611                _("Calculate a very precise GPS position"));
1612      g_signal_connect(but, "clicked",
1613                       G_CALLBACK(cb_menu_precpos), appdata);
1614      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1615    
1616    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));
1617                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_widget_show_all (GTK_WIDGET (view_window));
                                     _("Geomath"),  
                                     _("Geocoordinate calculation"));  
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(context.dialog)->vbox), but);  
   g_signal_connect_swapped(but, "clicked",  
                            G_CALLBACK(on_tools_geomath_clicked), &context);  
   
   but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  
                                     HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
                                     _("Geotext"),  
                                     _("Text analysis, letter counting etc"));  
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(context.dialog)->vbox), but);  
   g_signal_connect_swapped(but, "clicked",  
                    G_CALLBACK(on_tools_geotext_clicked), &context);  
   
   
   but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  
                                     HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
                                     _("Precise Position"),  
                                     _("Calculate a very precise GPS posotions"));  
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(context.dialog)->vbox), but);  
   g_signal_connect_swapped(but, "clicked",  
                            G_CALLBACK(on_tools_precpos_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);  
1618  }  }
1619    
1620  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 1622  HildonAppMenu *menu_create(appdata_t *ap
1622    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1623    
1624    /* ------- */    /* ------- */
1625      button = gtk_button_new_with_label(_("About"));
1626      g_signal_connect_after(button, "clicked",
1627                             G_CALLBACK(cb_menu_about), appdata);
1628      hildon_app_menu_append(menu, GTK_BUTTON(button));
1629    
1630    button = gtk_button_new_with_label(_("Settings"));    button = gtk_button_new_with_label(_("Settings"));
1631    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1632                           appdata);                           appdata);
# Line 1569  HildonAppMenu *menu_create(appdata_t *ap Line 1638  HildonAppMenu *menu_create(appdata_t *ap
1638                             G_CALLBACK(cb_menu_add), appdata);                             G_CALLBACK(cb_menu_add), appdata);
1639      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1640    
1641      button = gtk_button_new_with_label(_("Import dir"));      button = gtk_button_new_with_label(_("Import directory"));
1642      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1643                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1644      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
# Line 1592  HildonAppMenu *menu_create(appdata_t *ap Line 1661  HildonAppMenu *menu_create(appdata_t *ap
1661                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1662    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1663    
1664    button = gtk_button_new_with_label(_("About"));    //  gtk_widget_show(GTK_WIDGET(menu));
   g_signal_connect_after(button, "clicked",  
                          G_CALLBACK(cb_menu_about), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
   
   gtk_widget_show(GTK_WIDGET(menu));  
1665    
1666    return menu;    return menu;
1667  }  }
1668  #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);  
 }  
1669    
1670  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1671    GtkWidget *menu, *item;    GtkWidget *menu, *item;
# Line 1649  void menu_create(appdata_t *appdata) { Line 1679  void menu_create(appdata_t *appdata) {
1679    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1680    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1681    
1682    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1683    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1684    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1685    
1686    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1687    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1688    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1689    
# Line 1680  void menu_create(appdata_t *appdata) { Line 1710  void menu_create(appdata_t *appdata) {
1710    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1711    
1712  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1713    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1714    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1715    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1716                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1717  #endif  #endif
1718    
1719    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1720    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1721    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1722                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1723    
1724    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1725    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1726    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1727                     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 1729  void menu_create(appdata_t *appdata) {
1729  #ifdef USE_BREAD_CRUMB_TRAIL  #ifdef USE_BREAD_CRUMB_TRAIL
1730    appdata->menu_search =    appdata->menu_search =
1731  #endif  #endif
1732    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1733    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1734    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1735    
# Line 1741  void menu_create(appdata_t *appdata) { Line 1771  void menu_create(appdata_t *appdata) {
1771    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1772    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1773    
1774    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1775    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1776    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1777                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1778    
1779    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1780    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1781    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1782                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1783    
1784    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1785    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1786    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1787                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
# Line 1759  void menu_create(appdata_t *appdata) { Line 1789  void menu_create(appdata_t *appdata) {
1789    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1790    
1791  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
1792    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
1793    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1794    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
1795  #endif  #endif
1796    
1797    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
1798    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1799    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
1800    
# Line 1837  void on_window_destroy (GtkWidget *widge Line 1867  void on_window_destroy (GtkWidget *widge
1867  }  }
1868    
1869  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
1870                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
1871    int handled = FALSE;    int handled = FALSE;
1872    
1873    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1846  gboolean on_window_key_press(GtkWidget * Line 1875  gboolean on_window_key_press(GtkWidget *
1875    switch(event->keyval) {    switch(event->keyval) {
1876  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1877    
 #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  
   
1878  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
1879    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
1880      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 2039  static void crumb_add(appdata_t *appdata Line 2059  static void crumb_add(appdata_t *appdata
2059  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2060    
2061  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2062      printf("main after settings redraw\n");
2063    
2064      if(!appdata->cur_view) {
2065        printf("no active view\n");
2066        return;
2067      }
2068    
2069  #ifndef USE_MAEMO  #ifndef USE_MAEMO
2070    // in non-maemo setup this can only affect the main screen as    // in non-maemo setup this can only affect the main screen as
2071    // 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 2101  void main_after_settings_redraw(appdata_
2101    }    }
2102    
2103    if(redraw) {    if(redraw) {
2104      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2105    
2106    #ifdef USE_STACKABLE_WINDOW
2107        HildonWindowStack *stack = hildon_window_stack_get_default();
2108        container = hildon_window_stack_peek(stack);
2109    #endif
2110    
2111        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2112      switch(redraw) {      switch(redraw) {
2113      case 1:      case 1:
2114        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 2089  void main_after_settings_redraw(appdata_ Line 2123  void main_after_settings_redraw(appdata_
2123        break;        break;
2124      }      }
2125    
2126      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2127      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2128    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2129        else
2130  #endif  #endif
2131          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2132    
2133        gtk_widget_show_all(container);
2134      }
2135    #endif // USE_MAEMO
2136  }  }
2137    
2138  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2149  int main(int argc, char *argv[]) { Line 2189  int main(int argc, char *argv[]) {
2189    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);
2190  #endif  #endif
2191    
2192    #if MAEMO_VERSION_MAJOR == 5
2193    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2194    #endif
2195    
2196    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2197                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2198    
Legend:
Removed from v.5  
changed lines
  Added in v.12