From 0c8af50544d06640de7dcb7819e7a79db6f60b0f Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 16 Jun 2006 08:20:36 +0000 Subject: [PATCH] new basic mode shelf config - simpler with "pre-defined" recipies - this should stop people asking stupid things like "how can i get gadgets on the desktop" as its a 1 click option. things like "they look like shit - cokie cutter" are hidden so silly peolpe who dont listen to advice and dont select below everything - have it selected for them. don't like the basic set of options given - use advanced to fiddle to your hearts content. SVN revision: 23456 --- TODO | 2 - data/themes/default_icons.edc | 114 +++++++++++++ data/themes/images/Makefile.am | 10 +- data/themes/images/e17_shelf_bottom_desk.png | Bin 0 -> 851 bytes data/themes/images/e17_shelf_custom.png | Bin 0 -> 905 bytes data/themes/images/e17_shelf_dock.png | Bin 0 -> 620 bytes data/themes/images/e17_shelf_menu_bar.png | Bin 0 -> 563 bytes data/themes/images/e17_shelf_panel.png | Bin 0 -> 535 bytes data/themes/images/e17_shelf_top_desk.png | Bin 0 -> 847 bytes src/bin/e_int_shelf_config.c | 166 ++++++++++++++----- 10 files changed, 244 insertions(+), 48 deletions(-) create mode 100644 data/themes/images/e17_shelf_bottom_desk.png create mode 100644 data/themes/images/e17_shelf_custom.png create mode 100644 data/themes/images/e17_shelf_dock.png create mode 100644 data/themes/images/e17_shelf_menu_bar.png create mode 100644 data/themes/images/e17_shelf_panel.png create mode 100644 data/themes/images/e17_shelf_top_desk.png diff --git a/TODO b/TODO index 86e01700d..d9374803a 100644 --- a/TODO +++ b/TODO @@ -58,8 +58,6 @@ Some of the things (in very short form) that need to be done to E17... that we have little choice but to implement a .desktop file loader. this is not to hard - it's the xml jungle of the system menus that is sucky. the real problems are where to find the icons for the .desktop files. -* shelf config dialog needs to have basic modce be simple recipies like "on - desktop", "at the top" "panel" etc. * middle mouse on gadgets as a quick move/resize thing? * on xrandr screen res change e moves and resizes windows to fit in the new resolution. this is good and bad. if some other app temporarily changes diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc index 7fc957c09..8f2f6fcf5 100644 --- a/data/themes/default_icons.edc +++ b/data/themes/default_icons.edc @@ -46,6 +46,12 @@ images { image: "e17_shelf_top_left.png" COMP; image: "e17_shelf_top.png" COMP; image: "e17_shelf_top_right.png" COMP; + image: "e17_shelf_bottom_desk.png" COMP; + image: "e17_shelf_custom.png" COMP; + image: "e17_shelf_dock.png" COMP; + image: "e17_shelf_menu_bar.png" COMP; + image: "e17_shelf_panel.png" COMP; + image: "e17_shelf_top_desk.png" COMP; } group { @@ -796,3 +802,111 @@ group { } } } +group { + name: "icons/enlightenment/shelf_bottom_desk"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_bottom_desk.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_custom"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_custom.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_dock"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_dock.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_menu_bar"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_menu_bar.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_panel"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_panel.png"; + } + } + } + } +} +group { + name: "icons/enlightenment/shelf_top_desk"; + max: 24 24; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 24 24; + image { + normal: "e17_shelf_top_desk.png"; + } + } + } + } +} diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index 4f3899016..959a5f6a0 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -435,5 +435,11 @@ e17_shelf_right.png \ e17_shelf_right_top.png \ e17_shelf_top_left.png \ e17_shelf_top.png \ -e17_shelf_top_right.png - +e17_shelf_top_right.png \ +e17_shelf_bottom_desk.png \ +e17_shelf_custom.png \ +e17_shelf_dock.png \ +e17_shelf_menu_bar.png \ +e17_shelf_panel.png \ +e17_shelf_top_desk.png + diff --git a/data/themes/images/e17_shelf_bottom_desk.png b/data/themes/images/e17_shelf_bottom_desk.png new file mode 100644 index 0000000000000000000000000000000000000000..316461be024f4a2ce31ae2e06a729966cd058e23 GIT binary patch literal 851 zcmV-Z1FZasP)v=4G;Y2#mN8w03CEi zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00Os3L_t(Y$K96COWR-= z$3IEi)Gk(w6pEsoMT+OPh=0Hi_O@LF51zg5&)8+K|3P7g9b_JK3BC%}^C@B9MlKo{r%F5m&m z4<0o%KnG$#958?+Pz2UA-{2$g0JMEbKLU^u=3zj>H%|d?fFE%`u)S2;K53w*9CxR537hq0SF}-^$7q`NObPG8ax*t%<0c$CS#6Y8uKjR z)yDq|(8e6UG-jxaw2-26G6JHF@`yiiV({?j<2ob~t3Tlr0QAs1Wgr#l_i-<~u!02R z0Gg&HN~O~0VzKD%?(TlNxw-KsCnpp6eExebmn)m58Gj7ZNTpKl;^N}j(b3U|TCLU( ze{5p0m{BYizm`g+`1bbpmrkbxx~@y5Qfb?^EsaJ)c6N5$_4V~{8yg$$<>jTgt}CAB z1#(?i?(XiSUaz;8mzQ%u7RV)&$#<1X#j$N$uCK4<`1rVE7>2O5wIvr97a}6!d7hk~ zpG&P)lV-CiA|gtuA$guB{eE98%aT^BwGX@n@+&JV`?hTdK9*%kwOW<<=H@1uOa`SC ztyYU}x6A74DoQDodMtyc4L8vJ{XLH3kjZ4?KpN1?<+3p~H5K?cj>GKiELu99K0Q1< zEY8f#Bpk<~P$;NIqwy=7&8}TtUFnYFATnIzSS&`NQ0Oi!EWE$Hy;Xp2nx=7ZaPV_( zZZ7FK4*7iEou8jS16Z1vm^iIgt72J}Oixb>Af{=`-rkpRlfsA)NpK002ovPDHLkV1nGzdQ1QS literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_custom.png b/data/themes/images/e17_shelf_custom.png new file mode 100644 index 0000000000000000000000000000000000000000..5187f36f019d2669c35b3a60c677754149737526 GIT binary patch literal 905 zcmV;419tq0P)v=7dZ5InjHWD03CEi zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00QkvL_t(Y$F-I{Xj4%X z$A9;|m!zgmA+e~S2x*HVQf-3}#Z3pLK`1VY2nB~OPCB>Pt&7kh(52ZrxH`DFbr35! zh+~InoutM@Y(CmF@8vmoZajUYbk;QA^1JDNc z0Uro}F29H2&#>!IeH*|5JRlAvfGOaX5ycsx1?&n*M+oe2L|mCsmUd+}ir^TK1YUZg z+!pW_uqOoeU`!6_*~orJdEAW{<|2%UQd_`xMKKhmn7BL)42pH00PX>Gk){w?kK>xa zSJv#y+A7B8=jSI2g~FX|HanTgWKJ1l+(x6(*xK6qyt=yjYGq~Rtq@ugUy%_4*MSKj z3!DTpz;WO-FcBUxeBTe2mX?-*8^9&t0&rO{Lz}R!NT9@4QoCBMeq38yd!EndpJXzb zXT@UijkV5oU1xT7_8u^#B4Y8dRdfy5kyy4QA2z{BiGLb60h~>z)8}io+G9)N`+g9M z#qI-NfQAqa0vnzx#pp!|)Y?eG2LXR>Zf;baquFfMmDQoTBWMEpkol_0LLgo!6tW8o z3pcg$`uh4iNpMG9&I4dqB{^p#!AVu~NlAQee0=;-rBbQsByVnReoCcM4}m;z4j2V4 z3T7|KhYh1@dZ<(?Js24oN!!is?d>1a)6>Ozz5W&WDfgnQL-aR--dzCVxm@mw-dJ2* zd{Hi!%Rohv+ldl*M_3+hWKJrT8rDjsQt3VLT`I7xTSPwsqa^z60Io6Ssa!r6_$I(j z0r%y1jnN}8eE=O*o*v+ZVYqz2O=IpxN;xV$0^N?Sgvto_kZ?NMLnRikcSvt~a>+~t zq}zueQ13uj8RJIVwWs=hpgOGG3#A03V^6j9xSC@Y+Y;DkE>NJpIt_~&K$6>1 z=WQeg1najmk~oaoIAj?00000NkvXXu0mjfo$`k3 literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_dock.png b/data/themes/images/e17_shelf_dock.png new file mode 100644 index 0000000000000000000000000000000000000000..e7a2aea7ba7167efd8f6bee65496e46135219219 GIT binary patch literal 620 zcmV-y0+aoTP)v=3^62<=_3FD03CEi zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00GcRL_t(Y$K92&PQx$| zhCioi3kWKK1P=fUD^Gz~Dt0>Z9!NX~BkXL5C!ibZ#>4|uYLQTt(58+VdX5g0q!H>w zq*G$&{C{WrbO&$(yZ~;)_5z$3`FI9ifjO`MmVgCvajts|5CJV920B0&I0Md&2wVaQ zkP0LV0Io({1KJ|K4eS7qu{h2}JORE0;CImk;G=KL8e|R+SP0}xK#M;DI!e5w0ZWN` zp~|8bD*#~*=YiD$P(g+| z1t5fkb5(ax!>7hu+moBI67BBLyvb2SiCrxBO@(A6;t(#`}K z6Rrt$3P7YpTdJnVVx|J%RB3T)z1J%MEoEJ)<@>-9(33J;2FQRAgICjoGOs7+_EL(M?`MeS^8ja}p`&Yob z9M=}G3q1K9bY**yw7Wy#mw1|{rGUv~f~=WH!|I9=14C)huX4HDa_*(V)>^Dx^_C<_ zG^Ypbsl+$~hA}Vz?tz;yvNTPZ&1RKHGairi@HY581P0$;kJOi9yqr=10000v=4Io!J_>ceq03CEi zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00EatL_t(Y$K8}oPQx$| zMxPreEeLT5PQWd=MlZl&xImB7L$K?fR)wZch!eBuI2ufvM*M8B^hvQZ{@!?Gj|m}! z?RHDkGyqgp#ZQJY27uje$7Zv^0=;=%*8p@~*Q;&YZvpDMrmCtFAR0U82qApg6xTus zU%u0LV+_aRk+LiSu>1WU=NyN_;YX#3`<-)rMar_o0AaOS@fTycT%G{HBQOJ6Yi$E~ zpi>$xyX>6-x%WN?GTHZJCFmJ&fb-rv;9VfCBoHnDGQa|J;7W-IcmrO618@ZD zm`{!Qbc>8qx)w$tX3WD5{7COM6W_sXz^4bqfJ~`N?mHtV$P)DlTJ-`m)l*sp?nWLO zDlse4UOm7{FDaCHHlf*>q}dgsJbFh!A&sh4K>rOu4lKm0(13Z8c_Z^~A|RG2S1o%U z%^rXfcu6uT)X5fSr2kzdx|enCfOXOde?x2F?gQ{b&ZMr?7x@4H002ovPDHLkV1mFb B--Q4G literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_panel.png b/data/themes/images/e17_shelf_panel.png new file mode 100644 index 0000000000000000000000000000000000000000..2a4fc8a4f92028f1d6a4e69a972286755fbb6abb GIT binary patch literal 535 zcmV+y0_gpTP)v=4FMZa=*|ED03CEi zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00DbRL_t(Y$K91nZUQk3 zhQACmR8;CIsve-H=(b1gwkKd&aSbF`p?NWrbb+0klz9}*s*x-_k@J7f!v^3P*aBf; z+XBx{oKN5jXn+>zfFAG?JT@GV0V^N}*1!Ys3cNWHcn3QOv zaPAJg5w}_q;KlmH{KQMr3)Y>a>mne1!#=Sw04B*)CjwGPIyZC&L-BDg8^|n7e9w&; z1S~fGFThQF&yBfyMb20{7e*j%Od~fHsQpBnmYb-9Uv=4Kk#FiP!)D03CEi zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00Of~L_t(Y$K8~_OB-Pr z$3K@lcnyV6p&+KkE?ugVO9zJv;^N=q-yj_v?AAp=f*`1ilaL{J2GK!6 ziZr>#GkM>q%jGzanAjgvANX>2&->i>^W5>ij{(d8UmVAIJ3T$k{{B8%YYf96m&=jM z$-Atb0b?@TWWcE z`P<6Min_YGl1`^1N~uttPDdJzhMbX>E5>O z6E-$Bq*|?th=@{3%H^^gA0JD-UKbG&t@Q&brKH_%OQlkgTCKJV6oA)rb91|{>xMp+ zN<|J255-ztT_v4PqqXMt_7>mwDHe-ptZW)sizn4FyK01d#LpP$#MR4VlG zJddfVDU8w4Q8_p`@YCt^u;+Q?^Lgd_{#VPgK3!j5o1W((A`bwjX_C+9?~27@?(FPL z0cIwXv3GWM%Gqpo#Pd8H$MG|n%rJmtv)Pa5=jWHc?^oB>)?NV<>+9<;N~Kc0)oMvR zlv3X}H#alD81NiO0~52evo9|$E~>3o>#|TNECONx0=x%)08QX0-~(+y1?xiZFanvt z5HJjk0?&XHaA*aEI*^K~o9_om1ow#^@6iQFOgg5103uDseL_GS63@{CV)UsGbBRYf zlL609t$7si&*J|D7z3W4TJvBR84<;E(g$Mn^RRj>bPrEr&<=^!CVKdUfNp^qk&f;6 zL8Bt7u)!`Mx@ZN*y$jZT4jPfhtUyt(5MTwvDj6|1e{VCN42 zLx3H4C8L1hSm*7?RD22`5gXYf!4(r&0z9A|>m(WZGW!ul*G6J`6Xclzj(UvRzts^i Z^9wSEeCK-a?jHaE002ovPDHLkV1j@ac9;MF literal 0 HcmV?d00001 diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c index ef21db3ec..20af2c1f5 100644 --- a/src/bin/e_int_shelf_config.c +++ b/src/bin/e_int_shelf_config.c @@ -11,11 +11,21 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Co static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +#define MODE_CUSTOM 0 +#define MODE_BOTTOM_MIDDLE 1 +#define MODE_BOTTOM_ALL 2 +#define MODE_BOTTOM_DESKTOP 3 +#define MODE_TOP_ALL 4 +#define MODE_TOP_DESKTOP 5 + /* Actual config data we will be playing with whil the dialog is active */ struct _E_Config_Dialog_Data { E_Shelf *es; E_Config_Shelf *escfg; + /* BASIC */ + int mode; + /* ADVANCED */ char *style; int orient; int fit_along; @@ -55,6 +65,42 @@ e_int_shelf_config(E_Shelf *es) static void _fill_data(E_Config_Dialog_Data *cfdata) { + cfdata->mode = MODE_CUSTOM; + if ((cfdata->escfg->orient == E_GADCON_ORIENT_BOTTOM) && + ((cfdata->escfg->style) && (!strcmp(cfdata->escfg->style, "default"))) && + (cfdata->escfg->fit_along == 1) && + (cfdata->escfg->popup) && + (cfdata->escfg->layer == 200)) + cfdata->mode = MODE_BOTTOM_MIDDLE; + else + if ((cfdata->escfg->orient == E_GADCON_ORIENT_BOTTOM) && + ((cfdata->escfg->style) && (!strcmp(cfdata->escfg->style, "default"))) && + (cfdata->escfg->fit_along == 0) && + (cfdata->escfg->popup) && + (cfdata->escfg->layer == 200)) + cfdata->mode = MODE_BOTTOM_ALL; + else + if ((cfdata->escfg->orient == E_GADCON_ORIENT_BOTTOM) && + ((cfdata->escfg->style) && (!strcmp(cfdata->escfg->style, "invisible"))) && + (cfdata->escfg->fit_along == 0) && + (!cfdata->escfg->popup) && + (cfdata->escfg->layer == 1)) + cfdata->mode = MODE_BOTTOM_DESKTOP; + else + if ((cfdata->escfg->orient == E_GADCON_ORIENT_TOP) && + ((cfdata->escfg->style) && (!strcmp(cfdata->escfg->style, "default"))) && + (cfdata->escfg->fit_along == 0) && + (cfdata->escfg->popup) && + (cfdata->escfg->layer == 200)) + cfdata->mode = MODE_TOP_ALL; + else + if ((cfdata->escfg->orient == E_GADCON_ORIENT_TOP) && + ((cfdata->escfg->style) && (!strcmp(cfdata->escfg->style, "invisible"))) && + (cfdata->escfg->fit_along == 0) && + (!cfdata->escfg->popup) && + (cfdata->escfg->layer == 1)) + cfdata->mode = MODE_TOP_DESKTOP; + if (cfdata->escfg->style) cfdata->style = strdup(cfdata->escfg->style); else @@ -108,12 +154,53 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) E_Zone *zone; int id; - cfdata->escfg->fit_along = cfdata->fit_along; - cfdata->escfg->fit_size = cfdata->fit_size; - cfdata->escfg->size = cfdata->size; + switch (cfdata->mode) + { + case MODE_BOTTOM_MIDDLE: + cfdata->escfg->orient = E_GADCON_ORIENT_BOTTOM; + if (cfdata->escfg->style) evas_stringshare_del(cfdata->escfg->style); + cfdata->escfg->style = evas_stringshare_add("default"); + cfdata->escfg->fit_along = 1; + cfdata->escfg->popup = 1; + cfdata->escfg->layer = 200; + break; + case MODE_BOTTOM_ALL: + cfdata->escfg->orient = E_GADCON_ORIENT_BOTTOM; + if (cfdata->escfg->style) evas_stringshare_del(cfdata->escfg->style); + cfdata->escfg->style = evas_stringshare_add("default"); + cfdata->escfg->fit_along = 0; + cfdata->escfg->popup = 1; + cfdata->escfg->layer = 200; + break; + case MODE_BOTTOM_DESKTOP: + cfdata->escfg->orient = E_GADCON_ORIENT_BOTTOM; + if (cfdata->escfg->style) evas_stringshare_del(cfdata->escfg->style); + cfdata->escfg->style = evas_stringshare_add("invisible"); + cfdata->escfg->fit_along = 0; + cfdata->escfg->popup = 0; + cfdata->escfg->layer = 1; + break; + case MODE_TOP_ALL: + cfdata->escfg->orient = E_GADCON_ORIENT_TOP; + if (cfdata->escfg->style) evas_stringshare_del(cfdata->escfg->style); + cfdata->escfg->style = evas_stringshare_add("default"); + cfdata->escfg->fit_along = 0; + cfdata->escfg->popup = 1; + cfdata->escfg->layer = 200; + break; + case MODE_TOP_DESKTOP: + cfdata->escfg->orient = E_GADCON_ORIENT_TOP; + if (cfdata->escfg->style) evas_stringshare_del(cfdata->escfg->style); + cfdata->escfg->style = evas_stringshare_add("invisible"); + cfdata->escfg->fit_along = 0; + cfdata->escfg->popup = 0; + cfdata->escfg->layer = 1; + break; + default: + break; + } - if (cfdata->escfg->style) evas_stringshare_del(cfdata->escfg->style); - cfdata->escfg->style = evas_stringshare_add(cfdata->style); + cfdata->escfg->size = cfdata->size; zone = cfdata->es->zone; id = cfdata->es->id; @@ -198,53 +285,44 @@ static Evas_Object * _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { /* generate the core widget layout for a basic dialog */ - Evas_Object *o, *of, *ob, *oi, *oj; - Evas_Coord wmw, wmh; - Evas_List *styles, *l; - int sel, n; + Evas_Object *o, *of, *ob, *ol; + E_Radio_Group *rg; o = e_widget_list_add(evas, 0, 0); + + ol = e_widget_list_add(evas, 0, 1); + + of = e_widget_framelist_add(evas, _("Layout"), 0); + rg = e_widget_radio_group_new(&(cfdata->mode)); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_dock", 64, 24, MODE_BOTTOM_MIDDLE, rg); + e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_panel", 64, 24, MODE_BOTTOM_ALL, rg); + e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_bottom_desk", 64, 24, MODE_BOTTOM_DESKTOP, rg); + e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_menu_bar", 64, 24, MODE_TOP_ALL, rg); + e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_top_desk", 64, 24, MODE_TOP_DESKTOP, rg); + e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_custom", 64, 24, MODE_CUSTOM, rg); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(ol, of, 1, 1, 0.5); of = e_widget_framelist_add(evas, _("Size"), 0); - ob = e_widget_check_add(evas, _("Shrink"), &(cfdata->fit_along)); + rg = e_widget_radio_group_new(&(cfdata->size)); + ob = e_widget_radio_add(evas, _("Tiny"), 24, rg); e_widget_framelist_object_append(of, ob); -// ob = e_widget_check_add(evas, _("Expand width to fit contents"), &(cfdata->fit_size)); -// e_widget_framelist_object_append(of, ob); - ob = e_widget_label_add(evas, _("Shelf Size")); + ob = e_widget_radio_add(evas, _("Small"), 32, rg); e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 4, 120, 4, 0, NULL, &(cfdata->size), 100); + ob = e_widget_radio_add(evas, _("Medium"), 40, rg); e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); - - of = e_widget_framelist_add(evas, _("Styles"), 0); - oi = e_widget_ilist_add(evas, 128, 20, &(cfdata->style)); + ob = e_widget_radio_add(evas, _("Large"), 48, rg); + e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_add(evas, _("Huge"), 56, rg); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(ol, of, 1, 1, 0.5); - sel = 0; - styles = e_theme_shelf_list(); - - for (n = 0, l = styles; l; l = l->next, n++) - { - char buf[4096]; - - ob = e_livethumb_add(evas); - e_livethumb_vsize_set(ob, 256, 40); - oj = edje_object_add(e_livethumb_evas_get(ob)); - snprintf(buf, sizeof(buf), "shelf/%s/base", (char *)l->data); - e_theme_edje_object_set(oj, "base/theme/shelf", buf); - e_livethumb_thumb_set(ob, oj); - e_widget_ilist_append(oi, ob, (char *)l->data, NULL, NULL, l->data); - if (!strcmp(cfdata->es->style, (char *)l->data)) - sel = n; - } - e_widget_min_size_get(oi, &wmw, &wmh); - e_widget_min_size_set(oi, wmw, 120); - - e_widget_ilist_go(oi); - e_widget_ilist_selected_set(oi, sel); - - e_widget_framelist_object_append(of, oi); - - e_widget_list_object_append(o, of, 0, 0, 0.5); + e_widget_list_object_append(o, ol, 0, 0, 0.5); ob = e_widget_button_add(evas, _("Configure Contents..."), "widget/config", _cb_configure, cfdata, NULL); e_widget_list_object_append(o, ob, 0, 0, 0.5);