Diff of /trunk/src/main.c

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

revision 120 by harbaum, Sat Sep 19 19:19:42 2009 UTC revision 143 by harbaum, Mon Oct 26 19:55:00 2009 UTC
# Line 35  Line 35 
35    
36  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
37    
38  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
39  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
40                        gpointer user_data);                        gpointer user_data);
41    
# Line 95  void errorf(const char *fmt, ...) { Line 95  void errorf(const char *fmt, ...) {
95    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
96                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
97                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
98                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
99                             buf);                             GTK_MESSAGE_ERROR,
100    #else
101                               GTK_MESSAGE_OTHER,
102    #endif
103                               GTK_BUTTONS_CLOSE, buf);
104    
105    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
106    
# Line 205  enum { Line 209  enum {
209    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
210  } ;  } ;
211    
212  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
213    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
214        cache_dialog(appdata, cache);
215    #else
216        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
217        appdata->cur_view = cache_view(appdata, cache);
218        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
219        gtk_widget_show_all(appdata->vbox);
220    
221        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
222    #endif
223    }
224    
225    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
226                                     GtkTreePath        *path,                                     GtkTreePath        *path,
227                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
228                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 222  void cachelist_view_onRowActivated(GtkTr Line 239  void cachelist_view_onRowActivated(GtkTr
239    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
240      cache_t *cache;      cache_t *cache;
241      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
242  #ifndef USE_BREAD_CRUMB_TRAIL      cachelist_goto_cache(appdata, cache);
     cache_dialog(appdata, cache);  
 #else  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = cache_view(appdata, cache);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
 #endif  
243    }    }
244  }  }
245    
# Line 274  static GtkWidget *cachelist_create(appda Line 282  static GtkWidget *cachelist_create(appda
282                                     cache_t *sel_cache);                                     cache_t *sel_cache);
283    
284  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
 #ifndef USE_MAEMO  
   //  gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
   //  appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
   //  gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
   // gtk_widget_show_all(appdata->vbox);  
 #else  
   
285    if(!appdata->cur_view) {    if(!appdata->cur_view) {
286      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
287      return;      return;
# Line 298  void cachelist_redraw(appdata_t *appdata Line 299  void cachelist_redraw(appdata_t *appdata
299    if(redraw) {    if(redraw) {
300      GtkWidget *container = appdata->vbox;      GtkWidget *container = appdata->vbox;
301    
     printf("redraw %d\n", redraw);  
   
302  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
303      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
304      container = hildon_window_stack_peek(stack);      container = hildon_window_stack_peek(stack);
# Line 326  void cachelist_redraw(appdata_t *appdata Line 325  void cachelist_redraw(appdata_t *appdata
325    
326      gtk_widget_show_all(container);      gtk_widget_show_all(container);
327    }    }
 #endif  
328  }  }
329    
330    
# Line 334  static gboolean cachelist_update(gpointe Line 332  static gboolean cachelist_update(gpointe
332    
333    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
334    
 #ifdef USE_MAEMO  
335    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
336    
337    if(appdata->cur_cache)    if(appdata->cur_cache)
338      return TRUE;      return TRUE;
339    
340    #ifdef USE_MAEMO
341    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
342      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
343        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
344    #endif
345    
346    if(appdata->cachelist_update)    if(appdata->cachelist_update)
347      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
348    
349    return TRUE;    return TRUE;
350  }  }
# Line 593  void on_cachelist_destroy(GtkWidget *wid Line 591  void on_cachelist_destroy(GtkWidget *wid
591    }    }
592    appdata->cur_gpx = NULL;    appdata->cur_gpx = NULL;
593    
594    #ifdef ENABLE_OSM_GPS_MAP
595      map_update(appdata);
596    #endif
597    
598    /* restore cur_view */    /* restore cur_view */
599    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
600  }  }
# Line 619  void cachelist_dialog(appdata_t *appdata Line 621  void cachelist_dialog(appdata_t *appdata
621                     G_CALLBACK(on_cachelist_destroy), appdata);                     G_CALLBACK(on_cachelist_destroy), appdata);
622    
623    gtk_widget_show_all(window);    gtk_widget_show_all(window);
624    
625    #ifdef ENABLE_OSM_GPS_MAP
626      map_update(appdata);
627    #endif
628  }  }
629  #endif  #endif
630  #endif  #endif
# Line 722  static void gpxlist_close(appdata_t *app Line 728  static void gpxlist_close(appdata_t *app
728    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
729  }  }
730    
731    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
732    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
733    #ifdef USE_STACKABLE_WINDOW
734      if(!appdata->cur_gpx)
735    #endif
736        cachelist_dialog(appdata, gpx);
737    #ifdef USE_STACKABLE_WINDOW
738      else
739        printf("selected gpx, but cachelist window already present\n");
740    #endif
741    #else
742      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
743      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
744      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
745      gtk_widget_show_all(appdata->vbox);
746    
747      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
748    #endif
749    }
750    
751  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
752                            GtkTreePath        *path,                            GtkTreePath        *path,
753                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 752  static void gpxlist_view_onRowActivated( Line 778  static void gpxlist_view_onRowActivated(
778        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
779                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
780                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
781                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   /* this doesn't fix the text selection issues ... */
782    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >=5)
783                     GTK_MESSAGE_OTHER,
784    #else
785                     GTK_MESSAGE_QUESTION,
786    #endif
787                     GTK_BUTTONS_CANCEL,
788                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
789                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
790    
# Line 764  static void gpxlist_view_onRowActivated( Line 796  static void gpxlist_view_onRowActivated(
796        if(gpx->closed)        if(gpx->closed)
797          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
798    
799        gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));        gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
800    
801        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
802        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
# Line 833  static void gpxlist_view_onRowActivated( Line 865  static void gpxlist_view_onRowActivated(
865    
866          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
867        }        }
868  #ifndef USE_BREAD_CRUMB_TRAIL  
869  #ifdef USE_STACKABLE_WINDOW        gpxlist_goto_cachelist(appdata, gpx);
       if(!appdata->cur_gpx)  
 #endif  
         cachelist_dialog(appdata, gpx);  
 #ifdef USE_STACKABLE_WINDOW  
       else  
         printf("selected gpx, but cachelist window already present\n");  
 #endif  
 #else  
       gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
       appdata->cur_view = cachelist_create(appdata, gpx, NULL);  
       gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
       gtk_widget_show_all(appdata->vbox);  
   
       crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);  
 #endif  
870      }      }
871    }    }
872  }  }
# Line 904  static GtkWidget *gpxlist_create_view_an Line 921  static GtkWidget *gpxlist_create_view_an
921    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
922                    -1, "Icon", renderer,                    -1, "Icon", renderer,
923                    "pixbuf", GPXLIST_COL_ICON,                    "pixbuf", GPXLIST_COL_ICON,
924                //                  "sensitive", GPXLIST_COL_OPEN,  #ifdef USE_PANNABLE_AREA
925            /* at least one entry needs to be sensitive. */
926            /* This is the delete icon if the PANNABLE_AREA is used */
927                      "sensitive", GPXLIST_COL_OPEN,
928    #endif
929                    NULL);                    NULL);
930    
931    /* --- "FileName" column --- */    /* --- "FileName" column --- */
# Line 960  static GtkWidget *gpxlist_create_view_an Line 981  static GtkWidget *gpxlist_create_view_an
981    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),    gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview),
982                    -1, "Del", renderer,                    -1, "Del", renderer,
983                    "pixbuf", GPXLIST_COL_DELETE,                    "pixbuf", GPXLIST_COL_DELETE,
984                    "sensitive", GPXLIST_COL_OPEN,                //                  "sensitive", GPXLIST_COL_OPEN,
985                    NULL);                    NULL);
986  #endif  #endif
987    
# Line 1456  cb_menu_search(GtkWidget *window, gpoint Line 1477  cb_menu_search(GtkWidget *window, gpoint
1477    
1478        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1479    
1480  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1481        gpx_t *found =        gpx_t *found =
1482          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1483    
# Line 1552  cb_menu_export_log(GtkWidget *widget, gp Line 1573  cb_menu_export_log(GtkWidget *widget, gp
1573    notes_log_export(appdata);    notes_log_export(appdata);
1574  }  }
1575    
1576  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1577  static void  static void
1578  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1579    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1671  static void submenu_cleanup(GtkWidget *m Line 1692  static void submenu_cleanup(GtkWidget *m
1692  }  }
1693    
1694  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1695    #ifdef ENABLE_MAEMO_MAPPER
1696    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1697      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1698    #endif
1699    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1700      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1701    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# Line 1782  void menu_create(appdata_t *appdata) { Line 1805  void menu_create(appdata_t *appdata) {
1805    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1806    menu = gtk_menu_new();    menu = gtk_menu_new();
1807    
1808  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1809    appdata->menu_import =    appdata->menu_import =
1810  #endif  #endif
1811    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1812  void menu_create(appdata_t *appdata) { Line 1835  void menu_create(appdata_t *appdata) {
1835    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1836  #endif  #endif
1837    
1838  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1839    appdata->menu_export =    appdata->menu_export =
1840  #endif  #endif
1841      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1820  void menu_create(appdata_t *appdata) { Line 1843  void menu_create(appdata_t *appdata) {
1843    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1844    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1845    
1846  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1847    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1848    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1849    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1837  void menu_create(appdata_t *appdata) { Line 1860  void menu_create(appdata_t *appdata) {
1860    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1861                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1862    
1863  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1864    appdata->menu_search =    appdata->menu_search =
1865  #endif  #endif
1866    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1846  void menu_create(appdata_t *appdata) { Line 1869  void menu_create(appdata_t *appdata) {
1869    
1870    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1871    
 #ifndef NO_COPY_N_PASTE  
1872    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1873    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1874    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1875    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1876    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 2044  gboolean on_window_key_press(GtkWidget * Line 2064  gboolean on_window_key_press(GtkWidget *
2064    return handled;    return handled;
2065  }  }
2066    
2067  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2068  typedef struct {  typedef struct {
2069    int level;    int level;
2070    appdata_t *appdata;    appdata_t *appdata;
# Line 2136  crumb_back(gpointer data) { Line 2156  crumb_back(gpointer data) {
2156    
2157    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2158    g_free(data);    g_free(data);
2159    
2160    #ifdef ENABLE_OSM_GPS_MAP
2161      map_update(crumb->appdata);
2162    #endif
2163  }  }
2164    
2165  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2176  static void crumb_add(appdata_t *appdata Line 2200  static void crumb_add(appdata_t *appdata
2200  #endif  #endif
2201    }    }
2202    
2203    #ifdef USE_BREAD_CRUMB_TRAIL
2204    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2205                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2206    #else
2207      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2208    #endif
2209    
2210    #ifdef ENABLE_OSM_GPS_MAP
2211      map_update(appdata);
2212    #endif
2213  }  }
2214  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2215    
# Line 2189  void main_after_settings_redraw(appdata_ Line 2221  void main_after_settings_redraw(appdata_
2221      return;      return;
2222    }    }
2223    
 #ifndef USE_MAEMO  
   // in non-maemo setup this can only affect the main screen as  
   // the menu is blocked while a dialog is open. also the main  
   // screen is always present  
   if(appdata->gpxlist_items != appdata->cur_items) {  
     /* re-do the main screen */  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   }  
 #else  
2224    /* a cache screen cannot be changed from the settings and thus doesn't */    /* a cache screen cannot be changed from the settings and thus doesn't */
2225    /* need to be redrawn */    /* need to be redrawn */
2226    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2255  void main_after_settings_redraw(appdata_ Line 2275  void main_after_settings_redraw(appdata_
2275    
2276      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2277    }    }
 #endif // USE_MAEMO  
2278  }  }
2279    
2280  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2284  int main(int argc, char *argv[]) { Line 2303  int main(int argc, char *argv[]) {
2303      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2304    }    }
2305    
2306    #ifdef ENABLE_MAEMO_MAPPER
2307    dbus_register(&appdata);    dbus_register(&appdata);
2308  #endif  #endif
2309    #endif
2310    
2311    icons_init();    icons_init();
2312    
# Line 2309  int main(int argc, char *argv[]) { Line 2330  int main(int argc, char *argv[]) {
2330    /* Create a Window. */    /* Create a Window. */
2331    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2332    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2333    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2334  #endif  #endif
2335    
2336  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2322  int main(int argc, char *argv[]) { Line 2343  int main(int argc, char *argv[]) {
2343    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2344                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2345    
2346      /* prepare clipboard */
2347      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2348      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2349    
2350    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2351    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2352  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
# Line 2337  int main(int argc, char *argv[]) { Line 2362  int main(int argc, char *argv[]) {
2362    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2363    
2364    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2365    #else
2366    #ifdef BCT
2367      /* on non-hildon machines we use some custom made breadcrumbtrail */
2368      /* replacement */
2369      appdata.bct = bct_new();
2370      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2371    #endif
2372    #endif
2373    
2374    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2375    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2376  #endif  #endif
2377    
Legend:
Removed from v.120  
changed lines
  Added in v.143