From 7e5df4ed70cfa0081c5d182c00ddd2e5255f4138 Mon Sep 17 00:00:00 2001
From: Jaime Thomas <avi.thomas@gmail.com>
Date: Sat, 21 Feb 2009 01:23:34 +0000
Subject: [PATCH] The config dialog is now accessable.  A bit more work done on
 the slide_in tab, but it still a bit glitchy.

---
 .../data/themes/default/groups/window.edc     |  91 +++++--
 .../data/themes/default/images/icon_about.png | Bin 0 -> 5520 bytes
 .../data/themes/default/images/images.edc     |   1 +
 ecdb/trunk/src/ecdb.c                         |   7 +
 ecdb/trunk/src/ecdb_config_dialog.c           | 237 ++++++++++++++----
 ecdb/trunk/src/ecdb_gui.c                     |  16 +-
 6 files changed, 292 insertions(+), 60 deletions(-)
 create mode 100644 ecdb/trunk/data/themes/default/images/icon_about.png

diff --git a/ecdb/trunk/data/themes/default/groups/window.edc b/ecdb/trunk/data/themes/default/groups/window.edc
index 6589090..b293cdb 100644
--- a/ecdb/trunk/data/themes/default/groups/window.edc
+++ b/ecdb/trunk/data/themes/default/groups/window.edc
@@ -4,12 +4,14 @@ group {
    min: 640 390;
 
    script {
-      public settings_time_id = 0;
-      const Float:show_timeout = 1.0;
+      public settings_time_id;
+      public in_transition;
+      const Float:show_timeout = 1.5;
 
       public show_settings(val) {
+         set_int(in_transition, 1);
          run_program(PROGRAM:"settings,show");
-         run_program(PROGRAM:"about_icon,show");
+         run_program(PROGRAM:"icons,show");
          if (get_int(settings_time_id) != 0) {
             cancel_timer(get_int(settings_time_id));
          }
@@ -374,8 +376,8 @@ group {
          description {
             state: "visible" 0.0;
             inherit: "default" 0.0;
-            min: 72 72;
-            max: 72 72;
+            min: 140 72;
+            max: 140 72;
             color: 0 0 0 128;
          }
       }
@@ -392,6 +394,47 @@ group {
             min: 0 0;
             max: 0 0;
             color: 255 255 255 0;
+            align: 0.0 0.0;
+
+            rel1 {
+               to: "config_icon";
+               relative: 1.0 0.0;
+               offset: 4 4;
+            }
+
+            rel2 {
+               to: "config_icon";
+               relative: 1.0 1.0;
+               offset: -5 -5;
+            }
+
+            image {
+               normal: "icon_about.png";
+            }
+         }
+
+         description {
+            state: "visible" 0.0;
+            inherit: "default" 0.0;
+            min: 64 64;
+            max: 64 64;
+            color: 255 255 255 255;
+         }
+      }
+
+      part {
+         name: "config_icon";
+         type: IMAGE;
+         mouse_events: 1;
+         repeat_events: 1;
+         scale: 1;
+
+         description {
+            state: "default" 0.0;
+            min: 0 0;
+            max: 0 0;
+            color: 255 255 255 0;
+            align: 0.0 0.0;
 
             rel1 {
                to: "settings_tab";
@@ -418,6 +461,7 @@ group {
             color: 255 255 255 255;
          }
       }
+
    }
 
    programs {
@@ -433,8 +477,6 @@ group {
 
       program {
          name: "settings,deactivate";
-         signal: "mouse,out";
-         source: "settings_tab";
          action: STATE_SET "default" 0.0;
          target: "settings_tab";
          transition: DECELERATE 0.3;
@@ -445,40 +487,61 @@ group {
          signal: "mouse,out";
          source: "settings_tab";
          script {
-            run_program(PROGRAM:"about_icon,hide");
-            if (get_int(settings_time_id) != 0) {
-               cancel_timer(get_int(settings_time_id));
-               set_int(settings_time_id, 0);
+            if (!get_int(in_transition))
+            {
+               run_program(PROGRAM:"settings,deactivate")
+               run_program(PROGRAM:"icons,hide");
+               if (get_int(settings_time_id) != 0) {
+                  cancel_timer(get_int(settings_time_id));
+                  set_int(settings_time_id, 0);
+               }
             }
          }
       }
 
       program {
-         name: "about_icon,hide";
+         name: "icons,hide";
          action: STATE_SET "default" 0.0;
          target: "about_icon";
+         target: "config_icon";
          transition: DECELERATE 0.3;
       }
 
       program {
-         name: "about_icon,show";
+         name: "icons,show";
          action: STATE_SET "visible" 0.0;
          target: "about_icon";
+         target: "config_icon";
          transition: DECELERATE 0.3;
       }
 
       program {
-         name: "icon,clicked";
+         name: "about_icon,clicked";
          signal: "mouse,clicked,1";
          source: "about_icon";
          action: SIGNAL_EMIT "ecdb/about/show" "ecdb";
       }
 
+      program {
+         name: "config_icon,clicked";
+         signal: "mouse,clicked,1";
+         source: "config_icon";
+         action: SIGNAL_EMIT "ecdb/config/show" "ecdb";
+      }
+
       program {
          name: "settings,show";
          action: STATE_SET "visible" 0.0;
          target: "settings_tab";
          transition: DECELERATE 0.3;
+         after: "settings,after";
+      }
+
+      program {
+         name: "settings,after";
+         script {
+            set_int(in_transition, 0);
+         }
       }
 
       program {
diff --git a/ecdb/trunk/data/themes/default/images/icon_about.png b/ecdb/trunk/data/themes/default/images/icon_about.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9a0dfd55f6b0a772efc677b20af42927a0f7532
GIT binary patch
literal 5520
zcmWky2RxMjAAfG(jJT-mS>(7-QAdPR#+hA0Mp>1Sy~{W`Gka!a)k$QQtwVnJhiuNs
zJUXN7E&QME^?L4kJ@>lL_xXO-`~7);BMtO4&M@&X0RV7DOY;sMysP}X5cJ@8k-gg#
zc!PUjwG0v9#~)!E0X{RjYCiM;|4;dML9pVPzTl7Co_9?=@4Gzp^s#b(0{Hm&NZC6(
zde~UGK9O>9f0ntb$O8c9&uHCIHT2D@GIM%vKAaxdQzv-chy1*QyF<6!Mh7N46EB8x
zXtmC&HoFlMRb70@u+1=0#B|<JqG5n3UPA7?=DB;L$M=Yb&m>E}+!f!pVf^M0l@V`%
z*TiG3$1j<*=<#<@BbBaa-@3j>_5U4L_spI4qP>SxL!tgUZAyMmvG=HP&9Ar4CnA|W
z=czC;etl2r<!-z;g`Sp4e@S@(lBoYKh|V<lc=26ad@t>LNzD|FDHK}alnJPm7+nM`
zAEv?yh7zI;_4V^(pPxOsk(uK2(~aR(;HCAYc(+yrBE*RBc?_*9mNX=*ix)p94mfbp
z4|}~mB<pk80DuL>iYv@EnsIuM4(J~q7FFy`O2OTo-}1{t)b-mgQYKW-?RR&xfaW~F
zm2@440{dmav#WC3p^8V@eg1#^3+@L`+eanZO*nzY`bT|U0m5(ff-1dMM&j5bi7-NX
z!FNCgP)yg^Oi$;&t)L*WT1#aW@2!6%QmPFhBJ&BbKE96rxsBRv9EqiOtJ}RUOWuEf
zy^xCWf$jST1qD^t)KE-oocTveEnZhSQlP-or%z?BUk_pCl(O{puJ%6pd!R^Qo7>nw
z+M9a0Hsz`C)h?sp*+lgkhV^v^l@BnEsuf@_jRc<T^!MM(Cx9iu3s`5<+B(|XPpV8y
zRyD<va!$u7<dL0b7@H-n=k4O+Vr~A3Hi^Bxy?y;~rOf8^<Tw;Z+Ef)uz|?xsdLCyK
zECH@G8ZF@Ne^XyymW^F0%>Y*qVPH!P4u*Wif8?q!?I0o}VGOK)wet-2SB;wvhjrtW
zcDcgB!>uyJ#7QwcQp-~bkx*=e`i>%7I4l1*ZRxMXnyD8nw#LSkptaEo>doW<37c*(
z=qK~@mw36k6Dav%#UcbGHhGx3QQO1yngjc(HJokw=FOXXqkVmSX@Q$bIejlz>lnhU
znq^q*GU$cjV1^WXVYJ43t#G@Hk-`G|Z<S~RT#J18+R=J|V9?=U&N@}_)Fey6YgtoY
zzgPQT{3h_78Ko<+R18ZnPiYuYQcNYd#>tGqvH<@PLl_zz9nBstHdfw#CwTn7{q~z=
z$e?V3<|QH0osWjtI&<|BqXz55*0xIY`$2n8Pfr5!l|vO%?^e0X^linh?&~Kc?X<uu
zFoa6L^NDJH;E_a%wXxc_D7bi#AUAg&3<i5qVIqqnMb_2Td3D6{AN4v-RG(@3yV+&(
z^@ZHPlB}$*np9fr@84()jRIFR1s`2pq(?qIg!RaGE?kqcs3&R&2AtD~6HxjBS_Z8w
zE!7DT3%$L)UnC_Z{hnzFfttumnV*GRym(PI^T+bAgWQGJZTQRj**_KJ<aYk5u_<{@
z+}BqMjg4gmJ(zcw*U{B&@tWj?Dw<kXaE+8bj+1j7$u*aHXDBf{_AIAOvaHd)psDFp
z`G(WD=T9$-TM3%A2maaoioOQsoDkgZf&Ua(URPUX@PdK+v+Ld6-9bt_L-!rkH8j9h
z3pGK9-T$B`oYO1KOu$F=^yt}M<9<`X*ecU3A5QZtcj9GcW;XcV?=G78!`jXcQM!_E
zAa1!f_0@NG?3srnr8MAgX~U|*{1MsWqv6lzH&)8#S)CXWNB-ywuOVPY^`{SK!v#+^
zBQIxj?T^%uL!aMZZs(c`It@tfT1Y+S3JV77^{0E+mBpo{-~xN6U@g>DC8d~+4Yzss
zI(4(+M7<Agdy_tD6fY1B8h6JXeOK#fVmF<}w<pPD@^zrIbfsRhjhLElDc;f#yuo+c
zmKd!F2nq(xW={Y8)m&=P&^I;~d2ry@c(mHEuBd-p+8=J8G1};N{f5gF%b@JUtJt5M
z0RaJvD=V%0`<N*|+S}?V&}$nTn^AJWErnaRDjX?NSxPUxXLcx$gYp_0j;y*W;Q*t`
z>e%OS4y<W=NGg*Mv9H9eX24UysolEby%kq6D<5Wku04jg>Ex$JuhowXxp@5CUejp+
z%>Rqx?x>CChe2a_qeXgF*1zUWJ5x|#KX-Dp#vlx@GiTLT+<>1PQkuwhHXX4+djUaU
z@^N+MyRm}GQty*R4qx&(A>OkM%F1<BT4!x-CtTDZ5BB%FohIquj<mhT2ypT8s^uA|
zknr{osT;ms5NRo?Icl78`v$ecZF62rM_<22)XmZo0HZ2cH0&^ObdHHGIwl4JB!0h?
z?Z2r7_RQbGhBfjLe~;gI<)=6H8RH-tC6eU(#_15il?$)av$lv-OmWx3W{uC<RLPTT
z+$O1^$47hAxwhB$=1gA!K!=;_{Qu5oVcejcQsyS^w*}&;U5`($fzXq;@<VOB+KG26
z@aT`a4uX?3<xmy%&sOsB0n@c~7J<NhtHW>1(*6@}S<?o%NfUHCfB^WsYV34XWEK+e
zAK!cQP_Yr+`}_NB^b8Cx<CRaC!F}I8T)dbi@A33*A24%t`(!;_c_uFCFSYW!L5Wdo
zS<tbgj*gDy-s+?-O`OEV!}INOj(_FvuRU4vAyZS2K0R&{FspvvGBY!y`$6yRVGAdD
zJ@lD8?a@a=Yp_XQA+g^oa#dA?*sLF>8cC(a2#q~_{L#=mCN>sJ@seqG-Cv)rw){rS
zQuJdlBOfkD-M6XblXr*LOb6ZqJ<c4z`Fyl|KD)%4GTRzn;XJ9ZSRV_rz~Ai;%9C;+
zau)aW^f*+RdJQhgG6=OoDp2&%(b34BIx$l8ecXKzGvfXgWijY2h;pvmi}%oIbhFoF
z>abgu`tewAVA#^qQZ=QzSkQmHh265)sKj9z3|?xJg^5XXg-u7i<|P>nCL%8{@4>&d
z@VNW<P7KW)gme4E5&@G~KnMg2Z!a(IjDm;cwP$=CV}a8Fd#V&KLy7Z^AR6mFd~}P`
z<hxv|BxtTZZe3wQCI8uk4xiAJPq{&~?DOJpZEfWe6r5f?3REAIZ7?lS2*m~qzke0R
z932~L{o+MNeW~MeeKy8t^=FR>dSr5XnoW1mb?!gLbFbS{XHsGQRkqtZJ6G(xXj@K`
zQn&~z2IDpdcWyfN-rn20C=lnPucPB1;Oe?=99@AEOLEiD&^Q3w24Wryng3bmVMy^(
z8<b7Dnp$X7eCj&kR3kUC@IgN(Y^B~<r@5+Vrsvk0`M_>X)A5;XTGf}p;_AT<`qU9K
zmrx|MX40EiFXwguo6T>ZjDmD5f(ow3xARbS*})l|f&<~%A-L?l|MYaNRVzIbYao73
zMoDRseP*X#Rp>6z+}DTn{ykbTpK)`_7e-zy6A$vr%FcE!-1(eyjMjUrP?g}3Js^8U
z4^@(k6J=6CVl`XoD#y@P(cD>E;5gHrCQeeq#R>-f-AJ?*WpWk88Y$E~{lW8(rDRy%
zeLU{VQ^SBSs3g4m1Gw(~e)z9YkB^UYlXpR5fBQe<RerjI(IDo6)eRubEp2UyAV^*j
zh~tf}@C9j5GU+=Ki@?y{WMw@U$>kqSG0)?Nr0dZ4DxWIW*Vku^GlxR60}q!{)2(l<
zFJt87LNlG~8Hq>`0pcC1UU1qxR~G)y#N2#HU0r>&C4_;*N=WW{f-fEx2SSkSoLJAx
zNm~14whlJ~^o7}@K#ut0d(G~ty|&kUmq=;lR;^(L-V@au$7?}BV=U$88H-9x(BItn
ze6z#vh(IQ)8$yw89d6O4CF)%Z*B}Ny!T67Nu5=9mT-b;=$(3D|Xy0sx4!82!+EJ5~
zD(HAryb<M&w!+(X>A($U|5cA1M~5<_V&C}$4Vl}w$#BnG&G)QvBzC@z;I*T2G&8>Q
z0XBk5_`h<r_I)=M2B4h_qEdBeJ(-Muitd8a_)1s4RsU&^(h2^`PKVYYJbCDQu#i^a
zMr|+H#gSf3HuzAbgATN{UGL?VAQJH3s-0>}LEd7Igafu1nivq{p$F?uyKmJaPnS#Q
zgc_9P<@e35fm<dMjsDD9Os`vdS#<OUop?N-YOG@<I8E$N?U5<TXQVD~iKAw{h2a-C
zIfaP^!E$Z#l=G073IMQSsW0UahM&hS664<>q2#rYtMom79OXuq6K6SYf4Hr@KNA8H
z(#t`)(v`Uc4S|Ovn|}~?lwbAEAuQO4?_7f@k|ECTpw70?MuhafP&#}PM}l^^@ifR|
zBT{o8oH2V@M|h)oX?>p>Ck@$Y6+A(%echW%TuFoRo(L!j1{Q!w32D9?0E@t(cwvsF
ztViTBV8{^ufZd(%S)}N@kw~cX`C9URo3uy@POj?fMmw+XN=c3B$to@}XYm<Il%>_K
z)-_(8GSvEJoowqXk7g9cBZMJ_ioGFgM>AQ{WAE+g_HodQ!f>-1XN!Sem!Kmv1KdP=
zwD?)cHm+QOXXX^ALO|s%LKsC#L{@q#=bDz_bO+&pFbVxKn}P`ZgNR5(ii#-MAhG2y
zc9um0vXp}Y8H4{^nvRM#lDG%gL_H9B@;bM+R5HbJW!ZXqPt-=o04Gnln*z7b2=i5(
z@;-bGjTy09`u*E{px|fm4|*r+&lGgnkP>wR1J0;6IwcozScDW2nT-D!U4)3Q|CjM3
z{9#5xfDo~^$xx!-Qz7QiCb%mUKhFNifsM`Fq6{ZXVE}skTBY9+4A-6HeuM@*df*j+
zz5x0R4iQ*Hp8Yrj9+!jf^t9ltFYTg-aBy%`zI&&}71jdOCJ*RiXy8;oP~z<aQZ+{N
z2E>`}QLys@eSdy7lLliv{su}d*yuP^%b*!Wl3{`2JLw@=TTs$AhcJ<uARl{C%DlEu
zNCg_7QNY+FaK#*}8RKz#0i#y~<&W!Vk$-G`oI<X7%`lt4^5S9-nsf3&E(^!m3>q&5
zwW5uh#jtYO+|MW&_Mi5F?5loC0(fp=2V_|E5E}v0WsJfS*a#}V^9m?WHnJW+)PgvX
z2;$sU>%hN38l?98NML#|^ITsPvAn9adDy4QO$`xj#TDbj^lBv*R*1wpgjwy^m)@-I
z;Dv)jYyyttk0PldKH^aN*V->wP=1KpFV(XO-_f3tOvpoETxV3wZrW+6NcQ#nA_W+1
zJ|!?7lAFXyiYU@2CSg8dqO!7b**U-hhtdkT1M;pI(N&&So$Ov=RQ$FQy&?ea<&lRy
zT_gY5s79j}H<G>d?}>YkHJ!*5sNtbNZ8HkBke@s-BKw1sToisOesi;+5H1weCQ^g$
zf>>&!v`bf3J@{y)w%5|}Z#5R0*dbj%SdFnN7({i~L2E}jman6Nzhmr!y{Q($idi_z
zv}9zIjirGg66~1q%P-qll!(TmI6D_M`wb<kY(xoN3G7C#ucgTm+1c4*2g=9WgKyrv
zF-fF^hnUIEgr=yXoW2zICgYQFq<8pEI&g2ue20vJ@c&V-T4)Ko!kj0n1>-u3qbm}V
zD`)Cg11G9$JV6EV<-W>(12`n7K!BBz5>R)za6nR@s1AM+g@1wSBJ8`>i^Q9)209nq
zzk5v{6XT(@#`h~PhO3>Fg@9|dT80oPVGR=t%l%|Ou1F|tYiomjG+YMdlf7(bP0^nS
zJ7aN@uBuGq=JN%5Cc9dqMY4w!Se+1H3;4xt^Q8R^tXV_zL}ju6jrAqV|G^Aqvp7SM
zejRR8>6w|g^5`e@R*S+~iq~fCWlg`)-pS#XaeEAev9U2W{tiD4L;@{~6JiL}(H(IS
z5h{WLa=>dq3i9T&)6tH()ZU(vmcFOuy}lw{%1-tDTwK@?ZQ;=V?iZfH-@kuPJ58J@
z10F4-oG`TZrzRqSz|D<U<yL{Hur@yj)$R1b!GU!{ciCH>Qguia(YraVOMdgf-_6Qu
zHVD#9ZzBcg;%Sk79*}!HF^8jLC9o5?2pGV_+k5wc?jU(`a4^XfB_765_G#x=rpt{R
zcanL)%J8&s!MzxY)f=L;M#dfLAzJ?a^?&lu1h@`J(T_;eaV77hC3~+S&JGRd!8CzI
zpq##00a$^sZ13*g9;Hyy9=M+|lVmavjyv>}Wiyx|B4h5Te>LKDHr9CXp`c)sQ~HrV
zUGpUZ3gCp&B?E@{f)>aNw?ev(AFI^8;)u_q(_jKVfBt+*JvvclV`XJ+x4z1*>zUt)
z;5c{26v%M*8&1nu{nm+?4!<gPSxl_wM{n<`6mYy3zthz+n$~#Xvj{}>5g^NOhkb}%
zers#1%rCo!3OYD7Fg#4EaSvVinSUPAzZ2wpp6kS1{M>$>2Q3y93j!(@yPU6V1iZR#
z(vgiu7)ob!`++a?&Hp{|S)}h{p1BU(Rzv;iefs$nBO|k(4$4#>FNX7@LpsRpvqOB+
zB)APoNbLz8Q~z5T-m|U{7rT7<nMd8vK;i!mn&&w0vH5S+qK~SBrOi{1yL2=e9gGYH
zFR_h!K`__|oK#wa=h6VF1w6SqGYyKu$?vv_ca9b7G59;E$E+VJ`knSoOa3`~q2R-Z
z>0ennYLf#VkahW?i-EqKW@rCK!M_Np>Lx*Vn)9DB@v5YIkbS|UnJqAiy!8zYH+QzT
zZC}28Nln*zT6Z#${n?2Z%z@{xU%xifq%0Jc{H8j93kG`|{;pXJ1}yD;$$v`V0=1o|
z%(<(q5<=|;K9RD^&J|2v6cf5!Njq)(jFHSAPya2t{T~0(<XZX=s6_rOFFVviY*^Z?
z&w?jdhQ$vaNu_-?mrBb7TjaZZ&Y9*EgPKh&@Iu&5@|~0)r`JV`tNX<wLRhG(g_61o
z@jNntk>EowcSeX#h})clIq<_${nT3>u?9#k{$uy`_Fpgn4cu2#3ax_0x8<f9q`i=@
zZNEFY%o2<(JNNeiN8c+%iX>OzWt<UkgBzNIwLlrU#st^D%C{HpSQwpy&lDAM<Z2ee
ztHQe6jd}Tu=^BF<Oc6k8p=w<yo*1cM`QW@f{W5W>#pT;zQIw=awRn7$!H(<L+-yvY
zBb3dY0TRP%%8{qSqbgT%&R-Imf62F{pRH;dITN$-SQ?@d0-w1i#8YHi7#6IN7COtV
zu3J?UW$=J9_o4-MGlEdSYL;}?h_PG|GTR%49QIaIxf!#k&e6A6>o*(Z<f0qqzR!Ec
dJmr)jdHJ;F;+5});OQx#byx3BDc17U{{b7JiYfpA

literal 0
HcmV?d00001

diff --git a/ecdb/trunk/data/themes/default/images/images.edc b/ecdb/trunk/data/themes/default/images/images.edc
index a2ca3d2..72d398e 100644
--- a/ecdb/trunk/data/themes/default/images/images.edc
+++ b/ecdb/trunk/data/themes/default/images/images.edc
@@ -31,4 +31,5 @@ images {
 	image: "progress_trough.png" COMP;
 	image: "logo.png" COMP;
 	image: "icon_config.png" COMP;
+	image: "icon_about.png" COMP;
 }
diff --git a/ecdb/trunk/src/ecdb.c b/ecdb/trunk/src/ecdb.c
index 8a405dd..182e0a2 100644
--- a/ecdb/trunk/src/ecdb.c
+++ b/ecdb/trunk/src/ecdb.c
@@ -226,6 +226,12 @@ ecdb_initialize_config(void)
    ecore_config_long_opt_set("scale", "The scaling factor.");
    ecore_config_short_opt_set("scale", 's');
 
+   // Use scale?
+   ecore_config_boolean_default("use_scale", 0);
+   ecore_config_describe("use_scale", "Use scaling?");
+   ecore_config_long_opt_set("use_scale", "Use scaling?");
+   ecore_config_short_opt_set("use_scale", 'u');
+
    // Engine
    ecore_config_string_default("engine", "software_x11");
    ecore_config_describe("engine", "The canvas engine.");
@@ -245,6 +251,7 @@ ecdb_initialize_config(void)
    {
       printf("Invalid file specified, attempting to fall back to default!\n");
       gui = ecore_config_theme_with_path_from_name_get("default");
+      ecore_config_theme_set("theme", "default");
 
       if (!gui)
       {
diff --git a/ecdb/trunk/src/ecdb_config_dialog.c b/ecdb/trunk/src/ecdb_config_dialog.c
index 5dfcedc..beeaf97 100644
--- a/ecdb/trunk/src/ecdb_config_dialog.c
+++ b/ecdb/trunk/src/ecdb_config_dialog.c
@@ -1,12 +1,7 @@
 /* vim: set sw=3 ts=3 sts=3 expandtab: */
 #include "ecdb.h"
-
-typedef struct Config_Data Config_Data;
-struct Config_Data
-{
-   char ** array;
-   unsigned int count;
-};
+#include <dirent.h>
+#include <Ecore_Str.h>
 
 static void destroy_cb(Ewl_Widget *w, void *event, void *data);
 static void conf_clicked_cb(Ewl_Widget *w, void *event, void *data);
@@ -14,12 +9,15 @@ static void scale_cb(Ewl_Widget *w, void *event, void *data);
 static void fps_cb(Ewl_Widget *w, void *event, void *data);
 static void engine_cb(Ewl_Widget *w, void *event, void *data);
 static void theme_cb(Ewl_Widget *w, void *event, void *data);
-static Config_Data *theme_data_init(void);
-static Config_Data *engine_data_init(void);
-static int theme_data_return_active(Config_Data *data);
-static int engine_data_return_active(Config_Data *data);
+static void combo_cb(Ewl_Widget *w, void *event, void *data);
+static void use_scale_cb(Ewl_Widget *w, void *event, void *data);
+static Eina_List *theme_data_init(void);
+static Eina_List *engine_data_init(void);
+static int theme_data_return_active(Eina_List *data);
+static int engine_data_return_active(Eina_List *data);
 static unsigned int model_data_count(void *data);
 static void *model_data_fetch(void *data, unsigned int row, unsigned int col);
+static char *theme_cut_suffix(const char *file);
 
 static Ewl_Widget *conf_win = NULL;
 
@@ -31,7 +29,8 @@ ecdb_config_dialog_show(void)
    Ewl_Widget *combo;
    Ewl_Model *model;
    Ewl_View *view;
-   Config_Data *data;
+   Eina_List *data;
+   int use_scale;
 
    /* Only show one config window */
    if (conf_win)
@@ -53,7 +52,7 @@ ecdb_config_dialog_show(void)
    ewl_dialog_active_area_set(EWL_DIALOG(conf_win), EWL_POSITION_TOP);
    main_box = ewl_vbox_new();
    ewl_container_child_append(EWL_CONTAINER(conf_win), main_box);
-   ewl_object_fill_policy_set(EWL_OBJECT(main_box), EWL_FLAG_ALIGN_CENTER);
+   ewl_object_fill_policy_set(EWL_OBJECT(main_box), EWL_FLAG_FILL_HSHRINKABLE);
    ewl_widget_show(main_box);
 
    /* Setup and show the stock icons */
@@ -102,20 +101,35 @@ ecdb_config_dialog_show(void)
    ewl_object_fill_policy_set(EWL_OBJECT(l), EWL_FLAG_FILL_NONE);
    ewl_widget_show(l);
 
+   use_scale = ecore_config_boolean_get("use_scale");
+
    o = ewl_hseeker_new();
    ewl_range_minimum_value_set(EWL_RANGE(o), 0.0);
    ewl_range_maximum_value_set(EWL_RANGE(o), 2.0);
-   ewl_range_step_set(EWL_RANGE(o), 0.1);
+   ewl_range_step_set(EWL_RANGE(o), 0.25);
    ewl_range_value_set(EWL_RANGE(o), em->scalef);
    ewl_container_child_append(EWL_CONTAINER(border_box), o);
    ewl_callback_append(o, EWL_CALLBACK_VALUE_CHANGED, scale_cb, l);
-   scale_cb(o, NULL, NULL);
+   if (!use_scale)
+      ewl_widget_disable(o);
+   scale_cb(o, NULL, l);
    ewl_widget_show(o);
 
+   // Store this widget as we use it as a parameter later
+   l = o;
+
+   o = ewl_checkbutton_new();
+   ewl_button_label_set(EWL_BUTTON(o), "Use scaling?");
+   ewl_container_child_append(EWL_CONTAINER(border_box), o);
+   ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_LEFT);
+   ewl_checkbutton_checked_set(EWL_CHECKBUTTON(o), use_scale);
+   ewl_widget_show(o);
+   ewl_callback_append(o, EWL_CALLBACK_CLICKED, use_scale_cb, l);
+
    /* FPS */
    hbox = ewl_grid_new();
    ewl_container_child_append(EWL_CONTAINER(border_box), hbox);
-   ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_FILL);
+   ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
    ewl_grid_column_preferred_w_use(EWL_GRID(hbox), 1);
    ewl_widget_show(hbox);
 
@@ -134,18 +148,18 @@ ecdb_config_dialog_show(void)
    o = ewl_hseeker_new();
    ewl_range_minimum_value_set(EWL_RANGE(o), 10.0);
    ewl_range_maximum_value_set(EWL_RANGE(o), 100.0);
-   ewl_range_step_set(EWL_RANGE(o), 5.0);
+   ewl_range_step_set(EWL_RANGE(o), 15.0);
    ewl_range_value_set(EWL_RANGE(o), em->fps);
    ewl_container_child_append(EWL_CONTAINER(border_box), o);
    ewl_callback_append(o, EWL_CALLBACK_VALUE_CHANGED, fps_cb, l);
-   fps_cb(o, NULL, NULL);
+   fps_cb(o, NULL, l);
    ewl_widget_show(o);
 
    /* Setup and show the border box */
    border_box = ewl_border_new();
    ewl_border_label_set(EWL_BORDER(border_box), "Rendering Engine");
    ewl_container_child_append(EWL_CONTAINER(main_box), border_box);
-   ewl_object_fill_policy_set(EWL_OBJECT(border_box), EWL_FLAG_FILL_FILL);
+   ewl_object_fill_policy_set(EWL_OBJECT(border_box), EWL_FLAG_FILL_NORMAL);
    ewl_object_alignment_set(EWL_OBJECT(border_box), EWL_FLAG_ALIGN_CENTER);
    ewl_object_alignment_set(EWL_OBJECT(main_box), EWL_FLAG_ALIGN_TOP);
    ewl_widget_show(border_box);
@@ -161,6 +175,7 @@ ecdb_config_dialog_show(void)
    combo = ewl_combo_new();
    ewl_container_child_append(EWL_CONTAINER(border_box), combo);
    ewl_callback_append(combo, EWL_CALLBACK_VALUE_CHANGED, engine_cb, NULL);
+   ewl_callback_append(combo, EWL_CALLBACK_DESTROY, combo_cb, data);
    ewl_mvc_model_set(EWL_MVC(combo), model);
    ewl_mvc_view_set(EWL_MVC(combo), view);
    ewl_mvc_data_set(EWL_MVC(combo), data);
@@ -182,6 +197,7 @@ ecdb_config_dialog_show(void)
    combo = ewl_combo_new();
    ewl_container_child_append(EWL_CONTAINER(border_box), combo);
    ewl_callback_append(combo, EWL_CALLBACK_VALUE_CHANGED, theme_cb, NULL);
+   ewl_callback_append(combo, EWL_CALLBACK_DESTROY, combo_cb, data);
    ewl_mvc_model_set(EWL_MVC(combo), model);
    ewl_mvc_view_set(EWL_MVC(combo), view);
    ewl_mvc_data_set(EWL_MVC(combo), data);
@@ -225,95 +241,228 @@ scale_cb(Ewl_Widget *w, void *event __UNUSED__, void *data)
 
    value = ewl_range_value_get(EWL_RANGE(w));
    ecore_config_float_set("scale", value);
-   snprintf(buffer, 10, "%f", value);
+   snprintf(buffer, 10, "%.1f", value);
    ewl_label_text_set(EWL_LABEL(data), buffer);
 }
 
 static void
 fps_cb(Ewl_Widget *w, void *event __UNUSED__, void *data)
 {
-   double value;
+   int value;
    char buffer[10];
 
    value = ewl_range_value_get(EWL_RANGE(w));
    ecore_config_int_set("frame_rate", value);
-   snprintf(buffer, 10, "%f", value);
+   snprintf(buffer, 10, "%d", value);
    ewl_label_text_set(EWL_LABEL(data), buffer);
 }
 
 static void
 engine_cb(Ewl_Widget *w, void *event __UNUSED__, void *data)
 {
-   Config_Data *d;
+   Eina_List *l;
    Ewl_Selection_Idx *idx;
+   char *eng;
 
-   d = ewl_mvc_data_get(EWL_MVC(w));
+   l = ewl_mvc_data_get(EWL_MVC(w));
    idx = ewl_mvc_selected_get(EWL_MVC(w));
+   if (!idx)
+      return;
    free(em->engine);
    
-   ecore_config_string_set("engine", d->array[idx->row]);
-   em->engine = strdup(d->array[idx->row]);
+   eng = eina_list_nth(l, idx->row);
+   ecore_config_string_set("engine", eng);
+   em->engine = strdup(eng);
    free(idx);
 }
 
 static void
 theme_cb(Ewl_Widget *w, void *event __UNUSED__, void *data)
 {
-   Config_Data *d;
+   Eina_List *l;
    Ewl_Selection_Idx *idx;
+   char *theme;
 
-   d = ewl_mvc_data_get(EWL_MVC(w));
+   l = ewl_mvc_data_get(EWL_MVC(w));
    idx = ewl_mvc_selected_get(EWL_MVC(w));
+   if (!idx)
+      return;
    free(em->theme_path);
 
-   ecore_config_theme_set("theme", d->array[idx->row]);
-   em->theme_path = ecore_config_theme_with_path_get("theme");
+   theme = eina_list_nth(l, idx->row);
+   ecore_config_theme_set("theme", theme);
+   em->theme_path = strdup(theme);
    free(idx);
 }
 
-static Config_Data *
+static Eina_List *
 theme_data_init(void)
 {
-   Config_Data *ret;
+   Eina_List *ret = NULL;
+   char *dirs;
+   char **dirs_array;
+   struct dirent *file;
+   DIR *rep;
+   int i = 0;
 
-   ret = malloc(sizeof(Config_Data));
+   dirs = ecore_config_theme_search_path_get();
+   dirs_array = ecore_str_split(dirs, "|", -1);
+   free(dirs);
+
+   if (!dirs_array)
+   {
+      printf("No possible theme paths!\n");
+      return NULL;
+   }
+
+   while ((dirs = dirs_array[i]))
+   {
+      rep = opendir(dirs);
+      if (rep)
+      {
+         while ((file = readdir(rep)))
+         {
+            if ((strlen(file->d_name) > 4) &&
+                                 (ecore_str_has_suffix(file->d_name, ".edj")))
+               ret = eina_list_append(ret, theme_cut_suffix(file->d_name));
+         }
+         closedir(rep);
+      }
+      i++;
+   }
+
+   free(*dirs_array);
+   free(dirs_array);
+
+   if (!ret)
+   {
+      printf("No themes available!\n");
+      return NULL;
+   }
 
    return ret;
 }
 
 static int
-theme_data_return_active(Config_Data *data)
+theme_data_return_active(Eina_List *l)
 {
-   return 0;
+   int i;
+   char *theme, *tmp_theme;
+
+   theme = ecore_config_theme_get("theme");
+
+   EINA_LIST_FOREACH(l, l, tmp_theme)
+   {
+      if (!strcmp(tmp_theme, theme))
+         break;
+      i++;
+   }
+
+   free(theme);
+   return i;
 }
 
-static Config_Data *
+static Eina_List *
 engine_data_init(void)
 {
-   Config_Data *ret;
+   Eina_List *l, *ret = NULL;
+   char *eng;
+   int i;
+   const char *accepted_engines[] = {"software_x11", "xrender_x11",
+                                     "opengl_x11", NULL};
 
-   ret = malloc(sizeof(Config_Data));
+   l = ecore_evas_engines_get();
+
+   EINA_LIST_FOREACH(l, l, eng)
+   {
+      for (i = 0; accepted_engines[i]; i++)
+      {
+         if (!strcmp(accepted_engines[i], eng))
+         {
+            ret = eina_list_append(ret, strdup(eng));
+            break;
+         }
+      }
+   }
+
+   ecore_evas_engines_free(l);
 
    return ret;
 }
 
 static int
-engine_data_return_active(Config_Data *data)
+engine_data_return_active(Eina_List *l)
 {
-   return 0;
+   int i = 0;
+   char *eng, *tmp_eng;
+
+   eng = ecore_config_string_get("engine");
+
+   EINA_LIST_FOREACH(l, l, tmp_eng)
+   {
+      if (!strcmp(tmp_eng, eng))
+         break;
+      i++;
+   }
+
+   free(eng);
+   return i;
 }
 
 static unsigned int
 model_data_count(void *data)
 {
-   Config_Data *cd = data;
-   return cd->count;
+   Eina_List *l = data;
+   return eina_list_count(l);
 }
 
 static void *
 model_data_fetch(void *data, unsigned int row, unsigned int col __UNUSED__)
 {
-   Config_Data *cd = data;
-   return cd->array[row];
+   Eina_List *l = data;
+   return eina_list_nth(l, row);
+}
+
+static char *
+theme_cut_suffix(const char *file)
+{
+   char *new_file, *pt, *end;
+
+   end = strrchr(file, '.');
+
+   new_file = malloc(end - file + 1);
+   pt = new_file;
+
+   while (file != end)
+      *pt++ = *file++;
+   
+   *pt = '\0';
+
+   return new_file;
+}
+
+static void
+combo_cb(Ewl_Widget *w, void *event __UNUSED__, void *data)
+{
+   char *str;
+
+   EINA_LIST_FREE(data, str)
+      free(str);
+
+   eina_list_free(data);
+}
+
+static void
+use_scale_cb(Ewl_Widget *w, void *event __UNUSED__, void *data)
+{
+   int use_scale;
+
+   use_scale = ewl_checkbutton_is_checked(EWL_CHECKBUTTON(w));
+   ecore_config_boolean_set("use_scale", use_scale);
+
+   if (use_scale)
+      ewl_widget_enable(EWL_WIDGET(data));
+   else
+      ewl_widget_disable(EWL_WIDGET(data));
 }
 
diff --git a/ecdb/trunk/src/ecdb_gui.c b/ecdb/trunk/src/ecdb_gui.c
index c832cce..f76d2e6 100644
--- a/ecdb/trunk/src/ecdb_gui.c
+++ b/ecdb/trunk/src/ecdb_gui.c
@@ -13,6 +13,8 @@ static void _filelist_del(Ewl_Widget *w, void *ev_data, void *data);
 
 static void ecdb_welcome_page_show_about(void *data, Evas_Object *o,
                                     const char *emission, const char *source);
+static void ecdb_welcome_page_show_config(void *data, Evas_Object *o,
+                                    const char *emission, const char *source);
 
 static void
 ecdb_welcome_page_show_about(void *data __UNUSED__, Evas_Object *o __UNUSED__,
@@ -22,6 +24,14 @@ ecdb_welcome_page_show_about(void *data __UNUSED__, Evas_Object *o __UNUSED__,
    ecdb_about_show();
 }
 
+static void
+ecdb_welcome_page_show_config(void *data __UNUSED__, Evas_Object *o __UNUSED__,
+                                             const char *emission __UNUSED__,
+                                             const char *source __UNUSED__)
+{
+   ecdb_config_dialog_show();
+}
+
 static void
 _filelist_del(Ewl_Widget *w, void *ev_data __UNUSED__, void *data __UNUSED__)
 {
@@ -223,14 +233,16 @@ ecdb_create_main_gui(void)
    edje_frametime_set(1.0 / (double)em->fps);
    ecore_evas_show(em->main_win_ee);
 
-   /* Make this configurable at some point */
-   edje_scale_set(em->scalef);
+   if (ecore_config_boolean_get("use_scale"))
+      edje_scale_set(em->scalef);
 
    em->page = calloc(1, sizeof(Ecdb_Page));
    em->page->gui = edje_object_add(ecore_evas_get(em->main_win_ee));
    edje_object_file_set(em->page->gui, em->theme_path, "ecdb/window");
    edje_object_signal_callback_add(em->page->gui, "ecdb/about/show",
                         "ecdb", ecdb_welcome_page_show_about, NULL);
+   edje_object_signal_callback_add(em->page->gui, "ecdb/config/show",
+                        "ecdb", ecdb_welcome_page_show_config, NULL);
    edje_object_size_min_get(em->page->gui, &mw, &mh);
    if (mw <= 0) mw = 400;
    if (mh <= 0) mh = 300;