Diff of /trunk/src/main.c

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

revision 2 by harbaum, Sat Jun 20 11:44:14 2009 UTC revision 3 by harbaum, Mon Jun 22 13:05:30 2009 UTC
# Line 551  void cachelist_dialog(appdata_t *appdata Line 551  void cachelist_dialog(appdata_t *appdata
551    gtk_container_add(GTK_CONTAINER(window),    gtk_container_add(GTK_CONTAINER(window),
552                      cachelist_create(appdata, gpx, NULL));                      cachelist_create(appdata, gpx, NULL));
553    
554      hildon_window_set_app_menu(HILDON_WINDOW(window),
555                                 menu_create(appdata, MENU_CACHELIST));
556    
557    gtk_widget_show_all(window);    gtk_widget_show_all(window);
558  }  }
559  #endif  #endif
# Line 1447  cb_menu_export_garmin(GtkWidget *widget, Line 1450  cb_menu_export_garmin(GtkWidget *widget,
1450    garmin_export(appdata);    garmin_export(appdata);
1451  }  }
1452    
1453    #ifdef USE_STACKABLE_WINDOW
1454    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1455      GtkWidget *dialog = gtk_dialog_new();
1456    
1457      GtkWidget *but =
1458        hildon_button_new_with_text(HILDON_SIZE_AUTO,
1459                                    HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1460                                    _("Export to Maemo Mapper"),
1461                                    _("Write a Maemo Mapper POI file"));
1462    
1463      gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),
1464                        but);
1465    
1466    
1467    #if 0
1468       g_signal_connect_swapped (dialog,
1469                                 "response",
1470                                 G_CALLBACK (gtk_widget_destroy),
1471                                 dialog);
1472    #endif
1473    
1474       gtk_widget_show_all (dialog);
1475       gint result = gtk_dialog_run(GTK_DIALOG(dialog));
1476       gtk_widget_destroy(dialog);
1477    }
1478    
1479    HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
1480      GtkWidget *button;
1481      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1482    
1483      /* ------- */
1484      button = gtk_button_new_with_label(_("Settings"));
1485      g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1486                             appdata);
1487      hildon_app_menu_append(menu, GTK_BUTTON(button));
1488    
1489      if(mode == MENU_GPXLIST) {
1490        button = gtk_button_new_with_label(_("Import file"));
1491        g_signal_connect_after(button, "clicked",
1492                               G_CALLBACK(cb_menu_add), appdata);
1493        hildon_app_menu_append(menu, GTK_BUTTON(button));
1494    
1495        button = gtk_button_new_with_label(_("Import dir"));
1496        g_signal_connect_after(button, "clicked",
1497                               G_CALLBACK(cb_menu_adddir), appdata);
1498        hildon_app_menu_append(menu, GTK_BUTTON(button));
1499      }
1500    
1501      if(mode == MENU_GPXLIST || mode == MENU_CACHELIST) {
1502        button = gtk_button_new_with_label(_("Export to Mapper"));
1503        g_signal_connect_after(button, "clicked",
1504                               G_CALLBACK(cb_menu_export_mmpoi), appdata);
1505        hildon_app_menu_append(menu, GTK_BUTTON(button));
1506      }
1507    
1508      if(mode == MENU_GPXLIST) {
1509        button = gtk_button_new_with_label(_("Export Field Notes"));
1510        g_signal_connect_after(button, "clicked",
1511                               G_CALLBACK(cb_menu_export_log), appdata);
1512        hildon_app_menu_append(menu, GTK_BUTTON(button));
1513    
1514        button = gtk_button_new_with_label(_("Export Garmin GPX"));
1515        g_signal_connect_after(button, "clicked",
1516                               G_CALLBACK(cb_menu_export_garmin), appdata);
1517        hildon_app_menu_append(menu, GTK_BUTTON(button));
1518    
1519        button = gtk_button_new_with_label(_("Search"));
1520        g_signal_connect_after(button, "clicked",
1521                               G_CALLBACK(cb_menu_search), appdata);
1522        hildon_app_menu_append(menu, GTK_BUTTON(button));
1523      }
1524    
1525      button = gtk_button_new_with_label(_("About"));
1526      g_signal_connect_after(button, "clicked",
1527                             G_CALLBACK(cb_menu_about), appdata);
1528      hildon_app_menu_append(menu, GTK_BUTTON(button));
1529    
1530      gtk_widget_show(GTK_WIDGET(menu));
1531    
1532      return menu;
1533    }
1534    #else
1535  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1536    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1537    menu = gtk_menu_new();    menu = gtk_menu_new();
1538    
1539  #ifdef USE_MAEMO  #ifdef USE_BREAD_CRUMB_TRAIL
1540    appdata->menu_import =    appdata->menu_import =
1541  #endif  #endif
1542    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1481  void menu_create(appdata_t *appdata) { Line 1566  void menu_create(appdata_t *appdata) {
1566    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1567  #endif  #endif
1568    
1569  #ifdef USE_MAEMO  #ifdef USE_BREAD_CRUMB_TRAIL
1570    appdata->menu_export =    appdata->menu_export =
1571  #endif  #endif
1572      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1506  void menu_create(appdata_t *appdata) { Line 1591  void menu_create(appdata_t *appdata) {
1591    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1592                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1593    
1594  #ifdef USE_MAEMO  #ifdef USE_BREAD_CRUMB_TRAIL
1595    appdata->menu_search =    appdata->menu_search =
1596  #endif  #endif
1597    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search...") );
# Line 1539  void menu_create(appdata_t *appdata) { Line 1624  void menu_create(appdata_t *appdata) {
1624    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_paste), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_paste), appdata);
1625  #endif  #endif
1626    
1627    item = gtk_menu_item_new_with_label( _("Settings...") );    item = gtk_menu_item_new_with_label( _("Settings") );
1628    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1629    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_settings),    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_settings),
1630                     appdata);                     appdata);
# Line 1600  void menu_create(appdata_t *appdata) { Line 1685  void menu_create(appdata_t *appdata) {
1685    gtk_box_pack_start(GTK_BOX(appdata->vbox), menu_bar, 0, 0, 0);    gtk_box_pack_start(GTK_BOX(appdata->vbox), menu_bar, 0, 0, 0);
1686  #endif  #endif
1687  }  }
1688    #endif
1689    
1690  /********************* end of menu **********************/  /********************* end of menu **********************/
1691    
# Line 1968  int main(int argc, char *argv[]) { Line 2054  int main(int argc, char *argv[]) {
2054    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2055    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2056    
2057    #ifndef USE_STACKABLE_WINDOW
2058    menu_create(&appdata);    menu_create(&appdata);
2059    #else
2060      hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),
2061                                 menu_create(&appdata, MENU_GPXLIST));
2062    #endif
2063    
2064  #ifdef USE_BREAD_CRUMB_TRAIL  #ifdef USE_BREAD_CRUMB_TRAIL
2065    appdata.bct = hildon_bread_crumb_trail_new();    appdata.bct = hildon_bread_crumb_trail_new();
Legend:
Removed from v.2  
changed lines
  Added in v.3