From: Enlightenment S. <no-...@en...> - 2009-05-25 08:44:58
|
Log: Fixes to etk b_and_w theme, removed glow on pressed toolbutton - looks ugly. Author: quaker Date: 2009-05-25 01:44:52 -0700 (Mon, 25 May 2009) New Revision: 40828 Modified: trunk/etk/data/themes/b_and_w/build.sh trunk/etk/data/themes/b_and_w/main.edc Modified: trunk/etk/data/themes/b_and_w/build.sh =================================================================== --- trunk/etk/data/themes/b_and_w/build.sh 2009-05-25 06:56:26 UTC (rev 40827) +++ trunk/etk/data/themes/b_and_w/build.sh 2009-05-25 08:44:52 UTC (rev 40828) @@ -1,2 +1,2 @@ #!/bin/sh -edje_cc $@ -id img -fd . main.edc -o b_and_w.edj +edje_cc $@ -id img -fd . main.edc -o xb_and_w.edj Modified: trunk/etk/data/themes/b_and_w/main.edc =================================================================== --- trunk/etk/data/themes/b_and_w/main.edc 2009-05-25 06:56:26 UTC (rev 40827) +++ trunk/etk/data/themes/b_and_w/main.edc 2009-05-25 08:44:52 UTC (rev 40828) @@ -167,7 +167,6 @@ image: "bt_base2.png" COMP; \ image: "bt_hilight.png" COMP; \ image: "bt_shine.png" COMP; \ - image: "bt_glow.png" COMP; \ image: "bt_dis_base.png" COMP; \ image: "bt_dis_hilight.png" COMP; \ } \ @@ -292,28 +291,6 @@ visible: 1; \ } \ } \ - part { name: "over3"; /* Overlay 3 - glow */ \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - visible: 0; \ - color: 255 255 255 0; \ - image { \ - normal: "bt_glow.png"; \ - border: 12 12 12 12; \ - } \ - rel1 { \ - to: "button_rect"; \ - } \ - rel2 { \ - to: "button_rect"; \ - } \ - } \ - description { state: "clicked" 0.0; \ - inherit: "default" 0.0; \ - color: 255 255 255 255; \ - visible: 1; \ - } \ - } \ part { name: "etk.swallow.content"; /* content swallow */ \ type: SWALLOW; \ description { state: "active" 0.0; \ @@ -356,7 +333,6 @@ target: "button_image"; \ target: "over1"; \ target: "over2"; \ - target: "over3"; \ } \ program { name: "button_release"; \ signal: "etk,state,released"; \ @@ -365,7 +341,6 @@ target: "button_image"; \ target: "over1"; \ target: "over2"; \ - target: "over3"; \ } \ program { name: "button_enable"; \ signal: "etk,state,enabled"; \ @@ -374,7 +349,6 @@ target: "button_image"; \ target: "over1"; \ target: "over2"; \ - target: "over3"; \ } \ program { name: "button_disable"; \ signal: "etk,state,disabled"; \ @@ -383,7 +357,6 @@ target: "button_image"; \ target: "over1"; \ target: "over2"; \ - target: "over3"; \ } \ } @@ -662,7 +635,7 @@ "color=#ffffff style=glow glow2_color=#fe87 glow_color=#fa14", /* Glow */ "color=#111111 font=Sans:style=Italic") /* Description */ - /* Default style for the label of a toolbutton */ + /* Default style for the label of a toolbutton and list rows */ STYLE("Toolbutton", "Sans", "Sans", "Sans:style=Italic", "Sans:style=Italic", "Sans:style=Mono", "10", "color=#000000FF style=soft_shadow shadow_color=#ffffff20", /* Normal style */ @@ -6300,33 +6273,12 @@ description { state: "default" 0.0; align: 0.0 0.5; text { - style: "Other Default"; + style: "Toolbutton"; min: 1 1; } } - description { state: "selected" 0.0; - inherit: "default" 0.0; - text { - style: "Button Default"; - min: 1 1; - } - } } } - programs { - program { name: "row_select"; - signal: "etk,state,selected"; - source: "etk"; - action: STATE_SET "selected" 0.0; - target: "etk.text.label"; - } - program { name: "row_unselect"; - signal: "etk,state,unselected"; - source: "etk"; - action: STATE_SET "default" 0.0; - target: "etk.text.label"; - } - } } /** |