Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_configure.c e_int_config_mime.c e_int_config_mime_edit.c
Log Message:
First refactor/reorder of the Config Panel Items.
Rename File Associations to File Icons.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- e_configure.c 27 Nov 2006 15:28:12 -0000 1.78
+++ e_configure.c 28 Nov 2006 11:08:44 -0000 1.79
@@ -401,41 +401,47 @@
_e_configure_item_add(cat, _("Borders"), "enlightenment/windows",
e_int_config_borders);
_e_configure_item_add(cat, _("Icon Theme"), "enlightenment/icon_theme",
e_int_config_icon_themes);
_e_configure_item_add(cat, _("Mouse Cursor"), "enlightenment/mouse",
e_int_config_cursor);
- _e_configure_item_add(cat, _("Window Display"), "enlightenment/windows",
e_int_config_window_display);
_e_configure_item_add(cat, _("Transitions"), "enlightenment/transitions",
e_int_config_transitions);
- _e_configure_item_add(cat, _("Shelves"), "enlightenment/shelf",
e_int_config_shelf);
+ _e_configure_item_add(cat, _("Startup"), "enlightenment/startup",
e_int_config_startup);
cat = _e_configure_category_add(eco, _("Screen"),
"enlightenment/screen_setup");
_e_configure_item_add(cat, _("Virtual Desktops"), "enlightenment/desktops",
e_int_config_desks);
_e_configure_item_add(cat, _("Screen Resolution"),
"enlightenment/screen_resolution", e_int_config_display);
_e_configure_item_add(cat, _("Screen Lock"), "enlightenment/desklock",
e_int_config_desklock);
-
- cat = _e_configure_category_add(eco, _("Behavior"),
"enlightenment/behavior");
- _e_configure_item_add(cat, _("Window Focus"), "enlightenment/focus",
e_int_config_focus);
+
+ cat = _e_configure_category_add(eco, _("Keyboard & Mouse"),
"enlightenment/behavior");
_e_configure_item_add(cat, _("Key Bindings"), "enlightenment/keys",
e_int_config_keybindings);
_e_configure_item_add(cat, _("Mouse Bindings"),
"enlightenment/mouse_clean", e_int_config_mousebindings);
- _e_configure_item_add(cat, _("Menus"), "enlightenment/menus",
e_int_config_menus);
- cat = _e_configure_category_add(eco, _("Miscellaneous"),
"enlightenment/misc");
+ cat = _e_configure_category_add(eco, _("Windows"), "enlightenment/windows");
+ _e_configure_item_add(cat, _("Window Display"), "enlightenment/windows",
e_int_config_window_display);
+ _e_configure_item_add(cat, _("Window Focus"), "enlightenment/focus",
e_int_config_focus);
+ _e_configure_item_add(cat, _("Window Manipulation"),
"enlightenment/window_manipulation", e_int_config_window_manipulation);
+
+ cat = _e_configure_category_add(eco, _("Menus"), "enlightenment/menus");
#ifdef ENABLE_FAVORITES
_e_configure_item_add(cat, _("Application Menus"),
"enlightenment/applications", e_int_config_apps);
#else
_e_configure_item_add(cat, _("Applications Menu"),
"enlightenment/applications", e_int_config_apps);
#endif
- _e_configure_item_add(cat, _("Performance"), "enlightenment/performance",
e_int_config_performance);
- _e_configure_item_add(cat, _("Configuration Dialogs"),
"enlightenment/configuration", e_int_config_cfgdialogs);
+ _e_configure_item_add(cat, _("Menu Settings"), "enlightenment/menus",
e_int_config_menus);
+
+ cat = _e_configure_category_add(eco, _("Language"), "enlightenment/intl");
_e_configure_item_add(cat, _("Language Settings"), "enlightenment/intl",
e_int_config_intl);
+
+ cat = _e_configure_category_add(eco, _("Miscellaneous"),
"enlightenment/misc");
+ _e_configure_item_add(cat, _("Configuration Dialogs"),
"enlightenment/configuration", e_int_config_cfgdialogs);
cat = _e_configure_category_add(eco, _("Advanced"),
"enlightenment/advanced");
- _e_configure_item_add(cat, _("Startup"), "enlightenment/startup",
e_int_config_startup);
+ _e_configure_item_add(cat, _("Performance"), "enlightenment/performance",
e_int_config_performance);
_e_configure_item_add(cat, _("Window List"), "enlightenment/winlist",
e_int_config_winlist);
- _e_configure_item_add(cat, _("Window Manipulation"),
"enlightenment/window_manipulation", e_int_config_window_manipulation);
_e_configure_item_add(cat, _("Run Command"), "enlightenment/run",
e_int_config_exebuf);
_e_configure_item_add(cat, _("Search Directories"),
"enlightenment/directories", e_int_config_paths);
- _e_configure_item_add(cat, _("File Associations"), "enlightenment/e",
e_int_config_mime);
+ _e_configure_item_add(cat, _("File Icons"), "enlightenment/e",
e_int_config_mime);
cat = _e_configure_category_add(eco, _("Extensions"),
"enlightenment/extensions");
_e_configure_item_add(cat, _("Modules"), "enlightenment/modules",
e_int_config_modules);
+ _e_configure_item_add(cat, _("Shelves"), "enlightenment/shelf",
e_int_config_shelf);
/* FIXME: we should have a way for modules to hook in here and add their
own entries
*
@@ -444,8 +450,8 @@
e_widget_ilist_go(eco->cat_list);
e_widget_min_size_get(eco->cat_list, &mw, &mh);
- edje_extern_object_min_size_set(eco->cat_list, 150, mh);
- e_widget_min_size_set(eco->cat_list, 150, mh);
+ edje_extern_object_min_size_set(eco->cat_list, mw, mh);
+ e_widget_min_size_set(eco->cat_list, mw, mh);
e_widget_ilist_thaw(eco->cat_list);
edje_thaw();
evas_event_thaw(evas_object_evas_get(eco->cat_list));
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_mime.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_int_config_mime.c 27 Nov 2006 14:23:07 -0000 1.18
+++ e_int_config_mime.c 28 Nov 2006 11:08:44 -0000 1.19
@@ -60,7 +60,7 @@
v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create;
- cfd = e_config_dialog_new(con, _("File Associations"), "E",
"_config_mime_dialog",
+ cfd = e_config_dialog_new(con, _("File Icons"), "E", "_config_mime_dialog",
"enlightenment/e", 0, v, NULL);
return cfd;
}
@@ -192,7 +192,7 @@
e_widget_framelist_object_append(of, ol);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_frametable_add(evas, _("File Associations"), 0);
+ of = e_widget_frametable_add(evas, _("File Types"), 0);
ol = e_widget_ilist_add(evas, 16, 16, NULL);
cfdata->gui.list = ol;
e_widget_ilist_go(ol);
@@ -327,7 +327,6 @@
if ((*p == '\n') || (*p == 0)) continue;
pp = p;
while (!isblank(*p) && (*p != 0) && (*p != '\n')) p++;
-// while ((*p != ':') && (*p != 0) && (*p != '\n')) p++;
if ((*p == '\n') || (*p == 0)) continue;
strncpy(mimetype, pp, (p - pp));
mimetype[p - pp] = 0;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_mime_edit.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_int_config_mime_edit.c 24 Nov 2006 09:21:54 -0000 1.12
+++ e_int_config_mime_edit.c 28 Nov 2006 11:08:44 -0000 1.13
@@ -65,7 +65,7 @@
v->basic.create_widgets = _basic_create;
v->basic.apply_cfdata = _basic_apply;
- cfd = e_config_dialog_new(con, _("File Association"), "E",
+ cfd = e_config_dialog_new(con, _("File Icon"), "E",
"_config_mime_edit_dialog", "enlightenment/e",
0, v, cfdata);
return cfd;
-------------------------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
