aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-12-19 17:51:26 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-01-14 19:09:43 +0100
commitbc239358bf75a4a34b82292afcdbc75cf49a106b (patch)
tree68db092e8317b67e9369801cea8f9955fa329a79
parentAdapt examples to new App API (diff)
downloadexamples-devs/bu5hm4n/POC.tar.gz
demonstrate application and SimpleApplicationdevs/bu5hm4n/POC
-rw-r--r--apps/csharp/life/src/life_main.cs31
-rw-r--r--apps/csharp/texteditor/src/texteditor_main.cs25
-rw-r--r--reference/c/ui/src/ui_translation.c6
3 files changed, 32 insertions, 30 deletions
diff --git a/apps/csharp/life/src/life_main.cs b/apps/csharp/life/src/life_main.cs
index e59b61de..9c16c109 100644
--- a/apps/csharp/life/src/life_main.cs
+++ b/apps/csharp/life/src/life_main.cs
@@ -1,9 +1,13 @@
using System;
-public class LifeWindow
+public class LifeWindow : Efl.Csharp.Application
{
private LifeBoard lifeBoard;
private LifeRender lifeRender;
+ private Efl.Ui.Win win;
+ public LifeWindow() {
+
+ }
void ResizeEvt(object sender, EventArgs ev)
{
@@ -30,14 +34,13 @@ public class LifeWindow
void KeyDownEvt(object sender, Efl.Input.InterfaceKeyDownEvt_Args ev)
{
- Efl.Ui.Win win = (Efl.Ui.Win)sender;
if (ev.arg.GetKey() == "space")
lifeBoard.TogglePause(win);
}
- public LifeWindow()
+ protected override void OnInitialize(Eina.Array<System.String> args)
{
- Efl.Ui.Win win = new Efl.Ui.Win(null, (Efl.Ui.Win ewin) => {
+ win = new Efl.Ui.Win(null, (Efl.Ui.Win ewin) => {
ewin.SetWinType(Efl.Ui.WinType.Basic);
ewin.SetText("EFL Life");
ewin.SetAutohide(true);
@@ -62,19 +65,27 @@ public class LifeWindow
lifeBoard.Run(win);
}
+ protected void OnPause() {
+ if (win != null) {
+ lifeBoard.TogglePause(win);
+ }
+ }
+ protected void OnResume() {
+ if (win != null) {
+ lifeBoard.TogglePause(win);
+ }
+ }
+ protected void OnTerminate() {
+ Console.WriteLine("Goodbye.");
+ }
}
public class Example
{
public static void Main()
{
- Efl.All.Init(Efl.Components.Ui);
-
var lifeWin = new LifeWindow();
- // start the mainloop
- Efl.Ui.Config.Run();
-
- Efl.All.Shutdown();
+ lifeWin.Launch();
}
}
diff --git a/apps/csharp/texteditor/src/texteditor_main.cs b/apps/csharp/texteditor/src/texteditor_main.cs
index 69e95bf4..a4fb0f63 100644
--- a/apps/csharp/texteditor/src/texteditor_main.cs
+++ b/apps/csharp/texteditor/src/texteditor_main.cs
@@ -17,7 +17,7 @@
using System;
-public class TextEditor
+public class TextEditor : Efl.Csharp.Application
{
private Efl.Ui.Win win; // The main window
private Efl.Ui.Text editorTextBox; // The main text entry
@@ -31,6 +31,10 @@ public class TextEditor
private readonly string filename = System.IO.Path.Combine(System.IO.Path.GetTempPath(),
"texteditor_example.txt");
+ public TextEditor() {
+
+ }
+
// Quits the application
private void GUIQuitCb(object sender, EventArgs ea)
{
@@ -154,7 +158,7 @@ public class TextEditor
}
// Builds the user interface for the text editor
- public TextEditor()
+ protected override void OnInitialize(Eina.Array<System.String> args)
{
// Create a window and initialize it
win = new Efl.Ui.Win(Efl.App.AppMain, (Efl.Ui.Win ewin) => {
@@ -185,13 +189,6 @@ public class TextEditor
// Initial refresh of the toolbar buttons
GUIToolbarRefresh();
}
-
- // This method won't return until the application quits
- public void Run()
- {
- // Start the EFL main loop
- Efl.Ui.Config.Run();
- }
}
public class Example
@@ -201,14 +198,8 @@ public class Example
#endif
public static void Main()
{
- // Initialize EFL and all UI components
- Efl.All.Init(Efl.Components.Ui);
-
- var textEditor = new TextEditor();
- textEditor.Run();
-
- // Shutdown EFL
- Efl.All.Shutdown();
+ TextEditor editor = new TextEditor();
+ editor.Launch();
}
}
diff --git a/reference/c/ui/src/ui_translation.c b/reference/c/ui/src/ui_translation.c
index b8aa9884..f4e5e48c 100644
--- a/reference/c/ui/src/ui_translation.c
+++ b/reference/c/ui/src/ui_translation.c
@@ -45,15 +45,15 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
efl_content_set(win, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
- efl_ui_translatable_text_set(efl_added, "Translations", _TEXT_DOMAIN),
+// efl_ui_translatable_text_set(efl_added, "Translations", _TEXT_DOMAIN),
efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
- efl_ui_translatable_text_set(efl_added, "Help", _TEXT_DOMAIN),
+// efl_ui_translatable_text_set(efl_added, "Help", _TEXT_DOMAIN),
efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
- efl_ui_translatable_text_set(efl_added, "Quit", _TEXT_DOMAIN),
+// efl_ui_translatable_text_set(efl_added, "Quit", _TEXT_DOMAIN),
efl_pack_end(box, efl_added),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 100)),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,