[client] update haxework

src/editor/haxe/ru/m/tankz/editor/Editor.hx

@@ -9,7 +9,6 @@ import haxework.gui.ButtonView;
 import haxework.gui.frame.FrameSwitcher;
 import haxework.gui.VGroupView;
 import haxework.gui.Root;
-import haxework.gui.ViewBuilder;
 import haxework.log.TraceLogger;
 import haxework.provider.Provider;
 import haxework.resources.IResources;
@@ -19,12 +18,12 @@ import ru.m.tankz.frame.LevelFrame;
 #if debug import haxework.log.SocketLogger; #end
 
 
-interface EditorViewLayout {
-    var switcher(default, null):FrameSwitcher;
-}
-
 @:template('ru/m/tankz/editor/Editor.yaml', 'ru/m/tankz/editor/Style.yaml')
-class EditorView extends VGroupView implements ViewBuilder implements EditorViewLayout {}
+class EditorView extends VGroupView {
+    @:view public var switcher(default, null):FrameSwitcher;
+    @:view public var btn_level(default, null):ButtonView;
+    @:view public var btn_tank(default, null):ButtonView;
+}
 
 class Editor {
 
@@ -54,13 +53,15 @@ class Editor {
         Provider.get(IResources).text.put('font', 'Bookman Old Style');
         Provider.get(IResources).text.put('version', 'v${Const.VERSION} b${Const.BUILD}');
 
-        view = new EditorView({handler: this});
+        view = new EditorView();
         Root.bind(view);
         view.content.stage.stageFocusRect = false;
 
         Provider.setFactory(IConfigBundle, ConfigBundle);
         Provider.setFactory(ILevelBundle, LevelBundle);
 
+        view.btn_level.onPress = this;
+        view.btn_tank.onPress = this;
         view.switcher.change(LevelFrame.ID);
     }
 

src/editor/haxe/ru/m/tankz/editor/Editor.yaml

@@ -15,12 +15,10 @@ views:
         $type: haxework.gui.ButtonView
         $style: button
         text: Level
-        onPress: "@link:handler"
       - id: btn_tank
         $type: haxework.gui.ButtonView
         $style: button
         text: Tank
-        onPress: "@link:handler"
   - $type: haxework.gui.SpriteView
     height: 3
     pWidth: 100

src/editor/haxe/ru/m/tankz/editor/frame/LevelFrame.hx

@@ -7,7 +7,6 @@ import haxework.gui.LabelView;
 import haxework.gui.list.ListView;
 import haxework.gui.list.VListView;
 import haxework.gui.VGroupView;
-import haxework.gui.ViewBuilder;
 import haxework.provider.Provider;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.editor.FileUtil;
@@ -19,22 +18,20 @@ import ru.m.tankz.game.DotaGame;
 import ru.m.tankz.Type;
 
 
-interface LevelFrameLayout {
-    var gameClassicButton(default, null):ButtonView;
-    var gameDotaButton(default, null):ButtonView;
-    var openButton(default, null):ButtonView;
-    var saveButton(default, null):ButtonView;
-    var fileNameLabel(default, null):LabelView;
-    var mapView(default, null):MapEditView;
-    var spawnPointList(default, null):VListView<SpawnPoint>;
-    var brickList(default, null):VListView<BrickConfig>;
-}
-
 @:template('ru/m/tankz/editor/frame/LevelFrame.yaml', 'ru/m/tankz/editor/Style.yaml')
-class LevelFrame extends VGroupView implements ViewBuilder implements LevelFrameLayout {
+class LevelFrame extends VGroupView {
     public static inline var ID = 'level';
     public static inline var TAG = 'level';
 
+    @:view var gameClassicButton(default, null):ButtonView;
+    @:view var gameDotaButton(default, null):ButtonView;
+    @:view var openButton(default, null):ButtonView;
+    @:view var saveButton(default, null):ButtonView;
+    @:view var fileNameLabel(default, null):LabelView;
+    @:view var mapView(default, null):MapEditView;
+    @:view var spawnPointList(default, null):VListView<SpawnPoint>;
+    @:view var brickList(default, null):VListView<BrickConfig>;
+
     private var config:Config;
 
     public function init():Void {

src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.hx

@@ -4,20 +4,17 @@ import ru.m.draw.Color;
 import ru.m.tankz.editor.tank.TankView;
 import haxework.gui.InputView;
 import haxework.gui.HGroupView;
-import haxework.gui.ViewBuilder;
 
 
-interface TankFrameLayout {
-    var tank(default, null):TankView;
-    var colorR(default, null):InputView;
-    var colorG(default, null):InputView;
-    var colorB(default, null):InputView;
-}
-
 @:template('ru/m/tankz/editor/frame/TankFrame.yaml', 'ru/m/tankz/editor/Style.yaml')
-class TankFrame extends HGroupView implements ViewBuilder implements TankFrameLayout {
+class TankFrame extends HGroupView {
     public static inline var ID = 'tank';
 
+    @:view var tank(default, null):TankView;
+    @:view var colorR(default, null):InputView;
+    @:view var colorG(default, null):InputView;
+    @:view var colorB(default, null):InputView;
+
     public function init():Void {
         colorR.onKeyUp = this;
         colorG.onKeyUp = this;