Diff of /trunk/src/main.c

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

revision 4 by harbaum, Mon Jun 22 14:25:59 2009 UTC revision 21 by harbaum, Sun Jul 5 17:38:06 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-2009 by\n"
1037                            "Till Harbaum <till@harbaum.org>\n"
1038                            "Mailing list: gpxview-users@garage.maemo.org"),
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 1010  cb_menu_adddir(GtkWidget *window, gpoint Line 1078  cb_menu_adddir(GtkWidget *window, gpoint
1078    if(new) gpxlist_add(appdata, new);    if(new) gpxlist_add(appdata, new);
1079  }  }
1080    
 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);  
 }  
   
1081  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
1082  static void  static void
1083  cb_menu_close(GtkWidget *window, gpointer data) {  cb_menu_close(GtkWidget *window, gpointer data) {
# Line 1343  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 1434  static void Line 1493  static void
1493  cb_menu_export_log(GtkWidget *widget, gpointer data) {  cb_menu_export_log(GtkWidget *widget, gpointer data) {
1494    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1495    notes_log_export(appdata);    notes_log_export(appdata);
1496    #ifdef USE_STACKABLE_WINDOW
1497      hildon_window_stack_pop_1 (hildon_window_stack_get_default());
1498    #endif
1499  }  }
1500    
1501  #ifdef USE_MAEMO  #ifdef USE_MAEMO
# Line 1441  static void Line 1503  static void
1503  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1504    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1505    mmpoi_export(appdata);    mmpoi_export(appdata);
1506    #ifdef USE_STACKABLE_WINDOW
1507      hildon_window_stack_pop_1 (hildon_window_stack_get_default());
1508    #endif
1509  }  }
1510  #endif  #endif
1511    
# Line 1448  static void Line 1513  static void
1513  cb_menu_export_garmin(GtkWidget *widget, gpointer data) {  cb_menu_export_garmin(GtkWidget *widget, gpointer data) {
1514    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1515    garmin_export(appdata);    garmin_export(appdata);
1516    #ifdef USE_STACKABLE_WINDOW
1517      hildon_window_stack_pop_1 (hildon_window_stack_get_default());
1518    #endif
1519    }
1520    
1521    static void
1522    cb_menu_geomath(GtkWidget *window, gpointer data) {
1523      geomath_dialog((appdata_t *)data);
1524    #ifdef USE_STACKABLE_WINDOW
1525      hildon_window_stack_pop_1 (hildon_window_stack_get_default());
1526    #endif
1527    }
1528    
1529    static void
1530    cb_menu_geotext(GtkWidget *window, gpointer data) {
1531      geotext_dialog((appdata_t *)data);
1532    #ifdef USE_STACKABLE_WINDOW
1533      hildon_window_stack_pop_1 (hildon_window_stack_get_default());
1534    #endif
1535    }
1536    
1537    static void
1538    cb_menu_precpos(GtkWidget *window, gpointer data) {
1539      precise_position((appdata_t *)data);
1540    #ifdef USE_STACKABLE_WINDOW
1541      hildon_window_stack_pop_1 (hildon_window_stack_get_default());
1542    #endif
1543  }  }
1544    
1545  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1546    static GtkWidget *export_menu_create(appdata_t *appdata) {
1547      GtkWidget *button;
1548      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1549    
1550      button = hildon_button_new_with_text(
1551                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1552                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1553                _("Export to Maemo Mapper"),
1554                _("Save a Maemo Mapper POI file"));
1555      g_signal_connect(button, "clicked",
1556                       G_CALLBACK(cb_menu_export_mmpoi), appdata);
1557      hildon_app_menu_append(menu, GTK_BUTTON(button));
1558    
1559      button = hildon_button_new_with_text(
1560                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1561                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1562                _("Export Field Notes"),
1563                _("Save a Garmin Field Notes file"));
1564      g_signal_connect(button, "clicked",
1565                       G_CALLBACK(cb_menu_export_log), appdata);
1566      hildon_app_menu_append(menu, GTK_BUTTON(button));
1567    
1568      button = 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 modified waypoints in GPX file"));
1573      g_signal_connect(button, "clicked",
1574                       G_CALLBACK(cb_menu_export_garmin), appdata);
1575      hildon_app_menu_append(menu, GTK_BUTTON(button));
1576    
1577      gtk_widget_show_all(GTK_WIDGET(menu));
1578    
1579      return GTK_WIDGET(menu);
1580    }
1581    
1582    /* the export submenu */
1583  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1584    GtkWidget *but, *dialog = gtk_dialog_new();    if(!appdata->export_menu)
1585        appdata->export_menu = export_menu_create(appdata);
1586    
1587    gtk_window_set_title(GTK_WINDOW(dialog), _("Export"));    /* draw a popup menu */
1588      hildon_app_menu_popup(HILDON_APP_MENU(appdata->export_menu),
1589                            GTK_WINDOW(hildon_window_stack_peek(
1590                        hildon_window_stack_get_default())));
1591    }
1592    
1593    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  static GtkWidget *tools_menu_create(appdata_t *appdata) {
1594                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,    GtkWidget *button;
1595                                      _("Export to Maemo Mapper"),    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
                                     _("Write a Maemo Mapper POI file"));  
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), but);  
   
1596    
1597    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,    /* the following doesn't have an effect */
1598                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,    //  gtk_window_set_title(GTK_WINDOW(menu), "Tools");
1599                                      _("Export Field Notes"),  
1600                                      _("Write a Garmin Field Notes file"));    button = hildon_button_new_with_text(
1601    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), but);              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1602                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1603                _("Geomath"),
1604                _("Geocoordinate calculation"));
1605      g_signal_connect(button, "clicked",
1606                       G_CALLBACK(cb_menu_geomath), appdata);
1607      hildon_app_menu_append(menu, GTK_BUTTON(button));
1608    
1609    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  
1610                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,    button = hildon_button_new_with_text(
1611                                      _("Export Garmin GPX"),              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1612                                      _("Write GPX file of modified points"));              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1613    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), but);              _("Geotext"),
1614                _("Text analysis"));
1615      g_signal_connect(button, "clicked",
1616                       G_CALLBACK(cb_menu_geotext), appdata);
1617      hildon_app_menu_append(menu, GTK_BUTTON(button));
1618    
1619    
1620  #if 0    button = hildon_button_new_with_text(
1621     g_signal_connect_swapped (dialog,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1622                               "response",              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1623                               G_CALLBACK (gtk_widget_destroy),              _("Precise Position"),
1624                               dialog);              _("Calculate a precise GPS position"));
1625  #endif    g_signal_connect(button, "clicked",
1626                       G_CALLBACK(cb_menu_precpos), appdata);
1627      hildon_app_menu_append(menu, GTK_BUTTON(button));
1628    
1629      gtk_widget_show_all(GTK_WIDGET(menu));
1630    
1631      return GTK_WIDGET(menu);
1632    }
1633    
1634     gtk_widget_show_all (dialog);  /* the tools submenu */
1635     gint result = gtk_dialog_run(GTK_DIALOG(dialog));  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1636     gtk_widget_destroy(dialog);    if(!appdata->tools_menu)
1637        appdata->tools_menu = tools_menu_create(appdata);
1638    
1639      /* draw a popup menu */
1640      hildon_app_menu_popup(HILDON_APP_MENU(appdata->tools_menu),
1641                            GTK_WINDOW(hildon_window_stack_peek(
1642                        hildon_window_stack_get_default())));
1643  }  }
1644    
1645    
1646  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
1647    GtkWidget *button;    GtkWidget *button;
1648    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1649    
1650    /* ------- */    /* ------- */
1651      button = gtk_button_new_with_label(_("About"));
1652      g_signal_connect_after(button, "clicked",
1653                             G_CALLBACK(cb_menu_about), appdata);
1654      hildon_app_menu_append(menu, GTK_BUTTON(button));
1655    
1656    button = gtk_button_new_with_label(_("Settings"));    button = gtk_button_new_with_label(_("Settings"));
1657    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1658                           appdata);                           appdata);
# Line 1505  HildonAppMenu *menu_create(appdata_t *ap Line 1664  HildonAppMenu *menu_create(appdata_t *ap
1664                             G_CALLBACK(cb_menu_add), appdata);                             G_CALLBACK(cb_menu_add), appdata);
1665      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1666    
1667      button = gtk_button_new_with_label(_("Import dir"));      button = gtk_button_new_with_label(_("Import directory"));
1668      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1669                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1670      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1671    }    }
1672    
 #if 0  
   if(mode == MENU_GPXLIST || mode == MENU_CACHELIST) {  
     button = gtk_button_new_with_label(_("Export to Mapper"));  
     g_signal_connect_after(button, "clicked",  
                            G_CALLBACK(cb_menu_export_mmpoi), appdata);  
     hildon_app_menu_append(menu, GTK_BUTTON(button));  
   }  
   
   if(mode == MENU_GPXLIST) {  
     button = gtk_button_new_with_label(_("Export Field Notes"));  
     g_signal_connect_after(button, "clicked",  
                            G_CALLBACK(cb_menu_export_log), appdata);  
     hildon_app_menu_append(menu, GTK_BUTTON(button));  
   
     button = gtk_button_new_with_label(_("Export Garmin GPX"));  
     g_signal_connect_after(button, "clicked",  
                            G_CALLBACK(cb_menu_export_garmin), appdata);  
     hildon_app_menu_append(menu, GTK_BUTTON(button));  
   
     button = gtk_button_new_with_label(_("Search"));  
     g_signal_connect_after(button, "clicked",  
                            G_CALLBACK(cb_menu_search), appdata);  
     hildon_app_menu_append(menu, GTK_BUTTON(button));  
   }  
 #else  
   
1673    if(mode == MENU_GPXLIST) {    if(mode == MENU_GPXLIST) {
1674      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1675      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
# Line 1549  HildonAppMenu *menu_create(appdata_t *ap Line 1682  HildonAppMenu *menu_create(appdata_t *ap
1682      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1683    }    }
1684    
1685  #endif    button = gtk_button_new_with_label(_("Tools"));
1686      g_signal_connect_after(button, "clicked",
1687                             G_CALLBACK(on_tools_clicked), appdata);
1688      hildon_app_menu_append(menu, GTK_BUTTON(button));
1689    
1690    button = gtk_button_new_with_label(_("About"));  #ifdef HILDON_HELP
1691      button = gtk_button_new_with_label(_("Help"));
1692    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
1693                           G_CALLBACK(cb_menu_about), appdata);                           G_CALLBACK(cb_menu_help), appdata);
1694    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1695    #endif
1696    
1697    gtk_widget_show(GTK_WIDGET(menu));    gtk_widget_show_all(GTK_WIDGET(menu));
1698    
1699    return menu;    return menu;
1700  }  }
1701  #else  #else
1702    
1703  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1704    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1705    menu = gtk_menu_new();    menu = gtk_menu_new();
# Line 1573  void menu_create(appdata_t *appdata) { Line 1712  void menu_create(appdata_t *appdata) {
1712    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1713    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1714    
1715    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1716    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1717    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1718    
1719    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1720    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1721    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1722    
# Line 1604  void menu_create(appdata_t *appdata) { Line 1743  void menu_create(appdata_t *appdata) {
1743    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1744    
1745  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1746    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1747    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1748    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1749                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1750  #endif  #endif
1751    
1752    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1753    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1754    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1755                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1756    
1757    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1758    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1759    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1760                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
# Line 1623  void menu_create(appdata_t *appdata) { Line 1762  void menu_create(appdata_t *appdata) {
1762  #ifdef USE_BREAD_CRUMB_TRAIL  #ifdef USE_BREAD_CRUMB_TRAIL
1763    appdata->menu_search =    appdata->menu_search =
1764  #endif  #endif
1765    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1766    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1767    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1768    
# Line 1665  void menu_create(appdata_t *appdata) { Line 1804  void menu_create(appdata_t *appdata) {
1804    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1805    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1806    
1807    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1808    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1809    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1810                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1811    
1812    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1813    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1814    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1815                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1816    
1817    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1818    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1819    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1820                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
# Line 1683  void menu_create(appdata_t *appdata) { Line 1822  void menu_create(appdata_t *appdata) {
1822    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1823    
1824  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
1825    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
1826    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1827    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
1828  #endif  #endif
1829    
1830    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
1831    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1832    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
1833    
# Line 1761  void on_window_destroy (GtkWidget *widge Line 1900  void on_window_destroy (GtkWidget *widge
1900  }  }
1901    
1902  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
1903                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
1904    int handled = FALSE;    int handled = FALSE;
1905    
1906    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1770  gboolean on_window_key_press(GtkWidget * Line 1908  gboolean on_window_key_press(GtkWidget *
1908    switch(event->keyval) {    switch(event->keyval) {
1909  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1910    
 #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  
   
1911  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
1912    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
1913      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1963  static void crumb_add(appdata_t *appdata Line 2092  static void crumb_add(appdata_t *appdata
2092  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2093    
2094  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2095      printf("main after settings redraw\n");
2096    
2097      if(!appdata->cur_view) {
2098        printf("no active view\n");
2099        return;
2100      }
2101    
2102  #ifndef USE_MAEMO  #ifndef USE_MAEMO
2103    // in non-maemo setup this can only affect the main screen as    // in non-maemo setup this can only affect the main screen as
2104    // 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 1998  void main_after_settings_redraw(appdata_ Line 2134  void main_after_settings_redraw(appdata_
2134    }    }
2135    
2136    if(redraw) {    if(redraw) {
2137      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2138    
2139    #ifdef USE_STACKABLE_WINDOW
2140        HildonWindowStack *stack = hildon_window_stack_get_default();
2141        container = hildon_window_stack_peek(stack);
2142    #endif
2143    
2144        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2145      switch(redraw) {      switch(redraw) {
2146      case 1:      case 1:
2147        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 2013  void main_after_settings_redraw(appdata_ Line 2156  void main_after_settings_redraw(appdata_
2156        break;        break;
2157      }      }
2158    
2159      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2160      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2161    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2162        else
2163  #endif  #endif
2164          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2165    
2166        gtk_widget_show_all(container);
2167      }
2168    #endif // USE_MAEMO
2169  }  }
2170    
2171  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2073  int main(int argc, char *argv[]) { Line 2222  int main(int argc, char *argv[]) {
2222    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);
2223  #endif  #endif
2224    
2225    #if MAEMO_VERSION_MAJOR == 5
2226    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2227    #endif
2228    
2229    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2230                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2231    
Legend:
Removed from v.4  
changed lines
  Added in v.21