Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c layout_etk_simple.c
Log Message:
* More config work
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- etk_list_viewer.c 24 Aug 2006 23:18:03 -0000 1.70
+++ etk_list_viewer.c 1 Sep 2006 12:12:50 -0000 1.71
@@ -120,21 +120,27 @@
{
gui_file *file1, *file2;
int val;
+ int presort_folder;
if (!tree || !row1 || !row2 || !col)
return 0;
file1 = ecore_hash_get(etk_list_viewer_row_hash, row1);
file2 = ecore_hash_get(etk_list_viewer_row_hash, row2);
+
+ presort_folder = entropy_config_misc_is_set("general.presortfolders");
if (file1 && file2) {
val = strcasecmp(file1->file->filename, file2->file->filename);
- if ( !strcmp(file1->file->mime_type, "file/folder") &&
strcmp(file2->file->mime_type, "file/folder"))
- return -1;
- else if (!strcmp(file2->file->mime_type, "file/folder") &&
strcmp(file1->file->mime_type, "file/folder"))
- return 1;
- else
+ if (presort_folder) {
+ if ( !strcmp(file1->file->mime_type, "file/folder") &&
strcmp(file2->file->mime_type, "file/folder"))
+ return -1;
+ else if (!strcmp(file2->file->mime_type, "file/folder") &&
strcmp(file1->file->mime_type, "file/folder"))
+ return 1;
+ else
+ return val;
+ } else
return val;
} else {
printf("Could not locate file!\n");
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- layout_etk_simple.c 1 Sep 2006 11:59:45 -0000 1.60
+++ layout_etk_simple.c 1 Sep 2006 12:12:50 -0000 1.61
@@ -686,9 +686,11 @@
if (entropy_config_misc_is_set("general.listviewer")) {
gui->list_viewer->active=1;
local_viewer_selected = 1;
+ etk_widget_show(gui->list_viewer->gui_object);
etk_box_append(ETK_BOX(gui->localshell),
gui->list_viewer->gui_object, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
} else {
gui->list_viewer->active=0;
+ etk_widget_show(gui->list_viewer->gui_object);
}
}
@@ -704,9 +706,11 @@
if (entropy_config_misc_is_set("general.iconviewer")) {
gui->iconbox_viewer->active=1;
local_viewer_selected = 1;
+ etk_widget_show(gui->iconbox_viewer->gui_object);
etk_box_append(ETK_BOX(gui->localshell),
gui->iconbox_viewer->gui_object, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
} else {
gui->iconbox_viewer->active=0;
+ etk_widget_show(gui->iconbox_viewer->gui_object);
}
}
@@ -795,11 +799,17 @@
menu_item = _entropy_etk_radio_item_new(_("List View (Alt-l)"), NULL,
ETK_MENU_SHELL(menu));
etk_object_data_set(ETK_OBJECT(menu_item), "VISUAL", gui->list_viewer);
etk_signal_connect("activated", ETK_OBJECT(menu_item),
ETK_CALLBACK(etk_local_viewer_cb), layout);
+ if (entropy_config_misc_is_set("general.listviewer")) {
+ etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),
ETK_TRUE);
+ }
menu_item = _entropy_etk_radio_item_new(_("Icon View (Alt-i)"), menu_item,
ETK_MENU_SHELL(menu));
etk_object_data_set(ETK_OBJECT(menu_item), "VISUAL", gui->iconbox_viewer);
etk_signal_connect("activated", ETK_OBJECT(menu_item),
ETK_CALLBACK(etk_local_viewer_cb), layout);
+ if (entropy_config_misc_is_set("general.iconviewer")) {
+ etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),
ETK_TRUE);
+ }
/*Debug menu*/
-------------------------------------------------------------------------
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
