diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc index 0e928fc33..7fc957c09 100644 --- a/data/themes/default_icons.edc +++ b/data/themes/default_icons.edc @@ -32,7 +32,20 @@ images { image: "e17_icon_up_arrow.png" COMP; image: "e17_icon_down_arrow.png" COMP; - image: "e17_pointer.png" COMP; + image: "e17_pointer.png" COMP; + + image: "e17_shelf_bottom_left.png" COMP; + image: "e17_shelf_bottom.png" COMP; + image: "e17_shelf_bottom_right.png" COMP; + image: "e17_shelf_left_bottom.png" COMP; + image: "e17_shelf_left.png" COMP; + image: "e17_shelf_left_top.png" COMP; + image: "e17_shelf_right_bottom.png" COMP; + image: "e17_shelf_right.png" COMP; + image: "e17_shelf_right_top.png" COMP; + image: "e17_shelf_top_left.png" COMP; + image: "e17_shelf_top.png" COMP; + image: "e17_shelf_top_right.png" COMP; } group { @@ -563,6 +576,223 @@ group { normal: "e17_pointer.png"; } } - } - } + } + } +} +group { + name: "icons/enlightenment/shelf_position_bottom"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_bottom.png"; + } + } + } + } +} +/// +group { + name: "icons/enlightenment/shelf_position_bottom_left"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_bottom_left.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_bottom_right"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_bottom_right.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_top"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_top.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_top_left"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_top_left.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_top_right"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_top_right.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_left"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_left.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_left_top"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_left_top.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_left_bottom"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_left_bottom.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_right"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_right.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_right_top"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_right_top.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_position_right_bottom"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_right_bottom.png"; + } + } + } + } } diff --git a/data/themes/default_radio.edc b/data/themes/default_radio.edc index 9471af742..b11fbc39e 100644 --- a/data/themes/default_radio.edc +++ b/data/themes/default_radio.edc @@ -263,6 +263,19 @@ group { relative: 1.0 0.0; offset: 2 2; } + rel2 { + relative: 1.0 1.0; + offset: -2 -2; + } + } + description { + state: "label_visible" 0.0; + min: 16 16; + rel1 { + to_x: "outline"; + relative: 1.0 0.0; + offset: 2 2; + } rel2 { to_y: "label"; relative: 1.0 0.0; @@ -291,11 +304,25 @@ group { color: 255 255 255 128; } } + part { + name: "label_clip"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + visible: 0; + } + description { + state: "label_visible" 0.0; + visible: 1; + } + } part { name: "label"; type: TEXT; effect: SHADOW; mouse_events: 0; + clip_to: "label_clip"; description { state: "default" 0.0; min: 16 16; @@ -311,7 +338,7 @@ group { color: 0 0 0 255; color3: 255 255 255 128; text { - text: "Radio Button"; + text: ""; font: "Edje-Vera"; size: 10; min: 1 1; @@ -364,6 +391,14 @@ group { } } programs { + program { + name: "label_on"; + signal: "label_visible"; + source: ""; + action: STATE_SET "label_visible" 0.0; + target: "icon_swallow"; + target: "label_clip"; + } program { name: "turn_on1"; signal: "toggle_on"; diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index afeaff048..4f3899016 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -423,4 +423,17 @@ e17_border7b.png \ e17_shelf_bg_h.png \ e17_shelf_bg_v.png \ e17_shelf_bg2_h.png \ -e17_shelf_bg2_v.png +e17_shelf_bg2_v.png \ +e17_shelf_bottom_left.png \ +e17_shelf_bottom.png \ +e17_shelf_bottom_right.png \ +e17_shelf_left_bottom.png \ +e17_shelf_left.png \ +e17_shelf_left_top.png \ +e17_shelf_right_bottom.png \ +e17_shelf_right.png \ +e17_shelf_right_top.png \ +e17_shelf_top_left.png \ +e17_shelf_top.png \ +e17_shelf_top_right.png + diff --git a/data/themes/images/e17_shelf_bottom.png b/data/themes/images/e17_shelf_bottom.png new file mode 100644 index 000000000..cc600ecb9 Binary files /dev/null and b/data/themes/images/e17_shelf_bottom.png differ diff --git a/data/themes/images/e17_shelf_bottom_left.png b/data/themes/images/e17_shelf_bottom_left.png new file mode 100644 index 000000000..1f76067ac Binary files /dev/null and b/data/themes/images/e17_shelf_bottom_left.png differ diff --git a/data/themes/images/e17_shelf_bottom_right.png b/data/themes/images/e17_shelf_bottom_right.png new file mode 100644 index 000000000..025a6bcf9 Binary files /dev/null and b/data/themes/images/e17_shelf_bottom_right.png differ diff --git a/data/themes/images/e17_shelf_left.png b/data/themes/images/e17_shelf_left.png new file mode 100644 index 000000000..4500993e5 Binary files /dev/null and b/data/themes/images/e17_shelf_left.png differ diff --git a/data/themes/images/e17_shelf_left_bottom.png b/data/themes/images/e17_shelf_left_bottom.png new file mode 100644 index 000000000..6c5a383e5 Binary files /dev/null and b/data/themes/images/e17_shelf_left_bottom.png differ diff --git a/data/themes/images/e17_shelf_left_top.png b/data/themes/images/e17_shelf_left_top.png new file mode 100644 index 000000000..659c52b46 Binary files /dev/null and b/data/themes/images/e17_shelf_left_top.png differ diff --git a/data/themes/images/e17_shelf_right.png b/data/themes/images/e17_shelf_right.png new file mode 100644 index 000000000..26fa5cff4 Binary files /dev/null and b/data/themes/images/e17_shelf_right.png differ diff --git a/data/themes/images/e17_shelf_right_bottom.png b/data/themes/images/e17_shelf_right_bottom.png new file mode 100644 index 000000000..1f26807b7 Binary files /dev/null and b/data/themes/images/e17_shelf_right_bottom.png differ diff --git a/data/themes/images/e17_shelf_right_top.png b/data/themes/images/e17_shelf_right_top.png new file mode 100644 index 000000000..236c5da18 Binary files /dev/null and b/data/themes/images/e17_shelf_right_top.png differ diff --git a/data/themes/images/e17_shelf_top.png b/data/themes/images/e17_shelf_top.png new file mode 100644 index 000000000..8291263b4 Binary files /dev/null and b/data/themes/images/e17_shelf_top.png differ diff --git a/data/themes/images/e17_shelf_top_left.png b/data/themes/images/e17_shelf_top_left.png new file mode 100644 index 000000000..563687b17 Binary files /dev/null and b/data/themes/images/e17_shelf_top_left.png differ diff --git a/data/themes/images/e17_shelf_top_right.png b/data/themes/images/e17_shelf_top_right.png new file mode 100644 index 000000000..edac6f205 Binary files /dev/null and b/data/themes/images/e17_shelf_top_right.png differ diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c index d6e005826..4854e8436 100644 --- a/src/bin/e_int_shelf_config.c +++ b/src/bin/e_int_shelf_config.c @@ -183,29 +183,29 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_frametable_add(evas, _("Layout"), 1); rg = e_widget_radio_group_new(&(cfdata->orient)); - ob = e_widget_radio_icon_add(evas, _("Left"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_LEFT, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left", 24, 24, E_GADCON_ORIENT_LEFT, rg); e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Right"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_RIGHT, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right", 24, 24, E_GADCON_ORIENT_RIGHT, rg); e_widget_frametable_object_append(of, ob, 4, 2, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Top"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_TOP, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top", 24, 24, E_GADCON_ORIENT_TOP, rg); e_widget_frametable_object_append(of, ob, 2, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Bottom"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_BOTTOM, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom", 24, 24, E_GADCON_ORIENT_BOTTOM, rg); e_widget_frametable_object_append(of, ob, 2, 4, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_TL, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top_left", 24, 24, E_GADCON_ORIENT_CORNER_TL, rg); e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_TR, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top_right", 24, 24, E_GADCON_ORIENT_CORNER_TR, rg); e_widget_frametable_object_append(of, ob, 3, 0, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_BL, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom_left", 24, 24, E_GADCON_ORIENT_CORNER_BL, rg); e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_BR, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom_right", 24, 24, E_GADCON_ORIENT_CORNER_BR, rg); e_widget_frametable_object_append(of, ob, 3, 4, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_LT, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left_top", 24, 24, E_GADCON_ORIENT_CORNER_LT, rg); e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_RT, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right_top", 24, 24, E_GADCON_ORIENT_CORNER_RT, rg); e_widget_frametable_object_append(of, ob, 4, 1, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_LB, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left_bottom", 24, 24, E_GADCON_ORIENT_CORNER_LB, rg); e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1); - ob = e_widget_radio_icon_add(evas, _("Corner"), "enlightenment/e", 32, 32, E_GADCON_ORIENT_CORNER_RB, rg); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right_bottom", 24, 24, E_GADCON_ORIENT_CORNER_RB, rg); e_widget_frametable_object_append(of, ob, 4, 3, 1, 1, 1, 1, 1, 1); e_widget_list_object_append(o2, of, 1, 1, 0.5); @@ -246,7 +246,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf sel = n; } e_widget_min_size_get(oi, &wmw, &wmh); - e_widget_min_size_set(oi, wmw, 150); + e_widget_min_size_set(oi, wmw, 120); e_widget_ilist_go(oi); e_widget_ilist_selected_set(oi, sel); diff --git a/src/bin/e_widget_radio.c b/src/bin/e_widget_radio.c index 0920707b4..bf44e557a 100644 --- a/src/bin/e_widget_radio.c +++ b/src/bin/e_widget_radio.c @@ -106,6 +106,12 @@ e_widget_radio_icon_add(Evas *evas, char *label, char *icon, int icon_w, int ico edje_object_signal_callback_add(o, "toggled", "*", _e_wid_signal_cb1, obj); edje_object_part_text_set(o, "label", label); evas_object_show(o); + + if (label) + { + edje_object_signal_emit(o, "label_visible", ""); + edje_object_message_signal_process(o); + } if (icon) {