Menu
▾
▴
E SVN: raster IN trunk/TMP/st/elementary: data/desktop src/bin src/lib
|
From: Enlightenment S. <no-...@en...> - 2010-02-02 10:09:14
|
Log:
mini config app - live changed scaling and finger size. needed to really show
what elementary is about!
Author: raster
Date: 2010-02-02 02:09:07 -0800 (Tue, 02 Feb 2010)
New Revision: 45800
Added:
trunk/TMP/st/elementary/data/desktop/elementary_config.desktop
Modified:
trunk/TMP/st/elementary/data/desktop/Makefile.am trunk/TMP/st/elementary/src/bin/config.c trunk/TMP/st/elementary/src/lib/elm_main.c
Modified: trunk/TMP/st/elementary/data/desktop/Makefile.am
===================================================================
--- trunk/TMP/st/elementary/data/desktop/Makefile.am 2010-02-02 09:06:14 UTC (rev 45799)
+++ trunk/TMP/st/elementary/data/desktop/Makefile.am 2010-02-02 10:09:07 UTC (rev 45800)
@@ -2,9 +2,9 @@
MAINTAINERCLEANFILES = Makefile.in
desktopdir = $(datadir)/applications
-desktop_DATA = elementary_test.desktop
+desktop_DATA = elementary_test.desktop elementary_config.desktop
icondir = $(datadir)/icons
icon_DATA = elementary.png
-EXTRA_DIST = elementary_test.desktop elementary.png
+EXTRA_DIST = $(desktop_DATA) $(icon_DATA)
Modified: trunk/TMP/st/elementary/src/bin/config.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/config.c 2010-02-02 09:06:14 UTC (rev 45799)
+++ trunk/TMP/st/elementary/src/bin/config.c 2010-02-02 10:09:07 UTC (rev 45800)
@@ -16,6 +16,46 @@
}
static void
+sc_round(void *data, Evas_Object *obj, void *event_info)
+{
+ double val = elm_slider_value_get(obj);
+ double v;
+
+ v = round(val * 10.0) / 10.0;
+ if (v != val) elm_slider_value_set(obj, v);
+}
+
+static void
+sc_change(void *data, Evas_Object *obj, void *event_info)
+{
+ double scale = elm_scale_get();
+ double val = elm_slider_value_get(obj);
+
+ if (scale == val) return;
+ elm_scale_all_set(val);
+}
+
+static void
+fs_round(void *data, Evas_Object *obj, void *event_info)
+{
+ double val = elm_slider_value_get(obj);
+ double v;
+
+ v = round(val / 5.0) * 5.0;
+ if (v != val) elm_slider_value_set(obj, v);
+}
+
+static void
+fs_change(void *data, Evas_Object *obj, void *event_info)
+{
+ double scale = elm_scale_get();
+ double val = elm_slider_value_get(obj);
+
+ if (scale == val) return;
+ elm_finger_size_all_set(val);
+}
+
+static void
status_win(void)
{
Evas_Object *win, *bg, *bx0;
@@ -25,12 +65,12 @@
evas_object_smart_callback_add(win, "delete,request", my_win_del, NULL);
bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, 0.0, 0.0);
+ evas_object_size_hint_weight_set(bg, 1.0, 1.0);
elm_win_resize_object_add(win, bg);
evas_object_show(bg);
bx0 = elm_box_add(win);
- evas_object_size_hint_weight_set(bx0, 0.0, 0.0);
+ evas_object_size_hint_weight_set(bx0, 1.0, 1.0);
elm_win_resize_object_add(win, bx0);
evas_object_show(bx0);
@@ -39,6 +79,7 @@
Evas_Object *lb, *fr;
fr = elm_frame_add(win);
+ evas_object_size_hint_weight_set(fr, 1.0, 1.0);
elm_frame_label_set(fr, "Information");
elm_box_pack_end(bx0, fr);
evas_object_show(fr);
@@ -52,19 +93,88 @@
}
else
{
- Evas_Object *lb, *fr;
+ Evas_Object *lb, *pd, *bx2, *fr, *sl, *sp;
fr = elm_frame_add(win);
- elm_frame_label_set(fr, "Fill me in");
+ evas_object_size_hint_weight_set(fr, 1.0, 1.0);
+ evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_frame_label_set(fr, "Sizing");
elm_box_pack_end(bx0, fr);
evas_object_show(fr);
+ bx2 = elm_box_add(win);
+ evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
+ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, 0.5);
+
+ pd = elm_frame_add(win);
+ evas_object_size_hint_weight_set(pd, 1.0, 0.0);
+ evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, 0.5);
+ elm_object_style_set(pd, "pad_medium");
+ elm_box_pack_end(bx2, pd);
+ evas_object_show(pd);
+
lb = elm_label_add(win);
- elm_label_label_set(lb,
- "Not done yet"
- );
- elm_frame_content_set(fr, lb);
+ evas_object_size_hint_weight_set(lb, 1.0, 0.0);
+ evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5);
+ elm_label_label_set(lb,"<hilight>Scale</>");
+ elm_frame_content_set(pd, lb);
evas_object_show(lb);
+
+ sl = elm_slider_add(win);
+ evas_object_size_hint_weight_set(sl, 1.0, 0.0);
+ evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
+ elm_slider_span_size_set(sl, 120);
+ elm_slider_unit_format_set(sl, "%1.2f");
+ elm_slider_indicator_format_set(sl, "%1.2f");
+ elm_slider_min_max_set(sl, 0.25, 5.0);
+ elm_slider_value_set(sl, elm_scale_get());
+ elm_box_pack_end(bx2, sl);
+ evas_object_show(sl);
+
+ evas_object_smart_callback_add(sl, "changed", sc_round, NULL);
+ evas_object_smart_callback_add(sl, "delay,changed", sc_change, NULL);
+
+ sp = elm_separator_add(win);
+ elm_separator_horizontal_set(sp, 1);
+ evas_object_size_hint_weight_set(sp, 1.0, 0.0);
+ evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
+ elm_box_pack_end(bx2, sp);
+ evas_object_show(sp);
+
+ pd = elm_frame_add(win);
+ evas_object_size_hint_weight_set(pd, 1.0, 0.0);
+ evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, 0.5);
+ elm_object_style_set(pd, "pad_medium");
+ elm_box_pack_end(bx2, pd);
+ evas_object_show(pd);
+
+ lb = elm_label_add(win);
+ evas_object_size_hint_weight_set(lb, 1.0, 0.0);
+ evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5);
+ elm_label_label_set(lb, "<hilight>Finger Size</><br>");
+ elm_frame_content_set(pd, lb);
+ evas_object_show(lb);
+
+ sl = elm_slider_add(win);
+ evas_object_size_hint_weight_set(sl, 1.0, 0.0);
+ evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
+ elm_slider_span_size_set(sl, 120);
+ elm_slider_unit_format_set(sl, "%1.0f");
+ elm_slider_indicator_format_set(sl, "%1.0f");
+ elm_slider_min_max_set(sl, 5, 200);
+ elm_slider_value_set(sl, elm_finger_size_get());
+ elm_box_pack_end(bx2, sl);
+ evas_object_show(sl);
+
+ evas_object_smart_callback_add(sl, "changed", fs_round, NULL);
+ evas_object_smart_callback_add(sl, "delay,changed", fs_change, NULL);
+
+ // FIXME: add theme selector (basic mode and advanced for fallbacks)
+ // FIXME: save config
+ // FIXME: profile selector / creator etc.
+
+ elm_frame_content_set(fr, bx2);
+ evas_object_show(bx2);
}
evas_object_show(win);
@@ -124,7 +234,8 @@
if (!quiet)
{
status_win(); /* create main window */
- ecore_timer_add(2.0, _exit_timer, NULL);
+ if (!interactive)
+ ecore_timer_add(2.0, _exit_timer, NULL);
}
if (!interactive)
{
Modified: trunk/TMP/st/elementary/src/lib/elm_main.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_main.c 2010-02-02 09:06:14 UTC (rev 45799)
+++ trunk/TMP/st/elementary/src/lib/elm_main.c 2010-02-02 10:09:07 UTC (rev 45800)
@@ -833,7 +833,7 @@
s = getenv("ELM_SCALE");
if (s) _elm_config->scale = atof(s);
-
+
_elm_config->finger_size =
(double)_elm_config->finger_size * _elm_config->scale;
s = getenv("ELM_FINGER_SIZE");
@@ -900,6 +900,7 @@
// FIXME: hack until e export finger size too
if (getenv("ELM_FINGER_SIZE"))
_elm_config->finger_size = 40.0 * _elm_config->scale;
+ edje_scale_set(_elm_config->scale);
}
}
}
|
