yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=d1866ed4f252058e836c3d8b73460758fa40aacb
commit d1866ed4f252058e836c3d8b73460758fa40aacb
Author: Yakov Goldberg <yako...@samsung.com>
Date: Wed Mar 25 16:46:28 2015 +0200
Add support for Elm Slider widget
---
data/config/black_list.json | 3 ++-
data/config/egui_all.eo | 2 +-
src/bin/egui_gui/egui_layout.json | 46 ++++++++++++++++++++++++++++++++++++++-
src/bin/egui_gui/egui_logic.c | 4 ++++
src/lib/database.h | 1 +
5 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/data/config/black_list.json b/data/config/black_list.json
index ba52da8..9c241aa 100644
--- a/data/config/black_list.json
+++ b/data/config/black_list.json
@@ -44,5 +44,6 @@
"Elm_Ctxpopup":["direction_priority"],
"Elm_Box":["layout"],
"Elm_Win":
["illume_command_send","wm_available_rotations","available_profiles","keyboard_mode","indicator_opacity","indicator_mode","trap_data","fake_canvas"],
- "Elm_Bg":["option"]
+ "Elm_Bg":["option"],
+ "Elm_Slider":["indicator_visible_mode", "indicator_format_function",
"units_format_function"]
}
diff --git a/data/config/egui_all.eo b/data/config/egui_all.eo
index 9789ba9..b678ecc 100644
--- a/data/config/egui_all.eo
+++ b/data/config/egui_all.eo
@@ -1,3 +1,3 @@
-class EGUI_ALL (Elm_Win, Elm_Bg, Elm_Box, Elm_Table, Elm_Menu,
Elm_Diskselector, Elm_Ctxpopup, Elm_Actionslider, Elm_Bubble, Elm_Button,
Elm_Calendar, Elm_Check, Elm_Radio, Elm_Clock, Elm_Colorselector, Elm_Image,
Elm_Icon, Elm_Label, Elm_Entry, Elm_Flip, Elm_Genlist, Elm_Gengrid,
Elm_Dayselector, Elm_Toolbar, Elm_Layout, Elm_Scroller, Elm_Panes,
Elm_Fileselector_Button, Elm_Fileselector_Entry, Elm_Fileselector, Elm_Frame,
Elm_Grid, Elm_Panel, Elm_Separator, Elm_Hoversel, Evas.Image, Elm [...]
+class EGUI_ALL (Elm_Win, Elm_Bg, Elm_Box, Elm_Table, Elm_Menu,
Elm_Diskselector, Elm_Ctxpopup, Elm_Actionslider, Elm_Bubble, Elm_Button,
Elm_Calendar, Elm_Check, Elm_Radio, Elm_Clock, Elm_Colorselector, Elm_Image,
Elm_Icon, Elm_Label, Elm_Entry, Elm_Flip, Elm_Genlist, Elm_Gengrid,
Elm_Dayselector, Elm_Toolbar, Elm_Layout, Elm_Scroller, Elm_Panes,
Elm_Fileselector_Button, Elm_Fileselector_Entry, Elm_Fileselector, Elm_Frame,
Elm_Grid, Elm_Panel, Elm_Separator, Elm_Hoversel, Evas.Image, Elm [...]
{
}
diff --git a/src/bin/egui_gui/egui_layout.json
b/src/bin/egui_gui/egui_layout.json
index a81bc90..47c2a30 100644
--- a/src/bin/egui_gui/egui_layout.json
+++ b/src/bin/egui_gui/egui_layout.json
@@ -1134,7 +1134,8 @@
"fctr_evas_image_it":[0, 28, 1, 1],
"fctr_fileselector_it":[0, 29, 1, 1],
"fctr_fileselector_entry_it":[0, 30, 1, 1],
- "fctr_fileselector_button_it":[0, 31, 1, 1]
+ "fctr_fileselector_button_it":[0, 31, 1, 1],
+ "fctr_slider_it":[0, 32, 1, 1]
}
},
"fctr_win_it":
@@ -2513,6 +2514,49 @@
"Evas.Object.visibility":[true]
}
},
+ "fctr_slider_it":
+ {
+ "Desc":
+ {
+ "parent":"fctr_table",
+ "class":"Elm_Box",
+ "public":true
+ },
+ "Properties":
+ {
+ "Elm_Box.horizontal":[true],
+ "Elm_Box.padding":[7, 0],
+ "Evas.Object.visibility":[true]
+ },
+ "Contains":["fctr_slider_image", "fctr_slider_label"]
+ },
+ "fctr_slider_image":
+ {
+ "Desc":
+ {
+ "parent":"fctr_slider_it",
+ "class":"Elm_Image"
+ },
+ "Properties":
+ {
+ "Evas.Object.size_hint_min":[25, 25],
+ "Elm_Image.resizable":[true, true],
+ "Evas.Object.visibility":[true]
+ }
+ },
+ "fctr_slider_label":
+ {
+ "Desc":
+ {
+ "parent":"fctr_slider_it",
+ "class":"Elm_Label"
+ },
+ "Properties":
+ {
+ "Elm_Widget.part_text":[null, "Slider"],
+ "Evas.Object.visibility":[true]
+ }
+ },
"right_panes":
{
"Desc":
diff --git a/src/bin/egui_gui/egui_logic.c b/src/bin/egui_gui/egui_logic.c
index 0a4795e..384f194 100644
--- a/src/bin/egui_gui/egui_logic.c
+++ b/src/bin/egui_gui/egui_logic.c
@@ -793,7 +793,9 @@ _factory_vertical_pack(Eina_Bool vertical_pack)
elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_evas_image_it, 0, 28, 1, 1);
elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_fileselector_it, 0, 29, 1, 1);
elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_fileselector_entry_it, 0, 30, 1, 1);
+
elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_fileselector_button_it, 0, 31, 1, 1);
+ elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_slider_it, 0, 32, 1, 1);
}
else
{
@@ -841,6 +843,7 @@ _factory_vertical_pack(Eina_Bool vertical_pack)
elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_fileselector_entry_it, 0, 10, 1, 1);
elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_fileselector_button_it, 1, 10, 1, 1);
+ elm_table_pack(g_main_wdgs->main_win->fctr_table,
g_main_wdgs->main_win->fctr_slider_it, 2, 10, 1, 1);
}
}
@@ -1041,6 +1044,7 @@ egui_start()
_factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_it,
"factory_image.png", DB_DEF_FILESELECTOR_CLASS, EINA_TRUE);
_factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_entry_it,
"factory_image.png", DB_DEF_FILESELECTOR_ENTRY_CLASS, EINA_TRUE);
_factory_item_finalize(g_main_wdgs->main_win->fctr_fileselector_button_it,
"factory_image.png", DB_DEF_FILESELECTOR_BUTTON_CLASS, EINA_TRUE);
+ _factory_item_finalize(g_main_wdgs->main_win->fctr_slider_it,
"factory_image.png", DB_DEF_SLIDER_CLASS, EINA_TRUE);
/*FIXME: Need to unpack inline image, so pass it into delete callback*/
evas_object_smart_callback_add(g_main_wdgs->main_win->main_win,
"delete,request", _main_win_del_cb, NULL);
diff --git a/src/lib/database.h b/src/lib/database.h
index 337bbef..5429f9b 100644
--- a/src/lib/database.h
+++ b/src/lib/database.h
@@ -116,6 +116,7 @@ typedef struct _Container_Desc Container_Desc;
#define DB_DEF_FILESELECTOR_CLASS "Elm_Fileselector"
#define DB_DEF_FILESELECTOR_ENTRY_CLASS "Elm_Fileselector_Entry"
#define DB_DEF_FILESELECTOR_BUTTON_CLASS "Elm_Fileselector_Button"
+#define DB_DEF_SLIDER_CLASS "Elm_Slider"
#define VISIBILITY_SET "visibility"
#define SIZE_SET "size"
--
