diff --git a/src/client/haxe/ru/m/tankz/Client.hx b/src/client/haxe/ru/m/tankz/Client.hx index c6b0789..72ebef4 100755 --- a/src/client/haxe/ru/m/tankz/Client.hx +++ b/src/client/haxe/ru/m/tankz/Client.hx @@ -3,11 +3,7 @@ package ru.m.tankz; import haxework.gui.ButtonView; import flash.display.Sprite; import haxework.gui.IGroupView; -import ru.m.tankz.view.frames.GameReadyFrame; import ru.m.tankz.PacketBuilder; -import flash.text.TextFieldType; -import flash.Lib; -import flash.text.TextField; import haxework.log.JSLogger; import ru.m.tankz.data.GameData; import haxework.frame.IFrameSwitcher; @@ -42,7 +38,7 @@ class Client implements IConnectionHandler { public function new() { var bytes = Assets.getBytes("resources/layout/main.json"); var form:Dynamic = Json.parse(bytes.readUTFBytes(bytes.bytesAvailable)); - view = GuiBuilder.build(form, {listener:this}); + view = GuiBuilder.build(form); new Root(view); switcher = view.findViewById("switcher"); logout = view.findViewById("top:logout"); @@ -58,13 +54,6 @@ class Client implements IConnectionHandler { #end switcher.change(AuthFrame.ID); - - /*var tf = new TextField(); - tf.type = TextFieldType.INPUT; - tf.text = "Azaza"; - tf.border = true; - tf.borderColor = 0xff0000; - Lib.current.addChild(tf);*/ } public function onPress(view:ButtonView):Void { diff --git a/src/client/haxe/ru/m/tankz/view/frames/AuthFrame.hx b/src/client/haxe/ru/m/tankz/view/frames/AuthFrame.hx index ec52ebb..9ecafe4 100755 --- a/src/client/haxe/ru/m/tankz/view/frames/AuthFrame.hx +++ b/src/client/haxe/ru/m/tankz/view/frames/AuthFrame.hx @@ -8,7 +8,6 @@ import protohx.Message; import haxework.frame.IFrameSwitcher; import ru.m.tankz.proto.LoginRequest; import ru.m.tankz.proto.LoginResponse; -import ru.m.core.connect.IConnection; import haxework.provider.Provider; import haxe.crypto.Md5; import haxework.gui.InputView; diff --git a/src/client/haxe/ru/m/tankz/view/frames/GameListFrame.hx b/src/client/haxe/ru/m/tankz/view/frames/GameListFrame.hx index a16b594..56a39d3 100755 --- a/src/client/haxe/ru/m/tankz/view/frames/GameListFrame.hx +++ b/src/client/haxe/ru/m/tankz/view/frames/GameListFrame.hx @@ -4,7 +4,7 @@ import ru.m.tankz.proto.JoinGameResponse; import ru.m.tankz.proto.JoinGameRequest; import ru.m.tankz.proto.CreateGameResponse; import ru.m.tankz.proto.CreateGameRequest; -import ru.m.tankz.view.frames.game.GameView; +import ru.m.tankz.view.frames.list.GameView; import haxework.frame.IFrameSwitcher; import haxework.gui.ButtonView; import haxework.gui.LabelView; diff --git a/src/client/haxe/ru/m/tankz/view/frames/PersonListFrame.hx b/src/client/haxe/ru/m/tankz/view/frames/PersonListFrame.hx index 1346263..0136d9b 100755 --- a/src/client/haxe/ru/m/tankz/view/frames/PersonListFrame.hx +++ b/src/client/haxe/ru/m/tankz/view/frames/PersonListFrame.hx @@ -7,7 +7,7 @@ import ru.m.tankz.proto.PersonSelectRequest; import haxework.gui.list.ListView; import protohx.Message; import ru.m.core.connect.IConnection; -import ru.m.tankz.view.frames.person.PersonView; +import ru.m.tankz.view.frames.list.PersonView; import ru.m.tankz.data.GameData; import haxework.provider.Provider; import ru.m.tankz.proto.Person; diff --git a/src/client/haxe/ru/m/tankz/view/frames/game/PersonView.hx b/src/client/haxe/ru/m/tankz/view/frames/game/PersonView.hx deleted file mode 100755 index 421bc3d..0000000 --- a/src/client/haxe/ru/m/tankz/view/frames/game/PersonView.hx +++ /dev/null @@ -1,31 +0,0 @@ -package ru.m.tankz.view.frames.game; - -import ru.m.tankz.proto.Person; -import haxework.gui.list.ListView.IListItemView; -import haxework.gui.LabelView; -import haxework.gui.skin.ColorSkin; -import haxework.gui.HGroupView; - -class PersonView extends HGroupView implements IListItemView { - - public var item_index(default, default):Int; - public var data(default, set):Person; - - private var nameLabel:LabelView; - - public function new() { - super(); - pWidth = 100; - height = 50; - skin = new ColorSkin(0xffffff); - - nameLabel = new LabelView(); - addView(nameLabel); - } - - private function set_data(value:Person):Person { - this.data = value; - nameLabel.text = value.name; - return this.data; - } -} \ No newline at end of file diff --git a/src/client/haxe/ru/m/tankz/view/frames/game/GameView.hx b/src/client/haxe/ru/m/tankz/view/frames/list/GameView.hx similarity index 95% rename from src/client/haxe/ru/m/tankz/view/frames/game/GameView.hx rename to src/client/haxe/ru/m/tankz/view/frames/list/GameView.hx index 51f38de..c7f5e4d 100755 --- a/src/client/haxe/ru/m/tankz/view/frames/game/GameView.hx +++ b/src/client/haxe/ru/m/tankz/view/frames/list/GameView.hx @@ -1,4 +1,4 @@ -package ru.m.tankz.view.frames.game; +package ru.m.tankz.view.frames.list; import ru.m.tankz.proto.Person; import ru.m.tankz.proto.Game; diff --git a/src/client/haxe/ru/m/tankz/view/frames/person/PersonView.hx b/src/client/haxe/ru/m/tankz/view/frames/list/PersonView.hx similarity index 90% rename from src/client/haxe/ru/m/tankz/view/frames/person/PersonView.hx rename to src/client/haxe/ru/m/tankz/view/frames/list/PersonView.hx index fe20aaf..ecf686b 100755 --- a/src/client/haxe/ru/m/tankz/view/frames/person/PersonView.hx +++ b/src/client/haxe/ru/m/tankz/view/frames/list/PersonView.hx @@ -1,4 +1,4 @@ -package ru.m.tankz.view.frames.person; +package ru.m.tankz.view.frames.list; import haxework.gui.list.ListView.IListItemView; import haxework.gui.LabelView; diff --git a/src/client/resources/fonts/BookmanOldStyle.eot b/src/client/resources/fonts/BookmanOldStyle.eot new file mode 100644 index 0000000..8b88ee9 Binary files /dev/null and b/src/client/resources/fonts/BookmanOldStyle.eot differ diff --git a/src/client/resources/fonts/BookmanOldStyle.svg b/src/client/resources/fonts/BookmanOldStyle.svg new file mode 100644 index 0000000..f867f6a --- /dev/null +++ b/src/client/resources/fonts/BookmanOldStyle.svg @@ -0,0 +1,1365 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/src/client/resources/fonts/BookmanOldStyle.woff b/src/client/resources/fonts/BookmanOldStyle.woff new file mode 100644 index 0000000..9be5802 Binary files /dev/null and b/src/client/resources/fonts/BookmanOldStyle.woff differ diff --git a/src/client/resources/layout/main.json b/src/client/resources/layout/main.json index bf97b04..10c2d52 100755 --- a/src/client/resources/layout/main.json +++ b/src/client/resources/layout/main.json @@ -87,7 +87,7 @@ { "id": "list", "type": "haxework.gui.list.VListView", "factory": { - "type": "~ru.m.tankz.view.frames.person.PersonView" + "type": "~ru.m.tankz.view.frames.list.PersonView" }, "scroll": { "type": "haxework.gui.list.VScrollView", @@ -116,7 +116,7 @@ { "id": "list", "type": "haxework.gui.list.VListView", "factory": { - "type": "~ru.m.tankz.view.frames.game.GameView" + "type": "~ru.m.tankz.view.frames.list.GameView" }, "scroll": { "type": "haxework.gui.list.VScrollView", @@ -151,7 +151,7 @@ { "id": "list", "type": "haxework.gui.list.VListView", "factory": { - "type": "~ru.m.tankz.view.frames.game.PersonView" + "type": "~ru.m.tankz.view.frames.list.PersonView" }, "scroll": { "type": "haxework.gui.list.VScrollView",