From fa4ebb5b2f07aca0aa226a38e6d6ba9650ef6570 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sun, 24 Mar 2013 19:56:01 +0900 Subject: [PATCH] icons for buttons, theme overlay (for now) and some theme polishing for terminology sel --- TODO | 1 - data/themes/default.edc | 32 ++ data/themes/images/Makefile.am | 9 + data/themes/images/icon_about.png | Bin 0 -> 6332 bytes data/themes/images/icon_about.svg | 417 ++++++++++++++++++++ data/themes/images/icon_close.png | Bin 0 -> 7343 bytes data/themes/images/icon_close.svg | 252 ++++++++++++ data/themes/images/icon_copy.png | Bin 0 -> 1617 bytes data/themes/images/icon_copy.svg | 541 +++++++++++++++++++++++++ data/themes/images/icon_new.png | Bin 0 -> 3632 bytes data/themes/images/icon_new.svg | 325 +++++++++++++++ data/themes/images/icon_paste.png | Bin 0 -> 1629 bytes data/themes/images/icon_paste.svg | 569 +++++++++++++++++++++++++++ data/themes/images/icon_settings.png | Bin 0 -> 3662 bytes data/themes/images/icon_settings.svg | 334 ++++++++++++++++ data/themes/images/icon_split_h.png | Bin 0 -> 4119 bytes data/themes/images/icon_split_h.svg | 337 ++++++++++++++++ data/themes/images/icon_split_v.png | Bin 0 -> 3885 bytes data/themes/images/icon_split_v.svg | 320 +++++++++++++++ data/themes/images/inset_shadow.png | Bin 0 -> 231 bytes src/bin/controls.c | 89 ++--- src/bin/main.c | 16 +- 22 files changed, 3179 insertions(+), 63 deletions(-) create mode 100644 data/themes/images/icon_about.png create mode 100644 data/themes/images/icon_about.svg create mode 100644 data/themes/images/icon_close.png create mode 100644 data/themes/images/icon_close.svg create mode 100644 data/themes/images/icon_copy.png create mode 100644 data/themes/images/icon_copy.svg create mode 100644 data/themes/images/icon_new.png create mode 100644 data/themes/images/icon_new.svg create mode 100644 data/themes/images/icon_paste.png create mode 100644 data/themes/images/icon_paste.svg create mode 100644 data/themes/images/icon_settings.png create mode 100644 data/themes/images/icon_settings.svg create mode 100644 data/themes/images/icon_split_h.png create mode 100644 data/themes/images/icon_split_h.svg create mode 100644 data/themes/images/icon_split_v.png create mode 100644 data/themes/images/icon_split_v.svg create mode 100644 data/themes/images/inset_shadow.png diff --git a/TODO b/TODO index 1de040ab..c37e2d97 100644 --- a/TODO +++ b/TODO @@ -3,7 +3,6 @@ make it a first-class terminal: [ ] splits need to size only by steps in font size (elm feature) [ ] split handles need to become invisible (elm theme) -[ ] new term/split/close buttons need proper icons [ ] better info in tyls -m [ ] tyls -b needs doing [ ] blink and blink2 attributes need to be supported diff --git a/data/themes/default.edc b/data/themes/default.edc index f6e8c278..2f84b8f4 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -2262,6 +2262,7 @@ target: "4.bottom" image: "pm_overlay.png" COMP; image: "pm_fill.png" COMP; image: "bg_shadow.png" COMP; + image: "inset_shadow.png" COMP; } parts { part { name: "shadow"; @@ -2318,17 +2319,32 @@ target: "4.bottom" color: 255 255 255 255; } } + part { name: "overlay_shadow"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "inset_shadow.png"; + image.border: 5 5 7 3; + image.middle: 0; + fill.smooth: 0; + color: 255 255 255 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } program { signal: "begin"; source: "terminology"; action: STATE_SET "visible" 0.0; transition: DECELERATE 0.3; target: "overlay"; + target: "overlay_shadow"; } program { signal: "end"; source: "terminology"; action: STATE_SET "default" 0.0; transition: DECELERATE 0.3 CURRENT; target: "overlay"; + target: "overlay_shadow"; } } } @@ -2979,6 +2995,22 @@ target: "4.bottom" } } +#define ICON(Grp, Img) \ + group { name: "elm/icon/"##Grp##"/default"; min: 10 10; max: 80 80; \ + images.image: Img COMP; \ + parts { part { name: "base"; description { state: "default" 0.0; \ + aspect: 1.0 1.0; aspect_preference: BOTH; image.normal: Img; \ + } } } } + ICON("new", "icon_new.png"); + ICON("split-h", "icon_split_h.png"); + ICON("split-v", "icon_split_v.png"); + ICON("close", "icon_close.png"); + ICON("copy", "icon_copy.png"); + ICON("paste", "icon_paste.png"); + ICON("settings", "icon_settings.png"); + ICON("about", "icon_about.png"); +#undef ICON + ////////////////////////////////////////////////////////////////////////////// //// the about box content image group { name: "terminology/about"; diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index f4b9910f..c655a94f 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -16,6 +16,15 @@ cr_key.png \ cr_out.png \ cr_pulse.png \ fn_shadow.png \ +icon_about.png \ +icon_close.png \ +icon_copy.png \ +icon_new.png \ +icon_paste.png \ +icon_settings.png \ +icon_split_h.png \ +icon_split_v.png \ +inset_shadow.png \ media_bg.png \ media_line.png \ media_pause.png \ diff --git a/data/themes/images/icon_about.png b/data/themes/images/icon_about.png new file mode 100644 index 0000000000000000000000000000000000000000..1c3423e3e4d66e0e2b5d9fa6910dc89238d20917 GIT binary patch literal 6332 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 y{vZRen{sKte7GE@{TzV1xbz?A{|@8-2l; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + ? + ? + + + + + + diff --git a/data/themes/images/icon_close.png b/data/themes/images/icon_close.png new file mode 100644 index 0000000000000000000000000000000000000000..440e306b4fd27905508eb8d445ccdf700ed86ebc GIT binary patch literal 7343 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 V?Y%;Bje7t9002ovPDHLkV1g~n{LcUY literal 0 HcmV?d00001 diff --git a/data/themes/images/icon_close.svg b/data/themes/images/icon_close.svg new file mode 100644 index 00000000..937a47ec --- /dev/null +++ b/data/themes/images/icon_close.svg @@ -0,0 +1,252 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/data/themes/images/icon_copy.png b/data/themes/images/icon_copy.png new file mode 100644 index 0000000000000000000000000000000000000000..bf7ec28ba775a2283627f693ec85e99a09d03e23 GIT binary patch literal 1617 zcmV-X2Cn&uP)S130x{ShZEYFr+O282IJOTLj@Ptx zvm{QNb2>j#mBejg`{&2+dyb#D!f_ljwJ)RF8=$)~fGL#$OsNcDN@W03%IeeyxvneL zEn5HjNs{ps$8lt%KU7H_abOLe08FBTk^}5EeoVkfI2g)Gq!|a+finQ>{V(UPeE0j^ z13g0r5mvsf&%AhC^a4H*=-|Y*9k|YQ`FBs>x;j2GbfCI8gAA%^wy8kmVlC=(TN}9^ z-igyUrzghtjW2oNm+waaW!vWIBPsz}oW?B!+yL+Mo74NpM#q;tSn?qBR-P&cw$z0a z;f;@u#qgFY@WC4u94BCS7({}HUOn~1)x^zYXF0GLcqI>lARr9GwA-WwJZRE^&B7~r z@W~I7Q_CT_-L#8A8+g!!16zT&Q~_by5C%w@%7xmfA;4DQEqP$ry~r?t3?R@VJOCqC zh=wpv3BXNjpzFE@Ey4r%)am2kLBYrfW zEEch>j$NZrUK{qbuI^bt@42h@CcgRcH~jKKG)VR+MUKzx z#_G#s6$Iib;JDc?8bkxyLeJ2P%Q-YK0#-bk~og+sQC-+GJ>xVA( z>e7wZOQS_Q!)dNNC749Kbq?e90OoUkG(!2$A{;qK;Jz{yGKqAYwICZgFow8BzrK@h zLsjg$t~(`;p24^@hqW?IzF^Z+wj=Wtpt>^6qx}O^4xhn4du%GKhuEmh#}IeECJ~qB zu!b!P73jAt`b|k6Kp-fEl7(SdxHLzZNvd3?DS(Mm(LqUSI-@yyRJ_DjrhWhQ-jzN5 z1DN?yGcZRj+ZY58fxIUz?G9iTE+PwVhK_!%dZ^`IPqGv z{Ig&DuP@vQXUtF*?TVRO^f89&-lykSBSBl0(S$)@%CKt4z)LIvEjuu67mn4*TAGm2 zTuIDmk}i?g-uSpHNSJvDAAcXcoc;H~Z65K!7y0F|*y{~fS#y;{`%`$6jApErj7G); zMf6bi;qQg$cguIKUo&!rSu0mq%$1(4tQ;c9f4ll#t-El?GMbwG>YW%*yh^t&-n8@m zv%Q6Zhx5gW%C+-^^+~$6HL#-@ja>7vMoWL3zgznA{KD)%KbH>=<1?WtAqQ5u(AoJ%+o^hSmA&UUeQH*Z>c@*o9-Y zQd84sG@ZZjp<4}9E~C+=3#*#ZXi)=I&S;besCq`DJiwZi&1km03%6NAmCa~$aG=r| zjV@hS*^EY~aiEeJjSi=9Lv{P=kWLO%QW?OM$^fR+lWJf$?i6Zio!!o88aYq`-T0bm zNOulgTiVQl5(t3m#pB{_U@y@fL^hotN=Tpzlz_Xn=K)PZ>~&~Y5;x^BG#eOBEE zTLTax7y3l-^mbqkVqAxOw&(V%*ohJdo4r@Kn;8u>7{=6gAV|4AJ6_pbIHj_gNJ?b@ zQz`?PQrg$R?25GJ(%ykt7uH-Ez?8}Wrc?$nr80mir5ixyG8&x#Dw)yfG7eNWqtOAN z(ix2o072o5MtOj$XEdq)hw65!?u+L2k6WpxG8%0Fsw$m^F-j@}m{R`(@Hv-Ci|M&< P00000NkvXXu0mjfd=LGV literal 0 HcmV?d00001 diff --git a/data/themes/images/icon_copy.svg b/data/themes/images/icon_copy.svg new file mode 100644 index 00000000..5cb3f497 --- /dev/null +++ b/data/themes/images/icon_copy.svg @@ -0,0 +1,541 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/themes/images/icon_new.png b/data/themes/images/icon_new.png new file mode 100644 index 0000000000000000000000000000000000000000..845f400688bc44f0c86efbe7e2b625edc42a4a51 GIT binary patch literal 3632 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/data/themes/images/icon_paste.png b/data/themes/images/icon_paste.png new file mode 100644 index 0000000000000000000000000000000000000000..d0a338bb757587aad98c0ae479d913e2330cf224 GIT binary patch literal 1629 zcmV-j2BP_iP)kOK~#90?VQbz6h#<^pX%wJnO$}b2^v;W0hj0|-i(QQ@Q$~M zchA6451RM~pz$Dgu8`=-?9qc4A_AJ=NpNpyR5V!>boOheKgvT@F+DxAA2U_ey`%k0 zirInCUH$a0>aDl7szj&Lq1N;Ys;guZSb?r{4BYj<4RF#R00p<;$)?hTa09Y5fMdV~ zg-@Rjl)7ZPNHj=Wh>ew%6$ka(TRC`vE}wi4J(auw z+y!0>m^**v-Yo;K+lQ>bJ<|?!-Usdj@5Y%IPMtLHHhS>E>peQ1l%*vQQ#{J6mnZ%& zO$LD_KQgGk51bTUw-0HWl4Y68YV41?%E{Q% zi31CRp?Rcfa&|{n~++^6o(24yanS11(hpv{VhyQr`Q( z58w2Chhbg(y4?HK4z!e42MXZh>pt%=sz4``Qck(lU_yBTC{WXZLO?^PhYCu{k~67F zDm6sUApHQ;;Mx%!X+pc9zE89EWfDmZZYPD!KJ3JL0iZ{M&H){wF)q-9e7@z>Y{1m+RhL1b!uaB<7`X=-e84R;@?pG(_iQqW9BVUx1;66nUN?-M%T zE^89OXeOhu(7~t`s>NN+05nLm~*AA30h{AW) z;nSPtG~o$yU#AV+6+ja%r1_(lz;FM+qaA+}s>KP^1LnSx;qYc97XXXr5vT_PwsfBA zb4q`T+;`~Q1l#-D0?fb76up&xV8v?Et9=xsM>{xxXai8@K2sn8`nS)C*MLRf2x@b4 z{;-F#7GUOEMGEWyn?M)n>$)0u0mi^K3gV9b?xYz{ z1+dfUNWE9YR5D=z5dD3d;jQ&ht^>`ddAWUEKLapf0C8%$b|4JixH;6J%GLY%;Fh2u z##HS<7;&MA75QLNH9Vs{#I#T(*c}07efU^m%d6QhQg+bTPh*dM0%YY!Kdr2+u(q~l zDrr88Z#=80 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/themes/images/icon_settings.png b/data/themes/images/icon_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..0f1b2143138be437ac91dfa85d107839f67ecf5b GIT binary patch literal 3662 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 literal 0 HcmV?d00001 diff --git a/data/themes/images/icon_settings.svg b/data/themes/images/icon_settings.svg new file mode 100644 index 00000000..933097af --- /dev/null +++ b/data/themes/images/icon_settings.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/data/themes/images/icon_split_h.png b/data/themes/images/icon_split_h.png new file mode 100644 index 0000000000000000000000000000000000000000..6f96eb2732faa8ff1e85dc30cb3b810a5f8adf3e GIT binary patch literal 4119 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 G#r+QxSFi^F literal 0 HcmV?d00001 diff --git a/data/themes/images/icon_split_h.svg b/data/themes/images/icon_split_h.svg new file mode 100644 index 00000000..745a221f --- /dev/null +++ b/data/themes/images/icon_split_h.svg @@ -0,0 +1,337 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/data/themes/images/icon_split_v.png b/data/themes/images/icon_split_v.png new file mode 100644 index 0000000000000000000000000000000000000000..c72a8ea7f9ad5d8ccecb3c48367bf3f3da4f6811 GIT binary patch literal 3885 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/data/themes/images/inset_shadow.png b/data/themes/images/inset_shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..dad255c61a66d4fdd605bdc8f48e26020835f683 GIT binary patch literal 231 zcmV3O@Fn>sz5sq*uwk{0Z?asikI}Oj+VUI6d zg72E)4r@FVUhx*u5$8_OFvk)bJXOdq_`m_vji9i?RzACs-(%}E5ZtHtSh2AWJ_mwD z-Ul2jo~IB`1A)vZoU0pNZeY}(`D6VDL3OKZ9SnL6t&)|>ffn5=`@>Z*uLNry_#qlA hEGsG8hV)zbHdk`FIjjI0qwxR$002ovPDHLkV1fi@TS5Q; literal 0 HcmV?d00001 diff --git a/src/bin/controls.c b/src/bin/controls.c index 567cd1da..0e4ff867 100644 --- a/src/bin/controls.c +++ b/src/bin/controls.c @@ -121,6 +121,30 @@ _cb_saved_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUS } } +static Evas_Object * +_button_add(Evas_Object *win, const char *label, const char *icon, Evas_Smart_Cb cb, void *cbdata) +{ + Evas_Object *o, *bt, *ic; + + bt = o = elm_button_add(win); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); + if (label) elm_object_text_set(o, label); + evas_object_smart_callback_add(o, "clicked", cb, cbdata); + + if (icon) + { + ic = o = elm_icon_add(win); + evas_object_size_hint_aspect_set(o, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); + elm_icon_standard_set(o, icon); + elm_object_part_content_set(bt, "icon", o); + evas_object_show(o); + } + + evas_object_show(bt); + return bt; +} + void controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term) { @@ -150,41 +174,14 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term) elm_box_pack_end(ct_boxh, o); evas_object_show(o); - // XXX: need real icon - o = elm_button_add(win); - evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_text_set(o, "*"); + o = _button_add(win, "New", "new", _cb_ct_new, term); elm_box_pack_end(ct_box2, o); - evas_object_show(o); - evas_object_smart_callback_add(o, "clicked", _cb_ct_new, NULL); - - // XXX: need real icon - o = elm_button_add(win); - evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_text_set(o, "|"); + o = _button_add(win, "Split V", "split-h", _cb_ct_split_v, term); elm_box_pack_end(ct_box2, o); - evas_object_show(o); - evas_object_smart_callback_add(o, "clicked", _cb_ct_split_v, NULL); - - // XXX: need real icon - o = elm_button_add(win); - evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_text_set(o, "-"); + o = _button_add(win, "Split H", "split-v", _cb_ct_split_h, term); elm_box_pack_end(ct_box2, o); - evas_object_show(o); - evas_object_smart_callback_add(o, "clicked", _cb_ct_split_h, NULL); - - // XXX: need real icon - o = elm_button_add(win); - evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_text_set(o, "X"); + o = _button_add(win, "Close", "close", _cb_ct_close, term); elm_box_pack_end(ct_box2, o); - evas_object_show(o); - evas_object_smart_callback_add(o, "clicked", _cb_ct_close, NULL); o = elm_separator_add(win); evas_object_size_hint_weight_set(o, 0.0, EVAS_HINT_EXPAND); @@ -197,21 +194,10 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term) elm_box_pack_end(ct_boxh, o); evas_object_show(o); - o = elm_button_add(win); - evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_text_set(o, "Copy"); + o = _button_add(win, "Copy", "copy", _cb_ct_copy, term); elm_box_pack_end(ct_box, o); - evas_object_show(o); - evas_object_smart_callback_add(o, "clicked", _cb_ct_copy, term); - - o = elm_button_add(win); - evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_text_set(o, "Paste"); + o = _button_add(win, "Paste", "paste", _cb_ct_paste, term); elm_box_pack_end(ct_box, o); - evas_object_show(o); - evas_object_smart_callback_add(o, "clicked", _cb_ct_paste, term); o = elm_separator_add(win); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); @@ -220,13 +206,8 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term) elm_box_pack_end(ct_box, o); evas_object_show(o); - o = elm_button_add(win); - evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_text_set(o, "Options"); + o = _button_add(win, "Settings", "settings", _cb_ct_options, term); elm_box_pack_end(ct_box, o); - evas_object_show(o); - evas_object_smart_callback_add(o, "clicked", _cb_ct_options, NULL); o = elm_separator_add(win); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); @@ -235,14 +216,8 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term) elm_box_pack_end(ct_box, o); evas_object_show(o); - o = elm_button_add(win); - evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_text_set(o, "About"); + o = _button_add(win, "About", "about", _cb_ct_about, term); elm_box_pack_end(ct_box, o); - evas_object_show(o); - evas_object_smart_callback_add(o, "clicked", _cb_ct_about, NULL); - } if (!ct_out) { diff --git a/src/bin/main.c b/src/bin/main.c index 441c46c1..6d1537b3 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -2328,16 +2328,22 @@ elm_main(int argc, char **argv) return EXIT_FAILURE; } - config_init(); - - main_config = config_load("config"); - config = config_fork(main_config); - elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); elm_app_compile_data_dir_set(PACKAGE_DATA_DIR); elm_app_info_set(elm_main, "terminology", "themes/default.edj"); + config_init(); + + main_config = config_load("config"); + +// elm_theme_extension_add(NULL, config_theme_path_get(main_config)); +// elm_theme_extension_add(NULL, config_theme_path_default_get(main_config)); + elm_theme_overlay_add(NULL, config_theme_path_get(main_config)); + elm_theme_overlay_add(NULL, config_theme_path_default_get(main_config)); + + config = config_fork(main_config); + args = ecore_getopt_parse(&options, values, argc, argv); if (args < 0) {