test_progress.c: Added new test case for vertical progress status
Summary: Added new test case for vertical progress status .This would be visible under Progressbar 2 elementary test Reviewers: seoz, singh.amitesh Differential Revision: https://phab.enlightenment.org/D233
This commit is contained in:
Niraj Kumar
Daniel Juyung Seo
parent
1ae61021ec
commit
248f1490fd
Binary file not shown.
|
After Width: | Height: | Size: 495 B |
|
|
@ -846,205 +846,13 @@ group { name: "elm/progressbar/horizontal/wheel";
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
group { name: "elm/progressbar/horizontal/recording";
|
||||
group { name: "elm/progressbar/horizontal/double";
|
||||
inherit: "elm/progressbar/horizontal/default";
|
||||
images {
|
||||
image: "shelf_inset.png" COMP;
|
||||
image: "bt_sm_base2.png" COMP;
|
||||
image: "flip_shad.png" COMP;
|
||||
image: "bt_recording.png" COMP;
|
||||
}
|
||||
parts {
|
||||
part { name: "elm.background.progressbar";
|
||||
type: RECT;
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
rel1 {
|
||||
relative: 0.0 0.0;
|
||||
offset: 0 0;
|
||||
}
|
||||
rel2 {
|
||||
relative: 1.0 1.0;
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.bar";
|
||||
mouse_events: 0;
|
||||
scale: 1;
|
||||
type: SWALLOW;
|
||||
description {
|
||||
min: 48 28;
|
||||
max: 99999 28; state: "default" 0.0;
|
||||
rel1 {
|
||||
to_x: "elm.text";
|
||||
to_y: "elm.background.progressbar";
|
||||
relative: 1.0 0.0;
|
||||
}
|
||||
rel2 {
|
||||
to: "elm.background.progressbar";
|
||||
relative: 1.0 1.0;
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.content";
|
||||
type: SWALLOW;
|
||||
description { state: "default" 0.0;
|
||||
visible: 0;
|
||||
align: 0.0 0.5;
|
||||
rel1 {
|
||||
offset: 4 0;
|
||||
to_y: "elm.background.progressbar";
|
||||
}
|
||||
rel2 {
|
||||
offset: 3 -1;
|
||||
relative: 0.0 1.0;
|
||||
to_y: "elm.background.progressbar";
|
||||
}
|
||||
}
|
||||
description { state: "visible" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
visible: 1;
|
||||
aspect: 1.0 1.0;
|
||||
aspect_preference: VERTICAL;
|
||||
rel2.offset: 4 -1;
|
||||
}
|
||||
}
|
||||
part { name: "elm.text";
|
||||
type: TEXT;
|
||||
mouse_events: 0;
|
||||
scale: 1;
|
||||
description { state: "default" 0.0;
|
||||
visible: 0;
|
||||
fixed: 1 1;
|
||||
align: 0.0 0.5;
|
||||
rel1.to_x: "elm.swallow.content";
|
||||
rel1.relative: 1.0 0.0;
|
||||
rel1.offset: -1 4;
|
||||
rel2.to_x: "elm.swallow.content";
|
||||
rel2.relative: 1.0 1.0;
|
||||
rel2.offset: -1 -5;
|
||||
color: 0 0 0 255;
|
||||
text {
|
||||
font: "Sans,Edje-Vera";
|
||||
size: 10;
|
||||
min: 0 0;
|
||||
align: 0.0 0.5;
|
||||
}
|
||||
}
|
||||
description { state: "visible" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
visible: 1;
|
||||
text.min: 1 1;
|
||||
rel1.offset: 0 4;
|
||||
rel2.offset: 0 -5;
|
||||
}
|
||||
}
|
||||
part { name: "background";
|
||||
mouse_events: 0;
|
||||
clip_to: "elm.background.progressbar";
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
rel1 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 0.0 0.0;
|
||||
}
|
||||
rel2 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 1.0 1.0;
|
||||
offset: -1 -1;
|
||||
}
|
||||
image {
|
||||
normal: "shelf_inset.png";
|
||||
border: 7 7 7 7;
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "elm.text.status";
|
||||
type: TEXT;
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
visible: 0;
|
||||
rel1 {
|
||||
to: "background";
|
||||
relative: 0.5 0.5;
|
||||
}
|
||||
rel2 {
|
||||
to: "background";
|
||||
relative: 0.5 0.5;
|
||||
}
|
||||
text {
|
||||
font: "Sans:style=Bold,Edje-Vera-Bold";
|
||||
size: 10;
|
||||
min: 1 1;
|
||||
align: 0.5 0.0;
|
||||
}
|
||||
color: 0 0 0 255;
|
||||
}
|
||||
description { state: "hidden" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
visible: 0;
|
||||
text.min: 0 0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.progress.progressbar";
|
||||
mouse_events: 0;
|
||||
clip_to: "elm.background.progressbar";
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
min: 14 28;
|
||||
fixed: 1 1;
|
||||
rel1 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 0.0 0.0;
|
||||
}
|
||||
rel2 {
|
||||
to_y: "elm.swallow.bar";
|
||||
to_x: "elm.cur.progressbar";
|
||||
offset: -1 -1;
|
||||
}
|
||||
image {
|
||||
normal: "flip_shad.png";
|
||||
border: 6 6 6 6;
|
||||
}
|
||||
}
|
||||
description {
|
||||
state: "invert" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
rel1 {
|
||||
to_y: "elm.swallow.bar";
|
||||
to_x: "elm.cur.progressbar";
|
||||
}
|
||||
rel2 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 1.0 1.0;
|
||||
}
|
||||
}
|
||||
description {
|
||||
state: "state_begin" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
rel1 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 0.0 0.0;
|
||||
}
|
||||
rel2 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 0.1 1.0;
|
||||
}
|
||||
}
|
||||
description {
|
||||
state: "state_end" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
rel1 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 0.9 0.0;
|
||||
}
|
||||
rel2 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 1.0 1.0;
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "elm.progress.progressbar1";
|
||||
mouse_events: 0;
|
||||
clip_to: "elm.background.progressbar";
|
||||
|
|
@ -1062,7 +870,7 @@ group { name: "elm/progressbar/horizontal/recording";
|
|||
offset: -1 -1;
|
||||
}
|
||||
image {
|
||||
normal: "bt_sm_base2.png";
|
||||
normal: "bt_recording.png";
|
||||
border: 6 6 6 6;
|
||||
}
|
||||
}
|
||||
|
|
@ -1103,53 +911,6 @@ group { name: "elm/progressbar/horizontal/recording";
|
|||
}
|
||||
}
|
||||
}
|
||||
part { name: "text-bar";
|
||||
type: TEXT;
|
||||
mouse_events: 0;
|
||||
clip_to: "progress-rect";
|
||||
effect: SOFT_SHADOW;
|
||||
scale: 1;
|
||||
description { state: "default" 0.0;
|
||||
align: 0.0 0.0;
|
||||
fixed: 1 1;
|
||||
visible: 0;
|
||||
rel1.to: "elm.text.status";
|
||||
rel1.offset: -1 -1;
|
||||
rel2.to: "elm.text.status";
|
||||
text {
|
||||
text_source: "elm.text.status";
|
||||
font: "Sans:style=Bold,Edje-Vera-Bold";
|
||||
size: 10;
|
||||
min: 1 1;
|
||||
align: 0.0 0.0;
|
||||
}
|
||||
color: 224 224 224 255;
|
||||
color3: 0 0 0 64;
|
||||
}
|
||||
description { state: "hidden" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
visible: 0;
|
||||
text.min: 0 0;
|
||||
}
|
||||
}
|
||||
part { name: "elm.cur.progressbar";
|
||||
mouse_events: 0;
|
||||
dragable {
|
||||
confine: "background";
|
||||
x: 1 1 1;
|
||||
y: 0 0 0;
|
||||
}
|
||||
description { state: "default" 0.0;
|
||||
min: 14 28;
|
||||
fixed: 1 1;
|
||||
visible: 0;
|
||||
rel1 {
|
||||
to: "background";
|
||||
relative: 0 0;
|
||||
}
|
||||
rel2.to: "background";
|
||||
}
|
||||
}
|
||||
part { name: "elm.cur.progressbar1";
|
||||
mouse_events: 0;
|
||||
dragable {
|
||||
|
|
@ -1168,54 +929,8 @@ group { name: "elm/progressbar/horizontal/recording";
|
|||
rel2.to: "background";
|
||||
}
|
||||
}
|
||||
part { name: "progress-rect";
|
||||
type: RECT;
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "elm.progress.progressbar";
|
||||
rel2.to: "elm.progress.progressbar";
|
||||
}
|
||||
}
|
||||
}
|
||||
programs {
|
||||
program { name: "label_show";
|
||||
signal: "elm,state,text,visible";
|
||||
source: "elm";
|
||||
action: STATE_SET "visible" 0.0;
|
||||
target: "elm.text";
|
||||
}
|
||||
program { name: "label_hide";
|
||||
signal: "elm,state,text,hidden";
|
||||
source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.text";
|
||||
}
|
||||
program { name: "icon_show";
|
||||
signal: "elm,state,icon,visible";
|
||||
source: "elm";
|
||||
action: STATE_SET "visible" 0.0;
|
||||
target: "elm.swallow.content";
|
||||
}
|
||||
program { name: "icon_hide";
|
||||
signal: "elm,state,icon,hidden";
|
||||
source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.swallow.content";
|
||||
}
|
||||
program { name: "units_show";
|
||||
signal: "elm,state,units,visible";
|
||||
source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "text-bar";
|
||||
target: "elm.text.status";
|
||||
}
|
||||
program { name: "units_hide";
|
||||
signal: "elm,state,units,hidden";
|
||||
source: "elm";
|
||||
action: STATE_SET "hidden" 0.0;
|
||||
target: "text-bar";
|
||||
target: "elm.text.status";
|
||||
}
|
||||
program { name: "slide_to_end";
|
||||
action: STATE_SET "state_end" 0.0;
|
||||
transition: LINEAR 0.5;
|
||||
|
|
@ -1231,20 +946,6 @@ group { name: "elm/progressbar/horizontal/recording";
|
|||
transition: LINEAR 0.5;
|
||||
after: "slide_to_end";
|
||||
}
|
||||
program { name: "start_pulse";
|
||||
signal: "elm,state,pulse,start";
|
||||
source: "elm";
|
||||
after: "slide_to_end";
|
||||
}
|
||||
program { name: "stop_pulse";
|
||||
signal: "elm,state,pulse,stop";
|
||||
source: "elm";
|
||||
action: ACTION_STOP;
|
||||
target: "slide_to_begin";
|
||||
target: "slide_to_end";
|
||||
target: "start_pulse";
|
||||
after: "state_pulse";
|
||||
}
|
||||
program { name: "state_pulse";
|
||||
signal: "elm,state,pulse";
|
||||
source: "elm";
|
||||
|
|
@ -1282,3 +983,150 @@ group { name: "elm/progressbar/horizontal/recording";
|
|||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
group { name: "elm/progressbar/vertical/double";
|
||||
inherit: "elm/progressbar/vertical/default";
|
||||
images {
|
||||
image: "bt_recording.png" COMP;
|
||||
}
|
||||
parts {
|
||||
part { name: "elm.progress.progressbar1";
|
||||
mouse_events: 0;
|
||||
clip_to: "elm.background.progressbar";
|
||||
description {
|
||||
state: "default" 0.0;
|
||||
min: 28 14;
|
||||
fixed: 1 1;
|
||||
rel1 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 0.0 0.0;
|
||||
}
|
||||
rel2 {
|
||||
to_x: "elm.swallow.bar";
|
||||
to_y: "elm.cur.progressbar1";
|
||||
offset: -1 -1;
|
||||
}
|
||||
image {
|
||||
normal: "bt_recording.png";
|
||||
border: 6 6 6 6;
|
||||
}
|
||||
}
|
||||
description {
|
||||
state: "invert" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
rel1 {
|
||||
to_x: "elm.swallow.bar";
|
||||
to_y: "elm.cur.progressbar1";
|
||||
}
|
||||
rel2 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 1.0 1.0;
|
||||
}
|
||||
}
|
||||
description {
|
||||
state: "state_begin" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
rel1 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 0.0 0.0;
|
||||
}
|
||||
rel2 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 1.0 0.1;
|
||||
}
|
||||
}
|
||||
description {
|
||||
state: "state_end" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
rel1 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 0.0 0.9;
|
||||
}
|
||||
rel2 {
|
||||
to: "elm.swallow.bar";
|
||||
relative: 1.0 1.0;
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "elm.cur.progressbar1";
|
||||
mouse_events: 0;
|
||||
dragable {
|
||||
confine: "background";
|
||||
x: 0 0 0;
|
||||
y: 1 1 1;
|
||||
}
|
||||
description { state: "default" 0.0;
|
||||
min: 28 14;
|
||||
fixed: 1 1;
|
||||
visible: 0;
|
||||
rel1 {
|
||||
to: "background";
|
||||
relative: 0 0;
|
||||
}
|
||||
rel2.to: "background";
|
||||
}
|
||||
}
|
||||
}
|
||||
programs {
|
||||
program { name: "slide_to_end";
|
||||
action: STATE_SET "state_end" 0.0;
|
||||
transition: LINEAR 0.5;
|
||||
target: "elm.progress.progressbar";
|
||||
target: "elm.progress.progressbar1";
|
||||
after: "slide_to_begin";
|
||||
}
|
||||
program { name: "slide_to_begin";
|
||||
action: STATE_SET "state_begin" 0.0;
|
||||
target: "elm.progress.progressbar";
|
||||
target: "elm.progress.progressbar1";
|
||||
transition: LINEAR 0.5;
|
||||
after: "slide_to_end";
|
||||
}
|
||||
program { name: "start_pulse";
|
||||
signal: "elm,state,pulse,start";
|
||||
source: "elm";
|
||||
action: STATE_SET "state_begin" 0.0;
|
||||
target: "elm.progress.progressbar";
|
||||
target: "elm.progress.progressbar1";
|
||||
after: "slide_to_end";
|
||||
}
|
||||
program { name: "state_pulse";
|
||||
signal: "elm,state,pulse";
|
||||
source: "elm";
|
||||
action: STATE_SET "state_begin" 0.0;
|
||||
target: "elm.progress.progressbar";
|
||||
target: "elm.progress.progressbar1";
|
||||
after: "units_hide";
|
||||
}
|
||||
program { name: "state_fraction";
|
||||
signal: "elm,state,fraction";
|
||||
source: "elm";
|
||||
action: ACTION_STOP;
|
||||
target: "slide_to_begin";
|
||||
target: "slide_to_end";
|
||||
target: "start_pulse";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.progress.progressbar";
|
||||
target: "elm.progress.progressbar1";
|
||||
}
|
||||
program { name: "set_invert_on";
|
||||
signal: "elm,state,inverted,on";
|
||||
source: "elm";
|
||||
action: STATE_SET "invert" 0.0;
|
||||
target: "elm.progress.progressbar";
|
||||
target: "elm.cur.progressbar";
|
||||
target: "elm.progress.progressbar1";
|
||||
target: "elm.cur.progressbar1";
|
||||
}
|
||||
program { name: "set_invert_off";
|
||||
signal: "elm,state,inverted,off";
|
||||
source: "elm";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.progress.progressbar";
|
||||
target: "elm.cur.progressbar";
|
||||
target: "elm.progress.progressbar1";
|
||||
target: "elm.cur.progressbar1";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -236,26 +236,54 @@ test_progressbar(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
|
|||
evas_object_show(win);
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
_set_progress_val(Evas_Object *pb, double inc_value, char *part_name)
|
||||
{
|
||||
double progress;
|
||||
|
||||
progress = elm_progressbar_part_value_get(pb, part_name);
|
||||
|
||||
if (progress < 1.0)
|
||||
progress += inc_value;
|
||||
else
|
||||
return EINA_TRUE;
|
||||
|
||||
elm_progressbar_part_value_set(pb, part_name, progress);
|
||||
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
_progressbar2_timer_cb(void *data)
|
||||
{
|
||||
Progressbar_Data *pd = data;
|
||||
if (!pd) return ECORE_CALLBACK_CANCEL;
|
||||
|
||||
double progress;
|
||||
|
||||
progress = elm_progressbar_value_get (pd->pb1);
|
||||
if (progress < 1.0) progress += 0.0123;
|
||||
else progress = 0.0;
|
||||
elm_progressbar_part_value_set(pd->pb1, "elm.cur.progressbar", progress);
|
||||
elm_progressbar_value_set(pd->pb2, progress);
|
||||
elm_progressbar_part_value_set(pd->pb2, "elm.cur.progressbar1", progress-0.15);
|
||||
elm_progressbar_part_value_set(pd->pb3, "elm.cur.progressbar", progress);
|
||||
elm_progressbar_part_value_set(pd->pb3, "elm.cur.progressbar1", progress-0.15);
|
||||
if (!pd)
|
||||
{
|
||||
pd->timer = NULL;
|
||||
return ECORE_CALLBACK_CANCEL;
|
||||
}
|
||||
|
||||
if (progress < 1.0) return ECORE_CALLBACK_RENEW;
|
||||
progress = elm_progressbar_value_get (pd->pb1);
|
||||
|
||||
if (progress < 1.0)
|
||||
{
|
||||
progress += 0.0123;
|
||||
elm_progressbar_part_value_set(pd->pb1, "elm.cur.progressbar", progress);
|
||||
elm_progressbar_value_set(pd->pb2, progress);
|
||||
elm_progressbar_part_value_set(pd->pb3, "elm.cur.progressbar", progress);
|
||||
elm_progressbar_part_value_set(pd->pb4, "elm.cur.progressbar", progress);
|
||||
}
|
||||
|
||||
_set_progress_val(pd->pb2, 0.00723, "elm.cur.progressbar1");
|
||||
_set_progress_val(pd->pb3, 0.00523, "elm.cur.progressbar1");
|
||||
|
||||
if (!_set_progress_val(pd->pb4, 0.00423, "elm.cur.progressbar1"))
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
|
||||
pd->timer = NULL;
|
||||
|
||||
return ECORE_CALLBACK_CANCEL;
|
||||
}
|
||||
|
||||
|
|
@ -318,8 +346,8 @@ test_progressbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
|
|||
pd->pb1 = pb;
|
||||
|
||||
pb = elm_progressbar_add(win);
|
||||
elm_object_style_set(pb, "recording");
|
||||
elm_object_text_set(pb, "Style: Recording");
|
||||
elm_object_style_set(pb, "double");
|
||||
elm_object_text_set(pb, "Style: double");
|
||||
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
|
||||
elm_progressbar_span_size_set(pb, elm_config_scale_get() * 200);
|
||||
|
|
@ -328,8 +356,8 @@ test_progressbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
|
|||
pd->pb2 = pb;
|
||||
|
||||
pb = elm_progressbar_add(win);
|
||||
elm_object_style_set(pb, "recording");
|
||||
elm_object_text_set(pb, "Style: Recording 2");
|
||||
elm_object_style_set(pb, "double");
|
||||
elm_object_text_set(pb, "Style: double 2");
|
||||
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
|
||||
elm_progressbar_span_size_set(pb, elm_config_scale_get() * 200);
|
||||
|
|
@ -337,6 +365,17 @@ test_progressbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
|
|||
evas_object_show(pb);
|
||||
pd->pb3 = pb;
|
||||
|
||||
pb = elm_progressbar_add(win);
|
||||
elm_object_style_set(pb, "double");
|
||||
elm_progressbar_horizontal_set(pb, EINA_FALSE);
|
||||
elm_object_text_set(pb, "Style: Vertical");
|
||||
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
|
||||
elm_progressbar_span_size_set(pb, elm_config_scale_get() * 200);
|
||||
elm_box_pack_end(bx, pb);
|
||||
evas_object_show(pb);
|
||||
pd->pb4 = pb;
|
||||
|
||||
bt_bx = elm_box_add(win);
|
||||
elm_box_horizontal_set(bt_bx, EINA_TRUE);
|
||||
evas_object_size_hint_weight_set(bt_bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
|
|
|
|||
Loading…
Reference in New Issue