Diff of /trunk/src/main.c

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

revision 7 by harbaum, Thu Jun 25 15:24:24 2009 UTC revision 11 by harbaum, Fri Jun 26 12:24:24 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);        if(!appdata->cur_gpx)
815            cachelist_dialog(appdata, gpx);
816          else
817            printf("selected gpx, but cachelist window already present\n");
818  #else  #else
819        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
820        appdata->cur_view = cachelist_create(appdata, gpx, NULL);        appdata->cur_view = cachelist_create(appdata, gpx, NULL);
# Line 1328  cb_menu_search(GtkWidget *window, gpoint Line 1378  cb_menu_search(GtkWidget *window, gpoint
1378      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1379      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1380          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1381    
1382        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1383    
1384  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
1385        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        appdata->search_results =
1386            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1387    
1388        /* do search result dialog here ... */        /* do search result dialog here ... */
1389        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, appdata->search_results);
1390        search_result_free(found);  #ifndef USE_STACKABLE_WINDOW
1391          search_result_free(appdata->search_results);
1392          appdata->search_results = NULL;
1393    #endif
1394  #else  #else
1395          gpx_t *found = NULL;
1396    
1397        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1398          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1399        else        else
# Line 1451  cb_menu_precpos(GtkWidget *window, gpoin Line 1506  cb_menu_precpos(GtkWidget *window, gpoin
1506  }  }
1507    
1508  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1509    static void on_export_destroy(GtkWidget *widget, appdata_t *appdata) {
1510      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
1511    }
1512    
1513  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1514    HildonStackableWindow *view_window;    HildonStackableWindow *view_window;
1515    GtkWidget *but;    GtkWidget *but;
1516    
1517    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());
1518    gtk_window_set_title (GTK_WINDOW (view_window), "Export");    gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Export");
1519    
1520       /* store last "cur_view" in window */
1521      g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);
1522      appdata->cur_view = NULL;
1523    
1524      g_signal_connect(G_OBJECT(view_window), "destroy",
1525                       G_CALLBACK(on_export_destroy), appdata);
1526    
1527    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));
1528    
# Line 1494  void on_export_clicked(GtkButton *button Line 1559  void on_export_clicked(GtkButton *button
1559    gtk_widget_show_all (GTK_WIDGET (view_window));    gtk_widget_show_all (GTK_WIDGET (view_window));
1560  }  }
1561    
1562    static void on_tools_destroy(GtkWidget *widget, appdata_t *appdata) {
1563      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
1564    }
1565    
1566  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1567    HildonStackableWindow *view_window;    HildonStackableWindow *view_window;
1568    GtkWidget *but;    GtkWidget *but;
1569    
1570    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());
1571    gtk_window_set_title (GTK_WINDOW (view_window), "Export");    gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Tools");
1572    
1573       /* store last "cur_view" in window */
1574      g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);
1575      appdata->cur_view = NULL;
1576    
1577      g_signal_connect(G_OBJECT(view_window), "destroy",
1578                       G_CALLBACK(on_tools_destroy), appdata);
1579    
1580    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));
1581    
# Line 1786  void on_window_destroy (GtkWidget *widge Line 1862  void on_window_destroy (GtkWidget *widge
1862  }  }
1863    
1864  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
1865                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
1866    int handled = FALSE;    int handled = FALSE;
1867    
1868    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1795  gboolean on_window_key_press(GtkWidget * Line 1870  gboolean on_window_key_press(GtkWidget *
1870    switch(event->keyval) {    switch(event->keyval) {
1871  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1872    
 #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  
   
1873  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
1874    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
1875      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1988  static void crumb_add(appdata_t *appdata Line 2054  static void crumb_add(appdata_t *appdata
2054  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2055    
2056  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2057      printf("main after settings redraw\n");
2058    
2059      if(!appdata->cur_view) {
2060        printf("no active view\n");
2061        return;
2062      }
2063    
2064  #ifndef USE_MAEMO  #ifndef USE_MAEMO
2065    // in non-maemo setup this can only affect the main screen as    // in non-maemo setup this can only affect the main screen as
2066    // 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 2023  void main_after_settings_redraw(appdata_ Line 2096  void main_after_settings_redraw(appdata_
2096    }    }
2097    
2098    if(redraw) {    if(redraw) {
2099      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2100    
2101    #ifdef USE_STACKABLE_WINDOW
2102        HildonWindowStack *stack = hildon_window_stack_get_default();
2103        container = hildon_window_stack_peek(stack);
2104    #endif
2105    
2106        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2107      switch(redraw) {      switch(redraw) {
2108      case 1:      case 1:
2109        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 2038  void main_after_settings_redraw(appdata_ Line 2118  void main_after_settings_redraw(appdata_
2118        break;        break;
2119      }      }
2120    
2121      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2122      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2123    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2124        else
2125  #endif  #endif
2126          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2127    
2128        gtk_widget_show_all(container);
2129      }
2130    #endif // USE_MAEMO
2131  }  }
2132    
2133  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
Legend:
Removed from v.7  
changed lines
  Added in v.11