Diff of /trunk/src/main.c

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

revision 6 by harbaum, Wed Jun 24 19:20:21 2009 UTC revision 107 by harbaum, Fri Sep 11 12:16:50 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 138  gpx_t *choose_file(appdata_t *appdata, g Line 138  gpx_t *choose_file(appdata_t *appdata, g
138    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
139    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
140      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
141    
142        if(filename) {
143          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
144    
145      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
146            gpx = gpx_parse(dialog, filename);
147      if(!whole_dir)        else {
148        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
149      else {          if(strlastchr(filename) == '/')
150        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
151        if(strlastchr(filename) == '/')  
152          filename[strlen(filename)] = 0;          gpx = gpx_parse_dir(dialog, filename);
   
       gpx = gpx_parse_dir(dialog, filename);  
     }  
   
     gpx_busy_dialog_destroy(dialog);  
   
     /* save path if gpx was successfully loaded */  
     if(gpx) {  
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r && !whole_dir) {  
         *r = 0;  
         if(appdata->path) free(appdata->path);  
         appdata->path = strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
153        }        }
154    
155          gpx_busy_dialog_destroy(dialog);
156    
157          /* save path if gpx was successfully loaded */
158          if(gpx) {
159            char *r = strrchr(filename, '/');
160    
161            /* there is a delimiter, use everything left of it as path */
162            if(r && !whole_dir) {
163              *r = 0;
164              if(appdata->path) free(appdata->path);
165              appdata->path = strdup(filename);
166              /* restore path ... just in case ... */
167              *r = '/';
168            }
169    
170            if(whole_dir)
171              appdata->path = strdup(filename);
172          } else
173            errorf(_("Load error"));
174    
175        if(whole_dir)        g_free (filename);
176          appdata->path = strdup(filename);      } else {
177    #ifndef USE_MAEMO
178          errorf(_("Error accessing the file."));
179    #else
180          errorf(_("Error accessing the file. This may happen if the file "
181                   "resides on a remote file system. Please copy the file onto "
182                   "the device (e.g. onto the memory card) and try again."));
183    #endif
184      }      }
   
     g_free (filename);  
185    }    }
186    
187    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 213  void cachelist_view_onRowActivated(GtkTr
213    GtkTreeIter   iter;    GtkTreeIter   iter;
214    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
215    
216    #ifdef USE_MAEMO
217      /* check if a cache is already selected and ignore click if yes */
218      /* (was probably a double click) */
219      if(appdata->cur_cache) return;
220    #endif
221    
222    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
223      cache_t *cache;      cache_t *cache;
224      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
# Line 264  void cachelist_redraw(appdata_t *appdata Line 281  void cachelist_redraw(appdata_t *appdata
281    // gtk_widget_show_all(appdata->vbox);    // gtk_widget_show_all(appdata->vbox);
282  #else  #else
283    
284      if(!appdata->cur_view) {
285        printf("cachelist redraw: no active view\n");
286        return;
287      }
288    
289    g_assert(!appdata->cur_cache);    g_assert(!appdata->cur_cache);
290    int redraw = 0;    int redraw = 0;
291    if(appdata->search_results)    if(appdata->search_results)
# Line 274  void cachelist_redraw(appdata_t *appdata Line 296  void cachelist_redraw(appdata_t *appdata
296    }    }
297    
298    if(redraw) {    if(redraw) {
299      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
300    
301        printf("redraw %d\n", redraw);
302    
303    #ifdef USE_STACKABLE_WINDOW
304        HildonWindowStack *stack = hildon_window_stack_get_default();
305        container = hildon_window_stack_peek(stack);
306    #endif
307    
308        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
309      switch(redraw) {      switch(redraw) {
310      case 1:      case 1:
311        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 286  void cachelist_redraw(appdata_t *appdata Line 317  void cachelist_redraw(appdata_t *appdata
317        break;        break;
318      }      }
319    
320      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
321      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
322          gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
323        else
324    #endif
325          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
326    
327        gtk_widget_show_all(container);
328    }    }
329  #endif  #endif
330  }  }
# Line 300  static gboolean cachelist_update(gpointe Line 337  static gboolean cachelist_update(gpointe
337  #ifdef USE_MAEMO  #ifdef USE_MAEMO
338    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
339    
340      if(appdata->cur_cache)
341        return TRUE;
342    
343    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
344      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
345        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
# Line 312  static gboolean cachelist_update(gpointe Line 352  static gboolean cachelist_update(gpointe
352  }  }
353    
354  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(appdata_t *appdata) {
355      printf("cachelist timer reset\n");
356    g_assert(appdata->cachelist_handler_id);    g_assert(appdata->cachelist_handler_id);
357    gtk_timeout_remove(appdata->cachelist_handler_id);    gtk_timeout_remove(appdata->cachelist_handler_id);
358    appdata->cachelist_handler_id =    appdata->cachelist_handler_id =
# Line 543  void cachelist_dialog(appdata_t *appdata Line 584  void cachelist_dialog(appdata_t *appdata
584  }  }
585  #else  #else
586  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
587    static void search_result_free(gpx_t *result);
588    
589    void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
590      if(appdata->search_results) {
591        search_result_free(appdata->search_results);
592        appdata->search_results = NULL;
593      }
594      appdata->cur_gpx = NULL;
595    
596      /* restore cur_view */
597      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
598    }
599    
600  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
601    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
602    
603    gtk_window_set_title(GTK_WINDOW(window), gpx->name);    /* store last "cur_view" in window */
604      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
605    
606    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_gpx = gpx;
607                      cachelist_create(appdata, gpx, NULL));    char *title = g_strdup_printf("%s - GPXView", gpx->name);
608      gtk_window_set_title(GTK_WINDOW(window), title);
609      g_free(title);
610    
611      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
612      gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
613    
614    
615    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
616                               menu_create(appdata, MENU_CACHELIST));                               menu_create(appdata, MENU_CACHELIST));
617    
618      g_signal_connect(G_OBJECT(window), "destroy",
619                       G_CALLBACK(on_cachelist_destroy), appdata);
620    
621    gtk_widget_show_all(window);    gtk_widget_show_all(window);
622  }  }
623  #endif  #endif
# Line 666  static void gpxlist_view_onRowActivated( Line 730  static void gpxlist_view_onRowActivated(
730    GtkTreeIter   iter;    GtkTreeIter   iter;
731    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
732    
733    #ifdef USE_MAEMO
734      /* check if a cache is already selected and ignore click if yes */
735      /* (was probably a double click) */
736      if(appdata->cur_gpx) return;
737    #endif
738    
739    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
740      gpx_t *gpx;      gpx_t *gpx;
741      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 764  static void gpxlist_view_onRowActivated( Line 834  static void gpxlist_view_onRowActivated(
834          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
835        }        }
836  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
837        cachelist_dialog(appdata, gpx);  #ifdef USE_STACKABLE_WINDOW
838          if(!appdata->cur_gpx)
839    #endif
840            cachelist_dialog(appdata, gpx);
841    #ifdef USE_STACKABLE_WINDOW
842          else
843            printf("selected gpx, but cachelist window already present\n");
844    #endif
845  #else  #else
846        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
847        appdata->cur_view = cachelist_create(appdata, gpx, NULL);        appdata->cur_view = cachelist_create(appdata, gpx, NULL);
# Line 900  static GtkWidget *gpxlist_create_view_an Line 977  static GtkWidget *gpxlist_create_view_an
977    GtkTreeIter sel_iter;    GtkTreeIter sel_iter;
978    gboolean sel_iter_valid = FALSE;    gboolean sel_iter_valid = FALSE;
979    while(gpx) {    while(gpx) {
980      GtkTreeIter         iter;      /* don't display entries that failed at load */
981      gtk_list_store_append(appdata->gpxstore, &iter);      if(!gpx->failed) {
982      gpxlist_set(appdata->gpxstore, &iter, gpx);        GtkTreeIter         iter;
983          gtk_list_store_append(appdata->gpxstore, &iter);
984      if(gpx == sel_gpx) {        gpxlist_set(appdata->gpxstore, &iter, gpx);
985        sel_iter = iter;  
986        sel_iter_valid = TRUE;        if(gpx == sel_gpx) {
987            sel_iter = iter;
988            sel_iter_valid = TRUE;
989          }
990      }      }
991    
992      gpx = gpx->next;      gpx = gpx->next;
# Line 963  static void gpxlist_add(appdata_t *appda Line 1043  static void gpxlist_add(appdata_t *appda
1043    
1044  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1045    
1046    typedef struct {
1047      appdata_t *appdata;
1048      GtkWidget *dialog;
1049    } about_context_t;
1050    
1051    #ifdef ENABLE_BROWSER_INTERFACE
1052    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1053      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1054      browser_url(context->appdata,
1055                  "https://www.paypal.com/cgi-bin/webscr"
1056                  "?cmd=_s-xclick&hosted_button_id=7400558");
1057    }
1058    #endif
1059    
1060  static void  static void
1061  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1062    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1063    
1064      context.appdata = (appdata_t *)data;
1065    
1066    #ifdef ENABLE_LIBLOCATION
1067      char *uses = "uses liblocation";
1068    #elif defined(ENABLE_GPSBT)
1069      char *uses = "uses gpsbt and gpsd";
1070    #else
1071      char *uses = "uses gpsd";
1072    #endif
1073    
1074      const gchar *authors[] = {
1075        "Till Harbaum <till@harbaum.org>",
1076        "John Stowers <john.stowers@gmail.com>",
1077        NULL };
1078    
1079      context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1080                            "name", "GPXView",
1081                            "version", VERSION,
1082                            "copyright", _("Copyright 2008-2009"),
1083                            "authors", authors,
1084                            "website", _("http://www.harbaum.org/till/maemo"),
1085                            "comments", _(uses),
1086                            NULL);
1087    
1088    #ifdef ENABLE_BROWSER_INTERFACE
1089      /* add a way to donate to the project */
1090      GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1091    
1092      GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1093      gtk_box_pack_start(GTK_BOX(hbox),
1094                         gtk_label_new(_("Do you like GPXView?")),
1095                         FALSE, FALSE, 0);
1096    
1097      GtkWidget *button = gtk_button_new();
1098      gtk_button_set_image(GTK_BUTTON(button),
1099                           icon_get_widget(ICON_MISC, 8));
1100      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1101      g_signal_connect(button, "clicked",
1102                       G_CALLBACK(on_paypal_button_clicked), &context);
1103      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1104    
1105      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1106      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1107                                  alignment);
1108    
1109      gtk_widget_show_all(alignment);
1110    #endif
1111    
1112    gtk_about_dialog_set_name(about, "GPXView");    gtk_dialog_run(GTK_DIALOG(context.dialog));
1113    gtk_about_dialog_set_version(about, VERSION);    gtk_widget_destroy(context.dialog);
   gtk_about_dialog_set_copyright(about,  
          _("GPXView (c) 2008 by\n"  
          "Till Harbaum <till@harbaum.org>\n"  
          "Geocaching.com: Tantil"));  
   
   gtk_about_dialog_set_website(about,  
        _("http://www.harbaum.org/till/maemo"));  
   
   gtk_about_dialog_set_comments(about,  
        _("Geocaching.com GPX file viewer"));  
   
   gtk_widget_show_all(GTK_WIDGET(about));  
   gtk_dialog_run(GTK_DIALOG(about));  
   gtk_widget_destroy(GTK_WIDGET(about));  
1114  }  }
1115    
1116  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1328  cb_menu_search(GtkWidget *window, gpoint Line 1456  cb_menu_search(GtkWidget *window, gpoint
1456      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1457      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1458          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1459    
1460        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1461    
1462  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
1463        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        gpx_t *found =
1464            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1465    
1466        /* do search result dialog here ... */        /* do search result dialog here ... */
1467        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, found);
1468    #ifndef USE_STACKABLE_WINDOW
1469        search_result_free(found);        search_result_free(found);
1470  #else  #else
1471          appdata->search_results = found;
1472    #endif
1473    #else
1474          gpx_t *found = NULL;
1475    
1476        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1477          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1478        else        else
# Line 1359  cb_menu_search(GtkWidget *window, gpoint Line 1493  cb_menu_search(GtkWidget *window, gpoint
1493      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1494  }  }
1495    
1496  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1497    
1498  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1499  static void  static void
# Line 1435  cb_menu_export_garmin(GtkWidget *widget, Line 1569  cb_menu_export_garmin(GtkWidget *widget,
1569    garmin_export(appdata);    garmin_export(appdata);
1570  }  }
1571    
1572    #ifdef ENABLE_OSM_GPS_MAP
1573    static void
1574    cb_menu_map(GtkWidget *window, gpointer data) {
1575      map((appdata_t *)data);
1576    }
1577    #endif
1578    
1579  static void  static void
1580  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1581    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
# Line 1451  cb_menu_precpos(GtkWidget *window, gpoin Line 1592  cb_menu_precpos(GtkWidget *window, gpoin
1592  }  }
1593    
1594  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1595    typedef struct {
1596      char *label, *desc;
1597      GtkSignalFunc activate_cb;
1598    } menu_entry_t;
1599    
1600  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  typedef struct {
1601    HildonStackableWindow *view_window;    const char *title;
1602    GtkWidget *but;    const menu_entry_t *menu;
1603      int len;
1604    } submenu_t;
1605    
1606    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());  #define COLUMNS  1
   gtk_window_set_title (GTK_WINDOW (view_window), "Export");  
1607    
1608    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1609    
1610    but = hildon_button_new_with_text(    /* force closing of submenu dialog */
1611              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1612              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_widget_hide(menu);
1613              _("Export to Maemo Mapper"),  
1614              _("Save a Maemo Mapper POI file"));    /* let gtk clean up */
1615    g_signal_connect(but, "clicked",    while(gtk_events_pending())
1616                     G_CALLBACK(cb_menu_export_mmpoi), appdata);      gtk_main_iteration();
1617    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  }
1618    
1619    static GtkWidget *app_submenu_create(appdata_t *appdata,
1620                                         const submenu_t *submenu) {
1621    
1622    but = hildon_button_new_with_text(    /* create a oridinary dialog box */
1623              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    GtkWidget *dialog = gtk_dialog_new();
1624              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1625              _("Export Field Notes"),    gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1626              _("Save a Garmin Field Notes file"));    gtk_window_set_transient_for(GTK_WINDOW(dialog),
1627    g_signal_connect(but, "clicked",                                 GTK_WINDOW(appdata->window));
1628                     G_CALLBACK(cb_menu_export_log), appdata);    gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1629    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1630      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1631      int x = 0, y = 0;
1632    
1633    but = hildon_button_new_with_text(    const menu_entry_t *menu_entries = submenu->menu;
1634      while(menu_entries->label) {
1635        GtkWidget *button = NULL;
1636    
1637        button = hildon_button_new_with_text(
1638              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1639              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1640              _("Export Garmin GPX"),              _(menu_entries->label), _(menu_entries->desc));
1641              _("Save a GPX file containing modified waypoints"));  
1642    g_signal_connect(but, "clicked",      /* try to center both texts */
1643                     G_CALLBACK(cb_menu_export_garmin), appdata);      hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1644    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);      hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1645    
1646        g_signal_connect(button, "clicked",
1647                         G_CALLBACK(on_submenu_entry_clicked), dialog);
1648    
1649        g_signal_connect(button, "clicked",
1650                         menu_entries->activate_cb, appdata);
1651    
1652        gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1653    
1654        x++;
1655        if(x == COLUMNS) { x = 0; y++; }
1656    
1657        menu_entries++;
1658      }
1659    
1660      gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1661    
1662    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));    return dialog;
   gtk_widget_show_all (GTK_WIDGET (view_window));  
1663  }  }
1664    
1665  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  /* popup the dialog shaped submenu */
1666    HildonStackableWindow *view_window;  static void submenu_popup(GtkWidget *menu) {
1667    GtkWidget *but;    gtk_widget_show_all(menu);
1668      gtk_dialog_run(GTK_DIALOG(menu));
1669      gtk_widget_hide(menu);
1670    }
1671    
1672    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());  static void submenu_cleanup(GtkWidget *menu) {
1673    gtk_window_set_title (GTK_WINDOW (view_window), "Export");    gtk_widget_destroy(menu);
1674    }
1675    
1676    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));  static const menu_entry_t submenu_export_entries[] = {
1677      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1678        G_CALLBACK(cb_menu_export_mmpoi)  },
1679      { "Export Field Notes",      "Save a Garmin Field Notes file",
1680        G_CALLBACK(cb_menu_export_log)    },
1681      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1682        G_CALLBACK(cb_menu_export_garmin) },
1683      { NULL, NULL, NULL }
1684    };
1685    
1686    but = hildon_button_new_with_text(  static const submenu_t submenu_export = {
1687              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    "Export", submenu_export_entries,
1688              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1689              _("Geomath"),  };
             _("Geocoordinate calculation"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_geomath), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1690    
1691    /* the export submenu */
1692    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1693      if(!appdata->export_menu)
1694        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1695    
1696    but = hildon_button_new_with_text(    submenu_popup(appdata->export_menu);
1697              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  }
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Geotext"),  
             _("Text analysis, letter counting etc"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_geotext), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
   
1698    
1699    but = hildon_button_new_with_text(  static const menu_entry_t submenu_tools_entries[] = {
1700              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    { "Geomath",          "Geocoordinate calculation",
1701              HILDON_BUTTON_ARRANGEMENT_VERTICAL,      G_CALLBACK(cb_menu_geomath) },
1702              _("Precise Position"),    { "Geotext",          "Text analysis",
1703              _("Calculate a very precise GPS posotions"));      G_CALLBACK(cb_menu_geotext) },
1704    g_signal_connect(but, "clicked",    { "Precise Position", "Calculate a precise GPS position",
1705                     G_CALLBACK(cb_menu_precpos), appdata);      G_CALLBACK(cb_menu_precpos) },
1706    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);    { NULL, NULL, NULL }
1707    };
1708    
1709    static const submenu_t submenu_tools = {
1710      "Tools", submenu_tools_entries,
1711      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1712    };
1713    
1714    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));  /* the tools submenu */
1715    gtk_widget_show_all (GTK_WIDGET (view_window));  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1716      if(!appdata->tools_menu)
1717        appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1718    
1719      submenu_popup(appdata->tools_menu);
1720  }  }
1721    
1722  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
# Line 1541  HildonAppMenu *menu_create(appdata_t *ap Line 1724  HildonAppMenu *menu_create(appdata_t *ap
1724    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1725    
1726    /* ------- */    /* ------- */
1727      button = gtk_button_new_with_label(_("About"));
1728      g_signal_connect_after(button, "clicked",
1729                             G_CALLBACK(cb_menu_about), appdata);
1730      hildon_app_menu_append(menu, GTK_BUTTON(button));
1731    
1732    button = gtk_button_new_with_label(_("Settings"));    button = gtk_button_new_with_label(_("Settings"));
1733    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1734                           appdata);                           appdata);
# Line 1552  HildonAppMenu *menu_create(appdata_t *ap Line 1740  HildonAppMenu *menu_create(appdata_t *ap
1740                             G_CALLBACK(cb_menu_add), appdata);                             G_CALLBACK(cb_menu_add), appdata);
1741      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1742    
1743      button = gtk_button_new_with_label(_("Import dir"));      button = gtk_button_new_with_label(_("Import directory"));
1744      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1745                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1746      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1747    
   if(mode == MENU_GPXLIST) {  
1748      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1749      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1750                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1575  HildonAppMenu *menu_create(appdata_t *ap Line 1761  HildonAppMenu *menu_create(appdata_t *ap
1761                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1762    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1763    
1764    button = gtk_button_new_with_label(_("About"));  #ifdef ENABLE_OSM_GPS_MAP
1765      if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {
1766        button = gtk_button_new_with_label(_("Map"));
1767        g_signal_connect_after(button, "clicked",
1768                               G_CALLBACK(cb_menu_map), appdata);
1769        hildon_app_menu_append(menu, GTK_BUTTON(button));
1770      }
1771    #endif
1772    
1773    #ifdef HILDON_HELP
1774      button = gtk_button_new_with_label(_("Help"));
1775    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
1776                           G_CALLBACK(cb_menu_about), appdata);                           G_CALLBACK(cb_menu_help), appdata);
1777    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1778    #endif
1779    
1780    gtk_widget_show(GTK_WIDGET(menu));    gtk_widget_show_all(GTK_WIDGET(menu));
1781    
1782    return menu;    return menu;
1783  }  }
# Line 1598  void menu_create(appdata_t *appdata) { Line 1795  void menu_create(appdata_t *appdata) {
1795    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1796    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1797    
1798    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1799    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1800    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1801    
1802    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1803    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1804    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1805    
# Line 1629  void menu_create(appdata_t *appdata) { Line 1826  void menu_create(appdata_t *appdata) {
1826    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1827    
1828  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1829    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1830    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1831    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1832                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1833  #endif  #endif
1834    
1835    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1836    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1837    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1838                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1839    
1840    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1841    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1842    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1843                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
# Line 1648  void menu_create(appdata_t *appdata) { Line 1845  void menu_create(appdata_t *appdata) {
1845  #ifdef USE_BREAD_CRUMB_TRAIL  #ifdef USE_BREAD_CRUMB_TRAIL
1846    appdata->menu_search =    appdata->menu_search =
1847  #endif  #endif
1848    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1849    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1850    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1851    
# Line 1685  void menu_create(appdata_t *appdata) { Line 1882  void menu_create(appdata_t *appdata) {
1882    
1883    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1884    
1885    #ifdef ENABLE_OSM_GPS_MAP
1886      item = gtk_menu_item_new_with_label( _("Map") );
1887      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1888      g_signal_connect(item, "activate",
1889                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1890    #endif
1891    
1892    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1893    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1894    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1895    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1896    
1897    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1898    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1899    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1900                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1901    
1902    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1903    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1904    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1905                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1906    
1907    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1908    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1909    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1910                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
# Line 1708  void menu_create(appdata_t *appdata) { Line 1912  void menu_create(appdata_t *appdata) {
1912    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1913    
1914  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
1915    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
1916    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1917    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
1918  #endif  #endif
1919    
1920    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
1921    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1922    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
1923    
# Line 1749  void cleanup(appdata_t *appdata) { Line 1953  void cleanup(appdata_t *appdata) {
1953    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
1954    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
1955    
1956    #ifdef USE_STACKABLE_WINDOW
1957      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
1958      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
1959    #endif
1960    
1961    gnome_vfs_shutdown();    gnome_vfs_shutdown();
1962    icons_free();    icons_free();
1963    gps_release(appdata);    gps_release(appdata);
# Line 1777  void cleanup(appdata_t *appdata) { Line 1986  void cleanup(appdata_t *appdata) {
1986    puts("everything is gone");    puts("everything is gone");
1987  }  }
1988    
1989  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
1990    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1991    
1992    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 1786  void on_window_destroy (GtkWidget *widge Line 1995  void on_window_destroy (GtkWidget *widge
1995  }  }
1996    
1997  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
1998                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
1999    int handled = FALSE;    int handled = FALSE;
2000    
2001    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1795  gboolean on_window_key_press(GtkWidget * Line 2003  gboolean on_window_key_press(GtkWidget *
2003    switch(event->keyval) {    switch(event->keyval) {
2004  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2005    
 #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  
   
2006  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
2007    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
2008      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1988  static void crumb_add(appdata_t *appdata Line 2187  static void crumb_add(appdata_t *appdata
2187  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2188    
2189  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2190      printf("main after settings redraw\n");
2191    
2192      if(!appdata->cur_view) {
2193        printf("no active view\n");
2194        return;
2195      }
2196    
2197  #ifndef USE_MAEMO  #ifndef USE_MAEMO
2198    // in non-maemo setup this can only affect the main screen as    // in non-maemo setup this can only affect the main screen as
2199    // 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 2229  void main_after_settings_redraw(appdata_
2229    }    }
2230    
2231    if(redraw) {    if(redraw) {
2232      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2233    
2234    #ifdef USE_STACKABLE_WINDOW
2235        HildonWindowStack *stack = hildon_window_stack_get_default();
2236        container = hildon_window_stack_peek(stack);
2237    #endif
2238    
2239        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2240      switch(redraw) {      switch(redraw) {
2241      case 1:      case 1:
2242        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 2038  void main_after_settings_redraw(appdata_ Line 2251  void main_after_settings_redraw(appdata_
2251        break;        break;
2252      }      }
2253    
2254      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2255      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2256    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2257        else
2258  #endif  #endif
2259          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2260    
2261        gtk_widget_show_all(container);
2262      }
2263    #endif // USE_MAEMO
2264  }  }
2265    
2266  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2098  int main(int argc, char *argv[]) { Line 2317  int main(int argc, char *argv[]) {
2317    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);
2318  #endif  #endif
2319    
2320    #if MAEMO_VERSION_MAJOR == 5
2321    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2322    #endif
2323    
2324    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2325                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2326    
# Line 2107  int main(int argc, char *argv[]) { Line 2329  int main(int argc, char *argv[]) {
2329    
2330    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2331    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2332  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2333    menu_create(&appdata);    menu_create(&appdata);
2334  #else  #else
Legend:
Removed from v.6  
changed lines
  Added in v.107