[view] rename from gui

src/main/haxework/App.hx

@@ -1,12 +1,12 @@
 package haxework;
 
-import haxework.gui.Root;
-import haxework.gui.IView;
+import haxework.view.Root;
+import haxework.view.IView;
 import flash.Lib;
 import haxework.animate.Animate;
 import haxework.animate.FadeAnimate;
 import haxework.animate.UnFadeAnimate;
-import haxework.gui.popup.PopupManager;
+import haxework.view.popup.PopupManager;
 import haxework.net.manage.ILoaderManager;
 import haxework.net.manage.LoaderManager;
 import haxework.resources.IResources;

src/main/haxework/animate/CircleMaskAnimate.hx

@@ -4,7 +4,7 @@ import flash.display.DisplayObject;
 import flash.display.Sprite;
 import haxework.animate.Animate;
 import haxework.animate.IAnimate;
-import haxework.gui.IView;
+import haxework.view.IView;
 
 class CircleMaskAnimate extends Animate {
 

src/main/haxework/animate/FadeAnimate.hx

@@ -2,7 +2,7 @@ package haxework.animate;
 
 import flash.display.DisplayObject;
 import haxework.animate.IAnimate;
-import haxework.gui.IView;
+import haxework.view.IView;
 import haxework.animate.Animate;
 
 class FadeAnimate extends Animate {

src/main/haxework/animate/SlideAnimate.hx

@@ -1,7 +1,7 @@
 package haxework.animate;
 
 import flash.display.DisplayObject;
-import haxework.gui.IView;
+import haxework.view.IView;
 
 class SlideAnimate extends Animate {
 

src/main/haxework/animate/UnFadeAnimate.hx

@@ -1,7 +1,7 @@
 package haxework.animate;
 
 import flash.display.DisplayObject;
-import haxework.gui.IView;
+import haxework.view.IView;
 import haxework.animate.Animate;
 
 class UnFadeAnimate extends Animate {

src/main/haxework/resources/IResources.hx

@@ -2,7 +2,7 @@ package haxework.resources;
 
 import flash.display.BitmapData;
 import flash.display.MovieClip;
-import haxework.gui.skin.ISkin.SkinSet;
+import haxework.view.skin.ISkin.SkinSet;
 import haxework.resources.Resources.ResMap;
 
 interface IResources {

src/main/haxework/resources/Resources.hx

@@ -3,7 +3,7 @@ package haxework.resources;
 import flash.display.BitmapData;
 import flash.display.MovieClip;
 import haxe.ds.StringMap;
-import haxework.gui.skin.ISkin;
+import haxework.view.skin.ISkin;
 
 private typedef Listener = {object:Dynamic, field:String};
 

src/main/haxework/view/ButtonView.hx

@@ -1,4 +1,4 @@
-package haxework.gui;
+package haxework.view;
 
 import haxework.signal.Signal;
 import flash.events.MouseEvent;

src/main/haxework/view/DataView.hx

@@ -1,4 +1,4 @@
-package haxework.gui;
+package haxework.view;
 
 import flash.display.DisplayObject;
 import flash.events.MouseEvent;

src/main/haxework/view/GroupView.hx

@@ -1,8 +1,8 @@
-package haxework.gui;
+package haxework.view;
 
 import flash.display.DisplayObjectContainer;
-import haxework.gui.layout.DefaultLayout;
-import haxework.gui.layout.ILayout;
+import haxework.view.layout.DefaultLayout;
+import haxework.view.layout.ILayout;
 
 class GroupView extends SpriteView implements IGroupView {
     public var container(get, null):DisplayObjectContainer;

src/main/haxework/view/HGroupView.hx

@@ -1,6 +1,6 @@
-package haxework.gui;
+package haxework.view;
 
-import haxework.gui.layout.HorizontalLayout;
+import haxework.view.layout.HorizontalLayout;
 
 class HGroupView extends GroupView {
 

src/main/haxework/view/IGroupView.hx

@@ -1,7 +1,7 @@
-package haxework.gui;
+package haxework.view;
 
 import flash.display.DisplayObjectContainer;
-import haxework.gui.layout.ILayout;
+import haxework.view.layout.ILayout;
 
 interface IGroupView extends IView<Dynamic> {
     public var container(get, null):DisplayObjectContainer;

src/main/haxework/view/ITextView.hx

@@ -1,7 +1,7 @@
-package haxework.gui;
+package haxework.view;
 
 import flash.text.TextField;
-import haxework.gui.IView;
+import haxework.view.IView;
 import flash.text.TextFormatAlign;
 
 interface ITextView extends IView<Dynamic> {

src/main/haxework/view/IView.hx

@@ -1,8 +1,8 @@
-package haxework.gui;
+package haxework.view;
 
 import flash.display.DisplayObject;
-import haxework.gui.core.Geometry;
-import haxework.gui.skin.ISkin.SkinSet;
+import haxework.view.core.Geometry;
+import haxework.view.skin.ISkin.SkinSet;
 
 interface IView<C:DisplayObject> {
     public var id(default, default):String;

src/main/haxework/view/ImageView.hx

@@ -1,10 +1,10 @@
-package haxework.gui;
+package haxework.view;
 
 import flash.display.BitmapData;
-import haxework.gui.skin.BitmapSkin;
-import haxework.gui.skin.ISkin;
-import haxework.gui.utils.BitmapUtil;
-import haxework.gui.utils.DrawUtil.FillType;
+import haxework.view.skin.BitmapSkin;
+import haxework.view.skin.ISkin;
+import haxework.view.utils.BitmapUtil;
+import haxework.view.utils.DrawUtil.FillType;
 import haxework.net.ImageLoader;
 
 class ImageView extends SpriteView {

src/main/haxework/view/InputTextField.hx

@@ -1,4 +1,4 @@
-package haxework.gui;
+package haxework.view;
 
 import flash.events.Event;
 import flash.ui.Keyboard;
@@ -66,4 +66,4 @@ class InputTextField extends TextField {
     border = false;
   }
   #end
-}
+}

src/main/haxework/view/InputView.hx

@@ -1,4 +1,4 @@
-package haxework.gui;
+package haxework.view;
 
 import flash.events.Event;
 import flash.events.KeyboardEvent;

src/main/haxework/view/LabelView.hx

@@ -1,7 +1,7 @@
-package haxework.gui;
+package haxework.view;
 
-import haxework.gui.core.VAlign;
-import haxework.gui.core.HAlign;
+import haxework.view.core.VAlign;
+import haxework.view.core.HAlign;
 
 class LabelView extends TextView {
 

src/main/haxework/view/MovieView.hx

@@ -1,4 +1,4 @@
-package haxework.gui;
+package haxework.view;
 
 import haxework.net.SwfLoader;
 import flash.display.MovieClip;

src/main/haxework/view/ProgressView.hx

@@ -1,4 +1,4 @@
-package haxework.gui;
+package haxework.view;
 
 class ProgressView extends SpriteView {
 
@@ -26,4 +26,4 @@ class ProgressView extends SpriteView {
     }
     return max;
   }
-}
+}

src/main/haxework/view/Root.hx

@@ -1,4 +1,4 @@
-package haxework.gui;
+package haxework.view;
 
 import flash.display.DisplayObject;
 import flash.display.StageAlign;

src/main/haxework/view/ScrollView.hx

@@ -1,11 +1,11 @@
-package haxework.gui;
+package haxework.view;
 
 import flash.display.DisplayObject;
 import flash.display.Sprite;
 import flash.events.MouseEvent;
-import haxework.gui.core.Geometry.Position;
-import haxework.gui.list.ScrollBarView;
-import haxework.gui.skin.Skin;
+import haxework.view.core.Geometry.Position;
+import haxework.view.list.ScrollBarView;
+import haxework.view.skin.Skin;
 import haxework.signal.Signal;
 
 class ScrollView extends HGroupView {

src/main/haxework/view/SpriteView.hx

@@ -1,4 +1,4 @@
-package haxework.gui;
+package haxework.view;
 
 import flash.display.Sprite;
 

src/main/haxework/view/TextView.hx

@@ -1,13 +1,13 @@
-package haxework.gui;
+package haxework.view;
 
-import haxework.gui.layout.ILayout;
-import haxework.gui.layout.Layout;
+import haxework.view.layout.ILayout;
+import haxework.view.layout.Layout;
 import flash.text.TextField;
 import flash.text.TextFieldAutoSize;
 import flash.text.TextFormat;
 import flash.text.TextFormatAlign;
-import haxework.gui.core.HAlign;
-import haxework.gui.core.VAlign;
+import haxework.view.core.HAlign;
+import haxework.view.core.VAlign;
 import haxework.text.BitmapTextField;
 import haxework.text.TextUtil;
 

src/main/haxework/view/ToggleButtonView.hx

@@ -1,4 +1,4 @@
-package haxework.gui;
+package haxework.view;
 
 class ToggleButtonView extends ButtonView {
 

src/main/haxework/view/VGroupView.hx

@@ -1,6 +1,6 @@
-package haxework.gui;
+package haxework.view;
 
-import haxework.gui.layout.VerticalLayout;
+import haxework.view.layout.VerticalLayout;
 
 class VGroupView extends GroupView {
 

src/main/haxework/view/View.hx

@@ -1,10 +1,10 @@
-package haxework.gui;
+package haxework.view;
 
 import flash.display.DisplayObject;
 import flash.display.InteractiveObject;
-import haxework.gui.core.Geometry;
-import haxework.gui.skin.ISkin.ISizeSkin;
-import haxework.gui.skin.ISkin.SkinSet;
+import haxework.view.core.Geometry;
+import haxework.view.skin.ISkin.ISizeSkin;
+import haxework.view.skin.ISkin.SkinSet;
 import haxework.resources.IResources;
 
 class View<C:DisplayObject> implements IView<C> {

src/main/haxework/view/ViewUpdater.hx

@@ -1,4 +1,4 @@
-package haxework.gui;
+package haxework.view;
 
 import flash.events.Event;
 import flash.display.Stage;

src/main/haxework/view/core/Box.hx

@@ -1,4 +1,4 @@
-package haxework.gui.core;
+package haxework.view.core;
 
 abstract Box(Array<Float>) {
     public var left(get, set):Float;

src/main/haxework/view/core/Geometry.hx

@@ -1,4 +1,4 @@
-package haxework.gui.core;
+package haxework.view.core;
 
 enum SizeValue {
     FIXED(value:Float);

src/main/haxework/view/core/HAlign.hx

@@ -1,4 +1,4 @@
-package haxework.gui.core;
+package haxework.view.core;
 
 @:enum abstract HAlign(String) from String to String {
     var NONE = "none";

src/main/haxework/view/core/Size.hx

@@ -1,4 +1,4 @@
-package haxework.gui.core;
+package haxework.view.core;
 
 abstract Size(Array<Float>) {
     public var width(get, set):Float;

src/main/haxework/view/core/VAlign.hx

@@ -1,4 +1,4 @@
-package haxework.gui.core;
+package haxework.view.core;
 
 @:enum abstract VAlign(String) from String to String {
     var NONE = "none";

src/main/haxework/view/frame/FrameSwitcher.hx

@@ -1,9 +1,9 @@
-package haxework.gui.frame;
+package haxework.view.frame;
 
 import haxework.signal.Signal;
 import haxework.animate.IAnimate;
-import haxework.gui.IView;
-import haxework.gui.GroupView;
+import haxework.view.IView;
+import haxework.view.GroupView;
 
 class FrameSwitcher extends GroupView {
 

src/main/haxework/view/layout/DefaultLayout.hx

@@ -1,8 +1,8 @@
-package haxework.gui.layout;
+package haxework.view.layout;
 
-import haxework.gui.core.Geometry;
-import haxework.gui.core.VAlign;
-import haxework.gui.core.HAlign;
+import haxework.view.core.Geometry;
+import haxework.view.core.VAlign;
+import haxework.view.core.HAlign;
 
 class DefaultLayout extends Layout {
 

src/main/haxework/view/layout/HorizontalLayout.hx

@@ -1,7 +1,7 @@
-package haxework.gui.layout;
+package haxework.view.layout;
 
-import haxework.gui.core.Geometry.SizeValue;
-import haxework.gui.core.HAlign;
+import haxework.view.core.Geometry.SizeValue;
+import haxework.view.core.HAlign;
 
 class HorizontalLayout extends DefaultLayout {
 

src/main/haxework/view/layout/ILayout.hx

@@ -1,7 +1,7 @@
-package haxework.gui.layout;
+package haxework.view.layout;
 
-import haxework.gui.core.VAlign;
-import haxework.gui.core.HAlign;
+import haxework.view.core.VAlign;
+import haxework.view.core.HAlign;
 
 interface ILayout {
     public var hAlign(default, default):HAlign;

src/main/haxework/view/layout/Layout.hx

@@ -1,6 +1,6 @@
-package haxework.gui.layout;
-import haxework.gui.core.VAlign;
-import haxework.gui.core.HAlign;
+package haxework.view.layout;
+import haxework.view.core.VAlign;
+import haxework.view.core.HAlign;
 
 class Layout implements ILayout {
 

src/main/haxework/view/layout/TailLayout.hx

@@ -1,6 +1,6 @@
-package haxework.gui.layout;
+package haxework.view.layout;
 
-import haxework.gui.core.VAlign;
+import haxework.view.core.VAlign;
 typedef Row = {
     var width:Float;
     var height:Float;

src/main/haxework/view/layout/VerticalLayout.hx

@@ -1,7 +1,7 @@
-package haxework.gui.layout;
+package haxework.view.layout;
 
-import haxework.gui.core.VAlign;
-import haxework.gui.core.Geometry.SizeValue;
+import haxework.view.core.VAlign;
+import haxework.view.core.Geometry.SizeValue;
 
 class VerticalLayout extends DefaultLayout {
 

src/main/haxework/view/list/HListView.hx

@@ -1,11 +1,11 @@
-package haxework.gui.list;
+package haxework.view.list;
 
-import haxework.gui.core.Geometry.SizeValue;
-import haxework.gui.core.HAlign;
-import haxework.gui.core.VAlign;
-import haxework.gui.layout.HorizontalLayout;
-import haxework.gui.layout.VerticalLayout;
-import haxework.gui.list.ListView.IListItemView;
+import haxework.view.core.Geometry.SizeValue;
+import haxework.view.core.HAlign;
+import haxework.view.core.VAlign;
+import haxework.view.layout.HorizontalLayout;
+import haxework.view.layout.VerticalLayout;
+import haxework.view.list.ListView.IListItemView;
 
 class HListView<D> extends ListView<D> {
 

src/main/haxework/view/list/HScrollBarView.hx

@@ -1,4 +1,4 @@
-package haxework.gui.list;
+package haxework.view.list;
 
 import flash.geom.Point;
 

src/main/haxework/view/list/LabelListItem.hx

@@ -1,7 +1,7 @@
-package haxework.gui.list;
+package haxework.view.list;
 
-import haxework.gui.core.HAlign;
-import haxework.gui.list.ListView.IListItemView;
+import haxework.view.core.HAlign;
+import haxework.view.list.ListView.IListItemView;
 
 private typedef Formatter<T> = Int -> T -> String;
 

src/main/haxework/view/list/ListView.hx

@@ -1,11 +1,11 @@
-package haxework.gui.list;
+package haxework.view.list;
 
 import flash.events.MouseEvent;
-import haxework.gui.core.Geometry.Position;
-import haxework.gui.core.HAlign;
-import haxework.gui.core.VAlign;
-import haxework.gui.layout.ILayout;
-import haxework.gui.skin.Skin;
+import haxework.view.core.Geometry.Position;
+import haxework.view.core.HAlign;
+import haxework.view.core.VAlign;
+import haxework.view.layout.ILayout;
+import haxework.view.skin.Skin;
 import haxework.signal.Signal;
 import haxework.utils.NumberUtil;
 

src/main/haxework/view/list/ScrollBarView.hx

@@ -1,4 +1,4 @@
-package haxework.gui.list;
+package haxework.view.list;
 
 import haxework.signal.Signal;
 import haxework.utils.NumberUtil;

src/main/haxework/view/list/VListView.hx

@@ -1,11 +1,11 @@
-package haxework.gui.list;
+package haxework.view.list;
 
-import haxework.gui.core.Geometry.SizeValue;
-import haxework.gui.core.HAlign;
-import haxework.gui.core.VAlign;
-import haxework.gui.layout.HorizontalLayout;
-import haxework.gui.layout.VerticalLayout;
-import haxework.gui.list.ListView.IListItemView;
+import haxework.view.core.Geometry.SizeValue;
+import haxework.view.core.HAlign;
+import haxework.view.core.VAlign;
+import haxework.view.layout.HorizontalLayout;
+import haxework.view.layout.VerticalLayout;
+import haxework.view.list.ListView.IListItemView;
 
 class VListView<D> extends ListView<D> {
 

src/main/haxework/view/list/VScrollBarView.hx

@@ -1,4 +1,4 @@
-package haxework.gui.list;
+package haxework.view.list;
 
 import flash.geom.Point;
 

src/main/haxework/view/popup/PopupManager.hx

@@ -1,8 +1,8 @@
-package haxework.gui.popup;
+package haxework.view.popup;
 
 import haxework.animate.IAnimate;
-import haxework.gui.Root;
-import haxework.gui.IGroupView;
+import haxework.view.Root;
+import haxework.view.IGroupView;
 
 typedef P = PopupView<Dynamic>;
 

src/main/haxework/view/popup/PopupView.hx

@@ -1,8 +1,8 @@
-package haxework.gui.popup;
+package haxework.view.popup;
 
-import haxework.gui.core.Geometry.Position;
-import haxework.gui.GroupView;
-import haxework.gui.skin.Skin;
+import haxework.view.core.Geometry.Position;
+import haxework.view.GroupView;
+import haxework.view.skin.Skin;
 import promhx.Deferred;
 import promhx.Promise;
 

src/main/haxework/view/skin/BitmapSkin.hx

@@ -1,9 +1,9 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
 import flash.display.BitmapData;
 import flash.geom.Rectangle;
-import haxework.gui.skin.ISkin.ISizeSkin;
-import haxework.gui.utils.DrawUtil;
+import haxework.view.skin.ISkin.ISizeSkin;
+import haxework.view.utils.DrawUtil;
 
 class BitmapSkin implements ISkin<SpriteView> implements ISizeSkin {
     public var width(default, null):Float;

src/main/haxework/view/skin/BorderSkin.hx

@@ -1,4 +1,4 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
 class BorderSkin implements ISkin<SpriteView> {
 

src/main/haxework/view/skin/ButtonBitmapSkin.hx

@@ -1,11 +1,11 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
 import flash.display.BitmapData;
 import flash.geom.Rectangle;
-import haxework.gui.ButtonView.ButtonState;
-import haxework.gui.skin.ISkin.ISizeSkin;
-import haxework.gui.utils.BitmapUtil;
-import haxework.gui.utils.DrawUtil;
+import haxework.view.ButtonView.ButtonState;
+import haxework.view.skin.ISkin.ISizeSkin;
+import haxework.view.utils.BitmapUtil;
+import haxework.view.utils.DrawUtil;
 
 class ButtonBitmapSkin implements ISkin<ButtonView> implements ISizeSkin {
 

src/main/haxework/view/skin/ButtonColorSkin.hx

@@ -1,11 +1,11 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
 import flash.display.LineScaleMode;
 import flash.display.JointStyle;
 import flash.display.CapsStyle;
 import flash.display.Graphics;
 import haxework.color.ColorUtil;
-import haxework.gui.ButtonView.ButtonState;
+import haxework.view.ButtonView.ButtonState;
 
 class ButtonColorSkin implements ISkin<ButtonView> {
 

src/main/haxework/view/skin/ColorSkin.hx

@@ -1,4 +1,4 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
 class ColorSkin implements ISkin<SpriteView> {
 

src/main/haxework/view/skin/GeometrySkin.hx

@@ -1,8 +1,8 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
-import haxework.gui.core.HAlign;
-import haxework.gui.core.VAlign;
-import haxework.gui.core.Geometry;
+import haxework.view.core.HAlign;
+import haxework.view.core.VAlign;
+import haxework.view.core.Geometry;
 
 class GeometrySkin implements ISkin<IView<Dynamic>> {
 

src/main/haxework/view/skin/HScrollBarSkin.hx

@@ -1,7 +1,7 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
 import haxework.color.ColorUtil;
-import haxework.gui.list.ScrollBarView;
+import haxework.view.list.ScrollBarView;
 
 class HScrollBarSkin implements ISkin<ScrollBarView> {
     public var foreColor(default, default):Int;

src/main/haxework/view/skin/ISkin.hx

@@ -1,4 +1,4 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
 interface ISkin<V:IView<Dynamic>> {
     public function draw(view: V): Void;

src/main/haxework/view/skin/LayoutSkin.hx

@@ -1,8 +1,8 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
-import haxework.gui.core.HAlign;
-import haxework.gui.core.VAlign;
-import haxework.gui.layout.ILayout;
+import haxework.view.core.HAlign;
+import haxework.view.core.VAlign;
+import haxework.view.layout.ILayout;
 
 class LayoutSkin implements ISkin<IGroupView> {
 

src/main/haxework/view/skin/ProgressSkin.hx

@@ -1,7 +1,7 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
 import flash.display.Graphics;
-import haxework.gui.skin.ISkin;
+import haxework.view.skin.ISkin;
 
 class ProgressSkin implements ISkin<ProgressView> {
 

src/main/haxework/view/skin/Skin.hx

@@ -1,8 +1,7 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
-import ru.m.tankz.bot.BotHelper;
-import haxework.gui.layout.ILayout;
-import haxework.gui.core.Geometry;
+import haxework.view.layout.ILayout;
+import haxework.view.core.Geometry;
 import flash.display.BitmapData;
 
 class Skin {

src/main/haxework/view/skin/TabColorSkin.hx

@@ -1,4 +1,4 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
 import flash.display.Graphics;
 import haxework.color.ColorUtil;

src/main/haxework/view/skin/TextSkin.hx

@@ -1,4 +1,4 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
 class TextSkin implements ISkin<ITextView> {
 
@@ -7,7 +7,7 @@ class TextSkin implements ISkin<ITextView> {
     public var fontFamily(default, default):String;
     public var fontEmbed(default, default):Bool;
 
-    public function new(fontColor:Int, fontSize:Int, fontFamily:String, fontEmbed:Bool) {
+    public function new(fontColor:Int, fontSize:Int, fontFamily:String, fontEmbed:Bool=false) {
         this.fontColor = fontColor;
         this.fontSize = fontSize;
         this.fontFamily = fontFamily;

src/main/haxework/view/skin/VScrollBarSkin.hx

@@ -1,7 +1,7 @@
-package haxework.gui.skin;
+package haxework.view.skin;
 
 import haxework.color.ColorUtil;
-import haxework.gui.list.ScrollBarView;
+import haxework.view.list.ScrollBarView;
 
 class VScrollBarSkin implements ISkin<ScrollBarView> {
     public var foreColor(default, default):Int;

src/main/haxework/view/utils/BitmapUtil.hx

@@ -1,4 +1,4 @@
-package haxework.gui.utils;
+package haxework.view.utils;
 
 import flash.display.BitmapData;
 import flash.filters.ColorMatrixFilter;

src/main/haxework/view/utils/DrawUtil.hx

@@ -1,4 +1,4 @@
-package haxework.gui.utils;
+package haxework.view.utils;
 
 import flash.display.Bitmap;
 import flash.Lib;
@@ -127,4 +127,4 @@ class DrawUtil {
     graphics.drawRect(rect.width - w, h, w, rect.height - h * 2);
     graphics.endFill();
   }
-}
+}