summaryrefslogtreecommitdiff
path: root/src/examples
diff options
context:
space:
mode:
authorAli Alzyod <ali198724@gmail.com>2019-12-11 09:47:50 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2019-12-11 09:47:50 +0900
commit3359e03500d63eb7b0384e6cf10e92e0f3a736ef (patch)
treeaa0e932a77ffae8aed860c5ed9736e74365c2199 /src/examples
parentab67611c65f3bc665a0121e4a84d0d8d5bddf822 (diff)
efl.ui.text: rename to efl.ui.textbox
Summary: This patch will rename efl.ui.text into efl.ui.textbox Effected classes: - efl.ui.text_async : efl.ui.textbox_async - efl.ui.text_editable : efl.ui.textbox_editable **will be removed anyway** Needs consider Classes: - efl.ui.text_part - efl.ui.text_factory.Emoticons - efl.ui.text_factory.Fallback - efl.ui.text_factory.Images Reviewers: woohyun, segfaultxavi, bu5hm4n, zmike, YOhoho Reviewed By: woohyun Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10835
Diffstat (limited to 'src/examples')
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c10
-rw-r--r--src/examples/elementary/efl_ui_unit_converter.cs10
-rw-r--r--src/examples/elementary/table_cxx_example_01.cc8
3 files changed, 14 insertions, 14 deletions
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index f8f5c5b683..7a010fb9ff 100644
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -16,8 +16,8 @@
16//FIXME this can go away when efl_ui_text doesn't need elm_general 16//FIXME this can go away when efl_ui_text doesn't need elm_general
17# include <elm_general.h> 17# include <elm_general.h>
18# include <efl_text_interactive.eo.h> 18# include <efl_text_interactive.eo.h>
19# include <efl_ui_text.eo.h> 19# include <efl_ui_textbox.eo.h>
20# include <efl_ui_text_async.eo.h> 20# include <efl_ui_textbox_async.eo.h>
21 21
22#define NUM_ITEMS 400 22#define NUM_ITEMS 400
23 23
@@ -151,7 +151,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
151 ibox = efl_add(EFL_UI_BOX_CLASS, item); 151 ibox = efl_add(EFL_UI_BOX_CLASS, item);
152 efl_ui_layout_orientation_set(ibox, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL); 152 efl_ui_layout_orientation_set(ibox, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
153 153
154 txt = efl_add(EFL_UI_TEXT_CLASS, ibox); 154 txt = efl_add(EFL_UI_TEXTBOX_CLASS, ibox);
155 efl_gfx_hint_weight_set(txt, 0.95, EFL_GFX_HINT_EXPAND); 155 efl_gfx_hint_weight_set(txt, 0.95, EFL_GFX_HINT_EXPAND);
156 efl_text_horizontal_align_set(txt, 0.2); 156 efl_text_horizontal_align_set(txt, 0.2);
157 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); 157 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE);
@@ -229,7 +229,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
229 efl_pack_end(wbox, list); 229 efl_pack_end(wbox, list);
230 230
231 /*select mode */ 231 /*select mode */
232 txt = efl_add(EFL_UI_TEXT_CLASS, wbox); 232 txt = efl_add(EFL_UI_TEXTBOX_CLASS, wbox);
233 efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01); 233 efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01);
234 efl_text_horizontal_align_set(txt, 0.02); 234 efl_text_horizontal_align_set(txt, 0.02);
235 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); 235 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE);
@@ -256,7 +256,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
256 efl_event_callback_add(bbox, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, _select_radio_changed, list); 256 efl_event_callback_add(bbox, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, _select_radio_changed, list);
257 257
258 /* scroll mode */ 258 /* scroll mode */
259 txt = efl_add(EFL_UI_TEXT_CLASS, wbox); 259 txt = efl_add(EFL_UI_TEXTBOX_CLASS, wbox);
260 efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01); 260 efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01);
261 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); 261 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE);
262 efl_text_horizontal_align_set(txt, 0.02); 262 efl_text_horizontal_align_set(txt, 0.02);
diff --git a/src/examples/elementary/efl_ui_unit_converter.cs b/src/examples/elementary/efl_ui_unit_converter.cs
index 96481f52e4..6d7f200a1e 100644
--- a/src/examples/elementary/efl_ui_unit_converter.cs
+++ b/src/examples/elementary/efl_ui_unit_converter.cs
@@ -32,7 +32,7 @@ public class Example
32 private static void ShowErrorPopup(Efl.Ui.Win win, string message) 32 private static void ShowErrorPopup(Efl.Ui.Win win, string message)
33 { 33 {
34 Efl.Ui.AlertPopup popup = new Efl.Ui.AlertPopup(win); 34 Efl.Ui.AlertPopup popup = new Efl.Ui.AlertPopup(win);
35 Efl.Ui.Text popup_text = new Efl.Ui.Text(popup); 35 Efl.Ui.Textbox popup_text = new Efl.Ui.Textbox(popup);
36 popup_text.SetText($"Error: {message}"); 36 popup_text.SetText($"Error: {message}");
37 popup.SetContent(popup_text); 37 popup.SetContent(popup_text);
38 popup.SetVisible(true); 38 popup.SetVisible(true);
@@ -68,12 +68,12 @@ public class Example
68 68
69 box.DoPack(miles_box); 69 box.DoPack(miles_box);
70 70
71 Efl.Ui.Text miles_label = new Efl.Ui.Text(miles_box); 71 Efl.Ui.Textbox miles_label = new Efl.Ui.Textbox(miles_box);
72 miles_label.SetText("Miles:"); 72 miles_label.SetText("Miles:");
73 miles_label.SetSize(size); 73 miles_label.SetSize(size);
74 miles_label.SetVisible(true); 74 miles_label.SetVisible(true);
75 75
76 Efl.Ui.Text miles_input = new Efl.Ui.Text(miles_box); 76 Efl.Ui.Textbox miles_input = new Efl.Ui.Textbox(miles_box);
77 miles_input.SetText(""); 77 miles_input.SetText("");
78 miles_input.SetScrollable(true); 78 miles_input.SetScrollable(true);
79 miles_input.SetEditable(true); 79 miles_input.SetEditable(true);
@@ -95,12 +95,12 @@ public class Example
95 95
96 box.DoPack(kms_box); 96 box.DoPack(kms_box);
97 97
98 Efl.Ui.Text kms_label = new Efl.Ui.Text(kms_box); 98 Efl.Ui.Textbox kms_label = new Efl.Ui.Textbox(kms_box);
99 kms_label.SetText("Kilometers:"); 99 kms_label.SetText("Kilometers:");
100 kms_label.SetSize(size); 100 kms_label.SetSize(size);
101 kms_label.SetVisible(true); 101 kms_label.SetVisible(true);
102 102
103 Efl.Ui.TextEditable kms_input = new Efl.Ui.TextEditable(kms_box); 103 Efl.Ui.TextboxEditable kms_input = new Efl.Ui.TextboxEditable(kms_box);
104 kms_input.SetText(""); 104 kms_input.SetText("");
105 kms_input.SetScrollable(true); 105 kms_input.SetScrollable(true);
106 kms_input.SetSize(size); 106 kms_input.SetSize(size);
diff --git a/src/examples/elementary/table_cxx_example_01.cc b/src/examples/elementary/table_cxx_example_01.cc
index 8028b75c19..962fc5d74e 100644
--- a/src/examples/elementary/table_cxx_example_01.cc
+++ b/src/examples/elementary/table_cxx_example_01.cc
@@ -34,19 +34,19 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
34// FIXME 34// FIXME
35// table.homogeneous_set(true); 35// table.homogeneous_set(true);
36 36
37 efl::ui::Text label(instantiate, win); 37 efl::ui::Textbox label(instantiate, win);
38 label.text_set("label 0"); 38 label.text_set("label 0");
39 table.pack_table(label, 0, 0, 1, 1); 39 table.pack_table(label, 0, 0, 1, 1);
40 40
41 efl::ui::Text label1(instantiate, win); 41 efl::ui::Textbox label1(instantiate, win);
42 label1.text_set("label 1"); 42 label1.text_set("label 1");
43 table.pack_table(label1, 1, 0, 1, 1); 43 table.pack_table(label1, 1, 0, 1, 1);
44 44
45 efl::ui::Text label2(instantiate, win); 45 efl::ui::Textbox label2(instantiate, win);
46 label2.text_set("label 2"); 46 label2.text_set("label 2");
47 table.pack_table(label2, 0, 1, 1, 1); 47 table.pack_table(label2, 0, 1, 1, 1);
48 48
49 efl::ui::Text label3(instantiate, win); 49 efl::ui::Textbox label3(instantiate, win);
50 label3.text_set("label 3"); 50 label3.text_set("label 3");
51 table.pack_table(label3, 1, 1, 1, 1); 51 table.pack_table(label3, 1, 1, 1, 1);
52} 52}