rvandegrift
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New categories for modules. 

To be continued soon...


SVN revision: 53514
This commit is contained in:
Miculcy Brian 2010-10-17 17:33:44 +00:00
parent 1a7b1c2624
commit dd641e9259
28 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/themes/default.edc
View File

@ -29477,7 +29477,8 @@ collections {
ICON("preferences-menu-settings","icon_menu_settings.png",64) // *** // "enlightenment/menu_settings" ICON("preferences-menu-settings","icon_menu_settings.png",64) // *** // "enlightenment/menu_settings"
ICON("preferences-advanced","icon_advanced.png",64) // *** // "enlightenment/advanced" ICON("preferences-advanced","icon_advanced.png",64) // *** // "enlightenment/advanced"
ICON("preferences-behavior","icon_behavior.png",64) // *** // "enlightenment/behavior" ICON("preferences-behavior","icon_behavior.png",64) // *** // "enlightenment/behavior"
ICON("preferences-appearance","icon_appearance.png",64) // *** // "enlightenment/appearance" ICON("preferences-look","icon_look.png",64) // *** // "enlightenment/look"
ICON("preferences-utils","icon_gadget.png",64) // *** // "enlightenment/utils"
ICON("preferences-extensions","icon_extensions.png",64) // *** // "enlightenment/extensions" ICON("preferences-extensions","icon_extensions.png",64) // *** // "enlightenment/extensions"
ICON("preferences-file-icons","icon_file_icons.png",64) // *** // "enlightenment/file_icons" ICON("preferences-file-icons","icon_file_icons.png",64) // *** // "enlightenment/file_icons"
ICON("preferences-pager","icon_pager.png",64) // *** // "enlightenment/pager" ICON("preferences-pager","icon_pager.png",64) // *** // "enlightenment/pager"

BIN
data/themes/images/icon_gadget.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

0
data/themes/images/icon_appearance.png → data/themes/images/icon_look.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

4
src/bin/e_fm.c
View File

@ -7718,7 +7718,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
{ {
mi = e_menu_item_new(mn); mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("View Mode")); e_menu_item_label_set(mi, _("View Mode"));
e_util_menu_item_theme_icon_set(mi, "preferences-appearance"); e_util_menu_item_theme_icon_set(mi, "preferences-look");
e_menu_item_submenu_pre_callback_set(mi, _e_fm2_view_menu_pre, sd); e_menu_item_submenu_pre_callback_set(mi, _e_fm2_view_menu_pre, sd);
} }
if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REFRESH)) if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REFRESH))
@ -7878,7 +7878,7 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
{ {
mi = e_menu_item_new(mn); mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("View Mode")); e_menu_item_label_set(mi, _("View Mode"));
e_util_menu_item_theme_icon_set(mi, "preferences-appearance"); e_util_menu_item_theme_icon_set(mi, "preferences-look");
e_menu_item_submenu_pre_callback_set(mi, _e_fm2_icon_view_menu_pre, sd); e_menu_item_submenu_pre_callback_set(mi, _e_fm2_icon_view_menu_pre, sd);
} }
if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REFRESH)) if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REFRESH))

6
src/bin/e_gadcon.c
View File

@ -1327,7 +1327,7 @@ e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu)
mn = e_menu_new(); mn = e_menu_new();
mi = e_menu_item_new(menu); mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Move to")); e_menu_item_label_set(mi, _("Move to"));
e_util_menu_item_theme_icon_set(mi, "preferences-appearance"); e_util_menu_item_theme_icon_set(mi, "preferences-look");
e_menu_item_submenu_set(mi, mn); e_menu_item_submenu_set(mi, mn);
e_menu_pre_activate_callback_set(mn, _e_gadcon_gadget_move_to_pre_cb, gcc); e_menu_pre_activate_callback_set(mn, _e_gadcon_gadget_move_to_pre_cb, gcc);
} }
@ -1393,8 +1393,8 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_main,
e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_style_inset, gcc); e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_style_inset, gcc);
mi = e_menu_item_new(menu_gadget); mi = e_menu_item_new(menu_gadget);
e_menu_item_label_set(mi, _("Appearance")); e_menu_item_label_set(mi, _("Look"));
e_util_menu_item_theme_icon_set(mi, "preferences-appearance"); e_util_menu_item_theme_icon_set(mi, "preferences-look");
e_menu_item_submenu_set(mi, mo); e_menu_item_submenu_set(mi, mo);
} }

8
src/bin/e_int_config_modules.c
View File

@ -49,12 +49,12 @@ static const CFTypes _types[] =
{ {
#define _CFT(k, n, i) \ #define _CFT(k, n, i) \
{sizeof(k) - 1, k, n, i} {sizeof(k) - 1, k, n, i}
_CFT("appearance", N_("Appearance"), "preferences-appearance"), _CFT("utils", N_("Utils"), "preferences-utils"),
_CFT("look", N_("Look"), "preferences-look"),
_CFT("system", N_("System"), "system"),
_CFT("config", N_("Settings"), "preferences-system"), _CFT("config", N_("Settings"), "preferences-system"),
_CFT("everything", N_("Everything Launcher"), "system-run"), _CFT("everything", N_("Everything Launcher"), "system-run"),
_CFT("fileman", N_("File Manager"), "system-file-manager"), _CFT("fileman", N_("File Manager"), "system-file-manager"),
_CFT("shelf", N_("Shelf"), "preferences-desktop-shelf"),
_CFT("system", N_("System"), "system"),
#undef _CFT #undef _CFT
{0, NULL, NULL, NULL} {0, NULL, NULL, NULL}
}; };
@ -452,7 +452,7 @@ _load_modules(const char *dir, Eina_Hash *types_hash)
type = eina_hash_find(desk->x, "X-Enlightenment-ModuleType"); type = eina_hash_find(desk->x, "X-Enlightenment-ModuleType");
else else
type = NULL; type = NULL;
if (!type) type = "shelf"; // todo: warn? if (!type) type = "utils"; // todo: warn?
cft = eina_hash_find(types_hash, type); cft = eina_hash_find(types_hash, type);
if (cft) if (cft)

1
src/modules/clock/module.desktop.in
View File

@ -16,6 +16,7 @@ Name[tr]=Saat
Name[zh_CN]= Name[zh_CN]=
Name[zh_TW]= Name[zh_TW]=
Icon=e-module-clock Icon=e-module-clock
X-Enlightenment-ModuleType=utils
Comment=Nice clock gadget to show current time. Comment=Nice clock gadget to show current time.
Comment[cs]=Gadget pro zobrazení aktuálního času. Comment[cs]=Gadget pro zobrazení aktuálního času.
Comment[de]= Comment[de]=

2
src/modules/comp/e_mod_main.c
View File

@ -39,7 +39,7 @@ e_modapi_init(E_Module *m)
mod->module = m; mod->module = m;
snprintf(buf, sizeof(buf), "%s/e-module-comp.edj", e_module_dir_get(m)); snprintf(buf, sizeof(buf), "%s/e-module-comp.edj", e_module_dir_get(m));
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
"preferences-appearance"); "preferences-look");
e_configure_registry_item_add("appearance/comp", 120, _("Composite"), NULL, e_configure_registry_item_add("appearance/comp", 120, _("Composite"), NULL,
buf, e_int_config_comp_module); buf, e_int_config_comp_module);

2
src/modules/comp/module.desktop.in
View File

@ -5,4 +5,4 @@ Icon=e-module-comp
Comment= Comment=
Comment[fr]= Comment[fr]=
Comment[it]= Comment[it]=
X-Enlightenment-ModuleType=appearance X-Enlightenment-ModuleType=look

2
src/modules/conf_borders/e_mod_main.c
View File

@ -14,7 +14,7 @@ EAPI E_Module_Api e_modapi =
EAPI void * EAPI void *
e_modapi_init(E_Module *m) e_modapi_init(E_Module *m)
{ {
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance"); e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look");
e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL, "preferences-system-windows", e_int_config_borders); e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL, "preferences-system-windows", e_int_config_borders);
e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal"); e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "preferences-system-windows", e_int_config_borders_border); e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "preferences-system-windows", e_int_config_borders_border);

2
src/modules/conf_colors/e_mod_main.c
View File

@ -15,7 +15,7 @@ EAPI void *
e_modapi_init(E_Module *m __UNUSED__) e_modapi_init(E_Module *m __UNUSED__)
{ {
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
"preferences-appearance"); "preferences-look");
e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL,
"preferences-desktop-color", "preferences-desktop-color",
e_int_config_color_classes); e_int_config_color_classes);

2
src/modules/conf_fonts/e_mod_main.c
View File

@ -15,7 +15,7 @@ EAPI void *
e_modapi_init(E_Module *m) e_modapi_init(E_Module *m)
{ {
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
"preferences-appearance"); "preferences-look");
e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL,
"preferences-desktop-font", "preferences-desktop-font",
e_int_config_fonts); e_int_config_fonts);

2
src/modules/conf_icon_theme/e_mod_main.c
View File

@ -15,7 +15,7 @@ EAPI E_Module_Api e_modapi =
EAPI void * EAPI void *
e_modapi_init(E_Module *m) e_modapi_init(E_Module *m)
{ {
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance"); e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look");
e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon Theme"), NULL, "preferences-icon-theme", e_int_config_icon_themes); e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon Theme"), NULL, "preferences-icon-theme", e_int_config_icon_themes);
conf_module = m; conf_module = m;
e_module_delayed_set(m, 1); e_module_delayed_set(m, 1);

2
src/modules/conf_mouse_cursor/e_mod_main.c
View File

@ -14,7 +14,7 @@ EAPI E_Module_Api e_modapi =
EAPI void * EAPI void *
e_modapi_init(E_Module *m) e_modapi_init(E_Module *m)
{ {
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance"); e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look");
e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse Cursor"), NULL, "preferences-desktop-pointer", e_int_config_cursor); e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse Cursor"), NULL, "preferences-desktop-pointer", e_int_config_cursor);
conf_module = m; conf_module = m;
e_module_delayed_set(m, 1); e_module_delayed_set(m, 1);

2
src/modules/conf_scale/e_mod_main.c
View File

@ -16,7 +16,7 @@ EAPI void *
e_modapi_init(E_Module *m) e_modapi_init(E_Module *m)
{ {
e_configure_registry_category_add("appearance", 10, _("Look"), e_configure_registry_category_add("appearance", 10, _("Look"),
NULL, "preferences-appearance"); NULL, "preferences-look");
e_configure_registry_item_add("appearance/scale", 90, _("Scaling"), NULL, e_configure_registry_item_add("appearance/scale", 90, _("Scaling"), NULL,
"preferences-scale", e_int_config_scale); "preferences-scale", e_int_config_scale);
conf_module = m; conf_module = m;

2
src/modules/conf_startup/e_mod_main.c
View File

@ -15,7 +15,7 @@ EAPI void *
e_modapi_init(E_Module *m) e_modapi_init(E_Module *m)
{ {
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
"preferences-appearance"); "preferences-look");
e_configure_registry_item_add("appearance/startup", 90, _("Startup"), NULL, e_configure_registry_item_add("appearance/startup", 90, _("Startup"), NULL,
"preferences-startup", e_int_config_startup); "preferences-startup", e_int_config_startup);
conf_module = m; conf_module = m;

2
src/modules/conf_theme/e_mod_main.c
View File

@ -19,7 +19,7 @@ EAPI void *
e_modapi_init(E_Module *m) e_modapi_init(E_Module *m)
{ {
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
"preferences-appearance"); "preferences-look");
e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL,
"preferences-desktop-theme", "preferences-desktop-theme",
e_int_config_theme); e_int_config_theme);

2
src/modules/conf_transitions/e_mod_main.c
View File

@ -15,7 +15,7 @@ EAPI void *
e_modapi_init(E_Module *m) e_modapi_init(E_Module *m)
{ {
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
"preferences-appearance"); "preferences-look");
e_configure_registry_item_add("appearance/transitions", 80, e_configure_registry_item_add("appearance/transitions", 80,
_("Transitions"), NULL, _("Transitions"), NULL,
"preferences-transitions", "preferences-transitions",

2
src/modules/conf_wallpaper/e_mod_main.c
View File

@ -19,7 +19,7 @@ EAPI void *
e_modapi_init(E_Module *m) e_modapi_init(E_Module *m)
{ {
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
"preferences-appearance"); "preferences-look");
e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL, e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL,
"preferences-desktop-wallpaper", e_int_config_wallpaper); "preferences-desktop-wallpaper", e_int_config_wallpaper);
e_configure_registry_category_add("internal", -1, _("Internal"), e_configure_registry_category_add("internal", -1, _("Internal"),

2
src/modules/conf_wallpaper2/e_mod_main.c
View File

@ -19,7 +19,7 @@ EAPI E_Module_Api e_modapi =
EAPI void * EAPI void *
e_modapi_init(E_Module *m) e_modapi_init(E_Module *m)
{ {
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance"); e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look");
e_configure_registry_item_add("appearance/wallpaper2", 10, _("Wallpaper 2"), NULL, "preferences-desktop-wallpaper", wp_conf_show); e_configure_registry_item_add("appearance/wallpaper2", 10, _("Wallpaper 2"), NULL, "preferences-desktop-wallpaper", wp_conf_show);
e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal"); e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
// e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper 2"), NULL, "preferences-system-windows", e_int_config_wallpaper_desk); // e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper 2"), NULL, "preferences-system-windows", e_int_config_wallpaper_desk);

2
src/modules/dropshadow/e_mod_main.c
View File

@ -86,7 +86,7 @@ e_modapi_init(E_Module *m)
ds = _ds_init(m); ds = _ds_init(m);
snprintf(buf, sizeof(buf), "%s/e-module-dropshadow.edj", e_module_dir_get(m)); snprintf(buf, sizeof(buf), "%s/e-module-dropshadow.edj", e_module_dir_get(m));
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance"); e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look");
e_configure_registry_item_add("appearance/dropshadow", 150, _("Dropshadow"), NULL, buf, e_int_config_dropshadow_module); e_configure_registry_item_add("appearance/dropshadow", 150, _("Dropshadow"), NULL, buf, e_int_config_dropshadow_module);
dropshadow_mod = m; dropshadow_mod = m;

2
src/modules/dropshadow/module.desktop.in
View File

@ -21,4 +21,4 @@ Comment[pt_BR]=
Comment[tr]=Pencerelere gölge ekleyen modül. Comment[tr]=Pencerelere gölge ekleyen modül.
Comment[zh_CN]= Comment[zh_CN]=
Comment[zh_TW]= Comment[zh_TW]=
X-Enlightenment-ModuleType=appearance X-Enlightenment-ModuleType=look

4
src/modules/gadman/e_mod_gadman.c
View File

@ -762,7 +762,7 @@ _attach_menu(void *data __UNUSED__, E_Gadcon_Client *gcc, E_Menu *menu)
mi = e_menu_item_new(menu); mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Appearance")); e_menu_item_label_set(mi, _("Appearance"));
e_util_menu_item_theme_icon_set(mi, "preferences-appearance"); e_util_menu_item_theme_icon_set(mi, "preferences-look");
e_menu_item_submenu_set(mi, mn); e_menu_item_submenu_set(mi, mn);
e_object_del(E_OBJECT(mn)); e_object_del(E_OBJECT(mn));
@ -790,7 +790,7 @@ _attach_menu(void *data __UNUSED__, E_Gadcon_Client *gcc, E_Menu *menu)
mi = e_menu_item_new(menu); mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Behavior")); e_menu_item_label_set(mi, _("Behavior"));
e_util_menu_item_theme_icon_set(mi, "preferences-appearance"); e_util_menu_item_theme_icon_set(mi, "preferences-look");
e_menu_item_submenu_set(mi, mn); e_menu_item_submenu_set(mi, mn);
e_object_del(E_OBJECT(mn)); e_object_del(E_OBJECT(mn));

1
src/modules/ibar/module.desktop.in
View File

@ -4,6 +4,7 @@ Name=IBar
Name[cs]=Lišta spouštěčů Name[cs]=Lišta spouštěčů
Name[eo]=Breto IBar Name[eo]=Breto IBar
Icon=e-module-ibar Icon=e-module-ibar
X-Enlightenment-ModuleType=utils
Comment=Iconic application launcher. Comment=Iconic application launcher.
Comment[cs]=Lišta se spouštěči. Comment[cs]=Lišta se spouštěči.
Comment[de]= Comment[de]=

1
src/modules/ibox/module.desktop.in
View File

@ -3,6 +3,7 @@ Type=Link
Name=IBox Name=IBox
Name[eo]=Breto IBox Name[eo]=Breto IBox
Icon=e-module-ibox Icon=e-module-ibox
X-Enlightenment-ModuleType=utils
Comment=A home for your iconified applications. Comment=A home for your iconified applications.
Comment[cs]=Zde se zobrazují všechny minimalizované aplikace. Comment[cs]=Zde se zobrazují všechny minimalizované aplikace.
Comment[de]= Comment[de]=

1
src/modules/pager/module.desktop.in
View File

@ -6,6 +6,7 @@ Name[eo]=Tabulpaĝilo
Name[hu]=Lapozó Name[hu]=Lapozó
Name[tr]=Sayfalayıcı Name[tr]=Sayfalayıcı
Icon=e-module-pager Icon=e-module-pager
X-Enlightenment-ModuleType=utils
Comment=Gadget to allow you to visualize your virtual desktops and the windows they contain. Comment=Gadget to allow you to visualize your virtual desktops and the windows they contain.
Comment[cs]=Gadget pro zobrazení/přepínání virtuálních ploch a oken, které obsahují. Comment[cs]=Gadget pro zobrazení/přepínání virtuálních ploch a oken, které obsahují.
Comment[de]= Comment[de]=

1
src/modules/start/module.desktop.in
View File

@ -8,6 +8,7 @@ Name[hu]=Start menü
Name[fr]=Menu E Name[fr]=Menu E
Name[tr]=Başlat Name[tr]=Başlat
Icon=e-module-start Icon=e-module-start
X-Enlightenment-ModuleType=utils
Comment=E17's "Start" button equivalent. Comment=E17's "Start" button equivalent.
Comment[cs]=E17 Start menu. Comment[cs]=E17 Start menu.
Comment[de]= Comment[de]=

2
src/modules/systray/module.desktop.in
View File

@ -14,4 +14,4 @@ Comment[eo]=zono kiu vidigas la piktogramojn de aplikaĵoj kiel Skajpo, Pidgin,
Comment[fr]=Une zone qui reçoit les icones des applications comme Skype, Pidgin, Kopete et autres. Comment[fr]=Une zone qui reçoit les icones des applications comme Skype, Pidgin, Kopete et autres.
Comment[it]=Un'area che contiene le icone di notifica di applicazioni come Skype, Pidgin, Kopete e altre. Comment[it]=Un'area che contiene le icone di notifica di applicazioni come Skype, Pidgin, Kopete e altre.
Comment[tr]=Skype, Pidgin, Kopete ve diğerleri gibi uygulamaların simgelerini barındıran sistem çekmecesi. Comment[tr]=Skype, Pidgin, Kopete ve diğerleri gibi uygulamaların simgelerini barındıran sistem çekmecesi.
X-Enlightenment-ModuleType=shelf X-Enlightenment-ModuleType=utils