enlightenment
/
examples
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efl_mono: Update tests and examples after rename 

Summary:
Separated from the generator and libs for easier review
Depends on D6050

Reviewers: felipealmeida, vitor.sousa

Reviewed By: vitor.sousa

Subscribers: cedric

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D6051
This commit is contained in:
Lauro Moura 2018-05-03 01:02:11 -03:00
parent 4eebe1b884
commit 93d75b47c9
10 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unsorted/efl_mono/EoInherit01.cs
View File

@ -2,7 +2,7 @@ using static System.Console;
class PlusTenNumberWrapper : example.NumberwrapperInherit
{
public PlusTenNumberWrapper(efl.Object parent = null)
public PlusTenNumberWrapper(efl.IObject parent = null)
: base(parent)
{}
@ -52,7 +52,7 @@ public class ExampleEoInherit01
WriteLine("## Using original object ##\n");
// Check original EFL object
var origObj = new example.NumberwrapperConcrete();
var origObj = new example.Numberwrapper();
given = 111;
origObj.SetNumber(given);
stored = origObj.GetNumber();

2
unsorted/efl_mono/FunctionPointer01.cs
View File

@ -15,7 +15,7 @@ public class ExampleFunctionPointer01
eina.Config.Init();
efl.eo.Config.Init();
var obj = new example.NumberwrapperConcrete();
var obj = new example.Numberwrapper();
// Set internal value
obj.SetNumber(12);

20
unsorted/elementary/efl_ui_slider_mono.cs
View File

@ -2,11 +2,11 @@ using System;
public class Example
{
public static efl.ui.Button CreateButton(efl.Object parent,
public static efl.ui.IButton CreateButton(efl.IObject parent,
string text,
int w, int h,
EventHandler callback) {
efl.ui.Button button = new efl.ui.ButtonConcrete(parent);
efl.ui.IButton button = new efl.ui.Button(parent);
button.SetText(text);
button.SetSize(new eina.Size2D(w, h));
@ -36,32 +36,32 @@ public class Example
efl.All.Init(efl.Components.Ui);
efl.ui.Win win = new efl.ui.WinConcrete(null);
efl.ui.Win win = new efl.ui.Win(null);
win.SetText("Hello, C#!!");
win.SetAutohide(true);
efl.ui.Box_Flow box = new efl.ui.Box_FlowConcrete(win);
efl.ui.Box_Flow box = new efl.ui.Box_Flow(win);
efl.ui.Button button = CreateButton(box, "Click to exit", 120, 30,
efl.ui.IButton button = CreateButton(box, "Click to exit", 120, 30,
(object sender, EventArgs e) => {
efl.ui.Config.Exit();
});
box.Pack(button);
box.DoPack(button);
efl.ui.Progressbar bar = new efl.ui.ProgressbarConcrete(box);
efl.ui.Progressbar bar = new efl.ui.Progressbar(box);
bar.SetSize(new eina.Size2D(W, H));
bar.SetFormatCb(Formatter);
efl.ui.Slider slider = new efl.ui.SliderConcrete(box);
efl.ui.ISlider slider = new efl.ui.Slider(box);
slider.SetSize(new eina.Size2D(W, H));
slider.ChangedEvt += (object sender, EventArgs e) => {
bar.SetRangeValue(slider.GetRangeValue());
};
box.Pack(bar);
box.Pack(slider);
box.DoPack(bar);
box.DoPack(slider);
button.SetVisible(true);
box.SetVisible(true);

42
unsorted/elementary/efl_ui_unit_converter.cs
View File

@ -16,14 +16,14 @@ public class Example
private static void ShowErrorPopup(efl.ui.Win win, string message)
{
efl.ui.Popup_Alert popup = new efl.ui.Popup_AlertConcrete(win);
efl.ui.Text popup_text = new efl.ui.TextConcrete(popup);
efl.ui.IPopup_Alert popup = new efl.ui.Popup_Alert(win);
efl.ui.Text popup_text = new efl.ui.Text(popup);
popup_text.SetText($"Error: {message}");
popup.SetContent(popup_text);
popup.SetVisible(true);
popup.SetButton(efl.ui.Popup_Alert_Button.Positive, "Ok");
popup.SetSize(new eina.Size2D(150, 30));
popup.ButtonClickedEvt += (object sender, efl.ui.Popup_AlertConcrete.ButtonClickedEvt_Args e) => {
popup.ButtonClickedEvt += (object sender, efl.ui.Popup_Alert.ButtonClickedEvt_Args e) => {
popup.SetParent(null);
popup.Del();
};
@ -41,63 +41,63 @@ public class Example
efl.All.Init(efl.Components.Ui);
efl.ui.Win win = new efl.ui.WinConcrete(null);
efl.ui.Win win = new efl.ui.Win(null);
win.SetText("C# Unit Converter");
win.SetAutohide(true);
efl.ui.Box_Flow box = new efl.ui.Box_FlowConcrete(win);
efl.ui.Box_Flow box = new efl.ui.Box_Flow(win);
box.SetDirection(efl.ui.Dir.Horizontal);
efl.ui.Box_Flow miles_box = new efl.ui.Box_FlowConcrete(box);
efl.ui.Box_Flow miles_box = new efl.ui.Box_Flow(box);
miles_box.SetDirection(efl.ui.Dir.Down);
box.Pack(miles_box);
box.DoPack(miles_box);
efl.ui.Text miles_label = new efl.ui.TextConcrete(miles_box);
efl.ui.Text miles_label = new efl.ui.Text(miles_box);
miles_label.SetText("Miles:");
miles_label.SetSize(size);
miles_label.SetVisible(true);
efl.ui.Text_Editable miles_input = new efl.ui.Text_EditableConcrete(miles_box);
efl.ui.Text_Editable miles_input = new efl.ui.Text_Editable(miles_box);
miles_input.SetText("");
miles_input.SetScrollable(true);
miles_input.SetSize(size);
miles_input.SetVisible(true);
efl.ui.Button miles_button = new efl.ui.ButtonConcrete(miles_box);
efl.ui.IButton miles_button = new efl.ui.Button(miles_box);
miles_button.SetText("To Km");
miles_button.SetSize(size);
miles_button.SetVisible(true);
miles_box.Pack(miles_label);
miles_box.Pack(miles_input);
miles_box.Pack(miles_button);
miles_box.DoPack(miles_label);
miles_box.DoPack(miles_input);
miles_box.DoPack(miles_button);
efl.ui.Box_Flow kms_box = new efl.ui.Box_FlowConcrete(box);
efl.ui.Box_Flow kms_box = new efl.ui.Box_Flow(box);
kms_box.SetDirection(efl.ui.Dir.Down);
box.Pack(kms_box);
box.DoPack(kms_box);
efl.ui.Text kms_label = new efl.ui.TextConcrete(kms_box);
efl.ui.Text kms_label = new efl.ui.Text(kms_box);
kms_label.SetText("Kilometers:");
kms_label.SetSize(size);
kms_label.SetVisible(true);
efl.ui.Text_Editable kms_input = new efl.ui.Text_EditableConcrete(kms_box);
efl.ui.Text_Editable kms_input = new efl.ui.Text_Editable(kms_box);
kms_input.SetText("");
kms_input.SetScrollable(true);
kms_input.SetSize(size);
kms_input.SetVisible(true);
efl.ui.Button kms_button = new efl.ui.ButtonConcrete(kms_box);
efl.ui.IButton kms_button = new efl.ui.Button(kms_box);
kms_button.SetText("To Miles");
kms_button.SetSize(size);
kms_button.SetVisible(true);
kms_box.Pack(kms_label);
kms_box.Pack(kms_input);
kms_box.Pack(kms_button);
kms_box.DoPack(kms_label);
kms_box.DoPack(kms_input);
kms_box.DoPack(kms_button);
kms_button.ClickedEvt += (object sender, EventArgs e) => {
try

14
unsorted/evas/evas_mono_box.cs
View File

@ -4,7 +4,7 @@ using System.Runtime.CompilerServices;
public class MyBox : evas.BoxInherit
{
public MyBox(efl.Object parent) : base(parent) {}
public MyBox(efl.IObject parent) : base(parent) {}
[DllImport("evas")] static extern void evas_obj_box_layout_vertical(IntPtr obj, IntPtr data, IntPtr privdata);
[DllImport("evas")] static extern void evas_obj_box_layout_horizontal(IntPtr obj, IntPtr data, IntPtr privdata);
@ -32,18 +32,18 @@ class TestMain
{
efl.All.Init();
efl.Loop loop = new efl.LoopConcrete();
efl.Loop loop = new efl.Loop();
EcoreEvas ecore_evas = new EcoreEvas();
efl.canvas.Object canvas = ecore_evas.canvas;
efl.canvas.IObject canvas = ecore_evas.canvas;
canvas.SetVisible(true);
efl.Object parent = canvas.GetParent();
efl.IObject parent = canvas.GetParent();
System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero);
evas.Box box = new MyBox(canvas);
evas.IBox box = new MyBox(canvas);
eina.Size2D size = new eina.Size2D();
size.W = 320;
@ -52,7 +52,7 @@ class TestMain
box.SetSize(size);
box.SetVisible(true);
efl.canvas.Rectangle rect = new efl.canvas.RectangleConcrete(canvas);
efl.canvas.Rectangle rect = new efl.canvas.Rectangle(canvas);
rect.SetColor(0, 0, 255, 255);
size.W = 320;
size.H = 120;
@ -60,7 +60,7 @@ class TestMain
rect.SetVisible(true);
box.Append(rect);
efl.canvas.Rectangle rect2 = new efl.canvas.RectangleConcrete(canvas);
efl.canvas.Rectangle rect2 = new efl.canvas.Rectangle(canvas);
rect2.SetColor(0, 255, 0, 255);
rect2.SetSize(size);
rect2.SetVisible(true);

14
unsorted/evas/evas_mono_image.cs
View File

@ -6,7 +6,7 @@ class TestMain
static int WIDTH = 320;
static int HEIGHT = 240;
evas.Image image;
evas.IImage image;
static string ImagePath([CallerFilePath] string folder="")
@ -14,7 +14,7 @@ class TestMain
return System.IO.Path.GetDirectoryName(folder);
}
public TestMain(evas.Image image)
public TestMain(evas.IImage image)
{
this.image = image;
}
@ -23,18 +23,18 @@ class TestMain
{
efl.All.Init();
efl.Loop loop = new efl.LoopConcrete();
efl.Loop loop = new efl.Loop();
EcoreEvas ecore_evas = new EcoreEvas();
eina.Size2D size = new eina.Size2D();
efl.canvas.Object canvas = ecore_evas.canvas;
efl.canvas.IObject canvas = ecore_evas.canvas;
canvas.SetVisible(true);
efl.Object parent = canvas.GetParent();
efl.IObject parent = canvas.GetParent();
System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero);
efl.canvas.Rectangle bg = new efl.canvas.RectangleConcrete(canvas);
efl.canvas.Rectangle bg = new efl.canvas.Rectangle(canvas);
bg.SetColor(255, 255, 255, 255);
size.W = WIDTH;
size.H = HEIGHT;
@ -42,7 +42,7 @@ class TestMain
bg.SetVisible(true);
string valid_path = args[0];
evas.Image image = new evas.ImageConcrete(canvas);
evas.Image image = new evas.Image(canvas);
image.SetFile(valid_path, null);
/* FIXME evas-image uses error handling code from

12
unsorted/evas/evas_mono_image2.cs
View File

@ -12,17 +12,17 @@ class TestMain
{
efl.All.Init();
efl.Loop loop = new efl.LoopConcrete();
efl.Loop loop = new efl.Loop();
EcoreEvas ecore_evas = new EcoreEvas();
eina.Size2D size = new eina.Size2D();
eina.Position2D pos = new eina.Position2D();
efl.canvas.Object canvas = ecore_evas.canvas;
efl.canvas.IObject canvas = ecore_evas.canvas;
canvas.SetVisible(true);
efl.canvas.Rectangle bg = new efl.canvas.RectangleConcrete(canvas);
efl.canvas.Rectangle bg = new efl.canvas.Rectangle(canvas);
bg.SetColor(255, 255, 255, 255);
pos.X = 0;
pos.Y = 0;
@ -33,7 +33,7 @@ class TestMain
bg.SetVisible(true);
string path = args[0];
evas.Image logo = new evas.ImageConcrete(canvas);
evas.Image logo = new evas.Image(canvas);
logo.SetFillAuto(true);
// TODO add preloaded support (depends on events)
@ -53,7 +53,7 @@ class TestMain
pixels[i] = generator.Next();
}
evas.Image noise_img = new evas.ImageConcrete(canvas);
evas.Image noise_img = new evas.Image(canvas);
size.W = WIDTH / 4;
size.H = HEIGHT / 4;
noise_img.SetSize(size);
@ -66,7 +66,7 @@ class TestMain
noise_img.SetVisible(true);
Console.WriteLine("Creating noise image with sizez %d, %d", WIDTH/4, HEIGHT/4);
efl.canvas.Proxy proxy_img = new efl.canvas.ProxyConcrete(canvas);
efl.canvas.Proxy proxy_img = new efl.canvas.Proxy(canvas);
proxy_img.SetSource(noise_img);
pos.X = WIDTH / 2;
pos.Y = HEIGHT / 2;

10
unsorted/evas/evas_mono_rectangle.cs
View File

@ -14,15 +14,15 @@ class TestMain
efl.All.Init();
efl.Loop loop = new efl.LoopConcrete();
efl.Loop loop = new efl.Loop();
EcoreEvas ecore_evas = new EcoreEvas();
efl.canvas.Object canvas = ecore_evas.canvas;
efl.canvas.IObject canvas = ecore_evas.canvas;
canvas.SetVisible(true);
efl.Object parent = canvas.GetParent();
efl.IObject parent = canvas.GetParent();
System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero);
efl.canvas.Rectangle rect = new efl.canvas.RectangleConcrete(canvas);
efl.canvas.Rectangle rect = new efl.canvas.Rectangle(canvas);
rect.SetColor(colors[0, 0], colors[0, 1], colors[0, 2], 255);
eina.Size2D size = new eina.Size2D();
size.W = 640;
@ -30,7 +30,7 @@ class TestMain
rect.SetSize(size);
rect.SetVisible(true);
canvas.KeyDownEvt += (object sender, efl.input.InterfaceConcrete.KeyDownEvt_Args e) => {
canvas.KeyDownEvt += (object sender, efl.input.Interface.KeyDownEvt_Args e) => {
color_index = (color_index + 1) % 3;
Console.WriteLine("Key Down");
Console.WriteLine("Got key obj at {0}", e.arg.raw_handle.ToString("X"));

18
unsorted/evas/evas_mono_table.cs
View File

@ -11,7 +11,7 @@ class TestMain
{
efl.All.Init();
efl.Loop loop = new efl.LoopConcrete();
efl.Loop loop = new efl.Loop();
EcoreEvas ecore_evas = new EcoreEvas();
@ -21,25 +21,25 @@ class TestMain
eina.Size2D hint = new eina.Size2D();
efl.canvas.Object canvas = ecore_evas.canvas;
efl.canvas.IObject canvas = ecore_evas.canvas;
canvas.SetVisible(true);
efl.Object parent = canvas.GetParent();
efl.IObject parent = canvas.GetParent();
System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero);
efl.canvas.Rectangle bg = new efl.canvas.RectangleConcrete(canvas);
efl.canvas.Rectangle bg = new efl.canvas.Rectangle(canvas);
bg.SetColor(255, 255, 255, 255);
bg.SetSize(size);
bg.SetVisible(true);
evas.Table table = new evas.TableConcrete(canvas);
evas.Table table = new evas.Table(canvas);
table.SetHomogeneous(evas.object_table.Homogeneous_Mode.None);
table.SetPadding(0, 0);
table.SetSize(size);
table.SetVisible(true);
efl.canvas.Rectangle rect = new efl.canvas.RectangleConcrete(canvas);
efl.canvas.Rectangle rect = new efl.canvas.Rectangle(canvas);
rect.SetColor(255, 0, 0, 255);
hint.W = 100;
hint.H = 50;
@ -47,7 +47,7 @@ class TestMain
rect.SetVisible(true);
table.Pack(rect, 1, 1, 2, 1);
rect = new efl.canvas.RectangleConcrete(canvas);
rect = new efl.canvas.Rectangle(canvas);
rect.SetColor(0, 255, 0, 255);
hint.W = 50;
hint.H = 100;
@ -55,7 +55,7 @@ class TestMain
rect.SetVisible(true);
table.Pack(rect, 1, 2, 1, 2);
rect = new efl.canvas.RectangleConcrete(canvas);
rect = new efl.canvas.Rectangle(canvas);
rect.SetColor(0, 0, 255, 255);
hint.W = 50;
hint.H = 50;
@ -63,7 +63,7 @@ class TestMain
rect.SetVisible(true);
table.Pack(rect, 2, 2, 1, 1);
rect = new efl.canvas.RectangleConcrete(canvas);
rect = new efl.canvas.Rectangle(canvas);
rect.SetColor(255, 255, 0, 255);
rect.SetHintMin(hint);
rect.SetVisible(true);

14
unsorted/evas/evas_mono_text.cs
View File

@ -22,8 +22,8 @@ class TestMain
static int HEIGHT = 240;
private EcoreEvas ecore_evas;
private efl.canvas.Object canvas;
private efl.canvas.Rectangle bg;
private efl.canvas.IObject canvas;
private efl.canvas.IRectangle bg;
private evas.Text text;
private evas.Image border;
@ -34,7 +34,7 @@ class TestMain
canvas = ecore_evas.canvas;
canvas.SetVisible(true);
bg = new efl.canvas.RectangleConcrete(canvas);
bg = new efl.canvas.Rectangle(canvas);
bg.SetColor(255, 255, 255, 255);
position.X = 0;
position.Y = 0;
@ -47,7 +47,7 @@ class TestMain
bg.KeyDownEvt += On_KeyDown;
text = new evas.TextConcrete(canvas);
text = new evas.Text(canvas);
text.SetStyle(evas.Text_Style_Type.OutlineSoftShadow);
text.SetColor(0, 0, 0, 255);
@ -71,7 +71,7 @@ class TestMain
Console.WriteLine("Adding text object with font {0} and size {1}", font, size);
// setup border
border = new evas.ImageConcrete(canvas);
border = new evas.Image(canvas);
border.SetFile(border_file, null);
border.SetBorder(3, 3, 3, 3);
border.SetBorderCenterFill(0);
@ -87,7 +87,7 @@ class TestMain
}
private void On_KeyDown(object sender, efl.input.InterfaceConcrete.KeyDownEvt_Args e)
private void On_KeyDown(object sender, efl.input.Interface.KeyDownEvt_Args e)
{
var key = e.arg.GetKey();
@ -114,7 +114,7 @@ class TestMain
if (args.Length >= 1)
border_path = args[0];
efl.Loop loop = new efl.LoopConcrete();
efl.Loop loop = new efl.Loop();
TestMain t = new TestMain(border_path);
loop.Begin();