From b2d5514c3a900eab05131eeea1e933e8eec1eed9 Mon Sep 17 00:00:00 2001 From: Boris 'billiob' Faure Date: Sun, 9 May 2010 10:34:37 +0200 Subject: [PATCH] efl: rewrite personal info to use externals --- .../edc/contact_list/personal_info.edc | 176 +++++++++++------- amsn2/themes/default/main.edc | 4 + 2 files changed, 116 insertions(+), 64 deletions(-) diff --git a/amsn2/themes/default/edc/contact_list/personal_info.edc b/amsn2/themes/default/edc/contact_list/personal_info.edc index 07f14dae..57b63286 100644 --- a/amsn2/themes/default/edc/contact_list/personal_info.edc +++ b/amsn2/themes/default/edc/contact_list/personal_info.edc @@ -2,6 +2,84 @@ images { image: "contact_list/dp_border.png" COMP; } + +group { + name: "amsn2/personal_info.presence"; + parts { + part { + name: "presence"; + type: EXTERNAL; + source: "elm/hoversel"; + description { + state: "default" 0.0; + } + } + } +} + +group { + name: "amsn2/personal_info.nick"; + parts { + part { + name: "nick"; + type: EXTERNAL; + source: "elm/scrolled_entry"; + scale: 1; + description { + state: "default" 0.0; + params { + string: "text" "nick"; + bool: "editable" "0"; + bool: "single line" "1"; + bool: "password" "0"; + } + } + } + } +} + +group { + name: "amsn2/personal_info.psm"; + parts { + part { + name: "psm"; + type: EXTERNAL; + source: "elm/scrolled_entry"; + scale: 1; + description { + state: "default" 0.0; + params { + string: "text" "psm"; + bool: "editable" "0"; + bool: "single line" "1"; + bool: "password" "0"; + } + } + } + } +} +group { + name: "amsn2/personal_info.current_media"; + parts { + part { + name: "current_media"; + type: EXTERNAL; + source: "elm/scrolled_entry"; + scale: 1; + description { + state: "default" 0.0; + params { + string: "text" "current_media"; + bool: "editable" "0"; + bool: "single line" "1"; + bool: "password" "0"; + } + } + } + } +} + + group { name: "amsn2/personal_info"; parts { @@ -11,12 +89,12 @@ group { mouse_events: 0; description { state: "default" 0.0; - fixed: 1.0 1.0; + fixed: 1 1; min: 70 70; max: 70 70; align: 0.0 0.5; image { - normal: "contact_list/dp_border.png"; + normal: "dp_border.png"; border: 11 11 11 11; } } @@ -42,74 +120,44 @@ group { } } part { - name: "presence"; - type: SWALLOW; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; - rel1 { - relative: 0.0 0.0; - offset: 70 0; - } - rel2 { - relative: 1.0 0.25; - offset: -1 -1; - } - } - } - part { - name: "nick"; - type: SWALLOW; - mouse_events: 1; - repeat_events: 1; + name: "vbox"; + type: BOX; description { state: "default" 0.0; rel1 { - to: "presence"; - relative: 0.0 1.0; - offset: 0 0; + to_x: "dp_border"; + relative: 1.0 0.0; } - rel2 { - relative: 1.0 0.5; - offset: -1 -1; + box { + layout: "vertical"; } } - } - part { - name: "psm"; - type: SWALLOW; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; - rel1 { - to: "nick"; - relative: 0.0 1.0; - offset: 0 0; - } - rel2 { - relative: 1.0 0.75; - offset: -1 -1; - } - } - } - part { - name: "current_media"; - type: SWALLOW; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; - fixed: 1 1; - rel1 { - to: "psm"; - relative: 0.0 1.0; - offset: 0 0; - } - rel2 { - relative: 1.0 1.0; - offset: -1 -1; + box { + items { + item { + type: GROUP; + source: "amsn2/personal_info.presence"; + weight: 1 0; + align: -1 0.5; + } + item { + type: GROUP; + source: "amsn2/personal_info.nick"; + weight: 1 0; + align: -1 0.5; + } + item { + type: GROUP; + source: "amsn2/personal_info.psm"; + weight: 1 0; + align: -1 0.5; + } + item { + type: GROUP; + source: "amsn2/personal_info.current_media"; + weight: 1 0; + align: -1 0.5; + } } } } diff --git a/amsn2/themes/default/main.edc b/amsn2/themes/default/main.edc index afef1368..e2c9f46a 100644 --- a/amsn2/themes/default/main.edc +++ b/amsn2/themes/default/main.edc @@ -14,6 +14,10 @@ styles { #include "edc/styles.edc" } +externals { + external: "elm"; +} + collections { #include "edc/login_screen/login_screen.edc" #include "edc/contact_list/contact_list.edc"