From 7d570336a51231fe3a52e120c748c36f3de773df Mon Sep 17 00:00:00 2001 From: shmyga Date: Mon, 25 Mar 2019 16:45:54 +0300 Subject: [PATCH] [client] update haxework --- src/client/haxe/ru/m/skin/ButtonSVGSkin.hx | 4 +- src/client/haxe/ru/m/tankz/Client.hx | 2 +- src/client/haxe/ru/m/tankz/Init.hx | 2 +- src/client/haxe/ru/m/tankz/Style.hx | 16 ++++---- .../haxe/ru/m/tankz/render/AnimateBundle.hx | 2 +- src/client/haxe/ru/m/tankz/render/Render.hx | 2 +- src/client/haxe/ru/m/tankz/view/ClientView.hx | 2 +- .../haxe/ru/m/tankz/view/ClientView.yaml | 2 +- .../haxe/ru/m/tankz/view/NetworkFrame.hx | 14 +++---- .../haxe/ru/m/tankz/view/NetworkFrame.yaml | 38 +++++++++---------- .../haxe/ru/m/tankz/view/ResultFrame.hx | 10 ++--- .../haxe/ru/m/tankz/view/ResultFrame.yaml | 16 ++++---- .../haxe/ru/m/tankz/view/SettingsFrame.hx | 6 +-- .../haxe/ru/m/tankz/view/SettingsFrame.yaml | 10 ++--- src/client/haxe/ru/m/tankz/view/StartFrame.hx | 6 +-- .../haxe/ru/m/tankz/view/StartFrame.yaml | 20 +++++----- .../tankz/view/classic/ClassicGameFrame.yaml | 2 +- .../m/tankz/view/classic/ClassicGamePanel.hx | 4 +- .../tankz/view/classic/ClassicGamePanel.yaml | 4 +- .../m/tankz/view/classic/ClassicLevelFrame.hx | 8 ++-- .../tankz/view/classic/ClassicLevelFrame.yaml | 12 +++--- .../haxe/ru/m/tankz/view/common/GameFrame.hx | 4 +- .../haxe/ru/m/tankz/view/common/IGamePanel.hx | 2 +- .../haxe/ru/m/tankz/view/common/LevelFrame.hx | 4 +- .../haxe/ru/m/tankz/view/common/LifeView.hx | 6 +-- .../haxe/ru/m/tankz/view/common/LifeView.yaml | 6 +-- .../haxe/ru/m/tankz/view/common/PlayerView.hx | 10 ++--- .../ru/m/tankz/view/common/PlayerView.yaml | 6 +-- .../ru/m/tankz/view/dota/DotaGameFrame.yaml | 2 +- .../ru/m/tankz/view/dota/DotaGamePanel.hx | 4 +- .../ru/m/tankz/view/dota/DotaGamePanel.yaml | 6 +-- .../ru/m/tankz/view/dota/DotaLevelFrame.hx | 6 +-- .../ru/m/tankz/view/dota/DotaLevelFrame.yaml | 12 +++--- .../ru/m/tankz/view/network/GameItemView.hx | 6 +-- .../ru/m/tankz/view/network/GameItemView.yaml | 4 +- .../ru/m/tankz/view/network/UserItemView.hx | 6 +-- .../ru/m/tankz/view/network/UserItemView.yaml | 4 +- .../haxe/ru/m/tankz/view/popup/FontPopup.hx | 6 +-- .../haxe/ru/m/tankz/view/popup/FontPopup.yaml | 10 ++--- .../ru/m/tankz/view/settings/ActionView.hx | 6 +-- .../ru/m/tankz/view/settings/ActionView.yaml | 4 +- .../m/tankz/view/settings/SettingsEditor.hx | 8 ++-- .../m/tankz/view/settings/SettingsEditor.yaml | 14 +++---- .../haxe/ru/m/tankz/editor/ColorView.hx | 2 +- src/editor/haxe/ru/m/tankz/editor/Editor.hx | 14 +++---- .../haxe/ru/m/tankz/editor/EditorView.yaml | 12 +++--- .../ru/m/tankz/editor/frame/LevelFrame.hx | 8 ++-- .../ru/m/tankz/editor/frame/LevelFrame.yaml | 26 ++++++------- .../haxe/ru/m/tankz/editor/frame/TankFrame.hx | 6 +-- .../ru/m/tankz/editor/frame/TankFrame.yaml | 6 +-- .../haxe/ru/m/tankz/editor/level/BrushView.hx | 2 +- .../ru/m/tankz/editor/level/MapEditView.hx | 2 +- .../haxe/ru/m/tankz/editor/tank/TankView.hx | 4 +- 53 files changed, 200 insertions(+), 200 deletions(-) diff --git a/src/client/haxe/ru/m/skin/ButtonSVGSkin.hx b/src/client/haxe/ru/m/skin/ButtonSVGSkin.hx index bfcbb63..1862c3d 100644 --- a/src/client/haxe/ru/m/skin/ButtonSVGSkin.hx +++ b/src/client/haxe/ru/m/skin/ButtonSVGSkin.hx @@ -2,9 +2,9 @@ package ru.m.skin; import haxework.color.ColorUtil; import haxework.color.Color; -import haxework.gui.ButtonView; +import haxework.view.ButtonView; import format.SVG; -import haxework.gui.skin.ISkin; +import haxework.view.skin.ISkin; class ButtonSVGSkin implements ISkin { diff --git a/src/client/haxe/ru/m/tankz/Client.hx b/src/client/haxe/ru/m/tankz/Client.hx index fedd427..dc2b34d 100755 --- a/src/client/haxe/ru/m/tankz/Client.hx +++ b/src/client/haxe/ru/m/tankz/Client.hx @@ -3,7 +3,7 @@ package ru.m.tankz; import ru.m.tankz.view.ClientView; import flash.Lib; import haxework.animate.Animate; -import haxework.gui.Root; +import haxework.view.Root; import haxework.log.TraceLogger; #if flash import haxework.log.JSLogger; #end #if debug import haxework.log.SocketLogger; #end diff --git a/src/client/haxe/ru/m/tankz/Init.hx b/src/client/haxe/ru/m/tankz/Init.hx index c299e3a..83fb9bf 100644 --- a/src/client/haxe/ru/m/tankz/Init.hx +++ b/src/client/haxe/ru/m/tankz/Init.hx @@ -1,6 +1,6 @@ package ru.m.tankz; -import haxework.gui.popup.PopupManager; +import haxework.view.popup.PopupManager; import ru.m.tankz.storage.SettingsStorage; import haxework.provider.Provider; import haxework.resources.IResources; diff --git a/src/client/haxe/ru/m/tankz/Style.hx b/src/client/haxe/ru/m/tankz/Style.hx index 3dc5eed..f11fd14 100644 --- a/src/client/haxe/ru/m/tankz/Style.hx +++ b/src/client/haxe/ru/m/tankz/Style.hx @@ -3,13 +3,13 @@ package ru.m.tankz; import flash.text.Font; import flash.text.FontType; import haxework.color.ColorUtil; -import haxework.gui.core.Geometry; -import haxework.gui.core.HAlign; -import haxework.gui.core.VAlign; -import haxework.gui.ITextView; -import haxework.gui.layout.Layout; -import haxework.gui.skin.ISkin; -import haxework.gui.skin.Skin; +import haxework.view.core.Geometry; +import haxework.view.core.HAlign; +import haxework.view.core.VAlign; +import haxework.view.ITextView; +import haxework.view.layout.Layout; +import haxework.view.skin.ISkin; +import haxework.view.skin.Skin; import haxework.resources.IResources; import openfl.Assets; import ru.m.skin.ButtonSVGSkin; @@ -57,7 +57,7 @@ class Style { Skin.text(textColor, baseFontSize, fontFamily, fontEmbed), ]); resources.skin.put("scroll.vertical", [ - haxework.gui.skin.Skin.scrollVertical(lightColor, darkColor), + haxework.view.skin.Skin.scrollVertical(lightColor, darkColor), ]); resources.skin.put("text.header", [ Skin.color(0x000000, 0.1), diff --git a/src/client/haxe/ru/m/tankz/render/AnimateBundle.hx b/src/client/haxe/ru/m/tankz/render/AnimateBundle.hx index ca7b769..3a670e7 100644 --- a/src/client/haxe/ru/m/tankz/render/AnimateBundle.hx +++ b/src/client/haxe/ru/m/tankz/render/AnimateBundle.hx @@ -1,6 +1,6 @@ package ru.m.tankz.render; -import haxework.gui.utils.BitmapUtil; +import haxework.view.utils.BitmapUtil; import haxework.color.Color; import flash.display.BitmapData; import openfl.Assets; diff --git a/src/client/haxe/ru/m/tankz/render/Render.hx b/src/client/haxe/ru/m/tankz/render/Render.hx index cd372d1..ca98159 100755 --- a/src/client/haxe/ru/m/tankz/render/Render.hx +++ b/src/client/haxe/ru/m/tankz/render/Render.hx @@ -7,7 +7,7 @@ import flash.display.Sprite; import flash.text.TextField; import flash.text.TextFormat; import haxe.Timer; -import haxework.gui.SpriteView; +import haxework.view.SpriteView; import haxework.provider.Provider; import haxework.resources.IResources; import ru.m.animate.Animate; diff --git a/src/client/haxe/ru/m/tankz/view/ClientView.hx b/src/client/haxe/ru/m/tankz/view/ClientView.hx index 714879f..f89bcc7 100644 --- a/src/client/haxe/ru/m/tankz/view/ClientView.hx +++ b/src/client/haxe/ru/m/tankz/view/ClientView.hx @@ -3,7 +3,7 @@ package ru.m.tankz.view; import flash.events.KeyboardEvent; import flash.text.Font; import flash.ui.Keyboard; -import haxework.gui.frame.FrameSwitcher; +import haxework.view.frame.FrameSwitcher; import haxework.resources.IResources; @:template class ClientView extends FrameSwitcher { diff --git a/src/client/haxe/ru/m/tankz/view/ClientView.yaml b/src/client/haxe/ru/m/tankz/view/ClientView.yaml index 014562f..75f568e 100755 --- a/src/client/haxe/ru/m/tankz/view/ClientView.yaml +++ b/src/client/haxe/ru/m/tankz/view/ClientView.yaml @@ -1,5 +1,5 @@ --- -$type: haxework.gui.frame.FrameSwitcher +$type: haxework.view.frame.FrameSwitcher geometry.size.stretch: true skinId: dark views: diff --git a/src/client/haxe/ru/m/tankz/view/NetworkFrame.hx b/src/client/haxe/ru/m/tankz/view/NetworkFrame.hx index 0fcca37..4ecb28a 100644 --- a/src/client/haxe/ru/m/tankz/view/NetworkFrame.hx +++ b/src/client/haxe/ru/m/tankz/view/NetworkFrame.hx @@ -1,12 +1,12 @@ package ru.m.tankz.view; -import haxework.gui.ButtonView; -import haxework.gui.frame.IFrameSwitcher; -import haxework.gui.IGroupView; -import haxework.gui.InputView; -import haxework.gui.LabelView; -import haxework.gui.list.ListView; -import haxework.gui.VGroupView; +import haxework.view.ButtonView; +import haxework.view.frame.IFrameSwitcher; +import haxework.view.IGroupView; +import haxework.view.InputView; +import haxework.view.LabelView; +import haxework.view.list.ListView; +import haxework.view.VGroupView; import haxework.provider.Provider; import ru.m.tankz.game.GameState; import ru.m.tankz.network.NetworkManager; diff --git a/src/client/haxe/ru/m/tankz/view/NetworkFrame.yaml b/src/client/haxe/ru/m/tankz/view/NetworkFrame.yaml index 011829b..5c51d27 100644 --- a/src/client/haxe/ru/m/tankz/view/NetworkFrame.yaml +++ b/src/client/haxe/ru/m/tankz/view/NetworkFrame.yaml @@ -3,88 +3,88 @@ pWidth: 100 pHeight: 100 views: - id: frameSwitcher - $type: haxework.gui.frame.FrameSwitcher + $type: haxework.view.frame.FrameSwitcher pWidth: 100 pHeight: 100 views: # login - id: loginFrame - $type: haxework.gui.VGroupView + $type: haxework.view.VGroupView pWidth: 100 pHeight: 100 views: - id: stateLabel - $type: haxework.gui.LabelView + $type: haxework.view.LabelView $style: label text: offline width: 200 height: 50 - id: nameInput - $type: haxework.gui.InputView + $type: haxework.view.InputView $style: label width: 200 height: 50 text: User skin: - $type: haxework.gui.skin.ColorSkin + $type: haxework.view.skin.ColorSkin color: '#444444' - id: loginButton - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView $style: button text: Login # game list - id: gameListFrame - $type: haxework.gui.VGroupView + $type: haxework.view.VGroupView pWidth: 100 pHeight: 100 views: - id: createGameButton - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView $style: button text: Create - id: gameList - $type: haxework.gui.list.VListView + $type: haxework.view.list.VListView factory: "@class:ru.m.tankz.view.network.GameItemView" pWidth: 100 pHeight: 100 paddings: 10 scroll: - $type: haxework.gui.list.VScrollView + $type: haxework.view.list.VScrollView width: 10 pHeight: 100 skin: - $type: haxework.gui.list.VScrollSkin + $type: haxework.view.list.VScrollSkin skin: - $type: haxework.gui.skin.ColorSkin + $type: haxework.view.skin.ColorSkin color: "#000000" alpha: 0 # game - id: gameFrame - $type: haxework.gui.VGroupView + $type: haxework.view.VGroupView pWidth: 100 pHeight: 100 views: - id: startGameButton - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView $style: button text: Start - id: leaveGameButton - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView $style: button text: Leave - id: userList - $type: haxework.gui.list.VListView + $type: haxework.view.list.VListView factory: "@class:ru.m.tankz.view.network.UserItemView" pWidth: 100 pHeight: 100 paddings: 10 scroll: - $type: haxework.gui.list.VScrollView + $type: haxework.view.list.VScrollView width: 10 pHeight: 100 skin: - $type: haxework.gui.list.VScrollSkin + $type: haxework.view.list.VScrollSkin skin: - $type: haxework.gui.skin.ColorSkin + $type: haxework.view.skin.ColorSkin color: "#000000" alpha: 0 diff --git a/src/client/haxe/ru/m/tankz/view/ResultFrame.hx b/src/client/haxe/ru/m/tankz/view/ResultFrame.hx index d51b7b4..f1e019d 100644 --- a/src/client/haxe/ru/m/tankz/view/ResultFrame.hx +++ b/src/client/haxe/ru/m/tankz/view/ResultFrame.hx @@ -1,10 +1,10 @@ package ru.m.tankz.view; -import haxework.gui.LabelView; -import haxework.gui.ButtonView; -import haxework.gui.DataView; -import haxework.gui.frame.FrameSwitcher; -import haxework.gui.VGroupView; +import haxework.view.LabelView; +import haxework.view.ButtonView; +import haxework.view.DataView; +import haxework.view.frame.FrameSwitcher; +import haxework.view.VGroupView; import ru.m.tankz.control.Control; import ru.m.tankz.view.classic.ClassicGameFrame; import ru.m.tankz.view.common.LifeView; diff --git a/src/client/haxe/ru/m/tankz/view/ResultFrame.yaml b/src/client/haxe/ru/m/tankz/view/ResultFrame.yaml index 0495513..0f7da73 100644 --- a/src/client/haxe/ru/m/tankz/view/ResultFrame.yaml +++ b/src/client/haxe/ru/m/tankz/view/ResultFrame.yaml @@ -1,29 +1,29 @@ --- views: - - $type: haxework.gui.VGroupView + - $type: haxework.view.VGroupView skinId: container views: - id: level - $type: haxework.gui.LabelView + $type: haxework.view.LabelView skinId: text.header - id: result - $type: haxework.gui.DataView + $type: haxework.view.DataView factory: $this:playerViewFactory geometry.margin.top: 20 layout: - $type: haxework.gui.layout.VerticalLayout + $type: haxework.view.layout.VerticalLayout hAlign: right margin: 10 - - $type: haxework.gui.HGroupView + - $type: haxework.view.HGroupView skinId: panel views: - id: close - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView skinId: button.close +onPress: $code:close() - - $type: haxework.gui.SpriteView + - $type: haxework.view.SpriteView geometry.size.width: 100% - id: next - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView skinId: button.next +onPress: $code:next() diff --git a/src/client/haxe/ru/m/tankz/view/SettingsFrame.hx b/src/client/haxe/ru/m/tankz/view/SettingsFrame.hx index f765943..a14fdba 100644 --- a/src/client/haxe/ru/m/tankz/view/SettingsFrame.hx +++ b/src/client/haxe/ru/m/tankz/view/SettingsFrame.hx @@ -1,8 +1,8 @@ package ru.m.tankz.view; -import haxework.gui.frame.FrameSwitcher; -import haxework.gui.ButtonView; -import haxework.gui.VGroupView; +import haxework.view.frame.FrameSwitcher; +import haxework.view.ButtonView; +import haxework.view.VGroupView; @:template class SettingsFrame extends VGroupView { diff --git a/src/client/haxe/ru/m/tankz/view/SettingsFrame.yaml b/src/client/haxe/ru/m/tankz/view/SettingsFrame.yaml index 46d2103..c0f7bd0 100644 --- a/src/client/haxe/ru/m/tankz/view/SettingsFrame.yaml +++ b/src/client/haxe/ru/m/tankz/view/SettingsFrame.yaml @@ -1,22 +1,22 @@ --- views: - - $type: haxework.gui.VGroupView + - $type: haxework.view.VGroupView skinId: container views: - - $type: haxework.gui.LabelView + - $type: haxework.view.LabelView skinId: text.header text: Settings - - $type: haxework.gui.HGroupView + - $type: haxework.view.HGroupView layout.margin: 20 views: - $type: ru.m.tankz.view.settings.SettingsEditor controlIndex: 0 - $type: ru.m.tankz.view.settings.SettingsEditor controlIndex: 1 - - $type: haxework.gui.HGroupView + - $type: haxework.view.HGroupView skinId: panel views: - id: close - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView skinId: button.close +onPress: $this:onPress diff --git a/src/client/haxe/ru/m/tankz/view/StartFrame.hx b/src/client/haxe/ru/m/tankz/view/StartFrame.hx index ce34370..644bece 100644 --- a/src/client/haxe/ru/m/tankz/view/StartFrame.hx +++ b/src/client/haxe/ru/m/tankz/view/StartFrame.hx @@ -1,8 +1,8 @@ package ru.m.tankz.view; -import haxework.gui.ButtonView; -import haxework.gui.frame.FrameSwitcher; -import haxework.gui.VGroupView; +import haxework.view.ButtonView; +import haxework.view.frame.FrameSwitcher; +import haxework.view.VGroupView; import ru.m.tankz.view.classic.ClassicLevelFrame; import ru.m.tankz.view.dota.DotaLevelFrame; import ru.m.tankz.view.popup.FontPopup; diff --git a/src/client/haxe/ru/m/tankz/view/StartFrame.yaml b/src/client/haxe/ru/m/tankz/view/StartFrame.yaml index f4e6419..fe828d0 100644 --- a/src/client/haxe/ru/m/tankz/view/StartFrame.yaml +++ b/src/client/haxe/ru/m/tankz/view/StartFrame.yaml @@ -1,43 +1,43 @@ --- views: - - $type: haxework.gui.VGroupView + - $type: haxework.view.VGroupView skinId: container layout.margin: 10 views: - - $type: haxework.gui.ImageView + - $type: haxework.view.ImageView image: $asset:image:resources/image/ui/logo.png geometry.margin.bottom: 30 - id: classic - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView skinId: button +onPress: $this:onPress text: Classic - id: dota - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView skinId: button +onPress: $this:onPress text: DotA # - id: font -# $type: haxework.gui.ButtonView +# $type: haxework.view.ButtonView # skinId: button # +onPress: $code:choiceFont() # text: Font # - id: network -# $type: haxework.gui.ButtonView +# $type: haxework.view.ButtonView # skinId: button # +onPress: $this:onPress # text: Network (in developing) # fontColor: 0xff0000 - - $type: haxework.gui.HGroupView + - $type: haxework.view.HGroupView skinId: panel views: - id: settings - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView skinId: button.settings +onPress: $this:onPress - - $type: haxework.gui.SpriteView + - $type: haxework.view.SpriteView geometry.size.width: 100% - - $type: haxework.gui.LabelView + - $type: haxework.view.LabelView geometry.padding: [20, 5] skinId: text.box text: $r:text:version diff --git a/src/client/haxe/ru/m/tankz/view/classic/ClassicGameFrame.yaml b/src/client/haxe/ru/m/tankz/view/classic/ClassicGameFrame.yaml index c408d60..0e361b0 100644 --- a/src/client/haxe/ru/m/tankz/view/classic/ClassicGameFrame.yaml +++ b/src/client/haxe/ru/m/tankz/view/classic/ClassicGameFrame.yaml @@ -1,7 +1,7 @@ --- skinId: container views: - - $type: haxework.gui.HGroupView + - $type: haxework.view.HGroupView layout.margin: 5 views: - id: render diff --git a/src/client/haxe/ru/m/tankz/view/classic/ClassicGamePanel.hx b/src/client/haxe/ru/m/tankz/view/classic/ClassicGamePanel.hx index 4440e38..6533145 100644 --- a/src/client/haxe/ru/m/tankz/view/classic/ClassicGamePanel.hx +++ b/src/client/haxe/ru/m/tankz/view/classic/ClassicGamePanel.hx @@ -1,7 +1,7 @@ package ru.m.tankz.view.classic; -import haxework.gui.LabelView; -import haxework.gui.VGroupView; +import haxework.view.LabelView; +import haxework.view.VGroupView; import ru.m.tankz.view.common.IGamePanel; import ru.m.tankz.view.common.LifeView; import ru.m.tankz.game.Game; diff --git a/src/client/haxe/ru/m/tankz/view/classic/ClassicGamePanel.yaml b/src/client/haxe/ru/m/tankz/view/classic/ClassicGamePanel.yaml index 0402b5c..599417a 100644 --- a/src/client/haxe/ru/m/tankz/view/classic/ClassicGamePanel.yaml +++ b/src/client/haxe/ru/m/tankz/view/classic/ClassicGamePanel.yaml @@ -5,11 +5,11 @@ layout.margin: 5 layout.hAlign: right views: - id: level - $type: haxework.gui.LabelView + $type: haxework.view.LabelView skinId: text.box geometry.size.height: 38 geometry.size.width: 100% - - $type: haxework.gui.SpriteView + - $type: haxework.view.SpriteView geometry.size.height: 50% - id: bot $type: ru.m.tankz.view.common.LifeView diff --git a/src/client/haxe/ru/m/tankz/view/classic/ClassicLevelFrame.hx b/src/client/haxe/ru/m/tankz/view/classic/ClassicLevelFrame.hx index daba984..ad260c4 100644 --- a/src/client/haxe/ru/m/tankz/view/classic/ClassicLevelFrame.hx +++ b/src/client/haxe/ru/m/tankz/view/classic/ClassicLevelFrame.hx @@ -1,9 +1,9 @@ package ru.m.tankz.view.classic; -import haxework.gui.ButtonView; -import haxework.gui.DataView; -import haxework.gui.frame.FrameSwitcher; -import haxework.gui.ToggleButtonView; +import haxework.view.ButtonView; +import haxework.view.DataView; +import haxework.view.frame.FrameSwitcher; +import haxework.view.ToggleButtonView; import ru.m.tankz.config.Config; import ru.m.tankz.view.common.LevelFrame; import ru.m.tankz.preset.ClassicGame; diff --git a/src/client/haxe/ru/m/tankz/view/classic/ClassicLevelFrame.yaml b/src/client/haxe/ru/m/tankz/view/classic/ClassicLevelFrame.yaml index 889ab48..3adfa5a 100644 --- a/src/client/haxe/ru/m/tankz/view/classic/ClassicLevelFrame.yaml +++ b/src/client/haxe/ru/m/tankz/view/classic/ClassicLevelFrame.yaml @@ -1,24 +1,24 @@ --- skinId: container layout: - $type: haxework.gui.layout.VerticalLayout + $type: haxework.view.layout.VerticalLayout views: - - $type: haxework.gui.LabelView + - $type: haxework.view.LabelView skinId: text.header text: Classic - id: presets - $type: haxework.gui.DataView + $type: haxework.view.DataView layout: - $type: haxework.gui.layout.HorizontalLayout + $type: haxework.view.layout.HorizontalLayout hAlign: center margin: 2 factory: $this:presetViewFactory +onDataSelect: $code:function(value) preset = value geometry.padding: 10 - id: levels - $type: haxework.gui.DataView + $type: haxework.view.DataView layout: - $type: haxework.gui.layout.TailLayout + $type: haxework.view.layout.TailLayout rowSize: 10 margin: 5 factory: $this:levelViewFactory diff --git a/src/client/haxe/ru/m/tankz/view/common/GameFrame.hx b/src/client/haxe/ru/m/tankz/view/common/GameFrame.hx index 49a0a02..fad8934 100644 --- a/src/client/haxe/ru/m/tankz/view/common/GameFrame.hx +++ b/src/client/haxe/ru/m/tankz/view/common/GameFrame.hx @@ -4,8 +4,8 @@ import ru.m.tankz.game.GameState; import flash.events.Event; import haxe.ds.Option; import haxe.Timer; -import haxework.gui.frame.FrameSwitcher; -import haxework.gui.GroupView; +import haxework.view.frame.FrameSwitcher; +import haxework.view.GroupView; import ru.m.tankz.view.common.IGamePanel; import ru.m.tankz.game.Game; import ru.m.tankz.network.NetworkManager; diff --git a/src/client/haxe/ru/m/tankz/view/common/IGamePanel.hx b/src/client/haxe/ru/m/tankz/view/common/IGamePanel.hx index 4ced7e8..f29c95d 100644 --- a/src/client/haxe/ru/m/tankz/view/common/IGamePanel.hx +++ b/src/client/haxe/ru/m/tankz/view/common/IGamePanel.hx @@ -1,7 +1,7 @@ package ru.m.tankz.view.common; import ru.m.tankz.game.Game; -import haxework.gui.IView; +import haxework.view.IView; interface IGamePanel extends IView { public var game:Game; diff --git a/src/client/haxe/ru/m/tankz/view/common/LevelFrame.hx b/src/client/haxe/ru/m/tankz/view/common/LevelFrame.hx index fea5a96..99b33b5 100644 --- a/src/client/haxe/ru/m/tankz/view/common/LevelFrame.hx +++ b/src/client/haxe/ru/m/tankz/view/common/LevelFrame.hx @@ -1,7 +1,7 @@ package ru.m.tankz.view.common; -import haxework.gui.ButtonView; -import haxework.gui.GroupView; +import haxework.view.ButtonView; +import haxework.view.GroupView; import haxework.resources.IResources; import ru.m.tankz.bundle.IConfigBundle; import ru.m.tankz.config.Config; diff --git a/src/client/haxe/ru/m/tankz/view/common/LifeView.hx b/src/client/haxe/ru/m/tankz/view/common/LifeView.hx index b786a55..0939c63 100644 --- a/src/client/haxe/ru/m/tankz/view/common/LifeView.hx +++ b/src/client/haxe/ru/m/tankz/view/common/LifeView.hx @@ -1,9 +1,9 @@ package ru.m.tankz.view.common; import openfl.Assets; -import haxework.gui.LabelView; -import haxework.gui.ImageView; -import haxework.gui.HGroupView; +import haxework.view.LabelView; +import haxework.view.ImageView; +import haxework.view.HGroupView; @:template class LifeView extends HGroupView { @:view("tank") public var tankImage:ImageView; diff --git a/src/client/haxe/ru/m/tankz/view/common/LifeView.yaml b/src/client/haxe/ru/m/tankz/view/common/LifeView.yaml index 55161fd..5a84299 100644 --- a/src/client/haxe/ru/m/tankz/view/common/LifeView.yaml +++ b/src/client/haxe/ru/m/tankz/view/common/LifeView.yaml @@ -2,12 +2,12 @@ layout.margin: 5 views: - id: tank - $type: haxework.gui.ImageView + $type: haxework.view.ImageView - id: live - $type: haxework.gui.LabelView + $type: haxework.view.LabelView skinId: text.box geometry.size.fixed: [50, 38] - id: score - $type: haxework.gui.LabelView + $type: haxework.view.LabelView skinId: text.box geometry.size.fixed: [100, 38] diff --git a/src/client/haxe/ru/m/tankz/view/common/PlayerView.hx b/src/client/haxe/ru/m/tankz/view/common/PlayerView.hx index ea8f7dc..6468701 100644 --- a/src/client/haxe/ru/m/tankz/view/common/PlayerView.hx +++ b/src/client/haxe/ru/m/tankz/view/common/PlayerView.hx @@ -2,11 +2,11 @@ package ru.m.tankz.view.common; import haxework.resources.IResources; import haxework.color.ColorUtil; -import haxework.gui.DataView; -import haxework.gui.HGroupView; -import haxework.gui.LabelView; -import haxework.gui.skin.ISkin; -import haxework.gui.ToggleButtonView; +import haxework.view.DataView; +import haxework.view.HGroupView; +import haxework.view.LabelView; +import haxework.view.skin.ISkin; +import haxework.view.ToggleButtonView; import ru.m.tankz.control.Control; import ru.m.tankz.game.GameState; import ru.m.tankz.Type.TeamId; diff --git a/src/client/haxe/ru/m/tankz/view/common/PlayerView.yaml b/src/client/haxe/ru/m/tankz/view/common/PlayerView.yaml index fbf68fa..cd01d7b 100644 --- a/src/client/haxe/ru/m/tankz/view/common/PlayerView.yaml +++ b/src/client/haxe/ru/m/tankz/view/common/PlayerView.yaml @@ -4,12 +4,12 @@ layout.margin: 10 layout.vAlign: middle views: - id: label - $type: haxework.gui.LabelView + $type: haxework.view.LabelView skinId: text - id: teams - $type: haxework.gui.DataView + $type: haxework.view.DataView factory: $this:teamViewFactory layout: - $type: haxework.gui.layout.HorizontalLayout + $type: haxework.view.layout.HorizontalLayout margin: 3 +onDataSelect: $this:onTeamSelect diff --git a/src/client/haxe/ru/m/tankz/view/dota/DotaGameFrame.yaml b/src/client/haxe/ru/m/tankz/view/dota/DotaGameFrame.yaml index 4db47b6..3986e8b 100644 --- a/src/client/haxe/ru/m/tankz/view/dota/DotaGameFrame.yaml +++ b/src/client/haxe/ru/m/tankz/view/dota/DotaGameFrame.yaml @@ -1,7 +1,7 @@ --- skinId: container views: - - $type: haxework.gui.VGroupView + - $type: haxework.view.VGroupView layout.margin: 5 views: - id: panel diff --git a/src/client/haxe/ru/m/tankz/view/dota/DotaGamePanel.hx b/src/client/haxe/ru/m/tankz/view/dota/DotaGamePanel.hx index c053aee..bdbec83 100644 --- a/src/client/haxe/ru/m/tankz/view/dota/DotaGamePanel.hx +++ b/src/client/haxe/ru/m/tankz/view/dota/DotaGamePanel.hx @@ -1,7 +1,7 @@ package ru.m.tankz.view.dota; -import haxework.gui.HGroupView; -import haxework.gui.LabelView; +import haxework.view.HGroupView; +import haxework.view.LabelView; import ru.m.tankz.view.common.IGamePanel; import ru.m.tankz.view.common.LifeView; import ru.m.tankz.game.Game; diff --git a/src/client/haxe/ru/m/tankz/view/dota/DotaGamePanel.yaml b/src/client/haxe/ru/m/tankz/view/dota/DotaGamePanel.yaml index 4ef996a..f694286 100644 --- a/src/client/haxe/ru/m/tankz/view/dota/DotaGamePanel.yaml +++ b/src/client/haxe/ru/m/tankz/view/dota/DotaGamePanel.yaml @@ -6,14 +6,14 @@ views: $type: ru.m.tankz.view.common.LifeView tank: bc color: 0xff4422 - - $type: haxework.gui.SpriteView + - $type: haxework.view.SpriteView geometry.size.width: 25% - id: level - $type: haxework.gui.LabelView + $type: haxework.view.LabelView skinId: text.box geometry.size.height: 38 geometry.size.width: 50% - - $type: haxework.gui.SpriteView + - $type: haxework.view.SpriteView geometry.size.width: 25% - id: dire $type: ru.m.tankz.view.common.LifeView diff --git a/src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.hx b/src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.hx index a7e277b..7020dea 100644 --- a/src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.hx +++ b/src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.hx @@ -1,8 +1,8 @@ package ru.m.tankz.view.dota; -import haxework.gui.ButtonView; -import haxework.gui.DataView; -import haxework.gui.frame.FrameSwitcher; +import haxework.view.ButtonView; +import haxework.view.DataView; +import haxework.view.frame.FrameSwitcher; import ru.m.tankz.view.common.LevelFrame; import ru.m.tankz.view.common.PlayerView; import ru.m.tankz.game.GameState; diff --git a/src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.yaml b/src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.yaml index a2992e2..2299d42 100644 --- a/src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.yaml +++ b/src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.yaml @@ -1,22 +1,22 @@ --- skinId: container layout: - $type: haxework.gui.layout.VerticalLayout + $type: haxework.view.layout.VerticalLayout views: - - $type: haxework.gui.LabelView + - $type: haxework.view.LabelView skinId: text.header text: DotA - id: players - $type: haxework.gui.DataView + $type: haxework.view.DataView layout: - $type: haxework.gui.layout.VerticalLayout + $type: haxework.view.layout.VerticalLayout hAlign: right factory: $this:playerViewFactory geometry.padding: 10 - id: levels - $type: haxework.gui.DataView + $type: haxework.view.DataView layout: - $type: haxework.gui.layout.TailLayout + $type: haxework.view.layout.TailLayout rowSize: 5 margin: 5 factory: $this:levelViewFactory diff --git a/src/client/haxe/ru/m/tankz/view/network/GameItemView.hx b/src/client/haxe/ru/m/tankz/view/network/GameItemView.hx index 1bde8c4..060cc68 100755 --- a/src/client/haxe/ru/m/tankz/view/network/GameItemView.hx +++ b/src/client/haxe/ru/m/tankz/view/network/GameItemView.hx @@ -1,8 +1,8 @@ package ru.m.tankz.view.network; -import haxework.gui.HGroupView; -import haxework.gui.LabelView; -import haxework.gui.list.ListView; +import haxework.view.HGroupView; +import haxework.view.LabelView; +import haxework.view.list.ListView; import ru.m.tankz.proto.core.GameInfoProto; diff --git a/src/client/haxe/ru/m/tankz/view/network/GameItemView.yaml b/src/client/haxe/ru/m/tankz/view/network/GameItemView.yaml index 1cf0139..71244f0 100644 --- a/src/client/haxe/ru/m/tankz/view/network/GameItemView.yaml +++ b/src/client/haxe/ru/m/tankz/view/network/GameItemView.yaml @@ -4,12 +4,12 @@ height: 44 margins: 5 views: - id: label - $type: haxework.gui.LabelView + $type: haxework.view.LabelView $style: label pWidth: 100 pHeight: 100 text: "" skin: - $type: haxework.gui.skin.ColorSkin + $type: haxework.view.skin.ColorSkin color: "#000000" alpha: 0.2 diff --git a/src/client/haxe/ru/m/tankz/view/network/UserItemView.hx b/src/client/haxe/ru/m/tankz/view/network/UserItemView.hx index 30a1268..63fec48 100755 --- a/src/client/haxe/ru/m/tankz/view/network/UserItemView.hx +++ b/src/client/haxe/ru/m/tankz/view/network/UserItemView.hx @@ -1,8 +1,8 @@ package ru.m.tankz.view.network; -import haxework.gui.HGroupView; -import haxework.gui.LabelView; -import haxework.gui.list.ListView; +import haxework.view.HGroupView; +import haxework.view.LabelView; +import haxework.view.list.ListView; import ru.m.tankz.proto.core.UserProto; diff --git a/src/client/haxe/ru/m/tankz/view/network/UserItemView.yaml b/src/client/haxe/ru/m/tankz/view/network/UserItemView.yaml index 1cf0139..71244f0 100644 --- a/src/client/haxe/ru/m/tankz/view/network/UserItemView.yaml +++ b/src/client/haxe/ru/m/tankz/view/network/UserItemView.yaml @@ -4,12 +4,12 @@ height: 44 margins: 5 views: - id: label - $type: haxework.gui.LabelView + $type: haxework.view.LabelView $style: label pWidth: 100 pHeight: 100 text: "" skin: - $type: haxework.gui.skin.ColorSkin + $type: haxework.view.skin.ColorSkin color: "#000000" alpha: 0.2 diff --git a/src/client/haxe/ru/m/tankz/view/popup/FontPopup.hx b/src/client/haxe/ru/m/tankz/view/popup/FontPopup.hx index c6cc883..8c11814 100644 --- a/src/client/haxe/ru/m/tankz/view/popup/FontPopup.hx +++ b/src/client/haxe/ru/m/tankz/view/popup/FontPopup.hx @@ -2,9 +2,9 @@ package ru.m.tankz.view.popup; import flash.text.Font; import flash.text.FontType; -import haxework.gui.list.LabelListItem; -import haxework.gui.list.ListView; -import haxework.gui.popup.PopupView; +import haxework.view.list.LabelListItem; +import haxework.view.list.ListView; +import haxework.view.popup.PopupView; class FontLabelView extends LabelListItem { diff --git a/src/client/haxe/ru/m/tankz/view/popup/FontPopup.yaml b/src/client/haxe/ru/m/tankz/view/popup/FontPopup.yaml index 8391f1e..43ae0b5 100644 --- a/src/client/haxe/ru/m/tankz/view/popup/FontPopup.yaml +++ b/src/client/haxe/ru/m/tankz/view/popup/FontPopup.yaml @@ -1,6 +1,6 @@ --- view: - $type: haxework.gui.VGroupView + $type: haxework.view.VGroupView geometry.size.width: 400 geometry.size.height: 80% geometry.padding: 10 @@ -9,19 +9,19 @@ view: skinId: dark views: - id: fonts - $type: haxework.gui.list.VListView + $type: haxework.view.list.VListView geometry.size.stretch: true factory: $this:fontViewFactory +onItemSelect: $code:function(item) close(item.data) scroll: - $type: haxework.gui.list.VScrollBarView + $type: haxework.view.list.VScrollBarView skinId: scroll.vertical - - $type: haxework.gui.HGroupView + - $type: haxework.view.HGroupView geometry.size.width: 100% geometry.margin.top: 10 layout.hAlign: right views: - - $type: haxework.gui.ButtonView + - $type: haxework.view.ButtonView skinId: button.simple text: Cancel +onPress: $code:reject('cancel') diff --git a/src/client/haxe/ru/m/tankz/view/settings/ActionView.hx b/src/client/haxe/ru/m/tankz/view/settings/ActionView.hx index 09139eb..660de00 100755 --- a/src/client/haxe/ru/m/tankz/view/settings/ActionView.hx +++ b/src/client/haxe/ru/m/tankz/view/settings/ActionView.hx @@ -1,8 +1,8 @@ package ru.m.tankz.view.settings; -import haxework.gui.HGroupView; -import haxework.gui.LabelView; -import haxework.gui.list.ListView.IListItemView; +import haxework.view.HGroupView; +import haxework.view.LabelView; +import haxework.view.list.ListView.IListItemView; import openfl.Assets; import openfl.events.KeyboardEvent; import promhx.Deferred; diff --git a/src/client/haxe/ru/m/tankz/view/settings/ActionView.yaml b/src/client/haxe/ru/m/tankz/view/settings/ActionView.yaml index 3146f55..e388c50 100644 --- a/src/client/haxe/ru/m/tankz/view/settings/ActionView.yaml +++ b/src/client/haxe/ru/m/tankz/view/settings/ActionView.yaml @@ -3,10 +3,10 @@ geometry.margin: 5 layout.margin: 5 views: - id: action - $type: haxework.gui.LabelView + $type: haxework.view.LabelView geometry.size.fixed: [200, 38] skinId: text.box - id: key - $type: haxework.gui.LabelView + $type: haxework.view.LabelView geometry.size.fixed: [200, 38] skinId: text.box diff --git a/src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.hx b/src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.hx index f41d819..6f5ed3d 100644 --- a/src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.hx +++ b/src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.hx @@ -1,9 +1,9 @@ package ru.m.tankz.view.settings; -import haxework.gui.ButtonView; -import haxework.gui.DataView; -import haxework.gui.LabelView; -import haxework.gui.VGroupView; +import haxework.view.ButtonView; +import haxework.view.DataView; +import haxework.view.LabelView; +import haxework.view.VGroupView; import promhx.Promise; import ru.m.tankz.control.ActionConfig.ActionItem; import ru.m.tankz.control.ActionConfig; diff --git a/src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.yaml b/src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.yaml index 357f508..7b7f0e8 100644 --- a/src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.yaml +++ b/src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.yaml @@ -2,29 +2,29 @@ layout.margin: 10 layout.hAlign: center views: - id: label - $type: haxework.gui.LabelView + $type: haxework.view.LabelView skinId: text - - $type: haxework.gui.HGroupView + - $type: haxework.view.HGroupView layout.margin: 10 views: - id: change - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView +onPress: $this:onPress skinId: button.simple text: Change - id: clear - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView +onPress: $this:onPress skinId: button.simple text: Clear - id: reset - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView +onPress: $this:onPress skinId: button.simple text: Reset - id: list - $type: haxework.gui.DataView + $type: haxework.view.DataView layout: - $type: haxework.gui.layout.VerticalLayout + $type: haxework.view.layout.VerticalLayout factory: $this:viewFactory +onItemSelect: $this:onItemSelect diff --git a/src/editor/haxe/ru/m/tankz/editor/ColorView.hx b/src/editor/haxe/ru/m/tankz/editor/ColorView.hx index fcd4f73..7a5b863 100644 --- a/src/editor/haxe/ru/m/tankz/editor/ColorView.hx +++ b/src/editor/haxe/ru/m/tankz/editor/ColorView.hx @@ -2,7 +2,7 @@ package ru.m.tankz.editor; import flash.events.MouseEvent; import haxework.color.Color; -import haxework.gui.ImageView; +import haxework.view.ImageView; import haxework.signal.Signal; import openfl.Assets; diff --git a/src/editor/haxe/ru/m/tankz/editor/Editor.hx b/src/editor/haxe/ru/m/tankz/editor/Editor.hx index 7d16075..fde1cd2 100644 --- a/src/editor/haxe/ru/m/tankz/editor/Editor.hx +++ b/src/editor/haxe/ru/m/tankz/editor/Editor.hx @@ -1,17 +1,17 @@ package ru.m.tankz.editor; -import haxework.gui.IGroupView; -import haxework.gui.ToggleButtonView; -import haxework.gui.IView; +import haxework.view.IGroupView; +import haxework.view.ToggleButtonView; +import haxework.view.IView; import ru.m.tankz.editor.frame.LevelFrame; import ru.m.tankz.bundle.LevelBundle; import ru.m.tankz.bundle.ILevelBundle; import ru.m.tankz.bundle.ConfigBundle; import ru.m.tankz.bundle.IConfigBundle; -import haxework.gui.ButtonView; -import haxework.gui.frame.FrameSwitcher; -import haxework.gui.VGroupView; -import haxework.gui.Root; +import haxework.view.ButtonView; +import haxework.view.frame.FrameSwitcher; +import haxework.view.VGroupView; +import haxework.view.Root; import haxework.log.TraceLogger; import haxework.provider.Provider; import haxework.resources.IResources; diff --git a/src/editor/haxe/ru/m/tankz/editor/EditorView.yaml b/src/editor/haxe/ru/m/tankz/editor/EditorView.yaml index 493ac85..7be5584 100644 --- a/src/editor/haxe/ru/m/tankz/editor/EditorView.yaml +++ b/src/editor/haxe/ru/m/tankz/editor/EditorView.yaml @@ -1,27 +1,27 @@ --- -$type: haxework.gui.VGroupView +$type: haxework.view.VGroupView skinId: dark geometry.size.stretch: true layout.hAlign: center views: # Tabs - id: tabs - $type: haxework.gui.HGroupView + $type: haxework.view.HGroupView geometry.margin.bottom: -2 views: - id: level - $type: haxework.gui.ToggleButtonView + $type: haxework.view.ToggleButtonView skinId: button.tab text: Level +onPress: $this:onPress - id: tank - $type: haxework.gui.ToggleButtonView + $type: haxework.view.ToggleButtonView skinId: button.tab text: Tank +onPress: $this:onPress # Switcher - id: switcher - $type: haxework.gui.frame.FrameSwitcher + $type: haxework.view.frame.FrameSwitcher skinId: border +onSwitch: $this:onFrameSwitch geometry.size.stretch: true @@ -32,7 +32,7 @@ views: - id: tank $type: ru.m.tankz.editor.frame.TankFrame # Version - - $type: haxework.gui.LabelView + - $type: haxework.view.LabelView skinId: text geometry.position: absolute geometry.vAlign: top diff --git a/src/editor/haxe/ru/m/tankz/editor/frame/LevelFrame.hx b/src/editor/haxe/ru/m/tankz/editor/frame/LevelFrame.hx index 17a880d..7410e91 100644 --- a/src/editor/haxe/ru/m/tankz/editor/frame/LevelFrame.hx +++ b/src/editor/haxe/ru/m/tankz/editor/frame/LevelFrame.hx @@ -1,9 +1,9 @@ package ru.m.tankz.editor.frame; -import haxework.gui.ButtonView; -import haxework.gui.DataView; -import haxework.gui.LabelView; -import haxework.gui.VGroupView; +import haxework.view.ButtonView; +import haxework.view.DataView; +import haxework.view.LabelView; +import haxework.view.VGroupView; import haxework.provider.Provider; import ru.m.tankz.bundle.IConfigBundle; import ru.m.tankz.config.Config; diff --git a/src/editor/haxe/ru/m/tankz/editor/frame/LevelFrame.yaml b/src/editor/haxe/ru/m/tankz/editor/frame/LevelFrame.yaml index 807377c..e12fbaa 100644 --- a/src/editor/haxe/ru/m/tankz/editor/frame/LevelFrame.yaml +++ b/src/editor/haxe/ru/m/tankz/editor/frame/LevelFrame.yaml @@ -1,54 +1,54 @@ --- -$type: haxework.gui.VGroupView +$type: haxework.view.VGroupView geometry.size.stretch: true layout.margin: 2 layout.vAlign: top layout.hAlign: center views: - - $type: haxework.gui.HGroupView + - $type: haxework.view.HGroupView views: - id: gameClassicButton - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView skinId: button.simple text: Classic +onPress: $this:onPress - id: gameDotaButton - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView skinId: button.simple text: DotA +onPress: $this:onPress - id: fileNameLabel - $type: haxework.gui.LabelView + $type: haxework.view.LabelView # map - - $type: haxework.gui.HGroupView + - $type: haxework.view.HGroupView views: - id: spawnPointList - $type: haxework.gui.DataView + $type: haxework.view.DataView geometry.padding: 3 layout: - $type: haxework.gui.layout.VerticalLayout + $type: haxework.view.layout.VerticalLayout hAlign: center margin: 5 factory: $code:ru.m.tankz.editor.level.SpawnPointView.factory - id: mapView $type: ru.m.tankz.editor.level.MapEditView - id: brickList - $type: haxework.gui.DataView + $type: haxework.view.DataView geometry.padding: 3 layout: - $type: haxework.gui.layout.VerticalLayout + $type: haxework.view.layout.VerticalLayout hAlign: center margin: 5 factory: $code:ru.m.tankz.editor.level.BrickView.factory - - $type: haxework.gui.HGroupView + - $type: haxework.view.HGroupView views: - id: openButton - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView skinId: button.simple text: Open +onPress: $this:onPress - id: saveButton - $type: haxework.gui.ButtonView + $type: haxework.view.ButtonView skinId: button.simple text: Save +onPress: $this:onPress diff --git a/src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.hx b/src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.hx index 4c10bdb..b3d3392 100644 --- a/src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.hx +++ b/src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.hx @@ -1,10 +1,10 @@ package ru.m.tankz.editor.frame; import ru.m.tankz.editor.tank.TankView; -import haxework.gui.IGroupView; +import haxework.view.IGroupView; import haxework.color.Color; -import haxework.gui.InputView; -import haxework.gui.VGroupView; +import haxework.view.InputView; +import haxework.view.VGroupView; @:template class TankFrame extends VGroupView { public static inline var ID = 'tank'; diff --git a/src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.yaml b/src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.yaml index 7e3f647..6034a56 100644 --- a/src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.yaml +++ b/src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.yaml @@ -5,9 +5,9 @@ layout.hAlign: center layout.margin: 10 views: - id: tanks - $type: haxework.gui.GroupView + $type: haxework.view.GroupView layout: - $type: haxework.gui.layout.TailLayout + $type: haxework.view.layout.TailLayout rowSize: 4 margin: 20 views: @@ -28,7 +28,7 @@ views: - $type: ru.m.tankz.editor.tank.TankView image: "$asset:image:resources/image/tank/bd-0.png" - id: color - $type: haxework.gui.InputView + $type: haxework.view.InputView skinId: text.box +onChange: $code:function(value) color = value geometry.size.width: 120 diff --git a/src/editor/haxe/ru/m/tankz/editor/level/BrushView.hx b/src/editor/haxe/ru/m/tankz/editor/level/BrushView.hx index b0add74..eb1e671 100644 --- a/src/editor/haxe/ru/m/tankz/editor/level/BrushView.hx +++ b/src/editor/haxe/ru/m/tankz/editor/level/BrushView.hx @@ -1,7 +1,7 @@ package ru.m.tankz.editor.level; import flash.display.Shape; -import haxework.gui.ImageView; +import haxework.view.ImageView; import openfl.utils.Assets; class BrushView extends ImageView { diff --git a/src/editor/haxe/ru/m/tankz/editor/level/MapEditView.hx b/src/editor/haxe/ru/m/tankz/editor/level/MapEditView.hx index d9dcff2..7d09bb4 100644 --- a/src/editor/haxe/ru/m/tankz/editor/level/MapEditView.hx +++ b/src/editor/haxe/ru/m/tankz/editor/level/MapEditView.hx @@ -5,7 +5,7 @@ import flash.display.DisplayObjectContainer; import flash.display.Graphics; import flash.display.Sprite; import flash.events.MouseEvent; -import haxework.gui.SpriteView; +import haxework.view.SpriteView; import ru.m.geom.Point; import ru.m.geom.Rectangle; import ru.m.tankz.config.Config; diff --git a/src/editor/haxe/ru/m/tankz/editor/tank/TankView.hx b/src/editor/haxe/ru/m/tankz/editor/tank/TankView.hx index eb68fcc..cb7d556 100644 --- a/src/editor/haxe/ru/m/tankz/editor/tank/TankView.hx +++ b/src/editor/haxe/ru/m/tankz/editor/tank/TankView.hx @@ -3,8 +3,8 @@ package ru.m.tankz.editor.tank; import flash.display.Bitmap; import flash.display.BitmapData; import haxework.color.Color; -import haxework.gui.utils.BitmapUtil; -import haxework.gui.View; +import haxework.view.utils.BitmapUtil; +import haxework.view.View; class TankView extends View {