Diff of /trunk/src/main.c

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

revision 156 by harbaum, Wed Apr 1 12:47:35 2009 UTC revision 178 by harbaum, Tue Jun 16 15:27:37 2009 UTC
# Line 36  static void main_ui_enable(appdata_t *ap Line 36  static void main_ui_enable(appdata_t *ap
36      map_action_cancel(appdata);      map_action_cancel(appdata);
37    
38    /* ---- set project name as window title ----- */    /* ---- set project name as window title ----- */
39  #ifndef USE_HILDON  #if defined(USE_HILDON) && MAEMO_VERSION_MAJOR < 5
40      if(project_valid)
41        gtk_window_set_title(GTK_WINDOW(appdata->window), appdata->project->name);
42      else
43        gtk_window_set_title(GTK_WINDOW(appdata->window), "");
44    #else
45    char *str = NULL;    char *str = NULL;
46    if(project_valid)    if(project_valid)
47      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);
# Line 45  static void main_ui_enable(appdata_t *ap Line 50  static void main_ui_enable(appdata_t *ap
50    
51    gtk_window_set_title(GTK_WINDOW(appdata->window), str);    gtk_window_set_title(GTK_WINDOW(appdata->window), str);
52    g_free(str);    g_free(str);
 #else  
   if(project_valid)  
     gtk_window_set_title(GTK_WINDOW(appdata->window), appdata->project->name);  
   else  
     gtk_window_set_title(GTK_WINDOW(appdata->window), "");  
53  #endif  #endif
54    
55    if(appdata->iconbar && appdata->iconbar->toolbar)    if(appdata->iconbar && appdata->iconbar->toolbar)
# Line 62  static void main_ui_enable(appdata_t *ap Line 62  static void main_ui_enable(appdata_t *ap
62      gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);      gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);
63    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);
64    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);
65      gtk_widget_set_sensitive(appdata->menu_item_osm_relations, osm_valid);
66    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);
67    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);
68    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);
# Line 125  cb_menu_upload(GtkMenuItem *item, gpoint Line 126  cb_menu_upload(GtkMenuItem *item, gpoint
126    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
127    if(!appdata->osm || !appdata->project) return;    if(!appdata->osm || !appdata->project) return;
128    
129      if(project_check_demo(appdata->window, appdata->project))
130        return;
131    
132    osm_upload(appdata, appdata->osm, appdata->project);    osm_upload(appdata, appdata->osm, appdata->project);
133  }  }
134    
# Line 133  cb_menu_download(GtkMenuItem *item, gpoi Line 137  cb_menu_download(GtkMenuItem *item, gpoi
137    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
138    if(!appdata->project) return;    if(!appdata->project) return;
139    
140      if(project_check_demo(appdata->window, appdata->project))
141        return;
142    
143    /* if we have valid osm data loaded: save state first */    /* if we have valid osm data loaded: save state first */
144    if(appdata->osm) {    if(appdata->osm) {
145      /* redraw the entire map by destroying all map items and redrawing them */      /* redraw the entire map by destroying all map items and redrawing them */
# Line 144  cb_menu_download(GtkMenuItem *item, gpoi Line 151  cb_menu_download(GtkMenuItem *item, gpoi
151    }    }
152    
153    // download    // download
154    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {    if(osm_download(GTK_WIDGET(appdata->window), appdata->settings,
155      banner_busy_start(appdata, 1, "Redrawing...");                    appdata->project)) {
156      appdata->osm = osm_parse(appdata->project->osm);      banner_busy_start(appdata, 1, "Redrawing");
157        appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
158      diff_restore(appdata, appdata->project, appdata->osm);      diff_restore(appdata, appdata->project, appdata->osm);
159      map_paint(appdata);      map_paint(appdata);
160      banner_busy_stop(appdata); //"Redrawing..."      banner_busy_stop(appdata); //"Redrawing"
161    }    }
162    
163    main_ui_enable(appdata);    main_ui_enable(appdata);
# Line 195  cb_menu_redraw(GtkMenuItem *item, gpoint Line 203  cb_menu_redraw(GtkMenuItem *item, gpoint
203    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
204    
205    /* redraw the entire map by destroying all map items and redrawing them */    /* redraw the entire map by destroying all map items and redrawing them */
206    banner_busy_start(appdata, 1, "Redrawing...");    banner_busy_start(appdata, 1, "Redrawing");
207    track_save(appdata->project, appdata->track.track);    track_save(appdata->project, appdata->track.track);
208    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
209    map_clear(appdata, MAP_LAYER_ALL);    map_clear(appdata, MAP_LAYER_ALL);
210    osm_free(&appdata->icon, appdata->osm);    osm_free(&appdata->icon, appdata->osm);
211    
212    appdata->osm = osm_parse(appdata->project->osm);    appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
213    diff_restore(appdata, appdata->project, appdata->osm);    diff_restore(appdata, appdata->project, appdata->osm);
214    map_paint(appdata);    map_paint(appdata);
215    
# Line 210  cb_menu_redraw(GtkMenuItem *item, gpoint Line 218  cb_menu_redraw(GtkMenuItem *item, gpoint
218      map_track_draw(appdata->map, appdata->track.track);      map_track_draw(appdata->map, appdata->track.track);
219    
220    wms_load(appdata);    wms_load(appdata);
221    banner_busy_stop(appdata); //"Redrawing..."    banner_busy_stop(appdata); //"Redrawing"
222  }  }
223  #endif  #endif
224    
225  static void  static void
 cb_menu_style(GtkMenuItem *item, gpointer data) {  
   appdata_t *appdata = (appdata_t*)data;  
   
   style_select(GTK_WIDGET(appdata->window), appdata);  
 }  
   
 static void  
226  cb_menu_map_no_icons(GtkCheckMenuItem *item, gpointer data) {  cb_menu_map_no_icons(GtkCheckMenuItem *item, gpointer data) {
227    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
228    
229    banner_busy_start(appdata, 1, "Redrawing...");    banner_busy_start(appdata, 1, "Redrawing");
230    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
231    appdata->settings->no_icons = gtk_check_menu_item_get_active(item);    appdata->settings->no_icons = gtk_check_menu_item_get_active(item);
232    map_paint(appdata);    map_paint(appdata);
233    banner_busy_stop(appdata); //"Redrawing..."    banner_busy_stop(appdata); //"Redrawing"
234  }  }
235    
236  static void  static void
237  cb_menu_map_no_antialias(GtkCheckMenuItem *item, gpointer data) {  cb_menu_map_no_antialias(GtkCheckMenuItem *item, gpointer data) {
238    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
239    
240    banner_busy_start(appdata, 1, "Redrawing...");    banner_busy_start(appdata, 1, "Redrawing");
241    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
242    appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);    appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);
243    map_paint(appdata);    map_paint(appdata);
244    banner_busy_stop(appdata); //"Redrawing..."    banner_busy_stop(appdata); //"Redrawing"
245    }
246    
247    static void
248    cb_menu_style(GtkMenuItem *item, gpointer data) {
249      appdata_t *appdata = (appdata_t*)data;
250    
251      style_select(GTK_WIDGET(appdata->window), appdata);
252  }  }
253    
254  static void  static void
# Line 270  cb_menu_undo_changes(GtkMenuItem *item, Line 278  cb_menu_undo_changes(GtkMenuItem *item,
278                   "uploaded yet? This can't be undone.")))                   "uploaded yet? This can't be undone.")))
279      return;      return;
280    
281    banner_busy_start(appdata, 1, _("Redrawing..."));    banner_busy_start(appdata, 1, _("Redrawing"));
282    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
283    osm_free(&appdata->icon, appdata->osm);    osm_free(&appdata->icon, appdata->osm);
284    diff_remove(appdata->project);    diff_remove(appdata->project);
285    appdata->osm = osm_parse(appdata->project->osm);    appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
286    map_paint(appdata);    map_paint(appdata);
287    banner_busy_stop(appdata);  //"Redrawing..."    banner_busy_stop(appdata);  //"Redrawing"
288    
289    banner_show_info(appdata, _("Discarded local changes"));    banner_show_info(appdata, _("Discarded local changes"));
290  }  }
# Line 286  cb_menu_osm_relations(GtkMenuItem *item, Line 294  cb_menu_osm_relations(GtkMenuItem *item,
294    relation_list((appdata_t*)data);    relation_list((appdata_t*)data);
295  }  }
296    
297    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
298  static void  static void
299  cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {  cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {
300    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
# Line 295  cb_menu_fullscreen(GtkCheckMenuItem *ite Line 304  cb_menu_fullscreen(GtkCheckMenuItem *ite
304    else    else
305      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
306  }  }
307    #endif
308    
309  static void  static void
310  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {
# Line 313  cb_menu_zoomout(GtkMenuItem *item, appda Line 323  cb_menu_zoomout(GtkMenuItem *item, appda
323  }  }
324    
325  static void  static void
326    cb_menu_view_detail_inc(GtkMenuItem *item, gpointer data) {
327      appdata_t *appdata = (appdata_t*)data;
328    
329      printf("detail level increase\n");
330      map_detail_increase(appdata->map);
331    }
332    
333    static void
334    cb_menu_view_detail_normal(GtkMenuItem *item, gpointer data) {
335      appdata_t *appdata = (appdata_t*)data;
336    
337      printf("detail level normal\n");
338      map_detail_normal(appdata->map);
339    }
340    
341    static void
342    cb_menu_view_detail_dec(GtkMenuItem *item, gpointer data) {
343      appdata_t *appdata = (appdata_t*)data;
344    
345      printf("detail level decrease\n");
346      map_detail_decrease(appdata->map);
347    }
348    
349    static void
350  cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {  cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {
351    g_assert(appdata->settings);    g_assert(appdata->settings);
352    
# Line 598  void menu_create(appdata_t *appdata) { Line 632  void menu_create(appdata_t *appdata) {
632  #endif  #endif
633    
634    menu_append_new_item(    menu_append_new_item(
635      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open"),
636      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
637      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
638    );    );
# Line 621  void menu_create(appdata_t *appdata) { Line 655  void menu_create(appdata_t *appdata) {
655    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
656    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
657    
658    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
659    appdata->menu_item_view_fullscreen = menu_append_new_item(    appdata->menu_item_view_fullscreen = menu_append_new_item(
660      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
661      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
662      0, 0, TRUE, TRUE, FALSE      0, 0, TRUE, TRUE, FALSE
663    );    );
664    #endif
665    
666    menu_append_new_item(    menu_append_new_item(
667      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
# Line 639  void menu_create(appdata_t *appdata) { Line 675  void menu_create(appdata_t *appdata) {
675      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
676    );    );
677    
678      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
679    
680      menu_append_new_item(
681        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_inc), _("More details"),
682        NULL, "<OSM2Go-Main>/View/DetailInc",
683        GDK_period, GDK_MOD1_MASK, TRUE, FALSE, FALSE
684      );
685    
686      menu_append_new_item(
687        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_normal), _("Normal details"),
688        NULL, "<OSM2Go-Main>/View/DetailNormal",
689        0, 0, TRUE, FALSE, FALSE
690      );
691    
692      menu_append_new_item(
693        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_dec), _("Less details"),
694        NULL, "<OSM2Go-Main>/View/DetailDec",
695        GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE
696      );
697    
698    /* -------------------- OSM submenu -------------------- */    /* -------------------- OSM submenu -------------------- */
699    
700    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );
# Line 648  void menu_create(appdata_t *appdata) { Line 704  void menu_create(appdata_t *appdata) {
704    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
705    
706    appdata->menu_item_osm_upload = menu_append_new_item(    appdata->menu_item_osm_upload = menu_append_new_item(
707      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),
708      "upload.16", "<OSM2Go-Main>/OSM/Upload",      "upload.16", "<OSM2Go-Main>/OSM/Upload",
709      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
710    );    );
711    
712    menu_append_new_item(    menu_append_new_item(
713      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),
714      "download.16", "<OSM2Go-Main>/OSM/Download",      "download.16", "<OSM2Go-Main>/OSM/Download",
715      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
716    );    );
# Line 677  void menu_create(appdata_t *appdata) { Line 733  void menu_create(appdata_t *appdata) {
733    );    );
734    
735    appdata->menu_item_osm_undo_changes = menu_append_new_item(    appdata->menu_item_osm_undo_changes = menu_append_new_item(
736      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes"),
737      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",
738      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
739    );    );
740    
741    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
742    appdata->menu_item_osm_relations = menu_append_new_item(    appdata->menu_item_osm_relations = menu_append_new_item(
743      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),
744      NULL, "<OSM2Go-Main>/OSM/Relations",      NULL, "<OSM2Go-Main>/OSM/Relations",
745      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
746    );    );
# Line 698  void menu_create(appdata_t *appdata) { Line 754  void menu_create(appdata_t *appdata) {
754    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
755    
756    menu_append_new_item(    menu_append_new_item(
757      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import"),
758      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
759      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
760    );    );
# Line 742  void menu_create(appdata_t *appdata) { Line 798  void menu_create(appdata_t *appdata) {
798    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
799    
800    menu_append_new_item(    menu_append_new_item(
801      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle"),
802      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",
803      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
804    );    );
# Line 778  void menu_create(appdata_t *appdata) { Line 834  void menu_create(appdata_t *appdata) {
834    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
835    
836    appdata->track.menu_item_import = menu_append_new_item(    appdata->track.menu_item_import = menu_append_new_item(
837      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),
838      NULL, "<OSM2Go-Main>/Track/Import",      NULL, "<OSM2Go-Main>/Track/Import",
839      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
840    );    );
841    
842    appdata->track.menu_item_export = menu_append_new_item(    appdata->track.menu_item_export = menu_append_new_item(
843      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),
844      NULL, "<OSM2Go-Main>/Track/Export",      NULL, "<OSM2Go-Main>/Track/Export",
845      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
846    );    );
# Line 816  void menu_create(appdata_t *appdata) { Line 872  void menu_create(appdata_t *appdata) {
872                          gtk_separator_menu_item_new());                          gtk_separator_menu_item_new());
873    
874    menu_append_new_item(    menu_append_new_item(
875      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About"),
876      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
877      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
878    );    );
# Line 1059  int main(int argc, char *argv[]) { Line 1115  int main(int argc, char *argv[]) {
1115  #ifndef PORTRAIT  #ifndef PORTRAIT
1116    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);
1117  #endif  #endif
1118    gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);    //  gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);
1119    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1120    
1121    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);
Legend:
Removed from v.156  
changed lines
  Added in v.178