diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc index 8f2f6fcf5..75496b17c 100644 --- a/data/themes/default_icons.edc +++ b/data/themes/default_icons.edc @@ -26,6 +26,9 @@ images { image: "e17_icon_configuration.png" LOSSY 90; image: "e17_icon_run.png" LOSSY 90; + image: "e17_icon_font.png" LOSSY 90; + image: "e17_icon_background.png" LOSSY 90; + image: "e17_pager_window.png" COMP; image: "e17_icon_right_arrow.png" COMP; @@ -585,6 +588,42 @@ group { } } } +group { + name: "icons/enlightenment/fonts"; + max: 64 64; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 64 64; + image { + normal: "e17_icon_font.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/background"; + max: 64 64; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 64 64; + image { + normal: "e17_icon_background.png"; + } + } + } + } +} group { name: "icons/enlightenment/shelf_position_bottom"; max: 24 24; diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index 959a5f6a0..30441c998 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -371,6 +371,7 @@ e17_icon_fileman_gz.png \ e17_icon_fileman_zip.png \ e17_icon_fileman_home.png \ e17_icon_fileman_desktop.png \ +e17_icon_font.png \ e17_button_detail_paste.png \ e17_button_detail_arrange_name.png \ e17_button_detail_properties.png \ diff --git a/data/themes/images/e17_icon_background.png b/data/themes/images/e17_icon_background.png new file mode 100644 index 000000000..1596ab2f7 Binary files /dev/null and b/data/themes/images/e17_icon_background.png differ diff --git a/data/themes/images/e17_icon_font.png b/data/themes/images/e17_icon_font.png new file mode 100644 index 000000000..4e3e0b542 Binary files /dev/null and b/data/themes/images/e17_icon_font.png differ diff --git a/data/themes/images/e17_icon_run.png b/data/themes/images/e17_icon_run.png index 228003948..ff7f4b093 100644 Binary files a/data/themes/images/e17_icon_run.png and b/data/themes/images/e17_icon_run.png differ diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index 1036e43e5..589922ffe 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -64,42 +64,41 @@ e_configure_show(E_Container *con) /* add items here */ e_configure_header_item_add(eco, "enlightenment/appearance", _("Appearance")); - e_configure_standard_item_add(eco, "enlightenment/desktops", _("Background"), e_int_config_background); + e_configure_standard_item_add(eco, "enlightenment/background", _("Wallpaper"), e_int_config_background); e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme"), e_int_config_theme); - e_configure_standard_item_add(eco, "enlightenment/e", _("Fonts"), e_int_config_fonts); -/* - e_configure_standard_item_add(eco, "enlightenment/e", _("Font Display Hinting"), e_int_config_hinting); -*/ + e_configure_standard_item_add(eco, "enlightenment/fonts", _("Fonts"), e_int_config_fonts); e_configure_standard_item_add(eco, "enlightenment/mouse", _("Mouse Cursor"), e_int_config_cursor); e_configure_standard_item_add(eco, "enlightenment/windows", _("Window Display"), e_int_config_window_display); e_configure_standard_item_add(eco, "enlightenment/shelf", _("Shelves"), e_int_config_shelf); - e_configure_header_item_add(eco, "enlightenment/extensions", _("Extensions")); - e_configure_standard_item_add(eco, "enlightenment/modules", _("Modules"), e_int_config_modules); - e_configure_header_item_add(eco, "enlightenment/screen_setup", _("Screen")); e_configure_standard_item_add(eco, "enlightenment/desktops", _("Virtual Desktops"), e_int_config_desks); - e_configure_standard_item_add(eco, "enlightenment/desktops", _("Screen Resolution"), e_int_config_display); - e_configure_standard_item_add(eco, "enlightenment/desktops", _("Screen Lock"), e_int_config_desklock); + e_configure_standard_item_add(eco, "enlightenment/screen_resolution", _("Screen Resolution"), e_int_config_display); + e_configure_standard_item_add(eco, "enlightenment/desklock", _("Screen Lock"), e_int_config_desklock); e_configure_header_item_add(eco, "enlightenment/behavior", _("Behavior")); - e_configure_standard_item_add(eco, "enlightenment/e", _("Window Focus"), e_int_config_focus); - e_configure_standard_item_add(eco, "enlightenment/e", _("Key Bindings"), e_int_config_keybindings); - e_configure_standard_item_add(eco, "enlightenment/favorites", _("Menus"), e_int_config_menus); + e_configure_standard_item_add(eco, "enlightenment/focus", _("Window Focus"), e_int_config_focus); + e_configure_standard_item_add(eco, "enlightenment/keys", _("Key Bindings"), e_int_config_keybindings); + e_configure_standard_item_add(eco, "enlightenment/menus", _("Menus"), e_int_config_menus); e_configure_header_item_add(eco, "enlightenment/misc", _("Miscellaneous")); - e_configure_standard_item_add(eco, "enlightenment/configuration", _("Performance"), e_int_config_performance); + e_configure_standard_item_add(eco, "enlightenment/performance", _("Performance"), e_int_config_performance); e_configure_standard_item_add(eco, "enlightenment/configuration", _("Configuration Dialogs"), e_int_config_cfgdialogs); e_configure_header_item_add(eco, "enlightenment/advanced", _("Advanced")); - e_configure_standard_item_add(eco, "enlightenment/run", _("Startup"), e_int_config_startup); - e_configure_standard_item_add(eco, "enlightenment/windows", _("Window List"), e_int_config_winlist); - e_configure_standard_item_add(eco, "enlightenment/windows", _("Window Manipulation"), e_int_config_window_manipulation); + e_configure_standard_item_add(eco, "enlightenment/startup", _("Startup"), e_int_config_startup); + e_configure_standard_item_add(eco, "enlightenment/winlist", _("Window List"), e_int_config_winlist); + e_configure_standard_item_add(eco, "enlightenment/window_manipulation", _("Window Manipulation"), e_int_config_window_manipulation); e_configure_standard_item_add(eco, "enlightenment/run", _("Run Command"), e_int_config_exebuf); - e_configure_standard_item_add(eco, "enlightenment/e", _("Search Directories"), e_int_config_paths); + e_configure_standard_item_add(eco, "enlightenment/directories", _("Search Directories"), e_int_config_paths); + e_configure_header_item_add(eco, "enlightenment/extensions", _("Extensions")); + e_configure_standard_item_add(eco, "enlightenment/modules", _("Modules"), e_int_config_modules); + /* FIXME: we should have a way for modules to hook in here and add their * own entries + * + * e_configure_header_item_add(eco, "enlightenment/extension_config", _("Extension Configuration")); */ eco->close = e_widget_button_add(eco->evas, _("Close"), NULL, _e_configure_cb_close, eco, NULL); diff --git a/src/bin/e_int_config_background.c b/src/bin/e_int_config_background.c index 7fd92ca7c..86e19be55 100644 --- a/src/bin/e_int_config_background.c +++ b/src/bin/e_int_config_background.c @@ -52,7 +52,7 @@ e_int_config_background(E_Container *con) v->advanced.create_widgets = _advanced_create_widgets; v->close_cfdata = _bg_dialog_close; v->override_auto_apply = 1; - cfd = e_config_dialog_new(con, _("Background Settings"), NULL, 0, v, NULL); + cfd = e_config_dialog_new(con, _("Wallpaper Settings"), NULL, 0, v, NULL); return cfd; } @@ -181,7 +181,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data e_widget_table_object_append(ot, im, 1, 0, 1, 2, 1, 1, 1, 1); rg = e_widget_radio_group_new(&(cfdata->bg_method)); - of = e_widget_framelist_add(evas, _("Set Background For"), 0); + of = e_widget_framelist_add(evas, _("Set Wallpaper For"), 0); e_widget_min_size_set(of, 200, 160); oc = e_widget_radio_add(evas, _("Default Desktop"), BG_SET_DEFAULT_DESK, rg); @@ -309,7 +309,7 @@ _load_bgs(E_Config_Dialog *cfd, Evas_Object *il) else ic = e_thumb_evas_object_get(c, cfd->dia->win->evas, 48, 48, 1); - e_widget_ilist_append(il, ic, _("Theme Background"), _ilist_cb_bg_selected, cfd, ""); + e_widget_ilist_append(il, ic, _("Theme Wallpaper"), _ilist_cb_bg_selected, cfd, ""); if (!e_config->desktop_default_background) selnum = i; i++; } diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index 595162d3b..68cc184bf 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -609,8 +609,8 @@ _e_int_menus_config_pre_cb(void *data, E_Menu *m) e_menu_item_callback_set(mi, _e_int_menus_config_item_cb, NULL); mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Background")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/desktops"); + e_menu_item_label_set(mi, _("Wallpaper")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/background"); e_menu_item_callback_set(mi, _e_int_menus_background_item_cb, NULL); mi = e_menu_item_new(m);