From 25b42dc3d5dc195ffe39f5f7e600f2a431715a65 Mon Sep 17 00:00:00 2001 From: Jaime Thomas Date: Thu, 19 Feb 2009 02:02:43 +0000 Subject: [PATCH] Some theme work. Beginning to work to an about page. --- ecdb/trunk/data/themes/default/default.edc | 1 + .../data/themes/default/groups/Makefile.am | 3 +- .../data/themes/default/groups/about.edc | 359 ++++++++++++++++++ .../data/themes/default/groups/window.edc | 38 +- .../data/themes/default/images/images.edc | 1 + .../trunk/data/themes/default/images/logo.png | Bin 0 -> 2473 bytes ecdb/trunk/src/ecdb.h | 1 + ecdb/trunk/src/ecdb_audio.h | 2 +- ecdb/trunk/src/ecdb_burn_data_gui.c | 3 +- 9 files changed, 400 insertions(+), 8 deletions(-) create mode 100644 ecdb/trunk/data/themes/default/groups/about.edc create mode 100644 ecdb/trunk/data/themes/default/images/logo.png diff --git a/ecdb/trunk/data/themes/default/default.edc b/ecdb/trunk/data/themes/default/default.edc index 7cdfce9..328d01b 100644 --- a/ecdb/trunk/data/themes/default/default.edc +++ b/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/ecdb/trunk/data/themes/default/groups/Makefile.am b/ecdb/trunk/data/themes/default/groups/Makefile.am index cf4eb18..6b36049 100644 --- a/ecdb/trunk/data/themes/default/groups/Makefile.am +++ b/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/ecdb/trunk/data/themes/default/groups/about.edc b/ecdb/trunk/data/themes/default/groups/about.edc new file mode 100644 index 0000000..52747f2 --- /dev/null +++ b/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/ecdb/trunk/data/themes/default/groups/window.edc b/ecdb/trunk/data/themes/default/groups/window.edc index b8fcae7..aba889d 100644 --- a/ecdb/trunk/data/themes/default/groups/window.edc +++ b/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/ecdb/trunk/data/themes/default/images/images.edc b/ecdb/trunk/data/themes/default/images/images.edc index 6d7d658..df1d0f9 100644 --- a/ecdb/trunk/data/themes/default/images/images.edc +++ b/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/ecdb/trunk/data/themes/default/images/logo.png b/ecdb/trunk/data/themes/default/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f0262baf84622b867fd6f1c3eac7004f6f286649 GIT binary patch literal 2473 zcmV;a30C%rP)Px#24YJ`L;z?2YyfY}!O4CA000SaNLh0L01sgR01sgSs6VG^00007bV*G`2iXB1 z2o@G9px6Ka000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000RDNklc1>wweTNlnK@`wW`p7 z0t1yU8@-q|m8C^ZJJ{B03Nlx#O2-9^iCrKK=x7ljv9Z=|^U=f~v6I;G2N&mY(Y59EMBU`oif$;;l^+38Crlgn};Qotgx7z_q`!{PAt67v}Z zZaW?f1_w)hzT9!(4&YnG2kaJK$vc4^zz1J=;nxnpAtxUZ((rn{gVAVovCQ{#@-tgF z;P?Bz$z*a;NOs9<)8yo&9q0j)K*oxbvx>}*3yFh30*DR_4EV$0aKyyFkuO*!5b^u{ zLo+ioHed)?0OCNpmC5{&oXj3z9tam%S6$(BI`hCB5S4ADA6TmA9&E4UxQ_r^g}keU zW!wPdfS6cjH_!?AgyhDm`C5_7`SY)JzWCzH0aaD$>FLg1zdo4{27@(EG#n0N(m0C8 zh|zRGbNq0q!lH6Iz-Ia(E&rBqvvPXV8h<&`v9Jc@T`pH%?{Zhl2+wMCN~Ew%d!j=e{Ngy?fq_hWv6??6Kj)iVh3hp=0&oMs z;2$2|l1589p9U@zUC=@u{DQpqIFQ-D|G*&dVGHMZMIu6*UN!$H*4DYRVvQ4f_dXKQ z>53(Q-|XJKD+=rfK4Rf~|A*GwbgP<|vdlw=4)?9PLDEZ#&um8z&>eR0SM~*ywee>r2igT_sj$Vw9pYoqO_q$vu zG!eT+&CArmerf*j(-Z+1su>LKwgWMc~-Jf zXH6LEthjT-z*qO}J1|%#16J~QxzCq5?hrEL4`eNRe`BG$M_2HzSZ+lE10nrh@f>An}s16v))ijaimrV?X1{0 zV`$yQW??JVB(iNr1Sn;ZWjcXRn{?q6;4Vz+wbVgoPA{1Wi!9Ry%mVkCFxI`Y#I2fl zcHPG2#XMevK4+$&oci9*50#d1Kt64j*T7jQ=w?JDu3{m)2Gk) zfy-D6XR$kX)6Xnp1!0kX2i7HsJAlZQD^~}BBWRiSi>zeY6|{0eA=7>r@L!+Lmx;yV zR$h3ASmkZ4LY2xE%V-@8R%YAPg@pxGtkf^tO>qtA`>fm+^A6z5W^-2G_3IX6bLdrb z#EjiE1`f31nTmEN*?V$vqjIc^3e5l(koi{GgvLhQTpu!-jB?|~4f`vvoW6Yj{kv}Q zF7))YF9UrP-DlY5b#otDAHg%Fyo+118GcF78TbFEBEDd8!#SG0Ri`wX}D7mcn(X1Q4S zyTCv&7<9IintQ$8;Y1?wZ?uX)#aw}rrl&E$xwN#{P7juHr_*T#tznExR%w*X1>m=l zNVM=wq4f?M5P0B$-E-(nmK(LQKWy8!by4Ew^^O4W*Zc0^}7fcQF5^Q2^>4vS@0 zs^izb%!_aXEs5(y%Qv<(;_@Cb?Kv9&uoXb?TgP7qn z&H+E@>FLQ*{s1sJVicM)S!EI!;kn zh7r}S_cC9N3~&@Jy`KZNh~hUQu2^XAjEXJ^}m`?KZ-?shJgcOI|mhIXpQz*@0FYUy@g?J)yug{_t^WA7&xC1~Skw~a=%)!bd#*61$aIW1zm-x2>GDe|6 z;H5KXUb+nYLJyHdrive = 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);