Diff of /trunk/src/main.c

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

revision 211 by harbaum, Wed Nov 25 10:13:26 2009 UTC revision 226 by harbaum, Wed Dec 2 20:05:52 2009 UTC
# Line 223  void cachelist_goto_cache(appdata_t *app Line 223  void cachelist_goto_cache(appdata_t *app
223  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
224      cache_dialog(appdata, cache);      cache_dialog(appdata, cache);
225  #else  #else
226        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
227    
228      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
229      appdata->cur_view = cache_view(appdata, cache);      appdata->cur_view = cache_view(appdata, cache);
230      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
231      gtk_widget_show_all(appdata->vbox);      gtk_widget_show_all(appdata->vbox);
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
232  #endif  #endif
233  }  }
234    
# Line 599  static void search_result_free(gpx_t *re Line 599  static void search_result_free(gpx_t *re
599  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
600    printf("cachelist destroy\n");    printf("cachelist destroy\n");
601    
602      HildonWindowStack *stack = hildon_window_stack_get_default();
603      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
604    
605    if(appdata->search_results) {    if(appdata->search_results) {
606      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
607      appdata->search_results = NULL;      appdata->search_results = NULL;
# Line 615  void on_cachelist_destroy(GtkWidget *wid Line 618  void on_cachelist_destroy(GtkWidget *wid
618    
619  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
620    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
621      appdata->window = HILDON_WINDOW(window);
622    
623    /* store last "cur_view" in window */    /* store last "cur_view" in window */
624    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
625    
# Line 1110  static GtkWidget *gpxlist_create_view_an Line 1114  static GtkWidget *gpxlist_create_view_an
1114  }  }
1115    
1116  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1117  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1118    GtkTreeIter         iter;    GtkTreeIter         iter;
1119    
1120    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 1120  static void gpxlist_add(appdata_t *appda Line 1124  static void gpxlist_add(appdata_t *appda
1124    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1125    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1126    *gpx = new;    *gpx = new;
1127    
1128      /* select new iter */
1129      GtkTreeSelection *selection =
1130        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1131      gtk_tree_selection_select_iter(selection, &iter);
1132      GtkTreePath *path =
1133        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1134      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1135                                   path, NULL, TRUE, 0.0, 0.0);
1136      gtk_tree_path_free(path);
1137  }  }
1138    
1139  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
# Line 1479  cb_menu_search(GtkWidget *window, gpoint Line 1493  cb_menu_search(GtkWidget *window, gpoint
1493    
1494    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1495                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1496  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)    context.entry = entry_new();
   context.entry = gtk_entry_new();  
 #else  
   context.entry = hildon_entry_new(HILDON_SIZE_AUTO);  
 #endif  
   
1497    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1498                                context.entry);                                context.entry);
1499    
# Line 2070  void menu_create(appdata_t *appdata) { Line 2079  void menu_create(appdata_t *appdata) {
2079  /********************* end of menu **********************/  /********************* end of menu **********************/
2080    
2081  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2082      gconf_save_state(appdata);
2083    
2084    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
   if(appdata->path) free(appdata->path);  
   if(appdata->image_path) free(appdata->image_path);  
   if(appdata->search_str) free(appdata->search_str);  
2085    
2086  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2087    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
# Line 2111  void cleanup(appdata_t *appdata) { Line 2119  void cleanup(appdata_t *appdata) {
2119  static void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2120    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2121    
   gconf_save_state(appdata);  
2122    gtk_main_quit();    gtk_main_quit();
2123    appdata->window = NULL;    appdata->window = NULL;
2124  }  }
# Line 2402  int main(int argc, char *argv[]) { Line 2409  int main(int argc, char *argv[]) {
2409    
2410    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2411    
2412      misc_init();
2413    
2414    curl_global_init(CURL_GLOBAL_ALL);    curl_global_init(CURL_GLOBAL_ALL);
2415    
2416  #ifdef USE_MAEMO  #ifdef USE_MAEMO
Legend:
Removed from v.211  
changed lines
  Added in v.226