From a823fca07a3670b378f4374754d7c4d863438481 Mon Sep 17 00:00:00 2001 From: Bernard Jungen Date: Sat, 25 Apr 2009 16:08:56 +0200 Subject: [PATCH] Show check sign in Display menu for sort type --- ROX-Filer/src/menu.c | 68 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/ROX-Filer/src/menu.c b/ROX-Filer/src/menu.c index 28b029eb..cdaee790 100644 --- a/ROX-Filer/src/menu.c +++ b/ROX-Filer/src/menu.c @@ -164,19 +164,25 @@ static void resize(gpointer data, guint action, GtkWidget *widget); #define MENUS_NAME "menus2" -static GtkWidget *filer_menu; /* The popup filer menu */ -static GtkWidget *filer_file_item; /* The File '' label */ -static GtkWidget *filer_file_menu; /* The File '' menu */ -static GtkWidget *file_shift_item; /* Shift Open label */ -static GtkWidget *filer_auto_size_menu; /* The Automatic item */ -static GtkWidget *filer_hidden_menu; /* The Show Hidden item */ -static GtkWidget *filer_filter_dirs_menu;/* The Filter Dirs item */ -static GtkWidget *filer_reverse_menu; /* The Reversed item */ -static GtkWidget *filer_thumb_menu; /* The Show Thumbs item */ -static GtkWidget *filer_new_window; /* The New Window item */ -static GtkWidget *filer_new_menu; /* The New submenu */ -static GtkWidget *filer_follow_sym; /* Follow symbolic links item */ -static GtkWidget *filer_set_type; /* Set type item */ +static GtkWidget *filer_menu; /* The popup filer menu */ +static GtkWidget *filer_file_item; /* The File '' label */ +static GtkWidget *filer_file_menu; /* The File '' menu */ +static GtkWidget *file_shift_item; /* Shift Open label */ +static GtkWidget *filer_auto_size_menu; /* The Automatic item */ +static GtkWidget *filer_hidden_menu; /* The Show Hidden item */ +static GtkWidget *filer_filter_dirs_menu; /* The Filter Dirs item */ +static GtkWidget *filer_sort_by_name_menu; /* The Sort by Name item */ +static GtkWidget *filer_sort_by_type_menu; /* The Sort by Type item */ +static GtkWidget *filer_sort_by_date_menu; /* The Sort by Date item */ +static GtkWidget *filer_sort_by_size_menu; /* The Sort by Size item */ +static GtkWidget *filer_sort_by_owner_menu; /* The Sort by Owner item */ +static GtkWidget *filer_sort_by_group_menu; /* The Sort by Group item */ +static GtkWidget *filer_reverse_menu; /* The Reversed item */ +static GtkWidget *filer_thumb_menu; /* The Show Thumbs item */ +static GtkWidget *filer_new_window; /* The New Window item */ +static GtkWidget *filer_new_menu; /* The New submenu */ +static GtkWidget *filer_follow_sym; /* Follow symbolic links item */ +static GtkWidget *filer_set_type; /* Set type item */ #undef N_ #define N_(x) x @@ -195,12 +201,12 @@ static GtkItemFactoryEntry filer_menu_def[] = { {">" N_("Smaller Icons"), "minus", change_size, -1, "", GTK_STOCK_ZOOM_OUT}, {">" N_("Automatic"), NULL, change_size_auto, 0, ""}, {">", NULL, NULL, 0, ""}, -{">" N_("Sort by Name"), NULL, set_sort, SORT_NAME, NULL}, -{">" N_("Sort by Type"), NULL, set_sort, SORT_TYPE, NULL}, -{">" N_("Sort by Date"), NULL, set_sort, SORT_DATE, NULL}, -{">" N_("Sort by Size"), NULL, set_sort, SORT_SIZE, NULL}, -{">" N_("Sort by Owner"), NULL, set_sort, SORT_OWNER, NULL}, -{">" N_("Sort by Group"), NULL, set_sort, SORT_GROUP, NULL}, +{">" N_("Sort by Name"), NULL, set_sort, SORT_NAME, ""}, +{">" N_("Sort by Type"), NULL, set_sort, SORT_TYPE, ""}, +{">" N_("Sort by Date"), NULL, set_sort, SORT_DATE, ""}, +{">" N_("Sort by Size"), NULL, set_sort, SORT_SIZE, ""}, +{">" N_("Sort by Owner"), NULL, set_sort, SORT_OWNER, ""}, +{">" N_("Sort by Group"), NULL, set_sort, SORT_GROUP, ""}, {">" N_("Reversed"), NULL, reverse_sort, 0, ""}, {">", NULL, NULL, 0, ""}, {">" N_("Show Hidden"), "H", hidden, 0, ""}, @@ -297,6 +303,12 @@ gboolean ensure_filer_menu(void) GET_MENU_ITEM(filer_menu, "filer"); GET_SMENU_ITEM(filer_file_menu, "filer", "File"); GET_SSMENU_ITEM(filer_hidden_menu, "filer", "Display", "Show Hidden"); + GET_SSMENU_ITEM(filer_sort_by_name_menu, "filer", "Display", "Sort by Name"); + GET_SSMENU_ITEM(filer_sort_by_type_menu, "filer", "Display", "Sort by Type"); + GET_SSMENU_ITEM(filer_sort_by_date_menu, "filer", "Display", "Sort by Date"); + GET_SSMENU_ITEM(filer_sort_by_size_menu, "filer", "Display", "Sort by Size"); + GET_SSMENU_ITEM(filer_sort_by_owner_menu, "filer", "Display", "Sort by Owner"); + GET_SSMENU_ITEM(filer_sort_by_group_menu, "filer", "Display", "Sort by Group"); GET_SSMENU_ITEM(filer_filter_dirs_menu, "filer", "Display", "Filter Directories With Files"); GET_SSMENU_ITEM(filer_reverse_menu, "filer", "Display", "Reversed"); GET_SSMENU_ITEM(filer_auto_size_menu, "filer", "Display", "Automatic"); @@ -751,6 +763,24 @@ void show_filer_menu(FilerWindow *filer_window, GdkEvent *event, ViewIter *iter) file_label = filer_file_item; file_menu = filer_file_menu; gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(filer_sort_by_name_menu), + filer_window->sort_type == SORT_NAME); + gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(filer_sort_by_type_menu), + filer_window->sort_type == SORT_TYPE); + gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(filer_sort_by_date_menu), + filer_window->sort_type == SORT_DATE); + gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(filer_sort_by_size_menu), + filer_window->sort_type == SORT_SIZE); + gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(filer_sort_by_owner_menu), + filer_window->sort_type == SORT_OWNER); + gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(filer_sort_by_group_menu), + filer_window->sort_type == SORT_GROUP); + gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(filer_thumb_menu), filer_window->show_thumbs); gtk_check_menu_item_set_active( -- 2.11.4.GIT