From 670d147845afaf3310e991a007df4239e69210f8 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 9 Sep 2007 22:46:58 +0000 Subject: [PATCH] bah. until i have a better idea - i'm going "boring". SVN revision: 31666 --- data/themes/default_wizard.edc | 153 ++++++++++++++++++++++++++++-- data/themes/images/e17_wiz_b1.png | Bin 5035 -> 5020 bytes data/themes/images/e17_wiz_b2.png | Bin 5055 -> 4922 bytes 3 files changed, 147 insertions(+), 6 deletions(-) diff --git a/data/themes/default_wizard.edc b/data/themes/default_wizard.edc index fdc3c38ba..800e9b177 100644 --- a/data/themes/default_wizard.edc +++ b/data/themes/default_wizard.edc @@ -43,12 +43,12 @@ group { state: "default" 0.0; rel1 { relative: 0.0 1.0; - offset: 8 8; + offset: 16 8; to_y: "e.text.title"; } rel2 { relative: 1.0 0.0; - offset: -9 -1; + offset: -17 -9; to_y: "bottom"; } } @@ -59,8 +59,9 @@ group { description { state: "default" 0.0; rel1 { - relative: 0.0 1.0; - offset: 0 -40; + to: "b1"; + relative: 0.0 0.0; + offset: 0 -8; } rel2 { relative: 1.0 1.0; @@ -103,26 +104,132 @@ group { } } } - /* FIXME: adding button here */ part { name: "b1"; mouse_events: 1; description { state: "default" 0.0; align: 0.0 1.0; + rel1 { + to: "e.button.back.label"; + relative: 0.0 0.0; + offset: -9 -9; + } + rel2 { + to: "e.button.back.label"; + relative: 1.0 1.0; + offset: 8 8; + } image { normal: "e17_wiz_b1.png"; border: 7 7 7 7; } } description { - state: "pressed" 0.0; + state: "clicked" 0.0; inherit: "default" 0.0; image { normal: "e17_wiz_b2.png"; } } } + part { + name: "e.button.back.label"; + type: TEXT; + effect: SOFT_SHADOW; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 { + relative: 0.0 1.0; + offset: 16 -17; + } + rel2 { + relative: 0.0 1.0; + offset: 16 -17; + } + align: 0.0 1.0; + color: 255 255 255 255; + color3: 0 0 0 16; + text { + text: "Back"; + font: "Edje-Vera-Bold"; + size: 12; + min: 1 1; + align: 0.0 1.0; + text_class: "wizard_button"; + } + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + color3: 0 0 0 8; + } + } + part { + name: "b2"; + mouse_events: 1; + description { + state: "default" 0.0; + align: 0.0 1.0; + rel1 { + to: "e.button.next.label"; + relative: 0.0 0.0; + offset: -9 -9; + } + rel2 { + to: "e.button.next.label"; + relative: 1.0 1.0; + offset: 8 8; + } + image { + normal: "e17_wiz_b1.png"; + border: 7 7 7 7; + } + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + image { + normal: "e17_wiz_b2.png"; + } + } + } + part { + name: "e.button.next.label"; + type: TEXT; + effect: SOFT_SHADOW; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 { + relative: 1.0 1.0; + offset: -17 -17; + } + rel2 { + relative: 1.0 1.0; + offset: -17 -17; + } + align: 1.0 1.0; + color: 255 255 255 255; + color3: 0 0 0 16; + text { + text: "Next"; + font: "Edje-Vera-Bold"; + size: 12; + min: 1 1; + align: 1.0 1.0; + text_class: "wizard_button"; + } + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + color3: 0 0 0 8; + } + } part { name: "logo_shadow"; mouse_events: 0; @@ -155,4 +262,38 @@ group { } } } + programs { + program { + name: "b1_click"; + signal: "mouse,down,1"; + source: "b1"; + action: STATE_SET "clicked" 0.0; + target: "b1"; + target: "e.button.back.label"; + } + program { + name: "b1_unclick"; + signal: "mouse,up,1"; + source: "b1"; + action: STATE_SET "default" 0.0; + target: "b1"; + target: "e.button.back.label"; + } + program { + name: "b2_click"; + signal: "mouse,down,1"; + source: "b2"; + action: STATE_SET "clicked" 0.0; + target: "b2"; + target: "e.button.next.label"; + } + program { + name: "b2_unclick"; + signal: "mouse,up,1"; + source: "b2"; + action: STATE_SET "default" 0.0; + target: "b2"; + target: "e.button.next.label"; + } + } } diff --git a/data/themes/images/e17_wiz_b1.png b/data/themes/images/e17_wiz_b1.png index 9bb51bf6aaab5075a11990d058ab1924be354101..1f60d456b902f2fe8d4bbd876ac591ef543d11f5 100644 GIT binary patch delta 4945 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 P00000NkvXXu0mjf|7M^l delta 4962 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 diff --git a/data/themes/images/e17_wiz_b2.png b/data/themes/images/e17_wiz_b2.png index 805d7b1b3b1d2855179a906ea0f8ce187636fe0e..d722f6dc4b13cf766436a52867bf446ce640db45 100644 GIT binary patch delta 4846 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 U7K_(|-T(jq07*qoM6N<$f;YX3A^-pY delta 4982 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 AS^xk5