Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_main.c exhibit_menus.c exhibit_menus.h exhibit_sort.c
Log Message:
enable the sort menu in the statusbar - you will not see it because of a small
etk bug being fixed
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- exhibit_main.c 2 Sep 2006 01:43:23 -0000 1.74
+++ exhibit_main.c 2 Sep 2006 12:33:08 -0000 1.75
@@ -865,9 +865,10 @@
etk_signal_connect("current_page_changed", ETK_OBJECT(e->notebook),
ETK_CALLBACK(_ex_main_window_tab_toggled_cb), NULL);
- e->hbox = etk_hbox_new(ETK_TRUE, 0);
+ e->hbox = etk_hbox_new(ETK_TRUE, 0);
+ e->sort = etk_label_new("Sort by date");
etk_box_append(ETK_BOX(e->vbox), e->hbox, ETK_BOX_END, ETK_BOX_NONE, 0);
-
+ etk_box_append(ETK_BOX(e->hbox), e->sort, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
{
Etk_Widget *menu;
Etk_Widget *menu_item;
@@ -877,8 +878,9 @@
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by name"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by date"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by size"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by resolution"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(menu), NULL, NULL);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Ascending"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
+ _ex_menu_item_new(EX_MENU_ITEM_CHECK, _("Ascending"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
}
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- exhibit_menus.c 2 Sep 2006 01:43:23 -0000 1.34
+++ exhibit_menus.c 2 Sep 2006 12:33:08 -0000 1.35
@@ -52,6 +52,9 @@
case EX_MENU_ITEM_NORMAL:
menu_item = etk_menu_item_image_new_with_label(label);
break;
+ case EX_MENU_ITEM_CHECK:
+ menu_item = etk_menu_item_check_new_with_label(label);
+ break;
case EX_MENU_ITEM_SEPERATOR:
menu_item = etk_menu_item_separator_new();
break;
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- exhibit_menus.h 18 Aug 2006 10:36:41 -0000 1.12
+++ exhibit_menus.h 2 Sep 2006 12:33:08 -0000 1.13
@@ -7,6 +7,7 @@
typedef enum _Ex_Menu_Item_Type
{
EX_MENU_ITEM_NORMAL,
+ EX_MENU_ITEM_CHECK,
EX_MENU_ITEM_SEPERATOR
} Ex_Menu_Item_Type;
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_sort.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- exhibit_sort.c 2 Sep 2006 01:43:23 -0000 1.7
+++ exhibit_sort.c 2 Sep 2006 12:33:08 -0000 1.8
@@ -139,10 +139,9 @@
etk_tree_sort(ETK_TREE(e->cur_tab->itree), _ex_sort_itree_date_compare_cb,
ETK_TRUE, e->cur_tab->icol, NULL);
}
-
void
_ex_sort_label_mouse_down_cb(Etk_Object *object, void *event_info, void *data)
{
- etk_menu_popup(ETK_MENU(data));
+ etk_menu_popup(ETK_MENU(data));
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
