Enlightenment CVS committal Author : moom Project : e17 Module : libs/etk
Dir : e17/libs/etk/data/themes/default/widgets Modified Files: iconbox.edc label.edc tree.edc Log Message: * [Theme] Rename label's part "etk.text.textblock" to "etk.text.label" and tree's part "etk.text.text" to "etk.text.label" * [Theme] Each widget now have its own label's theme-group. You can thus use different label styles for different widgets * [Widget] Theme-children can now emits automatically the same theme-signals as their theme-parents... this is used for the labels to make them reactive to signals like "etk,state,pressed", "etk,state,released", ... * All existing themes are broken * =================================================================== RCS file: /cvs/e/e17/libs/etk/data/themes/default/widgets/iconbox.edc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- iconbox.edc 28 Jan 2007 18:39:07 -0000 1.5 +++ iconbox.edc 18 Feb 2007 16:53:24 -0000 1.6 @@ -260,14 +260,14 @@ } } part { - name: "etk.text.textblock"; - type: TEXTBLOCK; + name: "etk.text.label"; + type: TEXTBLOCK; description { state: "default" 0.0; - text { - style: "label_style"; - min: 1 1; - } + text { + style: "Label"; + min: 1 1; + } } } } =================================================================== RCS file: /cvs/e/e17/libs/etk/data/themes/default/widgets/label.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- label.edc 28 Jan 2007 18:39:07 -0000 1.1 +++ label.edc 18 Feb 2007 16:53:24 -0000 1.2 @@ -1,40 +1,35 @@ styles { - style { - name: "label_style"; - base: "font=Vera font_size=10 text_class=label align=left color=#000000 wrap=word style=shadow shadow_color=#ffffff80'"; - - tag: "br" "\n"; - tag: "left" "+ align=left"; - tag: "/left" "-\n"; - tag: "center" "+ align=center"; - tag: "/center" "- \n"; - tag: "right" "+ align=right"; - tag: "/right" "- \n"; - tag: "h1" "+ font_size=20"; - tag: "b" "+ font=Vera-Bold"; - tag: "i" "+ font=Vera-Italic"; - tag: "bi" "+ font=Vera-Bold-Italic"; - tag: "mono" "+ font=Vera-Mono"; - tag: "glow" "+ style=glow color=#fff glow2_color=#fe87 glow_color=#fa14"; - tag: "link" "+ underline=on underline_color=#0000aa color=#0000aa"; - tag: "red" "+ color=#ff0000"; - tag: "tab" "\t"; - } + STYLE("Label", "Vera", "Vera-Bold", "Vera-Italic", "Vera-Bold-Italic", "Vera-Mono", "10", + "color=#000000 style=shadow shadow_color=#ffffff80", /* Normal style */ + "color=#ffffff style=soft_shadow shadow_color=#00000020 font=Vera-Bold font_size=16", /* Title */ + "color=#ffffff style=soft_shadow shadow_color=#00000020 font=Vera-Bold font_size=12", /* Subtitle */ + "color=#ffffff style=glow glow2_color=#fe87 glow_color=#fa14", /* Glow */ + "color=#111111 font=Vera-Italic") /* Description */ } group { name: "etk/label"; + alias: "etk/button/label"; + alias: "etk/toggle_button/label"; + alias: "etk/check_button/label"; + alias: "etk/radio_button/label"; + alias: "etk/tree/header/label"; + alias: "etk/notebook/tab/label"; + alias: "etk/combobox/button/label"; + alias: "etk/htoolbar/tool_button/label"; + alias: "etk/vtoolbar/tool_button/label"; parts { part { - name: "etk.text.textblock"; - type: TEXTBLOCK; + name: "etk.text.label"; + type: TEXTBLOCK; description { state: "default" 0.0; - text { - style: "label_style"; - min: 1 1; - } + align: 0.0 0.5; + text { + style: "Label"; + min: 1 1; + } } } } =================================================================== RCS file: /cvs/e/e17/libs/etk/data/themes/default/widgets/tree.edc,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- tree.edc 1 Feb 2007 19:14:52 -0000 1.30 +++ tree.edc 18 Feb 2007 16:53:24 -0000 1.31 @@ -425,7 +425,7 @@ part { name: "select_clip"; type: RECT; - mouse_events: 0; + mouse_events: 0; description { state: "default" 0.0; visible: 0; @@ -448,7 +448,7 @@ name: "select_rect"; type: RECT; clip_to: "select_clip"; - mouse_events: 0; + mouse_events: 0; description { state: "default" 0.0; color: 247 236 202 255; @@ -575,7 +575,7 @@ /** * group "etk/tree/checkbox" * ----------------------- - * This group corresponds to checkbox used by the "checkbox" model of the tree + * This group corresponds to the checkbox used by the "checkbox" model of the tree * * Signals: * -------- @@ -682,22 +682,21 @@ /** * group "etk/tree/text" * ----------------------- - * This group corresponds to text used by the "text" model of the tree + * This group corresponds to the text of the rows of the tree * */ group { name: "etk/tree/text"; parts { part { - name: "etk.text.text"; - type: TEXTBLOCK; + name: "etk.text.label"; + type: TEXTBLOCK; description { state: "default" 0.0; - color: 0 0 0 255; - align: 0.0 0.5; + align: 0.0 0.5; text { - style: "label_style"; - min: 1 1; + style: "Label"; + min: 1 1; } } } ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs