From: Carsten Haitzler Date: Sat, 4 Apr 2009 14:15:08 +0000 (+0000) Subject: add a slide out panel/tab to put options and stuff in. X-Git-Tag: submit/efl/20131021.015651~9653 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=debd837c0ba0504c51017f5b3e7021f92c4a4b49;p=platform%2Fupstream%2Fenlightenment.git add a slide out panel/tab to put options and stuff in. SVN revision: 39855 --- diff --git a/data/themes/default.edc b/data/themes/default.edc index 58d343f..74f0361 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -23998,9 +23998,14 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); image: "dia_grad.png" COMP; image: "dia_topshad.png" COMP; image: "dia_botshad.png" COMP; - image: "menu_sep.png" COMP; image: "dia_botshad.png" COMP; image: "topsh.png" COMP; + image: "wp-bot1.png" COMP; + image: "wp-bot2.png" COMP; + image: "wp-tb1.png" COMP; + image: "wp-tb2.png" COMP; + image: "wp-tb3.png" COMP; + image: "big_arrow_up.png" COMP; } parts { part { name: "base"; @@ -24037,45 +24042,211 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); } rel2 { relative: 1.0 0.0; - offset: -3 -5; - to_y: "e.swallow.buttons"; + offset: -3 6; + to_y: "bot1"; } } } - part { name: "separator"; - mouse_events: 0; + part { name: "bot1"; + mouse_events: 0; description { state: "default" 0.0; - min: 16 2; + color_class: "dialog_base"; + rel1 { + to_y: "e.swallow.buttons"; + relative: 0.0 0.0; + offset: 0 -15; + } + rel2 { + relative: 1.0 1.0; + offset: -1 -1; + } + image { + normal: "wp-bot1.png"; + border: 0 0 21 0; + } + fill { + smooth: 0; + size { + relative: 0.0 1.0; + offset: 32 0; + } + } + } + } + part { + name: "e.swallow.buttons"; + type: SWALLOW; + description { state: "default" 0.0; + align: 1.0 1.0; + fixed: 0 1; rel1 { - relative: 0.0 1.0; - offset: 4 -1; - to_y: "e.swallow.list"; + to_y: "bot2"; + relative: 1.0 0.0; + offset: -5 1; } rel2 { - relative: 1.0 1.0; - offset: -5 0; - to_y: "e.swallow.list"; + to_y: "bot2"; + relative: 1.0 0.0; + offset: -5 1; } + } + } + part { name: "tb1"; + description { state: "default" 0.0; + color_class: "dialog_base"; + rel1 { + to_x: "tb2"; + to_y: "aup"; + relative: 0.0 0.0; + offset: 0 -6; + } + rel2 { + to_x: "aup"; + to_y: "tb2"; + relative: 1.0 0.0; + offset: 15 -1; + } image { - normal: "menu_sep.png"; - border: 2 2 0 0; - } + normal: "wp-tb1.png"; + border: 2 11 3 0; + } + fill.smooth: 0; + } + } + part { name: "tb2"; + description { state: "default" 0.0; + color_class: "dialog_base"; + rel1 { + to_x: "e.swallow.extras"; + to_y: "e.swallow.extras"; + relative: 0.0 0.0; + offset: -4 -7; + } + rel2 { + to_x: "tb1"; + to_y: "e.swallow.extras"; + relative: 1.0 1.0; + offset: -10 3; + } + image { + normal: "wp-tb2.png"; + border: 2 2 4 0; + } + fill.smooth: 0; + } + } + part { name: "tb3"; + description { state: "default" 0.0; + color_class: "dialog_base"; + rel1 { + to_x: "tb2"; + to_y: "tb2"; + relative: 1.0 0.0; + offset: 0 0; + } + rel2 { + to_x: "e.swallow.extras"; + to_y: "tb2"; + relative: 1.0 1.0; + offset: 18 -1; + } + image { + normal: "wp-tb3.png"; + border: 10 12 4 0; + } fill.smooth: 0; } } part { - name: "e.swallow.buttons"; + name: "e.swallow.extras"; type: SWALLOW; description { state: "default" 0.0; - align: 0.5 1.0; + align: 0.0 0.0; fixed: 0 1; rel1 { relative: 0.0 1.0; - offset: 4 -5; + offset: 4 0; } rel2 { - relative: 1.0 1.0; - offset: -5 -5; + relative: 0.0 1.0; + offset: 4 0; + } + } + description { state: "out" 0.0; + inherit: "default" 0.0; + align: 0.0 1.0; + rel1 { + relative: 0.0 1.0; + offset: 4 -10; + } + rel2 { + relative: 0.0 1.0; + offset: 4 -10; + } + } + } + part { name: "aup"; + mouse_events: 0; + description { state: "default" 0.0; + align: 0.0 1.0; + min: 22 22; + max: 22 22; + rel1 { + to_x: "tb2"; + to_y: "tb2"; + relative: 0.0 0.0; + offset: 5 -5; + } + rel2 { + to_x: "tb2"; + to_y: "tb2"; + relative: 0.0 0.0; + offset: 5 -3; + } + image.normal: "big_arrow_up.png"; + } + } + part { name: "ain"; + type: RECT; + description { state: "default" 0.0; + rel1.to: "aup"; + rel2.to: "aup"; + color: 0 0 0 0; + } + } + part { name: "aout"; + type: RECT; + description { state: "default" 0.0; + rel1.to: "aup"; + rel2.to: "aup"; + color: 0 0 0 0; + } + description { state: "out" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "bot2"; + mouse_events: 0; + description { state: "default" 0.0; + color_class: "dialog_base"; + rel1 { + relative: 0.0 1.0; + offset: 0 -16; + } + rel2 { + relative: 1.0 1.0; + offset: -1 -1; + } + image { + normal: "wp-bot2.png"; + } + fill { + smooth: 0; + size { + relative: 0.0 1.0; + offset: 32 0; + } } } } @@ -24108,10 +24279,35 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); } programs { program { name: "send_click"; - signal: "mouse,clicked,1"; + signal: "mouse,up,1"; source: "events"; action: SIGNAL_EMIT "e,action,click" "e"; } + program { name: "out"; + signal: "mouse,down,1"; + source: "aout"; + action: STATE_SET "out" 0.0; + target: "aout"; + after: "out2"; + + } + program { name: "out2"; + action: STATE_SET "out" 0.0; + target: "e.swallow.extras"; + transition: DECELERATE 0.5; + } + program { name: "in"; + signal: "mouse,down,1"; + source: "ain"; + action: STATE_SET "default" 0.0; + target: "aout"; + after: "in2"; + } + program { name: "in2"; + action: STATE_SET "default" 0.0; + target: "e.swallow.extras"; + transition: DECELERATE 1.0; + } } } group { name: "e/conf/wallpaper/main/mini"; diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index fc8f2df..7ee5441 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -549,4 +549,10 @@ wifi_0.png \ wifi_1.png \ wifi_2.png \ wifi_3.png \ -wifi_4.png +wifi_4.png \ +wp-tb1.png \ +wp-bot1.png \ +wp-tb2.png \ +wp-bot2.png \ +wp-tb3.png + diff --git a/data/themes/images/wp-bot1.png b/data/themes/images/wp-bot1.png new file mode 100644 index 0000000..a04e555 Binary files /dev/null and b/data/themes/images/wp-bot1.png differ diff --git a/data/themes/images/wp-bot2.png b/data/themes/images/wp-bot2.png new file mode 100644 index 0000000..cb86fb2 Binary files /dev/null and b/data/themes/images/wp-bot2.png differ diff --git a/data/themes/images/wp-tb1.png b/data/themes/images/wp-tb1.png new file mode 100644 index 0000000..4290c10 Binary files /dev/null and b/data/themes/images/wp-tb1.png differ diff --git a/data/themes/images/wp-tb2.png b/data/themes/images/wp-tb2.png new file mode 100644 index 0000000..d739fee Binary files /dev/null and b/data/themes/images/wp-tb2.png differ diff --git a/data/themes/images/wp-tb3.png b/data/themes/images/wp-tb3.png new file mode 100644 index 0000000..a46a265 Binary files /dev/null and b/data/themes/images/wp-tb3.png differ diff --git a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c index aff2e33..e0aab88 100644 --- a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c +++ b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c @@ -28,6 +28,8 @@ struct _Info int specific; int use_theme_bg; int con_num, zone_num, desk_x, desk_y; + + int mode; }; struct _Smart_Data @@ -744,6 +746,8 @@ wp_browser_new(E_Container *con) E_Desk *desk; const E_Config_Desktop_Background *cfbg; Evas_Coord mw, mh; + Evas_Object *o, *o2; + E_Radio_Group *rg; char buf[PATH_MAX]; info = calloc(1, sizeof(Info)); @@ -857,6 +861,34 @@ wp_browser_new(E_Container *con) edje_object_part_swallow(info->bg, "e.swallow.list", info->sframe); evas_object_show(info->sframe); evas_object_show(info->span); + + o = e_widget_table_add(info->win->evas, 0); + + rg = e_widget_radio_group_new(&(info->mode)); + o2 = e_widget_radio_add(info->win->evas, _("All Desktops"), 0, rg); + e_widget_table_object_align_append(o, o2, + 0, 1, 1, 1, + 1, 1, 0, 0, + 0.0, 0.5); + evas_object_show(o2); + o2 = e_widget_radio_add(info->win->evas, _("This Desktop"), 1, rg); + e_widget_table_object_align_append(o, o2, + 0, 2, 1, 1, + 1, 1, 0, 0, + 0.0, 0.5); + evas_object_show(o2); + o2 = e_widget_radio_add(info->win->evas, _("This Screen"), 2, rg); + e_widget_table_object_align_append(o, o2, + 0, 3, 1, 1, + 1, 1, 0, 0, + 0.0, 0.5); + evas_object_show(o2); + + e_widget_min_size_get(o, &mw, &mh); + edje_extern_object_min_size_set(o, mw, mh); + edje_object_part_swallow(info->bg, "e.swallow.extras", o); + evas_object_show(o); + // min size calc edje_object_size_min_calc(info->bg, &mw, &mh);