Diff of /trunk/src/main.c

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

revision 11 by harbaum, Fri Jun 26 12:24:24 2009 UTC revision 15 by harbaum, Sun Jun 28 18:58:40 2009 UTC
# Line 811  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    #ifdef USE_STACKABLE_WINDOW
815        if(!appdata->cur_gpx)        if(!appdata->cur_gpx)
816    #endif
817          cachelist_dialog(appdata, gpx);          cachelist_dialog(appdata, gpx);
818    #ifdef USE_STACKABLE_WINDOW
819        else        else
820          printf("selected gpx, but cachelist window already present\n");          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 1019  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 1382  cb_menu_search(GtkWidget *window, gpoint Line 1400  cb_menu_search(GtkWidget *window, gpoint
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        appdata->search_results =        gpx_t *found =
1404          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          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, appdata->search_results);        cachelist_dialog(appdata, found);
1408  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
1409        search_result_free(appdata->search_results);        search_result_free(found);
1410        appdata->search_results = NULL;  #else
1411          appdata->search_results = found;
1412  #endif  #endif
1413  #else  #else
1414        gpx_t *found = NULL;        gpx_t *found = NULL;
# Line 1656  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    gtk_widget_show(GTK_WIDGET(menu));  #ifdef HILDON_HELP
1679      button = gtk_button_new_with_label(_("Help"));
1680      g_signal_connect_after(button, "clicked",
1681                             G_CALLBACK(cb_menu_help), appdata);
1682      hildon_app_menu_append(menu, GTK_BUTTON(button));
1683    #endif
1684    
1685      gtk_widget_show_all(GTK_WIDGET(menu));
1686    
1687    return menu;    return menu;
1688  }  }
# Line 2184  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.11  
changed lines
  Added in v.15