From c56a0de8b20effe0c5f39433214996ec71767046 Mon Sep 17 00:00:00 2001 From: Bruno Dilly Date: Mon, 3 Sep 2012 22:06:40 +0000 Subject: [PATCH] e/connman: use image set for disabled connman Images by Marina SVN revision: 76073 --- data/themes/default.edc | 15 +++++++++++---- data/themes/images/Makefile.am | 3 ++- data/themes/images/connman_wifi_not.png | Bin 2788 -> 0 bytes data/themes/images/connman_wifi_not_128.png | Bin 0 -> 4889 bytes data/themes/images/connman_wifi_not_32.png | Bin 0 -> 2111 bytes 5 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 data/themes/images/connman_wifi_not.png create mode 100644 data/themes/images/connman_wifi_not_128.png create mode 100644 data/themes/images/connman_wifi_not_32.png diff --git a/data/themes/default.edc b/data/themes/default.edc index f9a8d54f6..4f2d082ff 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -8004,6 +8004,7 @@ CONNMAN_ICON(ethernet) parts { CONNMAN_BAR_IMAGES_SET(off) + CONNMAN_BAR_IMAGES_SET(not) part { name: "bar_off"; type: IMAGE; @@ -8014,6 +8015,11 @@ CONNMAN_ICON(ethernet) aspect_preference: BOTH; image.normal: "wifi_bar_off"; } + description { + state: "disabled" 0.0; + inherit: "default" 0.0; + color: 255 255 255 0; + } } CONNMAN_BAR_ON(0_on) @@ -8051,12 +8057,11 @@ CONNMAN_ICON(ethernet) state: "default" 0.0; aspect: 1 1; aspect_preference: BOTH; - image.image: "connman_wifi_not.png" COMP; - image.normal: "connman_wifi_not.png"; + image.normal: "wifi_bar_not"; color: 255 255 255 0; } description { - state: "visible" 0.0; + state: "disabled" 0.0; inherit: "default" 0.0; color: 255 255 255 255; } @@ -8069,6 +8074,7 @@ CONNMAN_ICON(ethernet) source: "e"; action: STATE_SET "default" 0.0; target: "bar_not"; + target: "bar_off"; } program { name: "connman,disabled"; @@ -8082,8 +8088,9 @@ CONNMAN_ICON(ethernet) } program { name: "connman,disabled,2"; - action: STATE_SET "visible" 0.0; + action: STATE_SET "disabled" 0.0; target: "bar_not"; + target: "bar_off"; } program { name: "strength,show"; diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index 2795a2658..30bb8a00c 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -79,7 +79,6 @@ connman_cellular.png \ connman_ethernet.png \ connman_online.png \ connman_ready.png \ -connman_wifi_not.png \ connman_security1_128.png \ connman_security1_32.png \ connman_security2_128.png \ @@ -92,6 +91,8 @@ connman_wifi_2_on_128.png \ connman_wifi_2_on_32.png \ connman_wifi_3_on_128.png \ connman_wifi_3_on_32.png \ +connman_wifi_not_128.png \ +connman_wifi_not_32.png \ connman_wifi_off_128.png \ connman_wifi_off_32.png \ dia_botshad.png \ diff --git a/data/themes/images/connman_wifi_not.png b/data/themes/images/connman_wifi_not.png deleted file mode 100644 index 27ec5ba43d0b9c658bc0091147791626f9142ffd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2788 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 diff --git a/data/themes/images/connman_wifi_not_128.png b/data/themes/images/connman_wifi_not_128.png new file mode 100644 index 0000000000000000000000000000000000000000..22a290ded17a55d156821dfbc04ed911f64d7f74 GIT binary patch literal 4889 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 MKz