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 15 by harbaum, Sun Jun 28 18:58:40 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 969  cb_menu_about(GtkWidget *window, gpointe Line 1023  cb_menu_about(GtkWidget *window, gpointe
1023    
1024    gtk_about_dialog_set_name(about, "GPXView");    gtk_about_dialog_set_name(about, "GPXView");
1025    gtk_about_dialog_set_version(about, VERSION);    gtk_about_dialog_set_version(about, VERSION);
1026    gtk_about_dialog_set_copyright(about,  
1027           _("GPXView (c) 2008 by\n"  #ifdef ENABLE_LIBLOCATION
1028           "Till Harbaum <till@harbaum.org>\n"    char *uses = "uses liblocation";
1029           "Geocaching.com: Tantil"));  #elif defined(ENABLE_GPSBT)
1030      char *uses = "uses gpsbt and gpsd";
1031    #else
1032      char *uses = "uses gpsd";
1033    #endif
1034    
1035      char *str = g_strdup_printf("%s\n\n(%s)",
1036                                  _("GPXView (c) 2008 by\n"
1037                                    "Till Harbaum <till@harbaum.org>\n"
1038                                    "Geocaching.com: Tantil"),
1039                                  _(uses)
1040                                  );
1041    
1042      gtk_about_dialog_set_copyright(about, str);
1043      g_free(str);
1044    
1045    gtk_about_dialog_set_website(about,    gtk_about_dialog_set_website(about,
1046         _("http://www.harbaum.org/till/maemo"));         _("http://www.harbaum.org/till/maemo"));
# Line 1328  cb_menu_search(GtkWidget *window, gpoint Line 1396  cb_menu_search(GtkWidget *window, gpoint
1396      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1397      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1398          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1399    
1400        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1401    
1402  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
1403        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        gpx_t *found =
1404            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1405    
1406        /* do search result dialog here ... */        /* do search result dialog here ... */
1407        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, found);
1408    #ifndef USE_STACKABLE_WINDOW
1409        search_result_free(found);        search_result_free(found);
1410  #else  #else
1411          appdata->search_results = found;
1412    #endif
1413    #else
1414          gpx_t *found = NULL;
1415    
1416        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1417          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1418        else        else
# Line 1415  cb_menu_paste(GtkWidget *widget, gpointe Line 1489  cb_menu_paste(GtkWidget *widget, gpointe
1489  }  }
1490  #endif  #endif
1491    
1492  #ifdef USE_STACKABLE_WINDOW  static void
1493  typedef struct {  cb_menu_export_log(GtkWidget *widget, gpointer data) {
1494    appdata_t *appdata;    appdata_t *appdata = (appdata_t*)data;
1495    GtkWidget *dialog;    notes_log_export(appdata);
1496  } appmenu_context_t;  }
1497    
1498  void on_export_mmpoi_clicked(appmenu_context_t *context) {  #ifdef USE_MAEMO
1499    gtk_widget_destroy(context->dialog);  static void
1500    while(gtk_events_pending())  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1501      gtk_main_iteration();    appdata_t *appdata = (appdata_t*)data;
1502      mmpoi_export(appdata);
1503    }
1504    #endif
1505    
1506    mmpoi_export(context->appdata);  static void
1507    cb_menu_export_garmin(GtkWidget *widget, gpointer data) {
1508      appdata_t *appdata = (appdata_t*)data;
1509      garmin_export(appdata);
1510  }  }
1511    
1512  void on_export_garmin_clicked(appmenu_context_t *context) {  static void
1513    gtk_widget_destroy(context->dialog);  cb_menu_geomath(GtkWidget *window, gpointer data) {
1514    while(gtk_events_pending())    geomath_dialog((appdata_t *)data);
1515      gtk_main_iteration();  }
1516    
1517    garmin_export(context->appdata);  static void
1518    cb_menu_geotext(GtkWidget *window, gpointer data) {
1519      geotext_dialog((appdata_t *)data);
1520  }  }
1521    
1522  void on_export_notes_log_clicked(appmenu_context_t *context) {  static void
1523    gtk_widget_destroy(context->dialog);  cb_menu_precpos(GtkWidget *window, gpointer data) {
1524    while(gtk_events_pending())    precise_position((appdata_t *)data);
1525      gtk_main_iteration();  }
1526    
1527    notes_log_export(context->appdata);  #ifdef USE_STACKABLE_WINDOW
1528    static void on_export_destroy(GtkWidget *widget, appdata_t *appdata) {
1529      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
1530  }  }
1531    
1532  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1533      HildonStackableWindow *view_window;
1534    GtkWidget *but;    GtkWidget *but;
   appmenu_context_t context;  
   
   context.appdata = appdata;  
   context.dialog = gtk_dialog_new();  
   
   gtk_window_set_decorated(GTK_WINDOW(context.dialog), FALSE);  
   
   but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  
                                     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);  
1535    
1536    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());
1537                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Export");
                                     _("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);  
 }  
1538    
1539  void on_tools_geomath_clicked(appmenu_context_t *context) {     /* store last "cur_view" in window */
1540    gtk_widget_destroy(context->dialog);    g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);
1541    while(gtk_events_pending())    appdata->cur_view = NULL;
1542      gtk_main_iteration();  
1543      g_signal_connect(G_OBJECT(view_window), "destroy",
1544                       G_CALLBACK(on_export_destroy), appdata);
1545    
1546      GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));
1547    
1548      but = hildon_button_new_with_text(
1549                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1550                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1551                _("Export to Maemo Mapper"),
1552                _("Save a Maemo Mapper POI file"));
1553      g_signal_connect(but, "clicked",
1554                       G_CALLBACK(cb_menu_export_mmpoi), appdata);
1555      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1556    
1557    
1558      but = hildon_button_new_with_text(
1559                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1560                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1561                _("Export Field Notes"),
1562                _("Save a Garmin Field Notes file"));
1563      g_signal_connect(but, "clicked",
1564                       G_CALLBACK(cb_menu_export_log), appdata);
1565      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1566    
1567    
1568      but = hildon_button_new_with_text(
1569                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1570                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1571                _("Export Garmin GPX"),
1572                _("Save a GPX file containing modified waypoints"));
1573      g_signal_connect(but, "clicked",
1574                       G_CALLBACK(cb_menu_export_garmin), appdata);
1575      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1576    
1577    geomath_dialog(context->appdata);    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));
1578      gtk_widget_show_all (GTK_WIDGET (view_window));
1579  }  }
1580    
1581  void on_tools_geotext_clicked(appmenu_context_t *context) {  static void on_tools_destroy(GtkWidget *widget, appdata_t *appdata) {
1582    gtk_widget_destroy(context->dialog);    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
   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);  
1583  }  }
1584    
1585  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1586      HildonStackableWindow *view_window;
1587    GtkWidget *but;    GtkWidget *but;
   appmenu_context_t context;  
1588    
1589    context.appdata = appdata;    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());
1590    context.dialog = gtk_dialog_new();    gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Tools");
1591    
1592    gtk_window_set_decorated(GTK_WINDOW(context.dialog), FALSE);     /* store last "cur_view" in window */
1593      g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);
1594      appdata->cur_view = NULL;
1595    
1596      g_signal_connect(G_OBJECT(view_window), "destroy",
1597                       G_CALLBACK(on_tools_destroy), appdata);
1598    
1599      GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));
1600    
1601      but = hildon_button_new_with_text(
1602                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1603                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1604                _("Geomath"),
1605                _("Geocoordinate calculation"));
1606      g_signal_connect(but, "clicked",
1607                       G_CALLBACK(cb_menu_geomath), appdata);
1608      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1609    
1610    
1611      but = hildon_button_new_with_text(
1612                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1613                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1614                _("Geotext"),
1615                _("Text analysis, letter counting etc"));
1616      g_signal_connect(but, "clicked",
1617                       G_CALLBACK(cb_menu_geotext), appdata);
1618      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1619    
1620    
1621      but = hildon_button_new_with_text(
1622                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1623                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1624                _("Precise Position"),
1625                _("Calculate a very precise GPS position"));
1626      g_signal_connect(but, "clicked",
1627                       G_CALLBACK(cb_menu_precpos), appdata);
1628      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1629    
1630    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));
1631                                      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);  
1632  }  }
1633    
1634  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 1636  HildonAppMenu *menu_create(appdata_t *ap
1636    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1637    
1638    /* ------- */    /* ------- */
1639      button = gtk_button_new_with_label(_("About"));
1640      g_signal_connect_after(button, "clicked",
1641                             G_CALLBACK(cb_menu_about), appdata);
1642      hildon_app_menu_append(menu, GTK_BUTTON(button));
1643    
1644    button = gtk_button_new_with_label(_("Settings"));    button = gtk_button_new_with_label(_("Settings"));
1645    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1646                           appdata);                           appdata);
# Line 1569  HildonAppMenu *menu_create(appdata_t *ap Line 1652  HildonAppMenu *menu_create(appdata_t *ap
1652                             G_CALLBACK(cb_menu_add), appdata);                             G_CALLBACK(cb_menu_add), appdata);
1653      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1654    
1655      button = gtk_button_new_with_label(_("Import dir"));      button = gtk_button_new_with_label(_("Import directory"));
1656      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1657                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1658      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 1675  HildonAppMenu *menu_create(appdata_t *ap
1675                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1676    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1677    
1678    button = gtk_button_new_with_label(_("About"));  #ifdef HILDON_HELP
1679      button = gtk_button_new_with_label(_("Help"));
1680    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
1681                           G_CALLBACK(cb_menu_about), appdata);                           G_CALLBACK(cb_menu_help), appdata);
1682    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1683    #endif
1684    
1685    gtk_widget_show(GTK_WIDGET(menu));    gtk_widget_show_all(GTK_WIDGET(menu));
1686    
1687    return menu;    return menu;
1688  }  }
1689  #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);  
 }  
1690    
1691  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1692    GtkWidget *menu, *item;    GtkWidget *menu, *item;
# Line 1649  void menu_create(appdata_t *appdata) { Line 1700  void menu_create(appdata_t *appdata) {
1700    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1701    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1702    
1703    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1704    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1705    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1706    
1707    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1708    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1709    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1710    
# Line 1680  void menu_create(appdata_t *appdata) { Line 1731  void menu_create(appdata_t *appdata) {
1731    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1732    
1733  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1734    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1735    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1736    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1737                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1738  #endif  #endif
1739    
1740    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1741    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1742    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1743                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1744    
1745    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1746    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1747    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1748                     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 1750  void menu_create(appdata_t *appdata) {
1750  #ifdef USE_BREAD_CRUMB_TRAIL  #ifdef USE_BREAD_CRUMB_TRAIL
1751    appdata->menu_search =    appdata->menu_search =
1752  #endif  #endif
1753    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1754    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1755    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1756    
# Line 1741  void menu_create(appdata_t *appdata) { Line 1792  void menu_create(appdata_t *appdata) {
1792    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1793    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1794    
1795    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1796    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1797    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1798                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1799    
1800    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1801    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1802    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1803                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1804    
1805    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1806    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1807    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1808                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
# Line 1759  void menu_create(appdata_t *appdata) { Line 1810  void menu_create(appdata_t *appdata) {
1810    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1811    
1812  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
1813    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
1814    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1815    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
1816  #endif  #endif
1817    
1818    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
1819    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1820    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
1821    
# Line 1837  void on_window_destroy (GtkWidget *widge Line 1888  void on_window_destroy (GtkWidget *widge
1888  }  }
1889    
1890  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
1891                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
1892    int handled = FALSE;    int handled = FALSE;
1893    
1894    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1846  gboolean on_window_key_press(GtkWidget * Line 1896  gboolean on_window_key_press(GtkWidget *
1896    switch(event->keyval) {    switch(event->keyval) {
1897  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1898    
 #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  
   
1899  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
1900    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
1901      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 2039  static void crumb_add(appdata_t *appdata Line 2080  static void crumb_add(appdata_t *appdata
2080  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2081    
2082  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2083      printf("main after settings redraw\n");
2084    
2085      if(!appdata->cur_view) {
2086        printf("no active view\n");
2087        return;
2088      }
2089    
2090  #ifndef USE_MAEMO  #ifndef USE_MAEMO
2091    // in non-maemo setup this can only affect the main screen as    // in non-maemo setup this can only affect the main screen as
2092    // 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 2122  void main_after_settings_redraw(appdata_
2122    }    }
2123    
2124    if(redraw) {    if(redraw) {
2125      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2126    
2127    #ifdef USE_STACKABLE_WINDOW
2128        HildonWindowStack *stack = hildon_window_stack_get_default();
2129        container = hildon_window_stack_peek(stack);
2130    #endif
2131    
2132        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2133      switch(redraw) {      switch(redraw) {
2134      case 1:      case 1:
2135        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 2089  void main_after_settings_redraw(appdata_ Line 2144  void main_after_settings_redraw(appdata_
2144        break;        break;
2145      }      }
2146    
2147      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2148      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2149    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2150        else
2151  #endif  #endif
2152          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2153    
2154        gtk_widget_show_all(container);
2155      }
2156    #endif // USE_MAEMO
2157  }  }
2158    
2159  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2149  int main(int argc, char *argv[]) { Line 2210  int main(int argc, char *argv[]) {
2210    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);
2211  #endif  #endif
2212    
2213    #if MAEMO_VERSION_MAJOR == 5
2214    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2215    #endif
2216    
2217    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2218                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2219    
Legend:
Removed from v.5  
changed lines
  Added in v.15