Diff of /trunk/src/main.c

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

revision 107 by harbaum, Fri Sep 11 12:16:50 2009 UTC revision 142 by harbaum, Mon Oct 26 10:40:06 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 977  static GtkWidget *gpxlist_create_view_an Line 994  static GtkWidget *gpxlist_create_view_an
994    GtkTreeIter sel_iter;    GtkTreeIter sel_iter;
995    gboolean sel_iter_valid = FALSE;    gboolean sel_iter_valid = FALSE;
996    while(gpx) {    while(gpx) {
997      /* don't display entries that failed at load */      GtkTreeIter         iter;
998      if(!gpx->failed) {      gtk_list_store_append(appdata->gpxstore, &iter);
999        GtkTreeIter         iter;      gpxlist_set(appdata->gpxstore, &iter, gpx);
1000        gtk_list_store_append(appdata->gpxstore, &iter);  
1001        gpxlist_set(appdata->gpxstore, &iter, gpx);      if(gpx == sel_gpx) {
1002          sel_iter = iter;
1003        if(gpx == sel_gpx) {        sel_iter_valid = TRUE;
         sel_iter = iter;  
         sel_iter_valid = TRUE;  
       }  
1004      }      }
1005    
1006      gpx = gpx->next;      gpx = gpx->next;
# Line 1459  cb_menu_search(GtkWidget *window, gpoint Line 1473  cb_menu_search(GtkWidget *window, gpoint
1473    
1474        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1475    
1476  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1477        gpx_t *found =        gpx_t *found =
1478          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1479    
# Line 1555  cb_menu_export_log(GtkWidget *widget, gp Line 1569  cb_menu_export_log(GtkWidget *widget, gp
1569    notes_log_export(appdata);    notes_log_export(appdata);
1570  }  }
1571    
1572  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1573  static void  static void
1574  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1575    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1674  static void submenu_cleanup(GtkWidget *m Line 1688  static void submenu_cleanup(GtkWidget *m
1688  }  }
1689    
1690  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1691    #ifdef ENABLE_MAEMO_MAPPER
1692    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1693      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1694    #endif
1695    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1696      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1697    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# Line 1762  HildonAppMenu *menu_create(appdata_t *ap Line 1778  HildonAppMenu *menu_create(appdata_t *ap
1778    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1779    
1780  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
   if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {  
1781      button = gtk_button_new_with_label(_("Map"));      button = gtk_button_new_with_label(_("Map"));
1782      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1783                             G_CALLBACK(cb_menu_map), appdata);                             G_CALLBACK(cb_menu_map), appdata);
1784      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1785  #endif  #endif
1786    
1787  #ifdef HILDON_HELP  #ifdef HILDON_HELP
# Line 1787  void menu_create(appdata_t *appdata) { Line 1801  void menu_create(appdata_t *appdata) {
1801    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1802    menu = gtk_menu_new();    menu = gtk_menu_new();
1803    
1804  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1805    appdata->menu_import =    appdata->menu_import =
1806  #endif  #endif
1807    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1817  void menu_create(appdata_t *appdata) { Line 1831  void menu_create(appdata_t *appdata) {
1831    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1832  #endif  #endif
1833    
1834  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1835    appdata->menu_export =    appdata->menu_export =
1836  #endif  #endif
1837      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1825  void menu_create(appdata_t *appdata) { Line 1839  void menu_create(appdata_t *appdata) {
1839    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1840    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1841    
1842  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1843    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1844    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1845    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1842  void menu_create(appdata_t *appdata) { Line 1856  void menu_create(appdata_t *appdata) {
1856    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1857                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1858    
1859  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1860    appdata->menu_search =    appdata->menu_search =
1861  #endif  #endif
1862    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1851  void menu_create(appdata_t *appdata) { Line 1865  void menu_create(appdata_t *appdata) {
1865    
1866    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1867    
 #ifndef NO_COPY_N_PASTE  
1868    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1869    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1870    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1871    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1872    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 2049  gboolean on_window_key_press(GtkWidget * Line 2060  gboolean on_window_key_press(GtkWidget *
2060    return handled;    return handled;
2061  }  }
2062    
2063  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2064  typedef struct {  typedef struct {
2065    int level;    int level;
2066    appdata_t *appdata;    appdata_t *appdata;
# Line 2141  crumb_back(gpointer data) { Line 2152  crumb_back(gpointer data) {
2152    
2153    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2154    g_free(data);    g_free(data);
2155    
2156    #ifdef ENABLE_OSM_GPS_MAP
2157      map_update(crumb->appdata);
2158    #endif
2159  }  }
2160    
2161  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2181  static void crumb_add(appdata_t *appdata Line 2196  static void crumb_add(appdata_t *appdata
2196  #endif  #endif
2197    }    }
2198    
2199    #ifdef USE_BREAD_CRUMB_TRAIL
2200    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2201                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2202    #else
2203      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2204    #endif
2205    
2206    #ifdef ENABLE_OSM_GPS_MAP
2207      map_update(appdata);
2208    #endif
2209  }  }
2210  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2211    
# Line 2194  void main_after_settings_redraw(appdata_ Line 2217  void main_after_settings_redraw(appdata_
2217      return;      return;
2218    }    }
2219    
 #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  
2220    /* 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 */
2221    /* need to be redrawn */    /* need to be redrawn */
2222    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2260  void main_after_settings_redraw(appdata_ Line 2271  void main_after_settings_redraw(appdata_
2271    
2272      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2273    }    }
 #endif // USE_MAEMO  
2274  }  }
2275    
2276  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2289  int main(int argc, char *argv[]) { Line 2299  int main(int argc, char *argv[]) {
2299      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2300    }    }
2301    
2302    #ifdef ENABLE_MAEMO_MAPPER
2303    dbus_register(&appdata);    dbus_register(&appdata);
2304  #endif  #endif
2305    #endif
2306    
2307    icons_init();    icons_init();
2308    
# Line 2314  int main(int argc, char *argv[]) { Line 2326  int main(int argc, char *argv[]) {
2326    /* Create a Window. */    /* Create a Window. */
2327    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2328    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2329    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2330  #endif  #endif
2331    
2332  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2327  int main(int argc, char *argv[]) { Line 2339  int main(int argc, char *argv[]) {
2339    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2340                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2341    
2342      /* prepare clipboard */
2343      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2344      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2345    
2346    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2347    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2348  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
# Line 2342  int main(int argc, char *argv[]) { Line 2358  int main(int argc, char *argv[]) {
2358    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);
2359    
2360    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2361    #else
2362    #ifdef BCT
2363      /* on non-hildon machines we use some custom made breadcrumbtrail */
2364      /* replacement */
2365      appdata.bct = bct_new();
2366      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2367    #endif
2368    #endif
2369    
2370    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2371    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2372  #endif  #endif
2373    
Legend:
Removed from v.107  
changed lines
  Added in v.142