From 143febda8211c85c9613748b69c492b17afd3bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=83=C2=A1vio=20Pontes?= Date: Tue, 23 Nov 2010 12:56:51 +0000 Subject: [PATCH] Adding new layout for title with back and next button. Content-back now has just the back button. SVN revision: 54871 --- legacy/elementary/data/themes/default.edc | 178 +++++++++++++++++----- 1 file changed, 142 insertions(+), 36 deletions(-) diff --git a/legacy/elementary/data/themes/default.edc b/legacy/elementary/data/themes/default.edc index 46015e47a3..b1f656de9f 100644 --- a/legacy/elementary/data/themes/default.edc +++ b/legacy/elementary/data/themes/default.edc @@ -32394,7 +32394,7 @@ collections { } } - /* application with toolbar and main content area with a back and next buttons and title area */ + /* application with toolbar and main content area with a back button and title area */ group { name: "elm/layout/application/toolbar-content-back"; parts { part { name: "elm.swallow.content"; @@ -32419,13 +32419,7 @@ collections { } } } - part { name: "elm.text.back"; - type: TEXTBLOCK; - entry_mode: PLAIN; - description { state: "default" 0.0; - visible: 0; - } - } + part { name: "back"; type: EXTERNAL; source: "elm/button"; @@ -32442,21 +32436,131 @@ collections { } params.string: "label" "Back"; } + } + programs { + program { + signal: "clicked"; + source: "back"; + action: SIGNAL_EMIT "elm,action,back" ""; + } + } + + part { name: "elm.swallow.end"; + type: SWALLOW; + description { state: "default" 0.0; + align: 1.0 0.0; + fixed: 1 1; + rel1 { to_y: "elm.external.toolbar"; + relative: 1.0 1.0; + offset: -2 1; + } + rel2 { to_y: "elm.external.toolbar"; + relative: 1.0 1.0; + offset: -1 32; + } + } + } + + part { name: "elm.text.title"; + type: TEXT; + effect: SOFT_SHADOW; + scale: 1; + description { state: "default" 0.0; + rel1 { to_y: "elm.external.toolbar"; + to_x: "back"; + relative: 1.0 1.0; + offset: 2 1; + } + rel2 { to_y: "back"; + to_x: "elm.swallow.end"; + relative: 0.0 1.0; + offset: -3 -1; + } + text { + font: "Sans:style=Bold"; + size: 12; + } + } + } + } + } + + /* application with toolbar and main content area with a back and next buttons and title area */ + group { name: "elm/layout/application/toolbar-content-back-next"; + parts { + part { name: "elm.swallow.content"; + type: SWALLOW; + description { state: "default" 0.0; + rel1 { to_y: "title_clipper"; + relative: 0.0 1.0; + offset: -1 1; + } + } + } + + part { name: "elm.external.toolbar"; + type: EXTERNAL; + source: "elm/toolbar"; + description { state: "default" 0.0; + fixed: 0 1; + align: 0.5 0.0; + rel2 { + relative: 1.0 0.0; + offset: -1 47; + } + } + } + part { name: "title_clipper"; + type: RECT; + description { state: "default" 0.0; + visible: 1; + rel1 { + to_y: "back"; + } + rel2 { + to_y: "back"; + } + } description { state: "hidden" 0.0; inherit: "default" 0.0; visible: 0; + rel2 { + relative: 1.0 0.0; + } } } - part { name: "elm.text.next"; - type: TEXTBLOCK; - entry_mode: PLAIN; + part { name: "back"; + type: EXTERNAL; + source: "elm/button"; + clip_to: "back_clipper"; description { state: "default" 0.0; + align: 0.0 0.0; + fixed: 1 1; + rel1 { to_y: "elm.external.toolbar"; + relative: 0.0 1.0; + offset: 0 1; + } + rel2 { to_y: "elm.external.toolbar"; + relative: 0.0 1.0; + offset: 50 32; + } + params.string: "label" "Back"; + } + } + part { name: "back_clipper"; + type: RECT; + clip_to: "title_clipper"; + description { state: "default" 0.0; + visible: 1; + } + description { state: "hidden" 0.0; visible: 0; } } part { name: "next"; type: EXTERNAL; source: "elm/button"; + clip_to: "next_clipper"; description { state: "default" 0.0; align: 1.0 0.0; fixed: 1 1; @@ -32470,10 +32574,16 @@ collections { } params.string: "label" "Next"; } - description { state: "hidden" 0.0; - inherit: "default" 0.0; + } + part { name: "next_clipper"; + type: RECT; + clip_to: "title_clipper"; + description { state: "default" 0.0; + visible: 1; + } + description { state: "hidden" 0.0; visible: 0; - } + } } programs { program { @@ -32481,26 +32591,30 @@ collections { source: "back"; action: SIGNAL_EMIT "elm,action,back" ""; } + program { + signal: "elm,title,hide"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + transition: LINEAR 0.1; + target: "title_clipper"; + } + program { + signal: "elm,title,show"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "title_clipper"; + } program { signal: "elm,back,hide"; source: "elm"; action: STATE_SET "hidden" 0.0; - target: "back"; + target: "back_clipper"; } program { signal: "elm,back,show"; source: "elm"; action: STATE_SET "default" 0.0; - target: "back"; - } - program { - signal: "entry,changed"; - source: "elm.text.back"; - script { - new buf[32]; - get_text(PART:"elm.text.back", buf, sizeof(buf)); - external_param_set_str(PART:"back", "label", buf); - } + target: "back_clipper"; } program { signal: "clicked"; @@ -32511,28 +32625,20 @@ collections { signal: "elm,next,hide"; source: "elm"; action: STATE_SET "hidden" 0.0; - target: "next"; + target: "next_clipper"; } program { signal: "elm,next,show"; source: "elm"; action: STATE_SET "default" 0.0; - target: "next"; - } - program { - signal: "entry,changed"; - source: "elm.text.next"; - script { - new buf[32]; - get_text(PART:"elm.text.next", buf, sizeof(buf)); - external_param_set_str(PART:"next", "label", buf); - } + target: "next_clipper"; } } part { name: "elm.text.title"; type: TEXT; effect: SOFT_SHADOW; scale: 1; + clip_to: "title_clipper"; description { state: "default" 0.0; rel1 { to_y: "elm.external.toolbar"; to_x: "back";