diff options
author | Xavi Artigas <xavierartigas@yahoo.es> | 2019-09-06 16:01:45 +0200 |
---|---|---|
committer | Xavi Artigas <xavierartigas@yahoo.es> | 2019-09-06 16:01:45 +0200 |
commit | 5472a77fb3ace3fa3dba7ae4c4770314412d5e55 (patch) | |
tree | d8cefe8c79195557178db6f8904e32d7dab45f15 | |
parent | 17609ba6bf8bea42e121f742fceea77308e50d5d (diff) |
mono-examples: adapt to latest bindings syntax
-rw-r--r-- | apps/csharp/life/src/life_board.cs | 2 | ||||
-rw-r--r-- | apps/csharp/life/src/life_main.cs | 16 | ||||
-rw-r--r-- | apps/csharp/texteditor/src/texteditor_main.cs | 24 | ||||
-rw-r--r-- | reference/csharp/core/src/core_event.cs | 4 | ||||
-rw-r--r-- | reference/csharp/core/src/core_idler.cs | 8 | ||||
-rw-r--r-- | reference/csharp/core/src/core_poll.cs | 8 | ||||
-rw-r--r-- | reference/csharp/snippets/Efl.Ui.Win.cs | 4 | ||||
-rw-r--r-- | reference/csharp/ui/src/focus_main.cs | 12 | ||||
-rw-r--r-- | reference/csharp/ui/src/ui_container.cs | 4 | ||||
-rw-r--r-- | reference/csharp/ui/src/ui_custom_widget.cs | 4 | ||||
-rw-r--r-- | reference/csharp/ui/src/ui_sizing.cs | 2 | ||||
-rw-r--r-- | tutorial/csharp/hello-gui/src/gui_main.cs | 6 | ||||
-rw-r--r-- | unsorted/elementary/efl_ui_slider_mono.cs | 4 | ||||
-rw-r--r-- | unsorted/elementary/efl_ui_unit_converter.cs | 6 | ||||
-rw-r--r-- | unsorted/evas/evas_mono_rectangle.cs | 2 | ||||
-rw-r--r-- | unsorted/evas/evas_mono_text.cs | 4 |
16 files changed, 55 insertions, 55 deletions
diff --git a/apps/csharp/life/src/life_board.cs b/apps/csharp/life/src/life_board.cs index 61b4d457..cecacc84 100644 --- a/apps/csharp/life/src/life_board.cs +++ b/apps/csharp/life/src/life_board.cs | |||
@@ -62,7 +62,7 @@ public class LifeBoard | |||
62 | { | 62 | { |
63 | lifeTimer = new Efl.LoopTimer(win, 0.1); | 63 | lifeTimer = new Efl.LoopTimer(win, 0.1); |
64 | 64 | ||
65 | lifeTimer.TimerTickEvt += (object sender, EventArgs ev) => { | 65 | lifeTimer.TimerTickEvent += (object sender, EventArgs ev) => { |
66 | Nextgen(); | 66 | Nextgen(); |
67 | if (this.lifeRender != null) | 67 | if (this.lifeRender != null) |
68 | this.lifeRender.Refresh(win); | 68 | this.lifeRender.Refresh(win); |
diff --git a/apps/csharp/life/src/life_main.cs b/apps/csharp/life/src/life_main.cs index a287f6c0..1b9e1297 100644 --- a/apps/csharp/life/src/life_main.cs +++ b/apps/csharp/life/src/life_main.cs | |||
@@ -6,19 +6,19 @@ public class LifeWindow : Efl.Csharp.Application | |||
6 | private LifeRender lifeRender; | 6 | private LifeRender lifeRender; |
7 | private Efl.Ui.Win win; | 7 | private Efl.Ui.Win win; |
8 | 8 | ||
9 | void ResizeEvt(object sender, EventArgs ev) | 9 | void ResizeEvent(object sender, EventArgs ev) |
10 | { | 10 | { |
11 | lifeRender.RenderLayout((Efl.Ui.Win)sender); | 11 | lifeRender.RenderLayout((Efl.Ui.Win)sender); |
12 | } | 12 | } |
13 | 13 | ||
14 | void QuitEvt(object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args ev) | 14 | void QuitEvent(object sender, Efl.Gfx.IEntityVisibilityChangedEventArgs ev) |
15 | { | 15 | { |
16 | // quit the mainloop | 16 | // quit the mainloop |
17 | if (ev.arg == false) | 17 | if (ev.arg == false) |
18 | Efl.App.AppMain.Quit(0); | 18 | Efl.App.AppMain.Quit(0); |
19 | } | 19 | } |
20 | 20 | ||
21 | void TouchEvt(object sender, Efl.Input.IInterfacePointerDownEvt_Args ev) | 21 | void TouchEvent(object sender, Efl.Input.IInterfacePointerDownEventArgs ev) |
22 | { | 22 | { |
23 | int cellx, celly; | 23 | int cellx, celly; |
24 | var position = ev.arg.GetPosition(); | 24 | var position = ev.arg.GetPosition(); |
@@ -29,7 +29,7 @@ public class LifeWindow : Efl.Csharp.Application | |||
29 | lifeRender.RenderCell(win, cellx, celly); | 29 | lifeRender.RenderCell(win, cellx, celly); |
30 | } | 30 | } |
31 | 31 | ||
32 | void KeyDownEvt(object sender, Efl.Input.IInterfaceKeyDownEvt_Args ev) | 32 | void KeyDownEvent(object sender, Efl.Input.IInterfaceKeyDownEventArgs ev) |
33 | { | 33 | { |
34 | if (ev.arg.GetKeySym() == "space") | 34 | if (ev.arg.GetKeySym() == "space") |
35 | lifeBoard.TogglePause(win); | 35 | lifeBoard.TogglePause(win); |
@@ -42,7 +42,7 @@ public class LifeWindow : Efl.Csharp.Application | |||
42 | win.SetAutohide(true); | 42 | win.SetAutohide(true); |
43 | 43 | ||
44 | // when the user clicks "close" on a window there is a request to hide | 44 | // when the user clicks "close" on a window there is a request to hide |
45 | ((Efl.Gfx.IEntity)win).VisibilityChangedEvt += QuitEvt; | 45 | ((Efl.Gfx.IEntity)win).VisibilityChangedEvent += QuitEvent; |
46 | 46 | ||
47 | Eina.Size2D sz; | 47 | Eina.Size2D sz; |
48 | sz.W = (int)(10 * LifeBoard.Width * win.GetScale()); | 48 | sz.W = (int)(10 * LifeBoard.Width * win.GetScale()); |
@@ -52,9 +52,9 @@ public class LifeWindow : Efl.Csharp.Application | |||
52 | lifeRender = new LifeRender(win, lifeBoard); | 52 | lifeRender = new LifeRender(win, lifeBoard); |
53 | lifeRender.Refresh(win); | 53 | lifeRender.Refresh(win); |
54 | 54 | ||
55 | ((Efl.Gfx.IEntity)win).SizeChangedEvt += ResizeEvt; | 55 | ((Efl.Gfx.IEntity)win).SizeChangedEvent += ResizeEvent; |
56 | ((Efl.Input.IInterface)win).PointerDownEvt += TouchEvt; | 56 | ((Efl.Input.IInterface)win).PointerDownEvent += TouchEvent; |
57 | ((Efl.Input.IInterface)win).KeyDownEvt += KeyDownEvt; | 57 | ((Efl.Input.IInterface)win).KeyDownEvent += KeyDownEvent; |
58 | 58 | ||
59 | win.SetSize(sz); | 59 | win.SetSize(sz); |
60 | 60 | ||
diff --git a/apps/csharp/texteditor/src/texteditor_main.cs b/apps/csharp/texteditor/src/texteditor_main.cs index ead73da2..55ef9379 100644 --- a/apps/csharp/texteditor/src/texteditor_main.cs +++ b/apps/csharp/texteditor/src/texteditor_main.cs | |||
@@ -32,7 +32,7 @@ public class TextEditor : Efl.Csharp.Application | |||
32 | "texteditor_example.txt"); | 32 | "texteditor_example.txt"); |
33 | 33 | ||
34 | // Quits the application | 34 | // Quits the application |
35 | private void GUIQuitCb(object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args ea) | 35 | private void GUIQuitCb(object sender, Efl.Gfx.IEntityVisibilityChangedEventArgs ea) |
36 | { | 36 | { |
37 | if (ea.arg == false) | 37 | if (ea.arg == false) |
38 | Efl.App.AppMain.Quit(0); | 38 | Efl.App.AppMain.Quit(0); |
@@ -63,8 +63,8 @@ public class TextEditor : Efl.Csharp.Application | |||
63 | popup.SetScrollableText(message); | 63 | popup.SetScrollableText(message); |
64 | popup.SetHintSizeMax(new Eina.Size2D(200, 200)); | 64 | popup.SetHintSizeMax(new Eina.Size2D(200, 200)); |
65 | popup.SetButton(Efl.Ui.AlertPopupButton.Positive, "OK", null); | 65 | popup.SetButton(Efl.Ui.AlertPopupButton.Positive, "OK", null); |
66 | popup.ButtonClickedEvt += | 66 | popup.ButtonClickedEvent += |
67 | (object sender, Efl.Ui.AlertPopupButtonClickedEvt_Args ea) => { | 67 | (object sender, Efl.Ui.AlertPopupButtonClickedEventArgs ea) => { |
68 | // Dismiss popup when the button is clicked | 68 | // Dismiss popup when the button is clicked |
69 | ((Efl.Ui.AlertPopup)sender).SetParent(null); | 69 | ((Efl.Ui.AlertPopup)sender).SetParent(null); |
70 | }; | 70 | }; |
@@ -72,11 +72,11 @@ public class TextEditor : Efl.Csharp.Application | |||
72 | 72 | ||
73 | // Adds a button to the toolbar, with the given text, icon and click event handler | 73 | // Adds a button to the toolbar, with the given text, icon and click event handler |
74 | private Efl.Ui.Button GUIToolbarButtonAdd(Efl.Ui.Box toolbar, string name, | 74 | private Efl.Ui.Button GUIToolbarButtonAdd(Efl.Ui.Box toolbar, string name, |
75 | string iconName, EventHandler<Efl.Input.IClickableClickedEvt_Args> func) | 75 | string iconName, EventHandler<Efl.Input.IClickableClickedEventArgs> func) |
76 | { | 76 | { |
77 | var button = new Efl.Ui.Button(toolbar); | 77 | var button = new Efl.Ui.Button(toolbar); |
78 | button.SetText(name); | 78 | button.SetText(name); |
79 | button.ClickedEvt += func; | 79 | button.ClickedEvent += func; |
80 | button.SetHintWeight(0, 1); | 80 | button.SetHintWeight(0, 1); |
81 | 81 | ||
82 | // Set the content of the button, which is an image | 82 | // Set the content of the button, which is an image |
@@ -102,7 +102,7 @@ public class TextEditor : Efl.Csharp.Application | |||
102 | 102 | ||
103 | // "New" button | 103 | // "New" button |
104 | toolbarButtonNew = GUIToolbarButtonAdd(bar, "New", "document-new", | 104 | toolbarButtonNew = GUIToolbarButtonAdd(bar, "New", "document-new", |
105 | (object sender, Efl.Input.IClickableClickedEvt_Args ea) => { | 105 | (object sender, Efl.Input.IClickableClickedEventArgs ea) => { |
106 | // When this button is clicked, remove content and refresh toolbar | 106 | // When this button is clicked, remove content and refresh toolbar |
107 | editorTextBox.SetText(""); | 107 | editorTextBox.SetText(""); |
108 | GUIToolbarRefresh(); | 108 | GUIToolbarRefresh(); |
@@ -110,7 +110,7 @@ public class TextEditor : Efl.Csharp.Application | |||
110 | 110 | ||
111 | // "Save" button | 111 | // "Save" button |
112 | toolbarButtonSave = GUIToolbarButtonAdd(bar, "Save", "document-save", | 112 | toolbarButtonSave = GUIToolbarButtonAdd(bar, "Save", "document-save", |
113 | (object sender, Efl.Input.IClickableClickedEvt_Args ea) => { | 113 | (object sender, Efl.Input.IClickableClickedEventArgs ea) => { |
114 | // When this button is clicked, try to save content and refresh toolbar | 114 | // When this button is clicked, try to save content and refresh toolbar |
115 | try { | 115 | try { |
116 | System.IO.File.WriteAllText(filename, editorTextBox.GetText()); | 116 | System.IO.File.WriteAllText(filename, editorTextBox.GetText()); |
@@ -125,7 +125,7 @@ public class TextEditor : Efl.Csharp.Application | |||
125 | 125 | ||
126 | // "Load" button | 126 | // "Load" button |
127 | toolbarButtonLoad = GUIToolbarButtonAdd(bar, "Load", "document-open", | 127 | toolbarButtonLoad = GUIToolbarButtonAdd(bar, "Load", "document-open", |
128 | (object sender, Efl.Input.IClickableClickedEvt_Args ea) => { | 128 | (object sender, Efl.Input.IClickableClickedEventArgs ea) => { |
129 | // When this button is clicked, try to load content and refresh toolbar | 129 | // When this button is clicked, try to load content and refresh toolbar |
130 | try { | 130 | try { |
131 | editorTextBox.SetText(System.IO.File.ReadAllText(filename)); | 131 | editorTextBox.SetText(System.IO.File.ReadAllText(filename)); |
@@ -147,7 +147,7 @@ public class TextEditor : Efl.Csharp.Application | |||
147 | bar.Pack(box); | 147 | bar.Pack(box); |
148 | 148 | ||
149 | // "Quit" button | 149 | // "Quit" button |
150 | GUIToolbarButtonAdd(bar, "Quit", "application-exit", (object sender, Efl.Input.IClickableClickedEvt_Args e) => { Efl.Ui.Config.Exit(); } ); | 150 | GUIToolbarButtonAdd(bar, "Quit", "application-exit", (object sender, Efl.Input.IClickableClickedEventArgs e) => { Efl.Ui.Config.Exit(); } ); |
151 | } | 151 | } |
152 | 152 | ||
153 | // Builds the user interface for the text editor | 153 | // Builds the user interface for the text editor |
@@ -157,7 +157,7 @@ public class TextEditor : Efl.Csharp.Application | |||
157 | win = new Efl.Ui.Win(parent: Efl.App.AppMain); | 157 | win = new Efl.Ui.Win(parent: Efl.App.AppMain); |
158 | win.SetText("Text Editor"); | 158 | win.SetText("Text Editor"); |
159 | win.SetAutohide(true); | 159 | win.SetAutohide(true); |
160 | win.VisibilityChangedEvt += GUIQuitCb; | 160 | win.VisibilityChangedEvent += GUIQuitCb; |
161 | 161 | ||
162 | // Create a vertical box container | 162 | // Create a vertical box container |
163 | Efl.Ui.Box box = new Efl.Ui.Box(win); | 163 | Efl.Ui.Box box = new Efl.Ui.Box(win); |
@@ -173,8 +173,8 @@ public class TextEditor : Efl.Csharp.Application | |||
173 | editorTextBox.Editable = true; | 173 | editorTextBox.Editable = true; |
174 | editorTextBox.Scrollable = true; | 174 | editorTextBox.Scrollable = true; |
175 | editorTextBox.SetHintSizeMin(new Eina.Size2D(360, 240)); | 175 | editorTextBox.SetHintSizeMin(new Eina.Size2D(360, 240)); |
176 | editorTextBox.ChangedEvt += EditorChangedCb; | 176 | editorTextBox.ChangedEvent += EditorChangedCb; |
177 | editorTextBox.ChangedUserEvt += EditorChangedCb; | 177 | editorTextBox.ChangedUserEvent += EditorChangedCb; |
178 | box.Pack(editorTextBox); | 178 | box.Pack(editorTextBox); |
179 | 179 | ||
180 | // Initial refresh of the toolbar buttons | 180 | // Initial refresh of the toolbar buttons |
diff --git a/reference/csharp/core/src/core_event.cs b/reference/csharp/core/src/core_event.cs index bb617bd1..43a5d679 100644 --- a/reference/csharp/core/src/core_event.cs +++ b/reference/csharp/core/src/core_event.cs | |||
@@ -22,14 +22,14 @@ public class Example : Efl.Csharp.Application | |||
22 | mainloop.SetName("Mainloop"); | 22 | mainloop.SetName("Mainloop"); |
23 | 23 | ||
24 | // This event gets triggered continuously | 24 | // This event gets triggered continuously |
25 | mainloop.PollHighEvt += PollCb; | 25 | mainloop.PollHighEvent += PollCb; |
26 | 26 | ||
27 | // This timer will control events fired by the main loop | 27 | // This timer will control events fired by the main loop |
28 | var timer = new Efl.LoopTimer(mainloop, 0.1); | 28 | var timer = new Efl.LoopTimer(mainloop, 0.1); |
29 | timer.SetName("Timer"); | 29 | timer.SetName("Timer"); |
30 | // To count number of timer triggers | 30 | // To count number of timer triggers |
31 | int tick_count = 0; | 31 | int tick_count = 0; |
32 | timer.TimerTickEvt += (object sender, EventArgs e) => { | 32 | timer.TimerTickEvent += (object sender, EventArgs e) => { |
33 | string message = "Tick {0} from {1}: "; | 33 | string message = "Tick {0} from {1}: "; |
34 | // Depending on the number of timer ticks, it does a different thing | 34 | // Depending on the number of timer ticks, it does a different thing |
35 | switch (tick_count) { | 35 | switch (tick_count) { |
diff --git a/reference/csharp/core/src/core_idler.cs b/reference/csharp/core/src/core_idler.cs index 224511b8..458a15d0 100644 --- a/reference/csharp/core/src/core_idler.cs +++ b/reference/csharp/core/src/core_idler.cs | |||
@@ -17,19 +17,19 @@ public class Example : Efl.Csharp.Application | |||
17 | var mainloop = Efl.App.AppMain; | 17 | var mainloop = Efl.App.AppMain; |
18 | 18 | ||
19 | // Register to all Idle events | 19 | // Register to all Idle events |
20 | mainloop.IdleEnterEvt += (object sender, EventArgs e) => { | 20 | mainloop.IdleEnterEvent += (object sender, EventArgs e) => { |
21 | Console.WriteLine("IDLE ENTER: Entering idle state."); | 21 | Console.WriteLine("IDLE ENTER: Entering idle state."); |
22 | }; | 22 | }; |
23 | mainloop.IdleEvt += (object sender, EventArgs e) => { | 23 | mainloop.IdleEvent += (object sender, EventArgs e) => { |
24 | Console.WriteLine("IDLE: Executing idler callback while in idle state."); | 24 | Console.WriteLine("IDLE: Executing idler callback while in idle state."); |
25 | }; | 25 | }; |
26 | mainloop.IdleExitEvt += (object sender, EventArgs e) => { | 26 | mainloop.IdleExitEvent += (object sender, EventArgs e) => { |
27 | Console.WriteLine("IDLE EXIT: Leaving idle state."); | 27 | Console.WriteLine("IDLE EXIT: Leaving idle state."); |
28 | }; | 28 | }; |
29 | 29 | ||
30 | // Use a timer to exit the application | 30 | // Use a timer to exit the application |
31 | var timer = new Efl.LoopTimer(mainloop, 0.02); | 31 | var timer = new Efl.LoopTimer(mainloop, 0.02); |
32 | timer.TimerTickEvt += (object sender, EventArgs e) => { | 32 | timer.TimerTickEvent += (object sender, EventArgs e) => { |
33 | Console.WriteLine("TIMER: timer callback called, exiting."); | 33 | Console.WriteLine("TIMER: timer callback called, exiting."); |
34 | mainloop.Quit(0); | 34 | mainloop.Quit(0); |
35 | }; | 35 | }; |
diff --git a/reference/csharp/core/src/core_poll.cs b/reference/csharp/core/src/core_poll.cs index 0032223d..9f233c19 100644 --- a/reference/csharp/core/src/core_poll.cs +++ b/reference/csharp/core/src/core_poll.cs | |||
@@ -16,19 +16,19 @@ public class Example : Efl.Csharp.Application | |||
16 | var mainloop = Efl.App.AppMain; | 16 | var mainloop = Efl.App.AppMain; |
17 | 17 | ||
18 | // Register to all Poll events | 18 | // Register to all Poll events |
19 | mainloop.PollLowEvt += (object sender, EventArgs e) => { | 19 | mainloop.PollLowEvent += (object sender, EventArgs e) => { |
20 | Console.Write("L"); | 20 | Console.Write("L"); |
21 | }; | 21 | }; |
22 | mainloop.PollMediumEvt += (object sender, EventArgs e) => { | 22 | mainloop.PollMediumEvent += (object sender, EventArgs e) => { |
23 | Console.Write("M"); | 23 | Console.Write("M"); |
24 | }; | 24 | }; |
25 | mainloop.PollHighEvt += (object sender, EventArgs e) => { | 25 | mainloop.PollHighEvent += (object sender, EventArgs e) => { |
26 | Console.Write("."); | 26 | Console.Write("."); |
27 | }; | 27 | }; |
28 | 28 | ||
29 | // Use a timer to exit the application | 29 | // Use a timer to exit the application |
30 | var timer = new Efl.LoopTimer(mainloop, 30); | 30 | var timer = new Efl.LoopTimer(mainloop, 30); |
31 | timer.TimerTickEvt += (object sender, EventArgs e) => { | 31 | timer.TimerTickEvent += (object sender, EventArgs e) => { |
32 | Console.WriteLine("\nTIMER: timer callback called, exiting."); | 32 | Console.WriteLine("\nTIMER: timer callback called, exiting."); |
33 | mainloop.Quit(0); | 33 | mainloop.Quit(0); |
34 | }; | 34 | }; |
diff --git a/reference/csharp/snippets/Efl.Ui.Win.cs b/reference/csharp/snippets/Efl.Ui.Win.cs index 59ede8bc..c4712e77 100644 --- a/reference/csharp/snippets/Efl.Ui.Win.cs +++ b/reference/csharp/snippets/Efl.Ui.Win.cs | |||
@@ -1,6 +1,6 @@ | |||
1 | var win = new Efl.Ui.Win(Efl.App.AppMain); | 1 | var win = new Efl.Ui.Win(Efl.App.AppMain); |
2 | win.SetText("Hello World"); | 2 | win.SetText("Hello World"); |
3 | win.SetAutohide(true); | 3 | win.SetAutohide(true); |
4 | win.VisibilityChangedEvt += | 4 | win.VisibilityChangedEvent += |
5 | (object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args e) => {}; | 5 | (object sender, Efl.Gfx.IEntityVisibilityChangedEventArgs e) => {}; |
6 | 6 | ||
diff --git a/reference/csharp/ui/src/focus_main.cs b/reference/csharp/ui/src/focus_main.cs index 4ced2a8d..ae943ba5 100644 --- a/reference/csharp/ui/src/focus_main.cs +++ b/reference/csharp/ui/src/focus_main.cs | |||
@@ -13,7 +13,7 @@ public class Example : Efl.Csharp.Application | |||
13 | var win = new Efl.Ui.Win(null, winType: Efl.Ui.WinType.Basic); | 13 | var win = new Efl.Ui.Win(null, winType: Efl.Ui.WinType.Basic); |
14 | win.SetText("Focus example"); | 14 | win.SetText("Focus example"); |
15 | win.SetAutohide(true); | 15 | win.SetAutohide(true); |
16 | win.VisibilityChangedEvt += (object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args e) => { | 16 | win.VisibilityChangedEvent += (object sender, Efl.Gfx.IEntityVisibilityChangedEventArgs e) => { |
17 | // Exit the EFL main loop | 17 | // Exit the EFL main loop |
18 | if (e.arg == false) | 18 | if (e.arg == false) |
19 | Efl.Ui.Config.Exit(); | 19 | Efl.Ui.Config.Exit(); |
@@ -32,7 +32,7 @@ public class Example : Efl.Csharp.Application | |||
32 | checkbox.SetText("Check " + i); | 32 | checkbox.SetText("Check " + i); |
33 | checkbox.SetHintFill(false, false); | 33 | checkbox.SetHintFill(false, false); |
34 | checkbox.SetHintAlign(0.5, 0.5); | 34 | checkbox.SetHintAlign(0.5, 0.5); |
35 | checkbox.FocusChangedEvt += FocusChangedCb; | 35 | checkbox.FocusChangedEvent += FocusChangedCb; |
36 | vbox.Pack(checkbox); | 36 | vbox.Pack(checkbox); |
37 | if (i == 0) first_checkbox = checkbox; | 37 | if (i == 0) first_checkbox = checkbox; |
38 | }; | 38 | }; |
@@ -45,8 +45,8 @@ public class Example : Efl.Csharp.Application | |||
45 | // Create a "Focus Mover" button | 45 | // Create a "Focus Mover" button |
46 | var button = new Efl.Ui.Button(hbox); | 46 | var button = new Efl.Ui.Button(hbox); |
47 | button.SetText("Focus mover"); | 47 | button.SetText("Focus mover"); |
48 | button.FocusChangedEvt += FocusChangedCb; | 48 | button.FocusChangedEvent += FocusChangedCb; |
49 | button.ClickedEvt += (object sender, Efl.Input.IClickableClickedEvt_Args e) => { | 49 | button.ClickedEvent += (object sender, Efl.Input.IClickableClickedEventArgs e) => { |
50 | Console.WriteLine("Clicked Focus Mover"); | 50 | Console.WriteLine("Clicked Focus Mover"); |
51 | // Manually transfer focus to the first check box | 51 | // Manually transfer focus to the first check box |
52 | Efl.Ui.Focus.Util.Focus(first_checkbox); | 52 | Efl.Ui.Focus.Util.Focus(first_checkbox); |
@@ -56,8 +56,8 @@ public class Example : Efl.Csharp.Application | |||
56 | // Create a Quit button | 56 | // Create a Quit button |
57 | button = new Efl.Ui.Button(hbox); | 57 | button = new Efl.Ui.Button(hbox); |
58 | button.SetText("Quit"); | 58 | button.SetText("Quit"); |
59 | button.FocusChangedEvt += FocusChangedCb; | 59 | button.FocusChangedEvent += FocusChangedCb; |
60 | button.ClickedEvt += (object sender, Efl.Input.IClickableClickedEvt_Args e) => { | 60 | button.ClickedEvent += (object sender, Efl.Input.IClickableClickedEventArgs e) => { |
61 | Console.WriteLine("Clicked Quit"); | 61 | Console.WriteLine("Clicked Quit"); |
62 | Efl.Ui.Config.Exit(); | 62 | Efl.Ui.Config.Exit(); |
63 | }; | 63 | }; |
diff --git a/reference/csharp/ui/src/ui_container.cs b/reference/csharp/ui/src/ui_container.cs index c3f05daa..9d987e17 100644 --- a/reference/csharp/ui/src/ui_container.cs +++ b/reference/csharp/ui/src/ui_container.cs | |||
@@ -63,7 +63,7 @@ public class Example : Efl.Csharp.Application | |||
63 | Efl.Ui.Win win = new Efl.Ui.Win(null, winType: Efl.Ui.WinType.Basic); | 63 | Efl.Ui.Win win = new Efl.Ui.Win(null, winType: Efl.Ui.WinType.Basic); |
64 | win.SetText("Container demo"); | 64 | win.SetText("Container demo"); |
65 | win.SetAutohide(true); | 65 | win.SetAutohide(true); |
66 | win.VisibilityChangedEvt += (object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args e) => { | 66 | win.VisibilityChangedEvent += (object sender, Efl.Gfx.IEntityVisibilityChangedEventArgs e) => { |
67 | // Exit the EFL main loop | 67 | // Exit the EFL main loop |
68 | if (e.arg == false) | 68 | if (e.arg == false) |
69 | Efl.Ui.Config.Exit(); | 69 | Efl.Ui.Config.Exit(); |
@@ -98,7 +98,7 @@ public class Example : Efl.Csharp.Application | |||
98 | Efl.Ui.Button quit_btn = new Efl.Ui.Button(win); | 98 | Efl.Ui.Button quit_btn = new Efl.Ui.Button(win); |
99 | quit_btn.SetText("Quit"); | 99 | quit_btn.SetText("Quit"); |
100 | quit_btn.SetHintSizeMax(new Eina.Size2D(150, 30)); | 100 | quit_btn.SetHintSizeMax(new Eina.Size2D(150, 30)); |
101 | quit_btn.ClickedEvt += (object sender, Efl.Input.IClickableClickedEvt_Args e) => { | 101 | quit_btn.ClickedEvent += (object sender, Efl.Input.IClickableClickedEventArgs e) => { |
102 | // Exit the EFL main loop | 102 | // Exit the EFL main loop |
103 | Efl.Ui.Config.Exit(); | 103 | Efl.Ui.Config.Exit(); |
104 | }; | 104 | }; |
diff --git a/reference/csharp/ui/src/ui_custom_widget.cs b/reference/csharp/ui/src/ui_custom_widget.cs index 03e57afd..6cc14d2c 100644 --- a/reference/csharp/ui/src/ui_custom_widget.cs +++ b/reference/csharp/ui/src/ui_custom_widget.cs | |||
@@ -36,7 +36,7 @@ public class Example : Efl.Csharp.Application | |||
36 | Efl.Ui.Win win = new Efl.Ui.Win(null, winType: Efl.Ui.WinType.Basic); | 36 | Efl.Ui.Win win = new Efl.Ui.Win(null, winType: Efl.Ui.WinType.Basic); |
37 | win.SetText("Custom widget demo"); | 37 | win.SetText("Custom widget demo"); |
38 | win.SetAutohide(true); | 38 | win.SetAutohide(true); |
39 | win.VisibilityChangedEvt += (object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args e) => { | 39 | win.VisibilityChangedEvent += (object sender, Efl.Gfx.IEntityVisibilityChangedEventArgs e) => { |
40 | // Exit the EFL main loop when the window is closed | 40 | // Exit the EFL main loop when the window is closed |
41 | if (e.arg == false) | 41 | if (e.arg == false) |
42 | Efl.Ui.Config.Exit(); | 42 | Efl.Ui.Config.Exit(); |
@@ -46,7 +46,7 @@ public class Example : Efl.Csharp.Application | |||
46 | 46 | ||
47 | // Instantiate our custom button widget | 47 | // Instantiate our custom button widget |
48 | MyButton btn = new MyButton(win, 99); | 48 | MyButton btn = new MyButton(win, 99); |
49 | btn.ClickedEvt += (object sender, Efl.Input.IClickableClickedEvt_Args e) => { | 49 | btn.ClickedEvent += (object sender, Efl.Input.IClickableClickedEventArgs e) => { |
50 | // When the button is clicked, change its text | 50 | // When the button is clicked, change its text |
51 | MyButton b = (MyButton)sender; | 51 | MyButton b = (MyButton)sender; |
52 | b.SetText("Hello!"); | 52 | b.SetText("Hello!"); |
diff --git a/reference/csharp/ui/src/ui_sizing.cs b/reference/csharp/ui/src/ui_sizing.cs index e1574c88..23e0f2d1 100644 --- a/reference/csharp/ui/src/ui_sizing.cs +++ b/reference/csharp/ui/src/ui_sizing.cs | |||
@@ -16,7 +16,7 @@ public class Example : Efl.Csharp.Application | |||
16 | Efl.Ui.Win win = new Efl.Ui.Win(null, winType: Efl.Ui.WinType.Basic); | 16 | Efl.Ui.Win win = new Efl.Ui.Win(null, winType: Efl.Ui.WinType.Basic); |
17 | win.SetText("Size Control"); | 17 | win.SetText("Size Control"); |
18 | win.SetAutohide(true); | 18 | win.SetAutohide(true); |
19 | win.VisibilityChangedEvt += (object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args e) => { | 19 | win.VisibilityChangedEvent += (object sender, Efl.Gfx.IEntityVisibilityChangedEventArgs e) => { |
20 | // Exit the EFL main loop | 20 | // Exit the EFL main loop |
21 | if (e.arg == false) | 21 | if (e.arg == false) |
22 | Efl.Ui.Config.Exit(); | 22 | Efl.Ui.Config.Exit(); |
diff --git a/tutorial/csharp/hello-gui/src/gui_main.cs b/tutorial/csharp/hello-gui/src/gui_main.cs index fc1cf18f..a0a40d6f 100644 --- a/tutorial/csharp/hello-gui/src/gui_main.cs +++ b/tutorial/csharp/hello-gui/src/gui_main.cs | |||
@@ -3,7 +3,7 @@ using System; | |||
3 | public class Example : Efl.Csharp.Application | 3 | public class Example : Efl.Csharp.Application |
4 | { | 4 | { |
5 | // Callback to quit the application | 5 | // Callback to quit the application |
6 | public static void QuitCb(object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args e) | 6 | public static void QuitCb(object sender, Efl.Gfx.IEntityVisibilityChangedEventArgs e) |
7 | { | 7 | { |
8 | // Exit the EFL main loop | 8 | // Exit the EFL main loop |
9 | if (e.arg == false) | 9 | if (e.arg == false) |
@@ -20,7 +20,7 @@ public class Example : Efl.Csharp.Application | |||
20 | // button is pressed | 20 | // button is pressed |
21 | win.SetAutohide(true); | 21 | win.SetAutohide(true); |
22 | // Hook to the Hide event | 22 | // Hook to the Hide event |
23 | win.VisibilityChangedEvt += QuitCb; | 23 | win.VisibilityChangedEvent += QuitCb; |
24 | 24 | ||
25 | // Create a box container | 25 | // Create a box container |
26 | var box = new Efl.Ui.Box(win); | 26 | var box = new Efl.Ui.Box(win); |
@@ -48,7 +48,7 @@ public class Example : Efl.Csharp.Application | |||
48 | button.SetText("Quit"); | 48 | button.SetText("Quit"); |
49 | button.SetHintWeight(1.0, 0.1); | 49 | button.SetHintWeight(1.0, 0.1); |
50 | // Set the method to be called when the button is pressed | 50 | // Set the method to be called when the button is pressed |
51 | button.ClickedEvt += (object sender, Efl.Input.IClickableClickedEvt_Args e) => { Efl.App.AppMain.Quit(0); }; | 51 | button.ClickedEvent += (object sender, Efl.Input.IClickableClickedEventArgs e) => { Efl.App.AppMain.Quit(0); }; |
52 | // Add the button to the box container | 52 | // Add the button to the box container |
53 | box.Pack(button); | 53 | box.Pack(button); |
54 | } | 54 | } |
diff --git a/unsorted/elementary/efl_ui_slider_mono.cs b/unsorted/elementary/efl_ui_slider_mono.cs index c6787edf..d15ad680 100644 --- a/unsorted/elementary/efl_ui_slider_mono.cs +++ b/unsorted/elementary/efl_ui_slider_mono.cs | |||
@@ -10,7 +10,7 @@ public class Example | |||
10 | button.SetText(text); | 10 | button.SetText(text); |
11 | button.SetSize(new Eina.Size2D(w, h)); | 11 | button.SetSize(new Eina.Size2D(w, h)); |
12 | 12 | ||
13 | button.ClickedEvt += callback; | 13 | button.ClickedEvent += callback; |
14 | 14 | ||
15 | return button; | 15 | return button; |
16 | } | 16 | } |
@@ -56,7 +56,7 @@ public class Example | |||
56 | Efl.Ui.Slider slider = new Efl.Ui.Slider(box); | 56 | Efl.Ui.Slider slider = new Efl.Ui.Slider(box); |
57 | slider.SetSize(new Eina.Size2D(W, H)); | 57 | slider.SetSize(new Eina.Size2D(W, H)); |
58 | 58 | ||
59 | slider.ChangedEvt += (object sender, EventArgs e) => { | 59 | slider.ChangedEvent += (object sender, EventArgs e) => { |
60 | bar.SetRangeValue(slider.GetRangeValue()); | 60 | bar.SetRangeValue(slider.GetRangeValue()); |
61 | }; | 61 | }; |
62 | 62 | ||
diff --git a/unsorted/elementary/efl_ui_unit_converter.cs b/unsorted/elementary/efl_ui_unit_converter.cs index 64286a20..cf268464 100644 --- a/unsorted/elementary/efl_ui_unit_converter.cs +++ b/unsorted/elementary/efl_ui_unit_converter.cs | |||
@@ -23,7 +23,7 @@ public class Example | |||
23 | popup.SetVisible(true); | 23 | popup.SetVisible(true); |
24 | popup.SetButton(Efl.Ui.Popup_Alert_Button.Positive, "Ok"); | 24 | popup.SetButton(Efl.Ui.Popup_Alert_Button.Positive, "Ok"); |
25 | popup.SetSize(new Eina.Size2D(150, 30)); | 25 | popup.SetSize(new Eina.Size2D(150, 30)); |
26 | popup.ButtonClickedEvt += (object sender, Efl.Ui.Popup_Alert.ButtonClickedEvt_Args e) => { | 26 | popup.ButtonClickedEvent += (object sender, Efl.Ui.Popup_Alert.ButtonClickedEventArgs e) => { |
27 | popup.SetParent(null); | 27 | popup.SetParent(null); |
28 | popup.Invalidate(); | 28 | popup.Invalidate(); |
29 | }; | 29 | }; |
@@ -99,7 +99,7 @@ public class Example | |||
99 | kms_box.DoPack(kms_input); | 99 | kms_box.DoPack(kms_input); |
100 | kms_box.DoPack(kms_button); | 100 | kms_box.DoPack(kms_button); |
101 | 101 | ||
102 | kms_button.ClickedEvt += (object sender, EventArgs e) => { | 102 | kms_button.ClickedEvent += (object sender, EventArgs e) => { |
103 | try | 103 | try |
104 | { | 104 | { |
105 | string text = kms_input.GetText(); | 105 | string text = kms_input.GetText(); |
@@ -115,7 +115,7 @@ public class Example | |||
115 | } | 115 | } |
116 | }; | 116 | }; |
117 | 117 | ||
118 | miles_button.ClickedEvt += (object sender, EventArgs e) => { | 118 | miles_button.ClickedEvent += (object sender, EventArgs e) => { |
119 | try | 119 | try |
120 | { | 120 | { |
121 | string text = miles_input.GetText(); | 121 | string text = miles_input.GetText(); |
diff --git a/unsorted/evas/evas_mono_rectangle.cs b/unsorted/evas/evas_mono_rectangle.cs index 0b363a76..9fb85b2b 100644 --- a/unsorted/evas/evas_mono_rectangle.cs +++ b/unsorted/evas/evas_mono_rectangle.cs | |||
@@ -30,7 +30,7 @@ class TestMain | |||
30 | rect.SetSize(size); | 30 | rect.SetSize(size); |
31 | rect.SetVisible(true); | 31 | rect.SetVisible(true); |
32 | 32 | ||
33 | canvas.KeyDownEvt += (object sender, Efl.Input.Interface.KeyDownEvt_Args e) => { | 33 | canvas.KeyDownEvent += (object sender, Efl.Input.Interface.KeyDownEventArgs e) => { |
34 | color_index = (color_index + 1) % 3; | 34 | color_index = (color_index + 1) % 3; |
35 | Console.WriteLine("Key Down"); | 35 | Console.WriteLine("Key Down"); |
36 | Console.WriteLine("Got key obj at {0}", e.arg.raw_handle.ToString("X")); | 36 | Console.WriteLine("Got key obj at {0}", e.arg.raw_handle.ToString("X")); |
diff --git a/unsorted/evas/evas_mono_text.cs b/unsorted/evas/evas_mono_text.cs index eb7e4191..54bd3fde 100644 --- a/unsorted/evas/evas_mono_text.cs +++ b/unsorted/evas/evas_mono_text.cs | |||
@@ -45,7 +45,7 @@ class TestMain | |||
45 | bg.SetVisible(true); | 45 | bg.SetVisible(true); |
46 | bg.SetKeyFocus(true); | 46 | bg.SetKeyFocus(true); |
47 | 47 | ||
48 | bg.KeyDownEvt += On_KeyDown; | 48 | bg.KeyDownEvent += On_KeyDown; |
49 | 49 | ||
50 | text = new evas.Text(canvas); | 50 | text = new evas.Text(canvas); |
51 | text.SetStyle(evas.Text_Style_Type.OutlineSoftShadow); | 51 | text.SetStyle(evas.Text_Style_Type.OutlineSoftShadow); |
@@ -87,7 +87,7 @@ class TestMain | |||
87 | 87 | ||
88 | } | 88 | } |
89 | 89 | ||
90 | private void On_KeyDown(object sender, Efl.Input.Interface.KeyDownEvt_Args e) | 90 | private void On_KeyDown(object sender, Efl.Input.Interface.KeyDownEventArgs e) |
91 | { | 91 | { |
92 | var key = e.arg.GetKey(); | 92 | var key = e.arg.GetKey(); |
93 | 93 | ||