Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin Modified Files: exhibit_main.c exhibit_menus.c Log Message: - use radio-button menu items for the sorting sub-menu =================================================================== RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v retrieving revision 1.101 retrieving revision 1.102 diff -u -3 -r1.101 -r1.102 --- exhibit_main.c 3 May 2007 16:21:53 -0000 1.101 +++ exhibit_main.c 4 May 2007 09:45:48 -0000 1.102 @@ -281,7 +281,7 @@ etk_tree_thaw(ETK_TREE(e->cur_tab->itree)); etk_tree_thaw(ETK_TREE(e->cur_tab->dtree)); - if (update == EX_TREE_UPDATE_FILES) + if (update == EX_TREE_UPDATE_FILES || update == EX_TREE_UPDATE_ALL) { if (e->options->default_sort == EX_SORT_BY_DATE) _ex_sort_date_cb(NULL, NULL); @@ -893,11 +893,19 @@ menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_run_in_cb), e); submenu = etk_menu_new(); etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(submenu)); - _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Date"), ETK_STOCK_OFFICE_CALENDAR, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_date_cb), e); - _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Size"), ETK_STOCK_DRIVE_HARDDISK, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_size_cb), e); - _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Name"), ETK_STOCK_TEXT_X_GENERIC, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_name_cb), e); - _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Resolution"), ETK_STOCK_UTILITIES_SYSTEM_MONITOR, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_resol_cb), e); - + menu_item = _ex_menu_item_new(EX_MENU_ITEM_RADIO, _("Date"), ETK_STOCK_OFFICE_CALENDAR, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_date_cb), NULL); + if (e->options->default_sort == EX_SORT_BY_DATE) + etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item), ETK_TRUE); + menu_item = _ex_menu_item_new(EX_MENU_ITEM_RADIO, _("Size"), ETK_STOCK_DRIVE_HARDDISK, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_size_cb), menu_item); + if (e->options->default_sort == EX_SORT_BY_SIZE) + etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item), ETK_TRUE); + menu_item = _ex_menu_item_new(EX_MENU_ITEM_RADIO, _("Name"), ETK_STOCK_TEXT_X_GENERIC, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_name_cb), menu_item); + if (e->options->default_sort == EX_SORT_BY_NAME) + etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item), ETK_TRUE); + menu_item = _ex_menu_item_new(EX_MENU_ITEM_RADIO, _("Resolution"), ETK_STOCK_UTILITIES_SYSTEM_MONITOR, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_resol_cb), menu_item); + if (e->options->default_sort == EX_SORT_BY_RESOLUTION) + etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item), ETK_TRUE); + _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Zoom in"), EX_IMAGE_ZOOM_IN, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_zoom_in_cb), e); _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Zoom out"), EX_IMAGE_ZOOM_OUT, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_zoom_out_cb), e); _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Zoom 1:1"), EX_IMAGE_ONE_TO_ONE, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_zoom_one_to_one_cb), e); @@ -910,7 +918,7 @@ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Add to favorites"), ETK_STOCK_EMBLEM_PHOTOS, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_add_to_fav_cb), e); _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("View favorites"), ETK_STOCK_EMBLEM_FAVORITE, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_go_to_fav_cb), e); - /* Create the "Help" submenu */ + /* Create the "Help" menu */ menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Help"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e->menu_bar), NULL, NULL); menu = etk_menu_new(); etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu)); =================================================================== RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_menus.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- exhibit_menus.c 3 May 2007 16:21:53 -0000 1.44 +++ exhibit_menus.c 4 May 2007 09:45:48 -0000 1.45 @@ -46,6 +46,7 @@ void *data) { Etk_Widget *menu_item = NULL; + Etk_Menu_Item_Radio *group_item; switch (item_type) { @@ -58,28 +59,35 @@ case EX_MENU_ITEM_SEPARATOR: menu_item = etk_menu_item_separator_new(); break; + case EX_MENU_ITEM_RADIO: + group_item = data; + menu_item = etk_menu_item_radio_new_with_label_from_widget(label, ETK_MENU_ITEM_RADIO(group_item)); + break; default: return NULL; } - - if (stock_id > ETK_STOCK_NO_STOCK) - { - Etk_Widget *image; - image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL); - etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image)); - } - else if (stock_id < ETK_STOCK_NO_STOCK) - { - stock_id = abs(stock_id) - 1; - if(stock_id >= 0 && stock_id < sizeof(ex_images) / sizeof(char*)) + if (item_type != EX_MENU_ITEM_RADIO) + { + if (stock_id > ETK_STOCK_NO_STOCK) { Etk_Widget *image; - image = etk_image_new_from_edje(PACKAGE_DATA_DIR - "/gui.edj", - ex_images[stock_id]); + image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL); etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image)); + } + else if (stock_id < ETK_STOCK_NO_STOCK) + { + stock_id = abs(stock_id) - 1; + if(stock_id >= 0 && stock_id < sizeof(ex_images) / sizeof(char*)) + { + Etk_Widget *image; + + image = etk_image_new_from_edje(PACKAGE_DATA_DIR + "/gui.edj", + ex_images[stock_id]); + etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image)); + } } } etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item)); ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs