From c64071ae132ddc5894d5daad8a874377a176aac5 Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Wed, 3 Aug 2016 17:29:31 -0700 Subject: [PATCH] elementary: keep theme consistent regarding the disabling of odd/even. This is another patch that should be reverted as soon as we start 7affe8c2047a41a2945cf6c048d59f28c974aa7a and is still a work around T3086. --- 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 +++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/data/elementary/themes/edc/elm/index.edc b/data/elementary/themes/edc/elm/index.edc index ce592946c7..5ce51905c1 100644 --- a/data/elementary/themes/edc/elm/index.edc +++ b/data/elementary/themes/edc/elm/index.edc @@ -147,6 +147,7 @@ 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; } @@ -261,6 +262,7 @@ 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"; @@ -374,6 +376,7 @@ group { name: "elm/index/item_odd/vertical/default"; } } } +#endif group { name: "elm/index/base/horizontal/default"; parts { @@ -508,6 +511,7 @@ 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; } @@ -610,6 +614,7 @@ 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"; @@ -710,3 +715,4 @@ 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 06419383b1..87bf8136ec 100644 --- a/data/elementary/themes/edc/elm/list.edc +++ b/data/elementary/themes/edc/elm/list.edc @@ -116,6 +116,7 @@ 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; @@ -136,16 +137,20 @@ 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; @@ -401,9 +406,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_ODD("elm/list/item_compress_odd/default", "elm/list/item/default") +COMPRESS("elm/list/item_compress_odd/default", "elm/list/item/default") // XXX: DO: // elm/list/h_item/default @@ -427,6 +432,7 @@ COMPRESS_ODD("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; @@ -447,16 +453,20 @@ 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; @@ -712,9 +722,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_ODD("elm/list/h_item_compress_odd/default", "elm/list/h_item/default") +COMPRESS("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 3dd3ac0305..633fb7bd3d 100644 --- a/data/elementary/themes/edc/fileman.edc +++ b/data/elementary/themes/edc/fileman.edc @@ -1,5 +1,7 @@ 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"; @@ -406,6 +408,7 @@ 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"; @@ -417,6 +420,7 @@ 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 b6eae7c410..512186e20d 100644 --- a/data/elementary/themes/edc/ilist.edc +++ b/data/elementary/themes/edc/ilist.edc @@ -60,6 +60,7 @@ 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"; @@ -287,6 +288,7 @@ group { name: "e/widgets/ilist"; } } +#if 0 group { name: "e/widgets/ilist_odd"; inherit: "e/widgets/ilist"; parts { @@ -309,6 +311,7 @@ group { name: "e/widgets/ilist_odd"; } } } +#endif group { name: "e/widgets/ilist_header"; alias: "e/widgets/ilist_header_odd";