Enlightenment CVS committal

Author  : balony
Project : e17
Module  : apps/exhibit

Dir     : e17/apps/exhibit/src/bin


Modified Files:
        exhibit_main.c exhibit_sort.c 


Log Message:


Sorting on the files now makes more sence IMO. Added callbacks to the empty 
dropdown.

===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- exhibit_main.c      30 Dec 2006 12:57:41 -0000      1.90
+++ exhibit_main.c      11 Jan 2007 21:23:11 -0000      1.91
@@ -233,17 +233,16 @@
    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 (e->options->default_sort == EX_SORT_BY_DATE)
-         _ex_sort_date_cb(NULL, NULL);
-       else if (e->options->default_sort == EX_SORT_BY_SIZE)
-         _ex_sort_size_cb(NULL, NULL);
-       else if (e->options->default_sort == EX_SORT_BY_NAME)
-         _ex_sort_name_cb(NULL, NULL);
-       else if (e->options->default_sort == EX_SORT_BY_RESOLUTION)
-         _ex_sort_resol_cb(NULL, NULL);
-     }
+   /* XXX Doing the sorting here is ofc very inefficient, but it 
+      makes the sort work like it should at least /Martin */
+   if (e->options->default_sort == EX_SORT_BY_DATE)
+     _ex_sort_date_cb(NULL, NULL);
+   else if (e->options->default_sort == EX_SORT_BY_SIZE)
+     _ex_sort_size_cb(NULL, NULL);
+   else if (e->options->default_sort == EX_SORT_BY_NAME)
+     _ex_sort_name_cb(NULL, NULL);
+   else if (e->options->default_sort == EX_SORT_BY_RESOLUTION)
+     _ex_sort_resol_cb(NULL, NULL);
 
    if (update == EX_TREE_UPDATE_ALL || update == EX_TREE_UPDATE_DIRS)
        etk_tree_sort(ETK_TREE(e->cur_tab->dtree), _ex_main_dtree_compare_cb, 
@@ -972,7 +971,7 @@
       
    e->hbox = etk_hbox_new(ETK_TRUE, 0);
    e->sort_bar = etk_statusbar_new();
-   etk_statusbar_message_push(ETK_STATUSBAR(e->sort_bar), "Sort by date", 0);
+   etk_statusbar_message_push(ETK_STATUSBAR(e->sort_bar), "Sorting", 0);
    etk_statusbar_has_resize_grip_set(ETK_STATUSBAR(e->sort_bar), ETK_FALSE);
    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_bar, ETK_BOX_START, ETK_BOX_NONE, 
0);
@@ -981,10 +980,10 @@
 
        menu = etk_menu_new();
        etk_signal_connect("mouse_down", ETK_OBJECT(e->sort_bar), 
ETK_CALLBACK(_ex_sort_label_mouse_down_cb), menu);
-       _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_NORMAL, _("Sort by name"), 
ETK_STOCK_TEXT_X_GENERIC, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_sort_name_cb), 
NULL);
+       _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by date"), 
ETK_STOCK_OFFICE_CALENDAR, ETK_MENU_SHELL(menu), 
ETK_CALLBACK(_ex_sort_date_cb), NULL);
+       _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by size"), 
ETK_STOCK_DRIVE_HARDDISK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_sort_size_cb), 
NULL);
+       _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort by resolution"), 
ETK_STOCK_UTILITIES_SYSTEM_MONITOR, ETK_MENU_SHELL(menu), 
ETK_CALLBACK(_ex_sort_resol_cb), 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_CHECK, _("Ascending"), 
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
      }
@@ -1034,7 +1033,7 @@
             printf("  %s <image>\n", PACKAGE);
             printf("  %s <path>\n", PACKAGE);
             printf("  %s <url>\n\n", PACKAGE);
-            printf("  -f, --fullscreen\t\t start Exhibit in fullscreen 
mode\n");
+            printf("  -f, --fullscreen\t start Exhibit in fullscreen mode\n");
             printf("  -h, --help\t\t display this help and exit\n");
             printf("  -v, --version\t\t output version information and 
exit\n\n");
             exit(1);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_sort.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- exhibit_sort.c      2 Sep 2006 12:33:08 -0000       1.8
+++ exhibit_sort.c      11 Jan 2007 21:23:11 -0000      1.9
@@ -119,24 +119,28 @@
 {    
    etk_tree_sort(ETK_TREE(e->cur_tab->itree), _ex_sort_itree_name_compare_cb, 
                         ETK_TRUE, e->cur_tab->icol, NULL);
+   etk_statusbar_message_push(ETK_STATUSBAR(e->sort_bar), "Sort by name", 0);
 }
 
 void 
 _ex_sort_size_cb(Etk_Object *obj, void *data)
 {    
    etk_tree_sort(ETK_TREE(e->cur_tab->itree), _ex_sort_itree_size_compare_cb, 
ETK_TRUE, e->cur_tab->icol, NULL);
+   etk_statusbar_message_push(ETK_STATUSBAR(e->sort_bar), "Sort by size", 0);
 }
 
 void 
 _ex_sort_resol_cb(Etk_Object *obj, void *data)
 {    
    etk_tree_sort(ETK_TREE(e->cur_tab->itree), _ex_sort_itree_resol_compare_cb, 
ETK_TRUE, e->cur_tab->icol, NULL);
+   etk_statusbar_message_push(ETK_STATUSBAR(e->sort_bar), "Sort by 
resolution", 0);
 }
 
 void 
 _ex_sort_date_cb(Etk_Object *obj, void *data)
 {    
    etk_tree_sort(ETK_TREE(e->cur_tab->itree), _ex_sort_itree_date_compare_cb, 
ETK_TRUE, e->cur_tab->icol, NULL);
+   etk_statusbar_message_push(ETK_STATUSBAR(e->sort_bar), "Sort by date", 0);
 }
 
 void



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to