comparison src/view_dir.c @ 419:ce5316d2e2d0

Cleanup last patch: - drop vd_pop_menu_dir_view_as_cb() since it is now unused. - use G_N_ELEMENTS()
author zas_
date Sat, 19 Apr 2008 11:11:53 +0000
parents 440979320308
children b8e663fab11f
comparison
equal deleted inserted replaced
418:4043254aee5b 419:ce5316d2e2d0
439 439
440 if (!vd->click_fd) return; 440 if (!vd->click_fd) return;
441 file_util_delete_dir(vd->click_fd, vd->widget); 441 file_util_delete_dir(vd->click_fd, vd->widget);
442 } 442 }
443 443
444 static void vd_pop_menu_dir_view_as_cb(GtkWidget *widget, gpointer data) 444 #define VIEW_DIR_AS_SUBMENU_KEY "view_dir_as_submenu"
445 {
446 ViewDir *vd = data;
447 DirViewType new_type = DIRVIEW_LIST;
448
449 if (!vd->layout) return;
450
451 switch(vd->type)
452 {
453 case DIRVIEW_LIST: new_type = DIRVIEW_TREE; break;
454 case DIRVIEW_TREE: new_type = DIRVIEW_LIST; break;
455 }
456
457 layout_views_set(vd->layout, new_type, vd->layout->icon_view);
458 }
459
460 #define VIEW_DIR_AS_SUBMENU_KEY "view_dir_as"
461 static void vd_pop_submenu_dir_view_as_cb(GtkWidget *widget, gpointer data) 445 static void vd_pop_submenu_dir_view_as_cb(GtkWidget *widget, gpointer data)
462 { 446 {
463 ViewDir *vd = data; 447 ViewDir *vd = data;
448
464 DirViewType new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), VIEW_DIR_AS_SUBMENU_KEY)); 449 DirViewType new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), VIEW_DIR_AS_SUBMENU_KEY));
465 layout_views_set(vd->layout, new_type, vd->layout->icon_view); 450 layout_views_set(vd->layout, new_type, vd->layout->icon_view);
466 } 451 }
467 452
468 static void vd_pop_menu_refresh_cb(GtkWidget *widget, gpointer data) 453 static void vd_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
618 603
619 item = menu_item_add(menu, _("_View as"), NULL, NULL); 604 item = menu_item_add(menu, _("_View as"), NULL, NULL);
620 submenu = gtk_menu_new(); 605 submenu = gtk_menu_new();
621 gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu); 606 gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
622 607
623 for (i = 0; i < sizeof(menu_view_dir_radio_entries) / sizeof(GtkRadioActionEntry); i++) 608 for (i = 0; i < G_N_ELEMENTS(menu_view_dir_radio_entries); i++)
624 { 609 {
625 item = menu_item_add_check(submenu, menu_view_dir_radio_entries[i].label, 610 item = menu_item_add_check(submenu, menu_view_dir_radio_entries[i].label,
626 (vd->type == menu_view_dir_radio_entries[i].value), 611 (vd->type == menu_view_dir_radio_entries[i].value),
627 G_CALLBACK(vd_pop_submenu_dir_view_as_cb), vd); 612 G_CALLBACK(vd_pop_submenu_dir_view_as_cb), vd);
628 g_object_set_data(G_OBJECT(item), VIEW_DIR_AS_SUBMENU_KEY, GINT_TO_POINTER(menu_view_dir_radio_entries[i].value)); 613 g_object_set_data(G_OBJECT(item), VIEW_DIR_AS_SUBMENU_KEY, GINT_TO_POINTER(menu_view_dir_radio_entries[i].value));