1 files changed, 4 insertions, 76 deletions

diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo
index 350fac5..35f239e 100644
--- a/src/lib/elementary/efl_ui_layout.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -1,85 +1,13 @@
 import efl_ui;
 
-class @beta Efl.Ui.Layout extends Efl.Ui.Widget implements Efl.Container, Efl.File,
-                     Efl.Ui.View, Efl.Ui.Property_Bind, Efl.Ui.Factory_Bind,
-                     Efl.Layout.Calc, Efl.Layout.Signal,
-                     Efl.Layout.Group
+class @beta Efl.Ui.Layout extends Efl.Ui.Layout_Base implements Efl.File
 {
    [[Elementary layout class]]
-   methods {
-      @property theme {
-         [[The theme of this widget, defines which edje group will be used.
-
-           Based on the type of widget ($klass), a given $group and a
-           $style (usually "default"), the edje group name will be formed
-           for this object.
-
-           Widgets that inherit from this class will call this function
-           automatically so it should not be called by applications, unless
-           you are dealing directly with a @Efl.Ui.Layout object.
-         ]]
-         set {
-            [[Sets the edje group from the elementary theme that will be used
-              as layout. Note that $style will be the new style of this object,
-              as in an @Efl.Ui.Widget.style. As a consequence this function can
-              only be called during construction of the object, before finalize.
-
-              If this returns $false the widget is very likely to become
-              non-functioning.
-            ]]
-            return: Efl.Ui.Theme_Apply_Result(0);
-               [[Whether the style was successfully applied or not, see
-                 the values of @Efl.Ui.Theme_Apply_Result for more information.]]
-         }
-         /*
-         TODO:
-         get {
-            [[Get information about the current theme in use.]]
-         }
-         */
-         values {
-            klass: string; [[The class of the group, eg. "button".]]
-            group: string("base"); [[The group, eg. "base".]]
-            style: string("default"); [[The style to use, eg "default".]]
-         }
-      }
-   }
+   data: null;
    implements {
-      class.constructor;
-      Efl.Object.constructor;
-      Efl.Object.finalize;
       Efl.File.file { get; set; }
+      Efl.File.key { get; set; }
       Efl.File.mmap { get; set; }
-      Efl.Canvas.Group.group_calculate;
-      Efl.Layout.Calc.calc_freeze;
-      Efl.Layout.Calc.calc_thaw;
-      Efl.Layout.Calc.calc_auto_update_hints { get; set; }
-      Efl.Layout.Calc.calc_size_min;
-      Efl.Layout.Calc.calc_parts_extends;
-      Efl.Layout.Calc.calc_force;
-      Efl.Layout.Signal.signal_callback_add;
-      Efl.Layout.Signal.signal_callback_del;
-      Efl.Layout.Signal.signal_emit;
-      Efl.Layout.Signal.message_send;
-      Efl.Layout.Signal.signal_process;
-      Efl.Layout.Group.group_data { get; }
-      Efl.Layout.Group.group_size_min { get; }
-      Efl.Layout.Group.group_size_max { get; }
-      Efl.Layout.Group.part_exist { get; }
-      Efl.Ui.Widget.widget_sub_object_add;
-      Efl.Ui.Widget.theme_apply;
-      Efl.Ui.Widget.on_disabled_update;
-      Efl.Ui.Widget.widget_sub_object_del;
-      Efl.Ui.Focus.Object.on_focus_update;
-      Efl.Container.content_count;
-      Efl.Container.content_remove;
-      Efl.Container.content_iterate;
-      Efl.Part.part_get;
-      Efl.Ui.View.model { get; set; }
-      Efl.Ui.Property_Bind.property_bind;
-      Efl.Ui.Factory_Bind.factory_bind;
-   }
-   events {
-      theme,changed: void; [[Called when theme changed]]
+      Efl.File.load;
    }
 }