diff --git a/experimental/ecdb/trunk/data/themes/default/default.edc b/experimental/ecdb/trunk/data/themes/default/default.edc index 7cdfce95..328d01b4 100644 --- a/experimental/ecdb/trunk/data/themes/default/default.edc +++ b/experimental/ecdb/trunk/data/themes/default/default.edc @@ -19,4 +19,5 @@ collections { #include "groups/capacity.edc" #include "groups/config_inwin.edc" #include "groups/icons.edc" + #include "groups/about.edc" } diff --git a/experimental/ecdb/trunk/data/themes/default/groups/Makefile.am b/experimental/ecdb/trunk/data/themes/default/groups/Makefile.am index cf4eb18a..6b360497 100644 --- a/experimental/ecdb/trunk/data/themes/default/groups/Makefile.am +++ b/experimental/ecdb/trunk/data/themes/default/groups/Makefile.am @@ -10,4 +10,5 @@ EXTRA_DIST= burn_data.edc \ welcome_page.edc \ capacity.edc \ window.edc \ - config_inwin.edc + config_inwin.edc \ + about.edc diff --git a/experimental/ecdb/trunk/data/themes/default/groups/about.edc b/experimental/ecdb/trunk/data/themes/default/groups/about.edc new file mode 100644 index 00000000..52747f20 --- /dev/null +++ b/experimental/ecdb/trunk/data/themes/default/groups/about.edc @@ -0,0 +1,359 @@ +/* vim: set sw=3 ts=3 sts=3 expandtab: */ +group { + name: "ecdb/about"; + min: 240 240; + max: 640 640; + + parts { + part { + name: "background"; + mouse_events: 0; + scale: 1; + + description { + state: "default" 0.0; + min: 240 240; + max: 640 640; + + rel1 { + relative: 0.0 0.0; + offset: 0 0; + } + + rel2 { + relative: 1.0 1.0; + offset: -1 -1; + } + + image { + normal: "background.png"; + } + } + } + + part { + name: "logo"; + type: IMAGE; + scale: 1; + + description { + state: "default" 0; + align: 0.5 0.05; + min: 83 83; + max: 83 83; + + image { + normal: "logo.png"; + } + } + } + + part { + name: "about"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + + description { + state: "default" 0.0; + + rel1 { + to_y: "logo"; + relative: 0.0 1.0; + offset: 8 -19; + } + + rel2 { + to_y: "button.base"; + relative: 1.0 0.0; + offset: -1 -1; + } + + text { + style: "ecdb.about"; + min: 1 1; + text: "text"; + } + } + } + + part { + name: "button.base"; + type: IMAGE; + mouse_events: 1; + scale: 1; + + description { + state: "default" 0.0; + min: 64 32; + max: 64 32; + align: 0.5 1.0; + fixed: 1 1; + color: 255 255 255 178; + + rel1 { + relative: 0.0 1.0; + offset: 0 0; + } + + rel2 { + relative: 1.0 1.0; + offset: -1 -1; + } + + image { + normal: "button_base.png"; + border: 7 7 7 7; + } + } + } + + part { + name: "button.button_clip"; + type: RECT; + mouse_events: 1; + + description { + state: "default" 0.0; + color: 255 255 255 255; + + rel1 { + to: "button.base"; + relative: 0.0 0.0; + offset: 3 1; + } + + rel2 { + to: "button.base"; + relative: 1.0 1.0; + offset: -4 -2; + } + } + } + + part { + name: "button.focus_clip"; + type: RECT; + mouse_events: 1; + + description { + state: "default" 0.0; + color: 255 255 255 0; + + rel1 { + to: "button.button"; + offset: -1 0; + } + + rel2 { + to: "button.button"; + offset: 0 -1; + } + } + + description { + state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + + part { + name: "button.focus"; + type: IMAGE; + mouse_events: 1; + clip_to: "button.focus_clip"; + scale: 1; + + description { + state: "default" 0.0; + + rel1 { + to: "button.focus_clip"; + } + + rel2 { + to: "button.focus_clip"; + } + + image { + normal: "focus.png"; + border: 7 7 7 7; + } + } + } + + part { + name: "button.button"; + type: IMAGE; + mouse_events: 1; + clip_to: "button.button_clip"; + scale: 1; + + description { + state: "default" 0.0; + min: 0 24; + + rel1 { + to: "button.button_clip"; + } + + rel2 { + to: "button.button_clip"; + } + + image { + normal: "button.png"; + border: 7 7 7 7; + } + } + + description { + state: "disabled" 0.0; + inherit: "default" 0.0; + + image { + normal: "button_disabled.png"; + border: 11 11 10 10; + } + } + } + + part { + name: "button.shadow"; + type: IMAGE; + mouse_events: 1; + clip_to: "button.button_clip"; + scale: 1; + + description { + state: "default" 0.0; + min: 0 24; + color: 255 255 255 0; + + rel1 { + to: "button.button_clip"; + } + + rel2 { + to: "button.button_clip"; + } + + image { + normal: "button_shadow.png"; + border: 6 6 0 6; + } + } + + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + + part { + name: "button.shadow_overlay"; + type: IMAGE; + mouse_events: 1; + clip_to: "button.button_clip"; + scale: 1; + + description { + state: "default" 0.0; + min: 0 24; + color: 255 255 255 0; + + rel1 { + to: "button.button_clip"; + } + + rel2 { + to: "button.button_clip"; + } + + image { + normal: "button_shadow_overlay.png"; + border: 6 6 6 13; + } + } + + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + + part { + name: "ecdb.about.label"; + type: TEXT; + effect: NONE; + mouse_events: 0; + repeat_events: 1; + scale: 1; + + description { + state: "default" 0.0; + align: 0.5 0.5; + color: 60 60 60 255; + + rel1 { + to: "button.base"; + relative: 0.0 0.0; + offset: 8 0; + } + + rel2 { + to: "button.base"; + relative: 1.0 1.0; + offset: -8 -1; + } + + text { + text: "Close"; + font: "ecdb/default"; + size: 11; + align: 0.5 0.5; + } + } + } + } + + programs { + program { + name: "button_mousedown"; + signal: "mouse,down,1"; + action: STATE_SET "clicked" 0.0; + source: "button.*"; + target: "button.shadow_overlay"; + target: "button.shadow"; + transition: DECELERATE 0.2; + } + + program { + name: "button_focus"; + signal: "mouse,down,1"; + action: STATE_SET "visible" 0.0; + source: "button.*"; + target: "button.focus_clip"; + transition: DECELERATE 0.5; + } + + program { + name: "button_mouseup"; + signal: "mouse,up,1"; + action: STATE_SET "default" 0.0; + source: "button.*"; + target: "button.shadow_overlay"; + target: "button.shadow"; + transition: DECELERATE 0.2; + } + + program { + name: "button_click"; + signal: "mouse,clicked,1"; + action: SIGNAL_EMIT "ecdb/close" "ecdb"; + source: "button.*"; + } +} diff --git a/experimental/ecdb/trunk/data/themes/default/groups/window.edc b/experimental/ecdb/trunk/data/themes/default/groups/window.edc index b8fcae75..aba889d4 100644 --- a/experimental/ecdb/trunk/data/themes/default/groups/window.edc +++ b/experimental/ecdb/trunk/data/themes/default/groups/window.edc @@ -30,6 +30,32 @@ group { } } + part { + name: "bottom_shiv"; + type: RECT; + scale: 1; + + description { + state: "default" 0.0; + visible: 0; + align: 0.0 1.0; + max: 99999 230; + } + } + + part { + name: "top_shiv"; + type: RECT; + scale: 1; + + description { + state: "default" 0.0; + visible: 0; + align: 0.0 0.0; + max: 99999 145; + } + } + part { name: "paned_container"; type: RECT; @@ -58,13 +84,14 @@ group { inherit: "default" 0.0; rel1 { - relative: 0.0 0.0; - offset: 0 145; + to_y: "top_shiv"; + relative: 0.0 1.0; } rel2 { - relative: 1.0 1.0; - offset: 0 -230; + to_y: "bottom_shiv"; + relative: 1.0 0.0; + offset: -1 -1; } } } @@ -173,7 +200,8 @@ group { rel2 { to_y: "paned_draggie"; - offset: -6 -12; + relative: 1.0 0.0; + offset: -6 -6; } image { diff --git a/experimental/ecdb/trunk/data/themes/default/images/images.edc b/experimental/ecdb/trunk/data/themes/default/images/images.edc index 6d7d6587..df1d0f97 100644 --- a/experimental/ecdb/trunk/data/themes/default/images/images.edc +++ b/experimental/ecdb/trunk/data/themes/default/images/images.edc @@ -29,4 +29,5 @@ images { image: "progress_bar_left.png" COMP; image: "progress_bar_right.png" COMP; image: "progress_trough.png" COMP; + image: "logo.png" COMP; } diff --git a/experimental/ecdb/trunk/data/themes/default/images/logo.png b/experimental/ecdb/trunk/data/themes/default/images/logo.png new file mode 100644 index 00000000..f0262baf Binary files /dev/null and b/experimental/ecdb/trunk/data/themes/default/images/logo.png differ diff --git a/experimental/ecdb/trunk/src/ecdb.h b/experimental/ecdb/trunk/src/ecdb.h index 2f61d331..72911d9f 100644 --- a/experimental/ecdb/trunk/src/ecdb.h +++ b/experimental/ecdb/trunk/src/ecdb.h @@ -84,6 +84,7 @@ extern int ECDB_FILELIST_SIZE_CHANGED; #include "ecdb_burn_image_gui.h" #include "ecdb_burn_data_gui.h" #include "ecdb_filelist_custom.h" +#include "ecdb_about.h" #endif diff --git a/experimental/ecdb/trunk/src/ecdb_audio.h b/experimental/ecdb/trunk/src/ecdb_audio.h index 2e7e89ee..b3c195e9 100644 --- a/experimental/ecdb/trunk/src/ecdb_audio.h +++ b/experimental/ecdb/trunk/src/ecdb_audio.h @@ -2,6 +2,6 @@ #ifndef ECDB_AUDIO_H #define ECDB_AUDIO_H -void ecdb_audio_project_start(Ecdb_Audio_Project *proj); +void ecdb_audio_project_start(Ecdb_Audio_Project *proj); #endif diff --git a/experimental/ecdb/trunk/src/ecdb_burn_data_gui.c b/experimental/ecdb/trunk/src/ecdb_burn_data_gui.c index d1bc01b7..5aca051f 100644 --- a/experimental/ecdb/trunk/src/ecdb_burn_data_gui.c +++ b/experimental/ecdb/trunk/src/ecdb_burn_data_gui.c @@ -226,7 +226,8 @@ _combo_cb_clicked(void *data, Evas_Object *obj __UNUSED__, base_proj->drive = eina_list_nth(em->drives, sel); /* Don't keep adding items to the combo if the drive hasn't changed */ - if (base_proj->drive == ecdb_combo_data_get(proj->speed_combo)); + if (base_proj->drive == ecdb_combo_data_get(proj->speed_combo)) + return; // Update the capacity here, as our capacity could change with the drive ecore_event_add(ECDB_FILELIST_SIZE_CHANGED, NULL, NULL, NULL);