raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c416dfa6eb86a8d51b96b62c8708610c26aeed8b
commit c416dfa6eb86a8d51b96b62c8708610c26aeed8b Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sun Aug 7 18:27:33 2016 +0900 Revert "elementary: keep theme consistent regarding the disabling of odd/even." Revert "elementary: disable visual hint at odd/even." This reverts commit c64071ae132ddc5894d5daad8a874377a176aac5. This reverts commit 7affe8c2047a41a2945cf6c048d59f28c974aa7a. This reverds the odd/even theme changes because this BREAKS ENLIGHTENMENT COMPLETELY. Enlightement also uses odd/even list looks and REMOVING this REMOVES every 2nd lost item member (it makes them 0x0 sized). This is a major break in actual FUNCTIONALITY in the name of looks. NO. Revert. We ship with this look. no more breaking stuff like this in the name of cosemtics and not ACTUALLY fixing any bug at all. it creates bugs. --- data/elementary/themes/edc/elm/genlist.edc | 136 ++++++++++++----------------- data/elementary/themes/edc/elm/index.edc | 6 -- data/elementary/themes/edc/elm/list.edc | 18 +--- data/elementary/themes/edc/fileman.edc | 4 - data/elementary/themes/edc/ilist.edc | 3 - 5 files changed, 60 insertions(+), 107 deletions(-) diff --git a/data/elementary/themes/edc/elm/genlist.edc b/data/elementary/themes/edc/elm/genlist.edc index 3953e2a..288440a 100644 --- a/data/elementary/themes/edc/elm/genlist.edc +++ b/data/elementary/themes/edc/elm/genlist.edc @@ -282,12 +282,12 @@ group { "genlist_base"; inherit_only: 1; nomouse; program_source: "elm"; color: 64 64 64 255; color_class: "list_item_base"; link.base: "elm,state,even"; + } + desc { "odd"; + color: 56 56 56 255; + color_class: "list_item_base_odd"; link.base: "elm,state,odd"; } -// desc { "odd"; -// color: 56 56 56 255; -// color_class: "list_item_base_odd"; -// } } image { "bevel"; desc { "default"; @@ -389,7 +389,6 @@ group { "elm/genlist/item/default/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; - alias: "elm/genlist/item_odd/default/default"; parts { //##// text { "elm.text"; @@ -566,9 +565,9 @@ group { "elm/genlist/item/default/default"; nomouse; } inherit: "genlist_top"; } -// ODD("elm/genlist/item_odd/default/default", "elm/genlist/item/default/default") +ODD("elm/genlist/item_odd/default/default", "elm/genlist/item/default/default") COMPRESS("elm/genlist/item_compress/default/default", "elm/genlist/item/default/default") -COMPRESS("elm/genlist/item_compress_odd/default/default", "elm/genlist/item/default/default") +COMPRESS_ODD("elm/genlist/item_compress_odd/default/default", "elm/genlist/item/default/default") group { "elm/genlist/item/default_style/default"; nomouse; data.item: "selectraise" "on"; @@ -577,7 +576,6 @@ group { "elm/genlist/item/default_style/default"; nomouse; data.item: "contents" "elm.swallow.icon elm.swallow.end"; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; - alias: "elm/genlist/item_odd/default_style/default"; styles.style { "genlist_style"; base: "font="FN" font_size=10 align=left valign=0.5 color=#fff style=shadow,bottom shadow_color=#00000080 text_class=list_item"; tag: "br" "\n"; @@ -777,9 +775,9 @@ group { "elm/genlist/item/default_style/default"; nomouse; } inherit: "genlist_top"; } -// ODD("elm/genlist/item_odd/default_style/default", "elm/genlist/item/default_style/default") +ODD("elm/genlist/item_odd/default_style/default", "elm/genlist/item/default_style/default") COMPRESS("elm/genlist/item_compress/default_style/default", "elm/genlist/item/default_style/default") -COMPRESS("elm/genlist/item_compress_odd/default_style/default", "elm/genlist/item/default_style/default") +COMPRESS_ODD("elm/genlist/item_compress_odd/default_style/default", "elm/genlist/item/default_style/default") group { "elm/genlist/item/one_icon/default"; nomouse; data.item: "selectraise" "on"; @@ -789,7 +787,6 @@ group { "elm/genlist/item/one_icon/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; - alias: "elm/genlist/item_odd/one_icon/default"; parts { //##// @@ -949,9 +946,9 @@ group { "elm/genlist/item/one_icon/default"; nomouse; } inherit: "genlist_top"; } -// ODD("elm/genlist/item_odd/one_icon/default", "elm/genlist/item/one_icon/default") +ODD("elm/genlist/item_odd/one_icon/default", "elm/genlist/item/one_icon/default") COMPRESS("elm/genlist/item_compress/one_icon/default", "elm/genlist/item/one_icon/default") -COMPRESS("elm/genlist/item_compress_odd/one_icon/default", "elm/genlist/item/one_icon/default") +COMPRESS_ODD("elm/genlist/item_compress_odd/one_icon/default", "elm/genlist/item/one_icon/default") group { "elm/genlist/item/end_icon/default"; nomouse; data.item: "selectraise" "on"; @@ -961,7 +958,6 @@ group { "elm/genlist/item/end_icon/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; - alias: "elm/genlist/item_odd/end_icon/default"; parts { //##// @@ -1130,9 +1126,9 @@ group { "elm/genlist/item/end_icon/default"; nomouse; } inherit: "genlist_top"; } -// ODD("elm/genlist/item_odd/end_icon/default", "elm/genlist/item/end_icon/default") +ODD("elm/genlist/item_odd/end_icon/default", "elm/genlist/item/end_icon/default") COMPRESS("elm/genlist/item_compress/end_icon/default", "elm/genlist/item/end_icon/default") -COMPRESS("elm/genlist/item_compress_odd/end_icon/default", "elm/genlist/item/end_icon/default") +COMPRESS_ODD("elm/genlist/item_compress_odd/end_icon/default", "elm/genlist/item/end_icon/default") group { "elm/genlist/item/no_icon/default"; nomouse; data.item: "selectraise" "on"; @@ -1141,7 +1137,6 @@ group { "elm/genlist/item/no_icon/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; - alias: "elm/genlist/item_odd/no_icon/default"; parts { //##// @@ -1292,9 +1287,9 @@ group { "elm/genlist/item/no_icon/default"; nomouse; } inherit: "genlist_top"; } -// ODD("elm/genlist/item_odd/no_icon/default", "elm/genlist/item/no_icon/default") +ODD("elm/genlist/item_odd/no_icon/default", "elm/genlist/item/no_icon/default") COMPRESS("elm/genlist/item_compress/no_icon/default", "elm/genlist/item/no_icon/default") -COMPRESS("elm/genlist/item_compress_odd/no_icon/default", "elm/genlist/item/no_icon/default") +COMPRESS_ODD("elm/genlist/item_compress_odd/no_icon/default", "elm/genlist/item/no_icon/default") group { "elm/genlist/item/full/default"; nomouse; data.item: "selectraise" "on"; @@ -1303,7 +1298,6 @@ group { "elm/genlist/item/full/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; - alias: "elm/genlist/item_odd/full/default"; parts { //##// @@ -1332,7 +1326,7 @@ group { "elm/genlist/item/full/default"; nomouse; } inherit: "genlist_top"; } -//ODD("elm/genlist/item_odd/full/default", "elm/genlist/item/full/default") +ODD("elm/genlist/item_odd/full/default", "elm/genlist/item/full/default") group { "elm/genlist/item_compress/full/default"; inherit: "elm/genlist/item/full/default"; } @@ -1525,7 +1519,6 @@ group { "genlist_arrow"; inherit_only: 1; program_source: "elm"; //-- tree_compress_odd group { "elm/genlist/tree/default/default"; nomouse; inherit: "elm/genlist/item/default/default"; - alias: "elm/genlist/tree_odd/default/default"; // XXX: these need to be... done specially. // alias: "elm/genlist/tree/tree_effect/default"; // alias: "elm/genlist/item/tree_effect/default"; @@ -1549,13 +1542,12 @@ group { "elm/genlist/tree/default/default"; nomouse; } inherit: "genlist_arrow"; } -//ODD("elm/genlist/tree_odd/default/default", "elm/genlist/tree/default/default") +ODD("elm/genlist/tree_odd/default/default", "elm/genlist/tree/default/default") COMPRESS("elm/genlist/tree_compress/default/default", "elm/genlist/tree/default/default") -COMPRESS("elm/genlist/tree_compress_odd/default/default", "elm/genlist/tree/default/default") +COMPRESS_ODD("elm/genlist/tree_compress_odd/default/default", "elm/genlist/tree/default/default") group { "elm/genlist/tree/default_style/default"; inherit: "elm/genlist/item/default_style/default"; - alias: "elm/genlist/tree_odd/default_style/default"; parts { swallow { "elm.swallow.icon"; desc { "default"; @@ -1574,13 +1566,12 @@ group { "elm/genlist/tree/default_style/default"; } inherit: "genlist_arrow"; } -//ODD("elm/genlist/tree_odd/default_style/default", "elm/genlist/tree/default_style/default") +ODD("elm/genlist/tree_odd/default_style/default", "elm/genlist/tree/default_style/default") COMPRESS("elm/genlist/tree_compress/default_style/default", "elm/genlist/tree/default_style/default") -COMPRESS("elm/genlist/tree_compress_odd/default_style/default", "elm/genlist/tree/default_style/default") +COMPRESS_ODD("elm/genlist/tree_compress_odd/default_style/default", "elm/genlist/tree/default_style/default") group { "elm/genlist/tree/one_icon/default"; inherit: "elm/genlist/item/one_icon/default"; - alias: "elm/genlist/tree_odd/one_icon/default"; parts { swallow { "elm.swallow.icon"; desc { "default"; @@ -1599,13 +1590,12 @@ group { "elm/genlist/tree/one_icon/default"; } inherit: "genlist_arrow"; } -//ODD("elm/genlist/tree_odd/one_icon/default", "elm/genlist/tree/one_icon/default") +ODD("elm/genlist/tree_odd/one_icon/default", "elm/genlist/tree/one_icon/default") COMPRESS("elm/genlist/tree_compress/one_icon/default", "elm/genlist/tree/one_icon/default") -COMPRESS("elm/genlist/tree_compress_odd/one_icon/default", "elm/genlist/tree/one_icon/default") +COMPRESS_ODD("elm/genlist/tree_compress_odd/one_icon/default", "elm/genlist/tree/one_icon/default") group { "elm/genlist/tree/end_icon/default"; inherit: "elm/genlist/item/end_icon/default"; - alias: "elm/genlist/tree_odd/end_icon/default"; parts { text { "elm.text"; desc { "default"; @@ -1628,13 +1618,12 @@ group { "elm/genlist/tree/end_icon/default"; } inherit: "genlist_arrow"; } -//ODD("elm/genlist/tree_odd/end_icon/default", "elm/genlist/tree/end_icon/default") +ODD("elm/genlist/tree_odd/end_icon/default", "elm/genlist/tree/end_icon/default") COMPRESS("elm/genlist/tree_compress/end_icon/default", "elm/genlist/tree/end_icon/default") -COMPRESS("elm/genlist/tree_compress_odd/end_icon/default", "elm/genlist/tree/end_icon/default") +COMPRESS_ODD("elm/genlist/tree_compress_odd/end_icon/default", "elm/genlist/tree/end_icon/default") group { "elm/genlist/tree/no_icon/default"; inherit: "elm/genlist/item/no_icon/default"; - alias: "elm/genlist/tree_odd/no_icon/default"; parts { text { "elm.text"; desc { "default"; @@ -1657,13 +1646,12 @@ group { "elm/genlist/tree/no_icon/default"; } inherit: "genlist_arrow"; } -//ODD("elm/genlist/tree_odd/no_icon/default", "elm/genlist/tree/no_icon/default") +ODD("elm/genlist/tree_odd/no_icon/default", "elm/genlist/tree/no_icon/default") COMPRESS("elm/genlist/tree_compress/no_icon/default", "elm/genlist/tree/no_icon/default") -COMPRESS("elm/genlist/tree_compress_odd/no_icon/default", "elm/genlist/tree/no_icon/default") +COMPRESS_ODD("elm/genlist/tree_compress_odd/no_icon/default", "elm/genlist/tree/no_icon/default") group { "elm/genlist/tree/full/default"; inherit: "elm/genlist/item/full/default"; - alias: "elm/genlist/tree_odd/full/default"; parts { swallow { "elm.swallow.content"; desc { "default"; @@ -1686,7 +1674,7 @@ group { "elm/genlist/tree/full/default"; } inherit: "genlist_arrow"; } -//ODD("elm/genlist/tree_odd/full/default", "elm/genlist/tree/full/default") +ODD("elm/genlist/tree_odd/full/default", "elm/genlist/tree/full/default") group { "elm/genlist/tree_compress/full/default"; inherit: "elm/genlist/tree/full/default"; } @@ -1805,7 +1793,6 @@ group { "elm/genlist/item/icon_top_text_bottom/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; - alias: "elm/genlist/item_odd/icon_top_text_bottom/default"; parts { //##// @@ -1992,13 +1979,12 @@ group { "elm/genlist/item/icon_top_text_bottom/default"; nomouse; } inherit: "genlist_top"; } -//ODD("elm/genlist/item_odd/icon_top_text_bottom/default", "elm/genlist/item/icon_top_text_bottom/default") +ODD("elm/genlist/item_odd/icon_top_text_bottom/default", "elm/genlist/item/icon_top_text_bottom/default") COMPRESS("elm/genlist/item_compress/icon_top_text_bottom/default", "elm/genlist/item/icon_top_text_bottom/default") -COMPRESS("elm/genlist/item_compress_odd/icon_top_text_bottom/default", "elm/genlist/item/icon_top_text_bottom/default") +COMPRESS_ODD("elm/genlist/item_compress_odd/icon_top_text_bottom/default", "elm/genlist/item/icon_top_text_bottom/default") group { "elm/genlist/tree/icon_top_text_bottom/default"; inherit: "elm/genlist/item/icon_top_text_bottom/default"; - alias: "elm/genlist/tree_odd/icon_top_text_bottom/default"; parts { image { "sizer.content"; desc { "default"; @@ -2019,9 +2005,9 @@ group { "elm/genlist/tree/icon_top_text_bottom/default"; } inherit: "genlist_arrow"; } -//ODD("elm/genlist/tree_odd/icon_top_text_bottom/default", "elm/genlist/tree/icon_top_text_bottom/default") +ODD("elm/genlist/tree_odd/icon_top_text_bottom/default", "elm/genlist/tree/icon_top_text_bottom/default") COMPRESS("elm/genlist/tree_compress/icon_top_text_bottom/default", "elm/genlist/tree/icon_top_text_bottom/default") -COMPRESS("elm/genlist/tree_compress_odd/icon_top_text_bottom/default", "elm/genlist/tree/icon_top_text_bottom/default") +COMPRESS_ODD("elm/genlist/tree_compress_odd/icon_top_text_bottom/default", "elm/genlist/tree/icon_top_text_bottom/default") #define COMPRESS_SUB(_NAME, _SRC) \ group { name: _NAME; \ @@ -2218,7 +2204,6 @@ group { "elm/genlist/item/double_label/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; - alias: "elm/genlist/item_odd/double_label/default"; parts { //##// @@ -2501,13 +2486,12 @@ group { "elm/genlist/item/double_label/default"; nomouse; } inherit: "genlist_top"; } -//ODD("elm/genlist/item_odd/double_label/default", "elm/genlist/item/double_label/default") +ODD("elm/genlist/item_odd/double_label/default", "elm/genlist/item/double_label/default") COMPRESS_SUB("elm/genlist/item_compress/double_label/default", "elm/genlist/item/double_label/default") -COMPRESS_SUB("elm/genlist/item_compress_odd/double_label/default", "elm/genlist/item/double_label/default") +COMPRESS_SUB_ODD("elm/genlist/item_compress_odd/double_label/default", "elm/genlist/item/double_label/default") group { "elm/genlist/tree/double_label/default"; inherit: "elm/genlist/item/double_label/default"; - alias: "elm/genlist/tree_odd/double_label/default"; parts { swallow { "elm.swallow.icon"; desc { "default"; @@ -2526,9 +2510,9 @@ group { "elm/genlist/tree/double_label/default"; } inherit: "genlist_arrow"; } -//ODD("elm/genlist/tree_odd/double_label/default", "elm/genlist/tree/double_label/default") +ODD("elm/genlist/tree_odd/double_label/default", "elm/genlist/tree/double_label/default") COMPRESS_SUB("elm/genlist/tree_compress/double_label/default", "elm/genlist/tree/double_label/default") -COMPRESS_SUB("elm/genlist/tree_compress_odd/double_label/default", "elm/genlist/tree/double_label/default") +COMPRESS_SUB_ODD("elm/genlist/tree_compress_odd/double_label/default", "elm/genlist/tree/double_label/default") #define COMPRESS_T1T2(_NAME, _SRC) \ group { name: _NAME; \ @@ -2808,7 +2792,6 @@ group { "elm/genlist/item/message/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; - alias: "elm/genlist/item_odd/message/default"; parts { //##// @@ -3148,9 +3131,9 @@ group { "elm/genlist/item/message/default"; nomouse; } inherit: "genlist_top"; } -//ODD("elm/genlist/item_odd/message/default", "elm/genlist/item/message/default") +ODD("elm/genlist/item_odd/message/default", "elm/genlist/item/message/default") COMPRESS_T1T2("elm/genlist/item_compress/message/default", "elm/genlist/item/message/default") -COMPRESS_T1T2("elm/genlist/item_compress_odd/message/default", "elm/genlist/item/message/default") +COMPRESS_T1T2_ODD("elm/genlist/item_compress_odd/message/default", "elm/genlist/item/message/default") group { "elm/genlist/item/media/default"; nomouse; data.item: "selectraise" "on"; @@ -3159,7 +3142,6 @@ group { "elm/genlist/item/media/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; - alias: "elm/genlist/item_odd/media/default"; parts { //##// @@ -3591,9 +3573,9 @@ group { "elm/genlist/item/media/default"; nomouse; } \ } \ } -//ODD("elm/genlist/item_odd/media/default", "elm/genlist/item/media/default") +ODD("elm/genlist/item_odd/media/default", "elm/genlist/item/media/default") COMPRESS_MEDIA("elm/genlist/item_compress/media/default", "elm/genlist/item/media/default") -COMPRESS_MEDIA("elm/genlist/item_compress_odd/media/default", "elm/genlist/item/media/default") +COMPRESS_MEDIA_ODD("elm/genlist/item_compress_odd/media/default", "elm/genlist/item/media/default") group { "elm/genlist/item/media-album/default"; nomouse; data.item: "selectraise" "on"; @@ -3602,7 +3584,6 @@ group { "elm/genlist/item/media-album/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; - alias: "elm/genlist/item_odd/media-album/default"; parts { //##// @@ -3965,7 +3946,7 @@ group { "elm/genlist/item/media-album/default"; nomouse; } inherit: "genlist_top"; } -//ODD("elm/genlist/item_odd/media-album/default", "elm/genlist/item/media-album/default") +ODD("elm/genlist/item_odd/media-album/default", "elm/genlist/item/media-album/default") group { "elm/genlist/item_compress/media-album/default"; inherit: "elm/genlist/item/media-album/default"; parts { @@ -4153,7 +4134,6 @@ group { "elm/genlist/item/media-preview/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.flip"; inherit: "genlist_base"; - alias: "elm/genlist/item_odd/media-preview/default"; parts { //##// @@ -4418,7 +4398,7 @@ group { "elm/genlist/item/media-preview/default"; nomouse; } inherit: "genlist_top"; } -//ODD("elm/genlist/item_odd/media-preview/default", "elm/genlist/item/media-preview/default") +ODD("elm/genlist/item_odd/media-preview/default", "elm/genlist/item/media-preview/default") group { "elm/genlist/item_compress/media-preview/default"; inherit: "elm/genlist/item/media-preview/default"; parts { @@ -4708,7 +4688,6 @@ group { "elm/genlist/item/mode/default"; nomouse; data.item: "treesize" TREEPAD; data.item: "flips" "elm.text.mode.flip"; inherit: "genlist_base"; - alias: "elm/genlist/item_odd/mode/default"; parts { //##// @@ -4963,13 +4942,12 @@ group { "elm/genlist/item/mode/default"; nomouse; } inherit: "genlist_top"; } -//ODD("elm/genlist/item_odd/mode/default", "elm/genlist/item/mode/default") +ODD("elm/genlist/item_odd/mode/default", "elm/genlist/item/mode/default") COMPRESS_MODE("elm/genlist/item_compress/mode/default", "elm/genlist/item/mode/default") -COMPRESS_MODE("elm/genlist/item_compress_odd/mode/default", "elm/genlist/item/mode/default") +COMPRESS_MODE_ODD("elm/genlist/item_compress_odd/mode/default", "elm/genlist/item/mode/default") group { "elm/genlist/tree/mode/default"; inherit: "elm/genlist/item/mode/default"; - alias: "elm/genlist/tree_odd/mode/default"; parts { text { "elm.text.mode"; desc { "default"; @@ -4984,9 +4962,9 @@ group { "elm/genlist/tree/mode/default"; } inherit: "genlist_arrow"; } -//ODD("elm/genlist/tree_odd/mode/default", "elm/genlist/tree/mode/default") +ODD("elm/genlist/tree_odd/mode/default", "elm/genlist/tree/mode/default") COMPRESS_MODE("elm/genlist/tree_compress/mode/default", "elm/genlist/tree/mode/default") -COMPRESS_MODE("elm/genlist/tree_compress_odd/mode/default", "elm/genlist/tree/mode/default") +COMPRESS_MODE_ODD("elm/genlist/tree_compress_odd/mode/default", "elm/genlist/tree/mode/default") @@ -5031,23 +5009,22 @@ group { "elm/genlist/item/edit/default"; nomouse; images.image: "bevel_horiz_out.png" COMP; images.image: "shadow_horiz.png" COMP; program_source: "elm"; - alias: "elm/genlist/item_odd/edit/default"; parts { rect { "base"; desc { "default"; color: 64 64 64 255; color_class: "list_item_base"; } -// desc { "odd"; -// color: 56 56 56 255; -// color_class: "list_item_base_odd"; -// } + desc { "odd"; + color: 56 56 56 255; + color_class: "list_item_base_odd"; + } + } + program { + signal: "elm,state,odd"; + action: STATE_SET "odd" 1.0; + target: "base"; } -// program { -// signal: "elm,state,odd"; -// action: STATE_SET "odd" 1.0; -// target: "base"; -// } program { signal: "elm,state,even"; action: STATE_SET "default"; @@ -5200,15 +5177,14 @@ group { "elm/genlist/item/edit/default"; nomouse; } } } -//ODD("elm/genlist/item_odd/edit/default", "elm/genlist/item/edit/default") +ODD("elm/genlist/item_odd/edit/default", "elm/genlist/item/edit/default") COMPRESS_EDIT("elm/genlist/item_compress/edit/default", "elm/genlist/item/edit/default") -COMPRESS_EDIT("elm/genlist/item_compress_odd/edit/default", "elm/genlist/item/edit/default") +COMPRESS_EDIT_ODD("elm/genlist/item_compress_odd/edit/default", "elm/genlist/item/edit/default") group { "elm/genlist/tree/edit/default"; inherit: "elm/genlist/item/edit/default"; - alias: "elm/genlist/tree/edit/default"; } -//ODD("elm/genlist/tree_odd/edit/default", "elm/genlist/tree/edit/default") +ODD("elm/genlist/tree_odd/edit/default", "elm/genlist/tree/edit/default") COMPRESS_EDIT("elm/genlist/tree_compress/edit/default", "elm/genlist/tree/edit/default") COMPRESS_EDIT_ODD("elm/genlist/tree_compress_odd/edit/default", "elm/genlist/tree/edit/default") diff --git a/data/elementary/themes/edc/elm/index.edc b/data/elementary/themes/edc/elm/index.edc index 5ce5190..ce59294 100644 --- a/data/elementary/themes/edc/elm/index.edc +++ b/data/elementary/themes/edc/elm/index.edc @@ -147,7 +147,6 @@ group { name: "elm/index/base/vertical/default"; group { name: "elm/index/item/vertical/default"; data.item: "stacking" "below"; - alias: "elm/index/item_odd/vertical/default"; images { image: "darken_rounded_square_half.png" COMP; } @@ -262,7 +261,6 @@ group { name: "elm/index/item/vertical/default"; } } -#if 0 group { name: "elm/index/item_odd/vertical/default"; data.item: "stacking" "above"; data.item: "selectraise" "on"; @@ -376,7 +374,6 @@ group { name: "elm/index/item_odd/vertical/default"; } } } -#endif group { name: "elm/index/base/horizontal/default"; parts { @@ -511,7 +508,6 @@ group { name: "elm/index/base/horizontal/default"; group { name: "elm/index/item/horizontal/default"; data.item: "stacking" "below"; - alias: "elm/index/item_odd/horizontal/default"; images { image: "darken_rounded_square_half_h.png" COMP; } @@ -614,7 +610,6 @@ group { name: "elm/index/item/horizontal/default"; } } -#if 0 group { name: "elm/index/item_odd/horizontal/default"; data.item: "stacking" "above"; data.item: "selectraise" "on"; @@ -715,4 +710,3 @@ group { name: "elm/index/item_odd/horizontal/default"; } } } -#endif diff --git a/data/elementary/themes/edc/elm/list.edc b/data/elementary/themes/edc/elm/list.edc index 87bf813..0641938 100644 --- a/data/elementary/themes/edc/elm/list.edc +++ b/data/elementary/themes/edc/elm/list.edc @@ -116,7 +116,6 @@ group { name: "elm/list/item/default"; data.item: "selectraise" "on"; data.item: "focusraise" "on"; - alias: "elm/list/item_odd/default"; images.image: "bevel_curved_horiz_out.png" COMP; images.image: "shadow_rounded_horiz.png" COMP; images.image: "vgrad_med_dark.png" COMP; @@ -137,20 +136,16 @@ group { name: "elm/list/item/default"; color: 64 64 64 255; color_class: "list_item_base"; } -#if 0 description { state: "odd" 0.0; color: 56 56 56 255; color_class: "list_item_base_odd"; } -#endif } -#if 0 program { signal: "elm,state,odd"; source: "elm"; action: STATE_SET "odd" 1.0; target: "base"; } -#endif program { signal: "elm,state,even"; source: "elm"; action: STATE_SET "default" 0.0; @@ -406,9 +401,9 @@ group { name: "elm/list/item/default"; } } } -//ODD("elm/list/item_odd/default", "elm/list/item/default") +ODD("elm/list/item_odd/default", "elm/list/item/default") COMPRESS("elm/list/item_compress/default", "elm/list/item/default") -COMPRESS("elm/list/item_compress_odd/default", "elm/list/item/default") +COMPRESS_ODD("elm/list/item_compress_odd/default", "elm/list/item/default") // XXX: DO: // elm/list/h_item/default @@ -432,7 +427,6 @@ COMPRESS("elm/list/item_compress_odd/default", "elm/list/item/default") group { name: "elm/list/h_item/default"; data.item: "selectraise" "on"; data.item: "focusraise" "on"; - alias: "elm/list/h_item_odd/default"; images.image: "bevel_curved_vert_out.png" COMP; images.image: "shadow_rounded_vert.png" COMP; images.image: "vgrad_med_dark.png" COMP; @@ -453,20 +447,16 @@ group { name: "elm/list/h_item/default"; color: 64 64 64 255; color_class: "list_item_base"; } -#if 0 description { state: "odd" 0.0; color: 56 56 56 255; color_class: "list_item_base_odd"; } -#endif } -#if 0 program { signal: "elm,state,odd"; source: "elm"; action: STATE_SET "odd" 1.0; target: "base"; } -#endif program { signal: "elm,state,even"; source: "elm"; action: STATE_SET "default" 0.0; @@ -722,9 +712,9 @@ group { name: "elm/list/h_item/default"; } } } -//ODD("elm/list/h_item_odd/default", "elm/list/h_item/default") +ODD("elm/list/h_item_odd/default", "elm/list/h_item/default") COMPRESS("elm/list/h_item_compress/default", "elm/list/h_item/default") -COMPRESS("elm/list/h_item_compress_odd/default", "elm/list/h_item/default") +COMPRESS_ODD("elm/list/h_item_compress_odd/default", "elm/list/h_item/default") #undef ODD #undef COMPRESS diff --git a/data/elementary/themes/edc/fileman.edc b/data/elementary/themes/edc/fileman.edc index 633fb7b..3dd3ac0 100644 --- a/data/elementary/themes/edc/fileman.edc +++ b/data/elementary/themes/edc/fileman.edc @@ -1,7 +1,5 @@ group { name: "e/fileman/default/list/variable"; alias: "e/fileman/default/list/fixed"; - alias: "e/fileman/default/list_odd/variable"; - alias: "e/fileman/default/list_odd/fixed"; // data.item: "stacking" "above"; data.item: "stacking" "below"; data.item: "selectraise" "on"; @@ -408,7 +406,6 @@ group { name: "e/fileman/default/list/variable"; } } -#if 0 group { name: "e/fileman/default/list_odd/variable"; inherit: "e/fileman/default/list/variable"; alias: "e/fileman/default/list_odd/fixed"; @@ -420,7 +417,6 @@ group { name: "e/fileman/default/list_odd/variable"; } } } -#endif group { name: "e/fileman/desktop/list/fixed"; alias: "e/fileman/desktop/list/variable"; diff --git a/data/elementary/themes/edc/ilist.edc b/data/elementary/themes/edc/ilist.edc index 512186e..b6eae7c 100644 --- a/data/elementary/themes/edc/ilist.edc +++ b/data/elementary/themes/edc/ilist.edc @@ -60,7 +60,6 @@ group { name: "e/ilist"; } group { name: "e/widgets/ilist"; - alias: "e/widgets/ilist"; // data.item: "stacking" "above"; data.item: "stacking" "below"; data.item: "selectraise" "on"; @@ -288,7 +287,6 @@ group { name: "e/widgets/ilist"; } } -#if 0 group { name: "e/widgets/ilist_odd"; inherit: "e/widgets/ilist"; parts { @@ -311,7 +309,6 @@ group { name: "e/widgets/ilist_odd"; } } } -#endif group { name: "e/widgets/ilist_header"; alias: "e/widgets/ilist_header_odd"; --
