Diff of /trunk/src/main.c

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

revision 23 by harbaum, Mon Jul 6 08:51:48 2009 UTC revision 74 by harbaum, Mon Aug 24 09:23:36 2009 UTC
# Line 168  gpx_t *choose_file(appdata_t *appdata, g Line 168  gpx_t *choose_file(appdata_t *appdata, g
168    
169        if(whole_dir)        if(whole_dir)
170          appdata->path = strdup(filename);          appdata->path = strdup(filename);
171      }      } else
172          errorf(_("Load error"));
173    
174      g_free (filename);      g_free (filename);
175    }    }
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 203  void cachelist_view_onRowActivated(GtkTr
203    GtkTreeIter   iter;    GtkTreeIter   iter;
204    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
205    
206    #ifdef USE_MAEMO
207      /* check if a cache is already selected and ignore click if yes */
208      /* (was probably a double click) */
209      if(appdata->cur_cache) return;
210    #endif
211    
212    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
213      cache_t *cache;      cache_t *cache;
214      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
# Line 587  void cachelist_dialog(appdata_t *appdata Line 594  void cachelist_dialog(appdata_t *appdata
594    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
595    
596    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
597    char *title = g_strdup_printf("GPXView - %s", gpx->name);    char *title = g_strdup_printf("%s - GPXView", gpx->name);
598    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
599    g_free(title);    g_free(title);
600    
# Line 713  static void gpxlist_view_onRowActivated( Line 720  static void gpxlist_view_onRowActivated(
720    GtkTreeIter   iter;    GtkTreeIter   iter;
721    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
722    
723    #ifdef USE_MAEMO
724      /* check if a cache is already selected and ignore click if yes */
725      /* (was probably a double click) */
726      if(appdata->cur_gpx) return;
727    #endif
728    
729    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
730      gpx_t *gpx;      gpx_t *gpx;
731      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 954  static GtkWidget *gpxlist_create_view_an Line 967  static GtkWidget *gpxlist_create_view_an
967    GtkTreeIter sel_iter;    GtkTreeIter sel_iter;
968    gboolean sel_iter_valid = FALSE;    gboolean sel_iter_valid = FALSE;
969    while(gpx) {    while(gpx) {
970      GtkTreeIter         iter;      /* don't display entries that failed at load */
971      gtk_list_store_append(appdata->gpxstore, &iter);      if(!gpx->failed) {
972      gpxlist_set(appdata->gpxstore, &iter, gpx);        GtkTreeIter         iter;
973          gtk_list_store_append(appdata->gpxstore, &iter);
974      if(gpx == sel_gpx) {        gpxlist_set(appdata->gpxstore, &iter, gpx);
975        sel_iter = iter;  
976        sel_iter_valid = TRUE;        if(gpx == sel_gpx) {
977            sel_iter = iter;
978            sel_iter_valid = TRUE;
979          }
980      }      }
981    
982      gpx = gpx->next;      gpx = gpx->next;
# Line 1017  static void gpxlist_add(appdata_t *appda Line 1033  static void gpxlist_add(appdata_t *appda
1033    
1034  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1035    
1036    typedef struct {
1037      appdata_t *appdata;
1038      GtkWidget *dialog;
1039    } about_context_t;
1040    
1041    #ifdef ENABLE_BROWSER_INTERFACE
1042    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1043      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1044      browser_url(context->appdata,
1045                  "https://www.paypal.com/cgi-bin/webscr"
1046                  "?cmd=_s-xclick&hosted_button_id=7400558");
1047    }
1048    #endif
1049    
1050  static void  static void
1051  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1052    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1053    
1054    gtk_about_dialog_set_name(about, "GPXView");    context.appdata = (appdata_t *)data;
   gtk_about_dialog_set_version(about, VERSION);  
1055    
1056  #ifdef ENABLE_LIBLOCATION  #ifdef ENABLE_LIBLOCATION
1057    char *uses = "uses liblocation";    char *uses = "uses liblocation";
# Line 1032  cb_menu_about(GtkWidget *window, gpointe Line 1061  cb_menu_about(GtkWidget *window, gpointe
1061    char *uses = "uses gpsd";    char *uses = "uses gpsd";
1062  #endif  #endif
1063    
1064    char *str = g_strdup_printf("%s\n\n(%s)",    const gchar *authors[] = {
1065                        _("GPXView (c) 2008-2009 by\n"      "Till Harbaum <till@harbaum.org>",
1066                          "Till Harbaum <till@harbaum.org>\n"      "John Stowers <john.stowers@gmail.com>",
1067                          "Mailing list: gpxview-users@garage.maemo.org"),      NULL };
1068                        _(uses)  
1069                        );    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1070                            "name", "GPXView",
1071    gtk_about_dialog_set_copyright(about, str);                          "version", VERSION,
1072    g_free(str);                          "copyright", _("Copyright 2008-2009"),
1073                            "authors", authors,
1074    gtk_about_dialog_set_website(about,                          "website", _("http://www.harbaum.org/till/maemo"),
1075         _("http://www.harbaum.org/till/maemo"));                          "comments", _(uses),
1076                            NULL);
1077    gtk_about_dialog_set_comments(about,  
1078         _("Geocaching.com GPX file viewer"));  #ifdef ENABLE_BROWSER_INTERFACE
1079      /* add a way to donate to the project */
1080    gtk_widget_show_all(GTK_WIDGET(about));    GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1081    gtk_dialog_run(GTK_DIALOG(about));  
1082    gtk_widget_destroy(GTK_WIDGET(about));    GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1083      gtk_box_pack_start(GTK_BOX(hbox),
1084                         gtk_label_new(_("Do you like GPXView?")),
1085                         FALSE, FALSE, 0);
1086    
1087      GtkWidget *button = gtk_button_new();
1088      gtk_button_set_image(GTK_BUTTON(button),
1089                           icon_get_widget(ICON_MISC, 8));
1090      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1091      g_signal_connect(button, "clicked",
1092                       G_CALLBACK(on_paypal_button_clicked), &context);
1093      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1094    
1095      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1096      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1097                                  alignment);
1098    
1099      gtk_widget_show_all(alignment);
1100    #endif
1101    
1102      gtk_dialog_run(GTK_DIALOG(context.dialog));
1103      gtk_widget_destroy(context.dialog);
1104  }  }
1105    
1106  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1433  cb_menu_search(GtkWidget *window, gpoint Line 1483  cb_menu_search(GtkWidget *window, gpoint
1483      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1484  }  }
1485    
1486  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1487    
1488  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1489  static void  static void
# Line 1509  cb_menu_export_garmin(GtkWidget *widget, Line 1559  cb_menu_export_garmin(GtkWidget *widget,
1559    garmin_export(appdata);    garmin_export(appdata);
1560  }  }
1561    
1562    #ifdef ENABLE_OSM_GPS_MAP
1563    static void
1564    cb_menu_map(GtkWidget *window, gpointer data) {
1565      map((appdata_t *)data);
1566    }
1567    #endif
1568    
1569  static void  static void
1570  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1571    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
# Line 1525  cb_menu_precpos(GtkWidget *window, gpoin Line 1582  cb_menu_precpos(GtkWidget *window, gpoin
1582  }  }
1583    
1584  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1585  static GtkWidget *export_menu_create(appdata_t *appdata) {  typedef struct {
1586    GtkWidget *button;    char *label, *desc;
1587    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    GtkSignalFunc activate_cb;
1588    } menu_entry_t;
   button = hildon_button_new_with_text(  
             HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Export to Maemo Mapper"),  
             _("Save a Maemo Mapper POI file"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_mmpoi), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1589    
1590    button = hildon_button_new_with_text(  typedef struct {
1591              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    const char *title;
1592              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    const menu_entry_t *menu;
1593              _("Export Field Notes"),    int len;
1594              _("Save a Garmin Field Notes file"));  } submenu_t;
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_log), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1595    
1596    button = hildon_button_new_with_text(  #define COLUMNS  1
             HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Export Garmin GPX"),  
             _("Save modified waypoints in GPX file"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_garmin), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1597    
1598    gtk_widget_show_all(GTK_WIDGET(menu));  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1599    
1600    return GTK_WIDGET(menu);    /* force closing of submenu dialog */
1601      gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1602      gtk_widget_hide(menu);
1603    
1604      /* let gtk clean up */
1605      while(gtk_events_pending())
1606        gtk_main_iteration();
1607  }  }
1608    
1609  /* the export submenu */  static GtkWidget *app_submenu_create(appdata_t *appdata,
1610  void on_export_clicked(GtkButton *button, appdata_t *appdata) {                                       const submenu_t *submenu) {
   if(!appdata->export_menu)  
     appdata->export_menu = export_menu_create(appdata);  
1611    
1612    /* draw a popup menu */    /* create a oridinary dialog box */
1613    hildon_app_menu_popup(HILDON_APP_MENU(appdata->export_menu),    GtkWidget *dialog = gtk_dialog_new();
1614                          GTK_WINDOW(hildon_window_stack_peek(    gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1615                      hildon_window_stack_get_default())));    gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1616  }    gtk_window_set_transient_for(GTK_WINDOW(dialog),
1617                                   GTK_WINDOW(appdata->window));
1618      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1619    
1620  static GtkWidget *tools_menu_create(appdata_t *appdata) {    GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1621    GtkWidget *button;    int x = 0, y = 0;
   HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());  
1622    
1623    /* the following doesn't have an effect */    const menu_entry_t *menu_entries = submenu->menu;
1624    //  gtk_window_set_title(GTK_WINDOW(menu), "Tools");    while(menu_entries->label) {
1625        GtkWidget *button = NULL;
1626    
1627    button = hildon_button_new_with_text(      button = hildon_button_new_with_text(
1628              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1629              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1630              _("Geomath"),              _(menu_entries->label), _(menu_entries->desc));
             _("Geocoordinate calculation"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_geomath), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1631    
1632        /* try to center both texts */
1633        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1634        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1635    
1636    button = hildon_button_new_with_text(      g_signal_connect(button, "clicked",
1637              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,                       G_CALLBACK(on_submenu_entry_clicked), dialog);
1638              HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
1639              _("Geotext"),      g_signal_connect(button, "clicked",
1640              _("Text analysis"));                       menu_entries->activate_cb, appdata);
1641    g_signal_connect(button, "clicked",  
1642                     G_CALLBACK(cb_menu_geotext), appdata);      gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1643    hildon_app_menu_append(menu, GTK_BUTTON(button));  
1644        x++;
1645        if(x == COLUMNS) { x = 0; y++; }
1646    
1647    button = hildon_button_new_with_text(      menu_entries++;
1648              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    }
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Precise Position"),  
             _("Calculate a precise GPS position"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_precpos), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1649    
1650    gtk_widget_show_all(GTK_WIDGET(menu));    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1651    
1652      return dialog;
1653    }
1654    
1655    /* popup the dialog shaped submenu */
1656    static void submenu_popup(GtkWidget *menu) {
1657      gtk_widget_show_all(menu);
1658      gtk_dialog_run(GTK_DIALOG(menu));
1659      gtk_widget_hide(menu);
1660    }
1661    
1662    static void submenu_cleanup(GtkWidget *menu) {
1663      gtk_widget_destroy(menu);
1664    }
1665    
1666    static const menu_entry_t submenu_export_entries[] = {
1667      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1668        G_CALLBACK(cb_menu_export_mmpoi)  },
1669      { "Export Field Notes",      "Save a Garmin Field Notes file",
1670        G_CALLBACK(cb_menu_export_log)    },
1671      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1672        G_CALLBACK(cb_menu_export_garmin) },
1673      { NULL, NULL, NULL }
1674    };
1675    
1676    static const submenu_t submenu_export = {
1677      "Export", submenu_export_entries,
1678      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1679    };
1680    
1681    /* the export submenu */
1682    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1683      if(!appdata->export_menu)
1684        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1685    
1686    return GTK_WIDGET(menu);    submenu_popup(appdata->export_menu);
1687  }  }
1688    
1689    static const menu_entry_t submenu_tools_entries[] = {
1690      { "Geomath",          "Geocoordinate calculation",
1691        G_CALLBACK(cb_menu_geomath) },
1692      { "Geotext",          "Text analysis",
1693        G_CALLBACK(cb_menu_geotext) },
1694      { "Precise Position", "Calculate a precise GPS position",
1695        G_CALLBACK(cb_menu_precpos) },
1696      { NULL, NULL, NULL }
1697    };
1698    
1699    static const submenu_t submenu_tools = {
1700      "Tools", submenu_tools_entries,
1701      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1702    };
1703    
1704  /* the tools submenu */  /* the tools submenu */
1705  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1706    if(!appdata->tools_menu)    if(!appdata->tools_menu)
1707      appdata->tools_menu = tools_menu_create(appdata);      appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1708    
1709    /* draw a popup menu */    submenu_popup(appdata->tools_menu);
   hildon_app_menu_popup(HILDON_APP_MENU(appdata->tools_menu),  
                         GTK_WINDOW(hildon_window_stack_peek(  
                     hildon_window_stack_get_default())));  
1710  }  }
1711    
   
1712  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
1713    GtkWidget *button;    GtkWidget *button;
1714    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
# Line 1650  HildonAppMenu *menu_create(appdata_t *ap Line 1734  HildonAppMenu *menu_create(appdata_t *ap
1734      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1735                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1736      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1737    
   if(mode == MENU_GPXLIST) {  
1738      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1739      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1740                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1669  HildonAppMenu *menu_create(appdata_t *ap Line 1751  HildonAppMenu *menu_create(appdata_t *ap
1751                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1752    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1753    
1754    #ifdef ENABLE_OSM_GPS_MAP
1755      if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {
1756        button = gtk_button_new_with_label(_("Map"));
1757        g_signal_connect_after(button, "clicked",
1758                               G_CALLBACK(cb_menu_map), appdata);
1759        hildon_app_menu_append(menu, GTK_BUTTON(button));
1760      }
1761    #endif
1762    
1763  #ifdef HILDON_HELP  #ifdef HILDON_HELP
1764    button = gtk_button_new_with_label(_("Help"));    button = gtk_button_new_with_label(_("Help"));
1765    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
# Line 1781  void menu_create(appdata_t *appdata) { Line 1872  void menu_create(appdata_t *appdata) {
1872    
1873    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1874    
1875    #ifdef ENABLE_OSM_GPS_MAP
1876      item = gtk_menu_item_new_with_label( _("Map") );
1877      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1878      g_signal_connect(item, "activate",
1879                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1880    #endif
1881    
1882    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1883    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1884    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1845  void cleanup(appdata_t *appdata) { Line 1943  void cleanup(appdata_t *appdata) {
1943    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
1944    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
1945    
1946    #ifdef USE_STACKABLE_WINDOW
1947      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
1948      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
1949    #endif
1950    
1951    gnome_vfs_shutdown();    gnome_vfs_shutdown();
1952    icons_free();    icons_free();
1953    gps_release(appdata);    gps_release(appdata);
# Line 1873  void cleanup(appdata_t *appdata) { Line 1976  void cleanup(appdata_t *appdata) {
1976    puts("everything is gone");    puts("everything is gone");
1977  }  }
1978    
1979  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
1980    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1981    
1982    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 2216  int main(int argc, char *argv[]) { Line 2319  int main(int argc, char *argv[]) {
2319    
2320    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2321    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2322  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2323    menu_create(&appdata);    menu_create(&appdata);
2324  #else  #else
Legend:
Removed from v.23  
changed lines
  Added in v.74