Diff of /trunk/src/main.c

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

revision 31 by harbaum, Sat Jul 25 10:29:30 2009 UTC revision 44 by harbaum, Tue Aug 4 14:07:18 2009 UTC
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 202  void cachelist_view_onRowActivated(GtkTr
202    GtkTreeIter   iter;    GtkTreeIter   iter;
203    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
204    
205      /* check if a cache is already selected and ignore click if yes */
206      /* (was probably a double click) */
207      if(appdata->cur_cache) return;
208    
209    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
210      cache_t *cache;      cache_t *cache;
211      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
# Line 587  void cachelist_dialog(appdata_t *appdata Line 591  void cachelist_dialog(appdata_t *appdata
591    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
592    
593    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
594    char *title = g_strdup_printf("GPXView - %s", gpx->name);    char *title = g_strdup_printf("%s - GPXView", gpx->name);
595    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
596    g_free(title);    g_free(title);
597    
# Line 713  static void gpxlist_view_onRowActivated( Line 717  static void gpxlist_view_onRowActivated(
717    GtkTreeIter   iter;    GtkTreeIter   iter;
718    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
719    
720      /* check if a cache is already selected and ignore click if yes */
721      /* (was probably a double click) */
722      if(appdata->cur_gpx) return;
723    
724    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
725      gpx_t *gpx;      gpx_t *gpx;
726      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 1433  cb_menu_search(GtkWidget *window, gpoint Line 1441  cb_menu_search(GtkWidget *window, gpoint
1441      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1442  }  }
1443    
1444  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1445    
1446  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1447  static void  static void
# Line 1509  cb_menu_export_garmin(GtkWidget *widget, Line 1517  cb_menu_export_garmin(GtkWidget *widget,
1517    garmin_export(appdata);    garmin_export(appdata);
1518  }  }
1519    
1520    #ifdef ENABLE_OSM_GPS_MAP
1521    static void
1522    cb_menu_map(GtkWidget *window, gpointer data) {
1523      map((appdata_t *)data);
1524    }
1525    #endif
1526    
1527  static void  static void
1528  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1529    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
# Line 1677  HildonAppMenu *menu_create(appdata_t *ap Line 1692  HildonAppMenu *menu_create(appdata_t *ap
1692      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1693                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1694      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1695    
   if(mode == MENU_GPXLIST) {  
1696      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1697      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1698                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1696  HildonAppMenu *menu_create(appdata_t *ap Line 1709  HildonAppMenu *menu_create(appdata_t *ap
1709                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1710    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1711    
1712    #ifdef ENABLE_OSM_GPS_MAP
1713      if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {
1714        button = gtk_button_new_with_label(_("Map"));
1715        g_signal_connect_after(button, "clicked",
1716                               G_CALLBACK(cb_menu_map), appdata);
1717        hildon_app_menu_append(menu, GTK_BUTTON(button));
1718      }
1719    #endif
1720    
1721  #ifdef HILDON_HELP  #ifdef HILDON_HELP
1722    button = gtk_button_new_with_label(_("Help"));    button = gtk_button_new_with_label(_("Help"));
1723    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
# Line 1813  void menu_create(appdata_t *appdata) { Line 1835  void menu_create(appdata_t *appdata) {
1835    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1836    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1837    
1838    #ifdef ENABLE_OSM_GPS_MAP
1839      item = gtk_menu_item_new_with_label( _("Map") );
1840      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1841      g_signal_connect(item, "activate",
1842                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1843    #endif
1844    
1845    item = gtk_menu_item_new_with_label( _("Geomath") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1846    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1847    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1905  void cleanup(appdata_t *appdata) { Line 1934  void cleanup(appdata_t *appdata) {
1934    puts("everything is gone");    puts("everything is gone");
1935  }  }
1936    
1937  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
1938    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1939    
1940    gconf_save_state(appdata);    gconf_save_state(appdata);
Legend:
Removed from v.31  
changed lines
  Added in v.44