diff --git a/assets/plugins/plugin-skin-composer-0.0.1.jar b/assets/plugins/plugin-skin-composer-0.0.1.jar index 37fa1511..9df63015 100644 Binary files a/assets/plugins/plugin-skin-composer-0.0.1.jar and b/assets/plugins/plugin-skin-composer-0.0.1.jar differ diff --git a/src/main/java/games/rednblack/editor/proxy/CursorManager.java b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/proxy/CursorManager.java similarity index 68% rename from src/main/java/games/rednblack/editor/proxy/CursorManager.java rename to hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/proxy/CursorManager.java index ddc898cf..17ea625f 100644 --- a/src/main/java/games/rednblack/editor/proxy/CursorManager.java +++ b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/proxy/CursorManager.java @@ -16,7 +16,7 @@ * ***************************************************************************** */ -package games.rednblack.editor.proxy; +package games.rednblack.h2d.common.proxy; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Cursor; @@ -24,6 +24,7 @@ import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.puremvc.patterns.proxy.BaseProxy; +import games.rednblack.h2d.common.view.ui.Cursors; import games.rednblack.h2d.common.vo.CursorData; /** @@ -33,31 +34,13 @@ public class CursorManager extends BaseProxy { private static final String TAG = CursorManager.class.getCanonicalName(); public static final String NAME = TAG; - public static CursorData NORMAL = new CursorData(Cursor.SystemCursor.Arrow); - public static CursorData CROSS = new CursorData("cross", 14, 14); - public static CursorData TEXT = new CursorData(Cursor.SystemCursor.Ibeam); - public static CursorData TEXT_TOOL = new CursorData("label-tool", 15, 17); - public static CursorData FINGER = new CursorData("fingerpoint", 16, 9); - public static CursorData EYEDROPPER = new CursorData("eyedropper", 10, 23); - public static CursorData HAND = new CursorData(Cursor.SystemCursor.Hand); - - public static CursorData ROTATION_LB = new CursorData("left-rotate-down", 15, 18); - public static CursorData ROTATION_LT = new CursorData("left-rotate-up", 15, 15); - public static CursorData ROTATION_RT = new CursorData("right-rotate-up", 18, 15); - public static CursorData ROTATION_RB = new CursorData("right-rotate-down", 18, 18); - - public static CursorData TRANSFORM_LEFT_RIGHT = new CursorData("left-down-up", 17, 16); - public static CursorData TRANSFORM_RIGHT_LEFT = new CursorData("right-down-up", 17, 16); - public static CursorData TRANSFORM_HORIZONTAL = new CursorData("left-right", 17, 16); - public static CursorData TRANSFORM_VERTICAL = new CursorData("up-down", 17, 16); - private CursorData cursor; private CursorData overrideCursor = null; public CursorManager() { super(NAME); - setCursor(NORMAL); + setCursor(Cursors.NORMAL); } public void setCursor(CursorData cursor, TextureRegion region) { diff --git a/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/Cursors.java b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/Cursors.java new file mode 100644 index 00000000..8aebb8b8 --- /dev/null +++ b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/Cursors.java @@ -0,0 +1,24 @@ +package games.rednblack.h2d.common.view.ui; + +import com.badlogic.gdx.graphics.Cursor; +import games.rednblack.h2d.common.vo.CursorData; + +public class Cursors { + public static CursorData NORMAL = new CursorData(Cursor.SystemCursor.Arrow); + public static CursorData CROSS = new CursorData("cross", 14, 14); + public static CursorData TEXT = new CursorData(Cursor.SystemCursor.Ibeam); + public static CursorData TEXT_TOOL = new CursorData("label-tool", 15, 17); + public static CursorData FINGER = new CursorData("fingerpoint", 16, 9); + public static CursorData EYEDROPPER = new CursorData("eyedropper", 10, 23); + public static CursorData HAND = new CursorData(Cursor.SystemCursor.Hand); + + public static CursorData ROTATION_LB = new CursorData("left-rotate-down", 15, 18); + public static CursorData ROTATION_LT = new CursorData("left-rotate-up", 15, 15); + public static CursorData ROTATION_RT = new CursorData("right-rotate-up", 18, 15); + public static CursorData ROTATION_RB = new CursorData("right-rotate-down", 18, 18); + + public static CursorData TRANSFORM_LEFT_RIGHT = new CursorData("left-down-up", 17, 16); + public static CursorData TRANSFORM_RIGHT_LEFT = new CursorData("right-down-up", 17, 16); + public static CursorData TRANSFORM_HORIZONTAL = new CursorData("left-right", 17, 16); + public static CursorData TRANSFORM_VERTICAL = new CursorData("up-down", 17, 16); +} diff --git a/src/main/java/games/rednblack/editor/utils/StandardWidgetsFactory.java b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/StandardWidgetsFactory.java similarity index 88% rename from src/main/java/games/rednblack/editor/utils/StandardWidgetsFactory.java rename to hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/StandardWidgetsFactory.java index 4a43f8fc..5d1c4436 100644 --- a/src/main/java/games/rednblack/editor/utils/StandardWidgetsFactory.java +++ b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/StandardWidgetsFactory.java @@ -16,7 +16,7 @@ * ***************************************************************************** */ -package games.rednblack.editor.utils; +package games.rednblack.h2d.common.view.ui; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.InputEvent; @@ -31,16 +31,21 @@ import com.kotcrab.vis.ui.util.InputValidator; import com.kotcrab.vis.ui.widget.*; import com.kotcrab.vis.ui.widget.spinner.IntSpinnerModel; import com.kotcrab.vis.ui.widget.spinner.Spinner; -import games.rednblack.editor.proxy.CursorManager; -import games.rednblack.editor.view.ui.widget.CursorListener; -import games.rednblack.editor.view.ui.widget.ScrollFocusListener; -import games.rednblack.editor.view.ui.widget.components.TintButton; +import com.puremvc.patterns.facade.Facade; +import games.rednblack.h2d.common.view.ui.listener.CursorListener; +import games.rednblack.h2d.common.view.ui.listener.ScrollFocusListener; +import games.rednblack.h2d.common.view.ui.widget.TintButton; /** * Creates standard widgets like labels or text fields with provided standard HyperLap2D specific visual style. */ public class StandardWidgetsFactory { + private static Facade facade; + public static void init(Facade f) { + facade = f; + } + private StandardWidgetsFactory() { } @@ -65,7 +70,7 @@ public class StandardWidgetsFactory { public static VisTextField createTextField(String style) { VisTextField visTextField = new VisTextField("", style); - visTextField.addListener(new CursorListener(CursorManager.TEXT)); + visTextField.addListener(new CursorListener(Cursors.TEXT, facade)); return visTextField; } @@ -74,7 +79,7 @@ public class StandardWidgetsFactory { Skin skin = VisUI.getSkin(); visTextField.setStyle(skin.get(style, VisTextField.VisTextFieldStyle.class)); if(textCursor) - visTextField.addListener(new CursorListener(CursorManager.TEXT)); + visTextField.addListener(new CursorListener(Cursors.TEXT, facade)); return visTextField; } @@ -99,14 +104,14 @@ public class StandardWidgetsFactory { VisValidatableTextField visTextField = new VisValidatableTextField(inputValidator); Skin skin = VisUI.getSkin(); visTextField.setStyle(skin.get(style, VisTextField.VisTextFieldStyle.class)); - visTextField.addListener(new CursorListener(CursorManager.TEXT)); + visTextField.addListener(new CursorListener(Cursors.TEXT, facade)); return visTextField; } public static VisValidatableTextField createValidableTextField (String style, InputValidator inputValidator, VisTextField.TextFieldFilter textFieldFilter) { VisValidatableTextField visTextField = createValidableTextField(style, inputValidator); visTextField.setTextFieldFilter(textFieldFilter); - visTextField.addListener(new CursorListener(CursorManager.TEXT)); + visTextField.addListener(new CursorListener(Cursors.TEXT, facade)); return visTextField; } @@ -132,7 +137,7 @@ public class StandardWidgetsFactory { public static VisTextArea createTextArea(String style) { VisTextArea visTextArea = new VisTextArea("", style); - visTextArea.addListener(new CursorListener(CursorManager.TEXT)); + visTextArea.addListener(new CursorListener(Cursors.TEXT, facade)); return visTextArea; } @@ -142,7 +147,7 @@ public class StandardWidgetsFactory { public static VisCheckBox createCheckBox(String text) { VisCheckBox visCheckBox = new VisCheckBox(text); - visCheckBox.addListener(new CursorListener(CursorManager.FINGER)); + visCheckBox.addListener(new CursorListener(Cursors.FINGER, facade)); return visCheckBox; } @@ -153,7 +158,7 @@ public class StandardWidgetsFactory { public static VisSelectBox createSelectBox(String style, Class type) { VisSelectBox visSelectBox = new VisSelectBox(style); visSelectBox.clearListeners(); - visSelectBox.addListener(new CursorListener(CursorManager.FINGER)); + visSelectBox.addListener(new CursorListener(Cursors.FINGER, facade)); visSelectBox.addListener(new ClickListener() { public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) { if (pointer == 0 && button != 0) return false; @@ -178,7 +183,7 @@ public class StandardWidgetsFactory { public static TintButton createTintButton(int width, int height) { TintButton visCheckBox = new TintButton(width, height); - visCheckBox.addListener(new CursorListener(CursorManager.EYEDROPPER)); + visCheckBox.addListener(new CursorListener(Cursors.EYEDROPPER, facade)); return visCheckBox; } @@ -212,7 +217,7 @@ public class StandardWidgetsFactory { public static VisImageButton createImageButton(String style) { VisImageButton button = new VisImageButton(style); - button.addListener(new CursorListener(CursorManager.FINGER)); + button.addListener(new CursorListener(Cursors.FINGER, facade)); return button; } } diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/CursorListener.java b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/listener/CursorListener.java similarity index 67% rename from src/main/java/games/rednblack/editor/view/ui/widget/CursorListener.java rename to hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/listener/CursorListener.java index 164dafb0..6d08c0aa 100644 --- a/src/main/java/games/rednblack/editor/view/ui/widget/CursorListener.java +++ b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/listener/CursorListener.java @@ -16,34 +16,31 @@ * ***************************************************************************** */ -package games.rednblack.editor.view.ui.widget; +package games.rednblack.h2d.common.view.ui.listener; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputListener; -import games.rednblack.editor.HyperLap2DFacade; -import games.rednblack.editor.proxy.CursorManager; +import com.puremvc.patterns.facade.Facade; +import games.rednblack.h2d.common.proxy.CursorManager; import games.rednblack.h2d.common.vo.CursorData; -/** - * Created by NateS - */ public class CursorListener extends InputListener { - private CursorData cursor; - private CursorManager cursorManager; + private final CursorData cursor; + private final CursorManager cursorManager; - private CursorData prevCursor; - - public CursorListener (CursorData cursor) { + public CursorListener(CursorData cursor, Facade facade) { this.cursor = cursor; - cursorManager = HyperLap2DFacade.getInstance().retrieveProxy(CursorManager.NAME); + cursorManager = facade.retrieveProxy(CursorManager.NAME); } - public void enter (InputEvent event, float x, float y, int pointer, Actor fromActor) { + @Override + public void enter(InputEvent event, float x, float y, int pointer, Actor fromActor) { if (pointer == -1) cursorManager.setOverrideCursor(cursor); } - public void exit (InputEvent event, float x, float y, int pointer, Actor toActor) { + @Override + public void exit(InputEvent event, float x, float y, int pointer, Actor toActor) { if (pointer == -1) cursorManager.removeOverrideCursor(); } } \ No newline at end of file diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/ScrollFocusListener.java b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/listener/ScrollFocusListener.java similarity index 81% rename from src/main/java/games/rednblack/editor/view/ui/widget/ScrollFocusListener.java rename to hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/listener/ScrollFocusListener.java index 5ea70f80..45a7ca7e 100644 --- a/src/main/java/games/rednblack/editor/view/ui/widget/ScrollFocusListener.java +++ b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/listener/ScrollFocusListener.java @@ -1,10 +1,8 @@ -package games.rednblack.editor.view.ui.widget; +package games.rednblack.h2d.common.view.ui.listener; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputListener; -import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; -import com.badlogic.gdx.scenes.scene2d.ui.SelectBox; public class ScrollFocusListener extends InputListener { private Actor listenerActor; diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/ui/HyperLapColorPicker.java b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/widget/HyperLapColorPicker.java similarity index 96% rename from src/main/java/games/rednblack/editor/view/ui/widget/ui/HyperLapColorPicker.java rename to hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/widget/HyperLapColorPicker.java index 1f69401c..ed00d74c 100644 --- a/src/main/java/games/rednblack/editor/view/ui/widget/ui/HyperLapColorPicker.java +++ b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/widget/HyperLapColorPicker.java @@ -1,4 +1,4 @@ -package games.rednblack.editor.view.ui.widget.ui; +package games.rednblack.h2d.common.view.ui.widget; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.InputEvent; diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/ui/HyperLapFileChooser.java b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/widget/HyperLapFileChooser.java similarity index 96% rename from src/main/java/games/rednblack/editor/view/ui/widget/ui/HyperLapFileChooser.java rename to hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/widget/HyperLapFileChooser.java index a6c4844d..bb1e9631 100644 --- a/src/main/java/games/rednblack/editor/view/ui/widget/ui/HyperLapFileChooser.java +++ b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/widget/HyperLapFileChooser.java @@ -1,4 +1,4 @@ -package games.rednblack.editor.view.ui.widget.ui; +package games.rednblack.h2d.common.view.ui.widget; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.scenes.scene2d.Actor; diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/InputFileWidget.java b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/widget/InputFileWidget.java similarity index 96% rename from src/main/java/games/rednblack/editor/view/ui/widget/InputFileWidget.java rename to hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/widget/InputFileWidget.java index e1460cd9..2324f38a 100644 --- a/src/main/java/games/rednblack/editor/view/ui/widget/InputFileWidget.java +++ b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/widget/InputFileWidget.java @@ -16,7 +16,7 @@ * ***************************************************************************** */ -package games.rednblack.editor.view.ui.widget; +package games.rednblack.h2d.common.view.ui.widget; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; @@ -29,8 +29,7 @@ import com.kotcrab.vis.ui.widget.VisTextButton; import com.kotcrab.vis.ui.widget.VisTextField; import com.kotcrab.vis.ui.widget.file.FileChooser; import com.kotcrab.vis.ui.widget.file.FileChooserListener; -import games.rednblack.editor.utils.StandardWidgetsFactory; -import games.rednblack.editor.view.ui.widget.ui.HyperLapFileChooser; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; /** * Created by sargis on 4/3/15. diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/components/TintButton.java b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/widget/TintButton.java similarity index 97% rename from src/main/java/games/rednblack/editor/view/ui/widget/components/TintButton.java rename to hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/widget/TintButton.java index 639a385e..2603b60c 100644 --- a/src/main/java/games/rednblack/editor/view/ui/widget/components/TintButton.java +++ b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/view/ui/widget/TintButton.java @@ -16,8 +16,7 @@ * ***************************************************************************** */ -package games.rednblack.editor.view.ui.widget.components; - +package games.rednblack.h2d.common.view.ui.widget; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.scenes.scene2d.Group; @@ -25,7 +24,6 @@ import com.badlogic.gdx.scenes.scene2d.ui.Image; import com.badlogic.gdx.scenes.scene2d.ui.Skin; import com.kotcrab.vis.ui.VisUI; - /** * Created by azakhary on 7/8/2014. */ diff --git a/plugin-skin-composer/src/main/java/games/rednblack/editor/plugin/skincomposer/SkinComposerSettings.java b/plugin-skin-composer/src/main/java/games/rednblack/editor/plugin/skincomposer/SkinComposerSettings.java index 979cedfe..417a9d61 100644 --- a/plugin-skin-composer/src/main/java/games/rednblack/editor/plugin/skincomposer/SkinComposerSettings.java +++ b/plugin-skin-composer/src/main/java/games/rednblack/editor/plugin/skincomposer/SkinComposerSettings.java @@ -1,25 +1,26 @@ package games.rednblack.editor.plugin.skincomposer; -import com.badlogic.gdx.utils.Json; import com.kotcrab.vis.ui.widget.VisCheckBox; import com.puremvc.patterns.facade.Facade; import games.rednblack.h2d.common.MsgAPI; import games.rednblack.h2d.common.plugins.H2DPluginAdapter; import games.rednblack.h2d.common.view.SettingsNodeValue; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; public class SkinComposerSettings extends SettingsNodeValue { private final VisCheckBox alwaysCheckUpdates; - private H2DPluginAdapter plugin; - private Json json = new Json(); + private final H2DPluginAdapter plugin; public SkinComposerSettings(Facade facade, H2DPluginAdapter plugin) { super("Skin Composer", facade); this.plugin = plugin; - alwaysCheckUpdates = new VisCheckBox("Always check for updates"); - getContentTable().add(alwaysCheckUpdates).left().row(); + getContentTable().add("Updates").left().row(); + getContentTable().addSeparator(); + alwaysCheckUpdates = StandardWidgetsFactory.createCheckBox("Always check for updates"); + getContentTable().add(alwaysCheckUpdates).left().padTop(5).padLeft(8).row(); } @Override diff --git a/src/main/java/games/rednblack/editor/HyperLap2DFacade.java b/src/main/java/games/rednblack/editor/HyperLap2DFacade.java index 04af3224..021526a1 100644 --- a/src/main/java/games/rednblack/editor/HyperLap2DFacade.java +++ b/src/main/java/games/rednblack/editor/HyperLap2DFacade.java @@ -22,6 +22,7 @@ import com.puremvc.patterns.facade.SimpleFacade; import com.puremvc.patterns.observer.BaseNotification; import games.rednblack.editor.controller.StartupCommand; import games.rednblack.editor.splash.SplashMediator; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; /** * Created by sargis on 3/30/15. @@ -71,6 +72,7 @@ public class HyperLap2DFacade extends SimpleFacade { @Override protected void initializeView() { + StandardWidgetsFactory.init(this); super.initializeView(); } } diff --git a/src/main/java/games/rednblack/editor/controller/BootstrapProxyCommand.java b/src/main/java/games/rednblack/editor/controller/BootstrapProxyCommand.java index 6900f5f0..e7e2ff31 100644 --- a/src/main/java/games/rednblack/editor/controller/BootstrapProxyCommand.java +++ b/src/main/java/games/rednblack/editor/controller/BootstrapProxyCommand.java @@ -23,6 +23,7 @@ import com.puremvc.patterns.observer.Notification; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.proxy.*; import games.rednblack.editor.splash.SplashScreenAdapter; +import games.rednblack.h2d.common.proxy.CursorManager; /** * Created by sargis on 4/1/15. diff --git a/src/main/java/games/rednblack/editor/controller/commands/resource/ExportLibraryItemCommand.java b/src/main/java/games/rednblack/editor/controller/commands/resource/ExportLibraryItemCommand.java index 1e933ea7..a0b330a2 100644 --- a/src/main/java/games/rednblack/editor/controller/commands/resource/ExportLibraryItemCommand.java +++ b/src/main/java/games/rednblack/editor/controller/commands/resource/ExportLibraryItemCommand.java @@ -16,7 +16,7 @@ import games.rednblack.editor.proxy.ResourceManager; import games.rednblack.editor.renderer.data.*; import games.rednblack.editor.utils.ImportUtils; import games.rednblack.editor.utils.ZipUtils; -import games.rednblack.editor.view.ui.widget.ui.HyperLapFileChooser; +import games.rednblack.h2d.common.view.ui.widget.HyperLapFileChooser; import games.rednblack.h2d.common.MsgAPI; import games.rednblack.h2d.common.vo.ExportMapperVO; import games.rednblack.h2d.common.vo.ExportMapperVO.ExportedAsset; diff --git a/src/main/java/games/rednblack/editor/proxy/PluginManager.java b/src/main/java/games/rednblack/editor/proxy/PluginManager.java index 93944910..0bcc2079 100644 --- a/src/main/java/games/rednblack/editor/proxy/PluginManager.java +++ b/src/main/java/games/rednblack/editor/proxy/PluginManager.java @@ -30,6 +30,7 @@ import games.rednblack.h2d.common.IItemCommand; import games.rednblack.h2d.common.MsgAPI; import games.rednblack.h2d.common.plugins.H2DPlugin; import games.rednblack.h2d.common.plugins.PluginAPI; +import games.rednblack.h2d.common.proxy.CursorManager; import games.rednblack.h2d.common.view.tools.Tool; import com.kotcrab.vis.ui.widget.VisImageButton; import com.puremvc.patterns.facade.Facade; diff --git a/src/main/java/games/rednblack/editor/view/menu/HyperLap2DMenuBarMediator.java b/src/main/java/games/rednblack/editor/view/menu/HyperLap2DMenuBarMediator.java index 6bafaf9d..d752c8c8 100644 --- a/src/main/java/games/rednblack/editor/view/menu/HyperLap2DMenuBarMediator.java +++ b/src/main/java/games/rednblack/editor/view/menu/HyperLap2DMenuBarMediator.java @@ -23,7 +23,7 @@ import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.utils.Array; import com.kotcrab.vis.ui.widget.file.FileTypeFilter; import games.rednblack.editor.proxy.SettingsManager; -import games.rednblack.editor.view.ui.widget.ui.HyperLapFileChooser; +import games.rednblack.h2d.common.view.ui.widget.HyperLapFileChooser; import games.rednblack.h2d.common.MsgAPI; import com.kotcrab.vis.ui.widget.file.FileChooser; import com.kotcrab.vis.ui.widget.file.FileChooserAdapter; diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/PanTool.java b/src/main/java/games/rednblack/editor/view/stage/tools/PanTool.java index 7cb334bf..b214d73b 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/PanTool.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/PanTool.java @@ -4,11 +4,12 @@ import com.badlogic.ashley.core.Entity; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.math.Vector2; -import games.rednblack.editor.proxy.CursorManager; +import games.rednblack.h2d.common.proxy.CursorManager; import games.rednblack.editor.proxy.ProjectManager; import games.rednblack.editor.proxy.ResourceManager; import games.rednblack.editor.view.stage.Sandbox; import games.rednblack.editor.HyperLap2DFacade; +import games.rednblack.h2d.common.view.ui.Cursors; import games.rednblack.h2d.common.vo.SceneConfigVO; /** @@ -40,7 +41,7 @@ public class PanTool extends SimpleTool { @Override public void initTool() { CursorManager cursorManager = HyperLap2DFacade.getInstance().retrieveProxy(CursorManager.NAME); - cursorManager.setCursor(CursorManager.HAND); + cursorManager.setCursor(Cursors.HAND); } @Override diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/SelectionTool.java b/src/main/java/games/rednblack/editor/view/stage/tools/SelectionTool.java index 780e6802..9aa42356 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/SelectionTool.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/SelectionTool.java @@ -28,7 +28,7 @@ import com.badlogic.gdx.utils.viewport.Viewport; import com.kotcrab.vis.ui.util.OsUtils; import games.rednblack.h2d.common.MsgAPI; import games.rednblack.editor.HyperLap2DFacade; -import games.rednblack.editor.proxy.CursorManager; +import games.rednblack.h2d.common.proxy.CursorManager; import games.rednblack.editor.renderer.components.DimensionsComponent; import games.rednblack.editor.renderer.components.ParentNodeComponent; import games.rednblack.editor.renderer.components.TransformComponent; @@ -37,6 +37,7 @@ import games.rednblack.editor.renderer.utils.ComponentRetriever; import games.rednblack.editor.utils.EntityBounds; import games.rednblack.editor.utils.runtime.EntityUtils; import games.rednblack.editor.view.stage.Sandbox; +import games.rednblack.h2d.common.view.ui.Cursors; import java.util.HashMap; import java.util.HashSet; @@ -97,7 +98,7 @@ public class SelectionTool extends SimpleTool { // set cursor CursorManager cursorManager = HyperLap2DFacade.getInstance().retrieveProxy(CursorManager.NAME); - cursorManager.setCursor(CursorManager.NORMAL); + cursorManager.setCursor(Cursors.NORMAL); } @Override diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/TextTool.java b/src/main/java/games/rednblack/editor/view/stage/tools/TextTool.java index c5b83d53..12ef2bcd 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/TextTool.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/TextTool.java @@ -19,15 +19,14 @@ package games.rednblack.editor.view.stage.tools; import com.badlogic.ashley.core.Entity; -import com.badlogic.gdx.Input; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Align; -import com.kotcrab.vis.ui.util.OsUtils; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.factory.ItemFactory; -import games.rednblack.editor.proxy.CursorManager; +import games.rednblack.h2d.common.proxy.CursorManager; import games.rednblack.editor.renderer.factory.EntityFactory; +import games.rednblack.h2d.common.view.ui.Cursors; /** * Created by azakhary on 4/30/2015. @@ -72,7 +71,7 @@ public class TextTool extends ItemDropTool { public void initTool() { super.initTool(); CursorManager cursorManager = HyperLap2DFacade.getInstance().retrieveProxy(CursorManager.NAME); - cursorManager.setCursor(CursorManager.TEXT_TOOL); + cursorManager.setCursor(Cursors.TEXT_TOOL); } @Override diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/TransformTool.java b/src/main/java/games/rednblack/editor/view/stage/tools/TransformTool.java index aaeb7166..934c83ec 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/TransformTool.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/TransformTool.java @@ -21,14 +21,12 @@ package games.rednblack.editor.view.stage.tools; import com.badlogic.ashley.core.Entity; import com.badlogic.gdx.Input; import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.NumberUtils; import com.kotcrab.vis.ui.util.OsUtils; -import games.rednblack.editor.renderer.components.PolygonComponent; import games.rednblack.editor.view.stage.tools.transformStrategy.*; import games.rednblack.h2d.common.MsgAPI; import com.puremvc.patterns.observer.Notification; import games.rednblack.editor.HyperLap2DFacade; -import games.rednblack.editor.proxy.CursorManager; +import games.rednblack.h2d.common.proxy.CursorManager; import games.rednblack.editor.renderer.components.TransformComponent; import games.rednblack.editor.renderer.factory.EntityFactory; import games.rednblack.editor.renderer.utils.ComponentRetriever; @@ -38,6 +36,7 @@ import games.rednblack.editor.view.stage.Sandbox; import games.rednblack.editor.view.ui.FollowersUIMediator; import games.rednblack.editor.view.ui.followers.FollowerTransformationListener; import games.rednblack.editor.view.ui.followers.NormalSelectionFollower; +import games.rednblack.h2d.common.view.ui.Cursors; import java.util.HashSet; import java.util.Set; @@ -96,7 +95,7 @@ public class TransformTool extends SelectionTool implements FollowerTransformati // set cursor cursorManager = HyperLap2DFacade.getInstance().retrieveProxy(CursorManager.NAME); - cursorManager.setCursor(CursorManager.CROSS); + cursorManager.setCursor(Cursors.CROSS); } @Override @@ -210,49 +209,49 @@ public class TransformTool extends SelectionTool implements FollowerTransformati public void anchorMouseEnter(NormalSelectionFollower follower, int anchor, float x, float y) { switch (anchor) { case NormalSelectionFollower.ROTATION_LB: - cursorManager.setCursor(CursorManager.ROTATION_LB); + cursorManager.setCursor(Cursors.ROTATION_LB); break; case NormalSelectionFollower.ROTATION_LT: - cursorManager.setCursor(CursorManager.ROTATION_LT); + cursorManager.setCursor(Cursors.ROTATION_LT); break; case NormalSelectionFollower.ROTATION_RT: - cursorManager.setCursor(CursorManager.ROTATION_RT); + cursorManager.setCursor(Cursors.ROTATION_RT); break; case NormalSelectionFollower.ROTATION_RB: - cursorManager.setCursor(CursorManager.ROTATION_RB); + cursorManager.setCursor(Cursors.ROTATION_RB); break; case NormalSelectionFollower.LB: - cursorManager.setCursor(CursorManager.TRANSFORM_LEFT_RIGHT); + cursorManager.setCursor(Cursors.TRANSFORM_LEFT_RIGHT); break; case NormalSelectionFollower.L: - cursorManager.setCursor(CursorManager.TRANSFORM_HORIZONTAL); + cursorManager.setCursor(Cursors.TRANSFORM_HORIZONTAL); break; case NormalSelectionFollower.LT: - cursorManager.setCursor(CursorManager.TRANSFORM_RIGHT_LEFT); + cursorManager.setCursor(Cursors.TRANSFORM_RIGHT_LEFT); break; case NormalSelectionFollower.T: - cursorManager.setCursor(CursorManager.TRANSFORM_VERTICAL); + cursorManager.setCursor(Cursors.TRANSFORM_VERTICAL); break; case NormalSelectionFollower.RT: - cursorManager.setCursor(CursorManager.TRANSFORM_LEFT_RIGHT); + cursorManager.setCursor(Cursors.TRANSFORM_LEFT_RIGHT); break; case NormalSelectionFollower.R: - cursorManager.setCursor(CursorManager.TRANSFORM_HORIZONTAL); + cursorManager.setCursor(Cursors.TRANSFORM_HORIZONTAL); break; case NormalSelectionFollower.RB: - cursorManager.setCursor(CursorManager.TRANSFORM_RIGHT_LEFT); + cursorManager.setCursor(Cursors.TRANSFORM_RIGHT_LEFT); break; case NormalSelectionFollower.B: - cursorManager.setCursor(CursorManager.TRANSFORM_VERTICAL); + cursorManager.setCursor(Cursors.TRANSFORM_VERTICAL); break; default: - cursorManager.setCursor(CursorManager.NORMAL); + cursorManager.setCursor(Cursors.NORMAL); break; } } @Override public void anchorMouseExit(NormalSelectionFollower follower, int anchor, float x, float y) { - cursorManager.setCursor(CursorManager.CROSS); + cursorManager.setCursor(Cursors.CROSS); } } diff --git a/src/main/java/games/rednblack/editor/view/ui/UIBottomMenuBar.java b/src/main/java/games/rednblack/editor/view/ui/UIBottomMenuBar.java index 8ef8ef14..18c1d957 100644 --- a/src/main/java/games/rednblack/editor/view/ui/UIBottomMenuBar.java +++ b/src/main/java/games/rednblack/editor/view/ui/UIBottomMenuBar.java @@ -5,7 +5,7 @@ import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.widget.VisScrollPane; import com.kotcrab.vis.ui.widget.VisTable; import games.rednblack.editor.HyperLap2DFacade; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.box.*; public class UIBottomMenuBar extends VisTable { diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UIAlignBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UIAlignBox.java index 07213a36..c33bf3d9 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UIAlignBox.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UIAlignBox.java @@ -23,7 +23,7 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.kotcrab.vis.ui.widget.VisImageButton; import com.kotcrab.vis.ui.widget.VisTable; import games.rednblack.editor.HyperLap2DFacade; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; /** * Created by sargis on 4/10/15. diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UICompositeHierarchy.java b/src/main/java/games/rednblack/editor/view/ui/box/UICompositeHierarchy.java index e5a90aef..ed3d785c 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UICompositeHierarchy.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UICompositeHierarchy.java @@ -7,7 +7,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.kotcrab.vis.ui.widget.VisImageTextButton; import com.kotcrab.vis.ui.widget.VisScrollPane; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; /** * Created by CyberJoe on 4/22/2015. diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UIGridBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UIGridBox.java index 01639d41..978f9fa0 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UIGridBox.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UIGridBox.java @@ -18,7 +18,6 @@ package games.rednblack.editor.view.ui.box; -import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.Align; import com.kotcrab.vis.ui.util.Validators; import com.kotcrab.vis.ui.widget.VisCheckBox; @@ -26,7 +25,7 @@ import com.kotcrab.vis.ui.widget.VisLabel; import com.kotcrab.vis.ui.widget.VisValidatableTextField; import games.rednblack.editor.event.CheckBoxChangeListener; import games.rednblack.editor.event.KeyboardListener; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; /** * Created by azakhary on 4/15/2015. diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UIItemsTreeBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UIItemsTreeBox.java index c9e24863..d96417b6 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UIItemsTreeBox.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UIItemsTreeBox.java @@ -37,7 +37,7 @@ import games.rednblack.editor.renderer.components.NodeComponent; import games.rednblack.editor.renderer.components.ZIndexComponent; import games.rednblack.editor.renderer.factory.EntityFactory; import games.rednblack.editor.renderer.utils.ComponentRetriever; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.utils.runtime.EntityUtils; import games.rednblack.editor.view.stage.Sandbox; diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UILayerBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UILayerBox.java index a94edf03..f680394a 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UILayerBox.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UILayerBox.java @@ -36,7 +36,7 @@ import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.event.KeyboardListener; import games.rednblack.editor.renderer.data.LayerItemVO; import games.rednblack.editor.utils.InputFilters; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; /** * Created by azakhary on 4/17/2015. diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UILivePreviewBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UILivePreviewBox.java index a7cb5f35..e0c1ddf2 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UILivePreviewBox.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UILivePreviewBox.java @@ -3,7 +3,7 @@ package games.rednblack.editor.view.ui.box; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.kotcrab.vis.ui.widget.VisTextButton; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; public class UILivePreviewBox extends UIBaseBox { diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UIMultiPropertyBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UIMultiPropertyBox.java index 2240146b..17da0931 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UIMultiPropertyBox.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UIMultiPropertyBox.java @@ -21,7 +21,7 @@ package games.rednblack.editor.view.ui.box; import com.badlogic.gdx.Gdx; import com.kotcrab.vis.ui.widget.VisScrollPane; import com.kotcrab.vis.ui.widget.VisTable; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.properties.UIAbstractProperties; /** diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UIResolutionBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UIResolutionBox.java index b38e4fff..98bc378a 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UIResolutionBox.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UIResolutionBox.java @@ -31,7 +31,7 @@ import com.kotcrab.vis.ui.widget.VisTextButton; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.proxy.ResolutionManager; import games.rednblack.editor.renderer.data.ResolutionEntryVO; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; public class UIResolutionBox extends UIBaseBox { private static final String prefix = "games.rednblack.editor.view.ui.box.UIResolutionBox"; diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UISceneBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UISceneBox.java index ae81acb8..3282f9e5 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UISceneBox.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UISceneBox.java @@ -11,7 +11,7 @@ import com.kotcrab.vis.ui.widget.VisSelectBox; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.proxy.ProjectManager; import games.rednblack.editor.renderer.data.SceneVO; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.stage.Sandbox; public class UISceneBox extends UIBaseBox { diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UIToolBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UIToolBox.java index e6f6fb62..322f7030 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UIToolBox.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UIToolBox.java @@ -26,7 +26,7 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.kotcrab.vis.ui.widget.VisImageButton; import com.kotcrab.vis.ui.widget.VisTable; import games.rednblack.editor.HyperLap2DFacade; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.h2d.common.view.tools.Tool; public class UIToolBox extends VisTable { diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UIZoomBox.java b/src/main/java/games/rednblack/editor/view/ui/box/UIZoomBox.java index 9f0072db..8a5ab168 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UIZoomBox.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UIZoomBox.java @@ -27,7 +27,7 @@ import com.kotcrab.vis.ui.widget.VisImageButton; import com.kotcrab.vis.ui.widget.VisTextField; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.event.KeyboardListener; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; /** * Created by sargis on 4/27/15. diff --git a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIAnimationsTab.java b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIAnimationsTab.java index 7db58517..2af1399b 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIAnimationsTab.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIAnimationsTab.java @@ -19,11 +19,10 @@ package games.rednblack.editor.view.ui.box.resourcespanel; import com.badlogic.gdx.scenes.scene2d.Actor; -import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; import com.badlogic.gdx.utils.Array; import com.kotcrab.vis.ui.widget.VisScrollPane; import com.kotcrab.vis.ui.widget.VisTable; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.box.resourcespanel.draggable.DraggableResource; /** diff --git a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIImagesTab.java b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIImagesTab.java index d0991f0b..60388153 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIImagesTab.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIImagesTab.java @@ -22,7 +22,7 @@ import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.utils.Array; import com.kotcrab.vis.ui.widget.VisScrollPane; import com.kotcrab.vis.ui.widget.VisTable; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.box.resourcespanel.draggable.DraggableResource; /** diff --git a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UILibraryItemsTab.java b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UILibraryItemsTab.java index c7038788..275e812a 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UILibraryItemsTab.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UILibraryItemsTab.java @@ -22,7 +22,7 @@ import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.utils.Array; import com.kotcrab.vis.ui.widget.VisScrollPane; import com.kotcrab.vis.ui.widget.VisTable; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.box.resourcespanel.draggable.DraggableResource; /** diff --git a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIParticleEffectsTab.java b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIParticleEffectsTab.java index f8092550..3693af21 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIParticleEffectsTab.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIParticleEffectsTab.java @@ -22,7 +22,7 @@ import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.utils.Array; import com.kotcrab.vis.ui.widget.VisScrollPane; import com.kotcrab.vis.ui.widget.VisTable; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.box.resourcespanel.draggable.DraggableResource; /** diff --git a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIResourcesTab.java b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIResourcesTab.java index ff9b96b9..5d983a27 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIResourcesTab.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/UIResourcesTab.java @@ -29,7 +29,7 @@ import com.kotcrab.vis.ui.widget.VisTable; import com.kotcrab.vis.ui.widget.VisTextField; import com.kotcrab.vis.ui.widget.tabbedpane.Tab; import games.rednblack.editor.HyperLap2DFacade; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; /** * Created by sargis on 5/4/15. diff --git a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/draggable/DraggableResource.java b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/draggable/DraggableResource.java index dc434c11..667db0b6 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/draggable/DraggableResource.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/draggable/DraggableResource.java @@ -23,7 +23,7 @@ import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.utils.DragAndDrop; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.box.resourcespanel.draggable.box.BoxItemResource; import games.rednblack.h2d.common.ResourcePayloadObject; import games.rednblack.editor.HyperLap2DFacade; diff --git a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/draggable/box/BoxItemResource.java b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/draggable/box/BoxItemResource.java index 3e4381ff..70099fe4 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/draggable/box/BoxItemResource.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/resourcespanel/draggable/box/BoxItemResource.java @@ -24,8 +24,6 @@ import com.badlogic.gdx.scenes.scene2d.Group; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputListener; import com.puremvc.patterns.facade.SimpleFacade; -import games.rednblack.editor.utils.StandardWidgetsFactory; -import games.rednblack.editor.view.ui.box.UIResourcesBoxMediator; import games.rednblack.editor.view.ui.widget.actors.basic.PixelRect; import games.rednblack.editor.view.stage.Sandbox; import games.rednblack.editor.view.ui.box.resourcespanel.draggable.DraggableResourceView; diff --git a/src/main/java/games/rednblack/editor/view/ui/dialog/AboutDialog.java b/src/main/java/games/rednblack/editor/view/ui/dialog/AboutDialog.java index 5d324dd0..dde01641 100644 --- a/src/main/java/games/rednblack/editor/view/ui/dialog/AboutDialog.java +++ b/src/main/java/games/rednblack/editor/view/ui/dialog/AboutDialog.java @@ -7,7 +7,7 @@ import com.kotcrab.vis.ui.widget.VisImage; import com.kotcrab.vis.ui.widget.VisScrollPane; import com.kotcrab.vis.ui.widget.VisTable; import games.rednblack.editor.utils.AppConfig; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.h2d.common.H2DDialog; public class AboutDialog extends H2DDialog { diff --git a/src/main/java/games/rednblack/editor/view/ui/dialog/CreateNewResolutionDialog.java b/src/main/java/games/rednblack/editor/view/ui/dialog/CreateNewResolutionDialog.java index d04c128f..66242f2a 100644 --- a/src/main/java/games/rednblack/editor/view/ui/dialog/CreateNewResolutionDialog.java +++ b/src/main/java/games/rednblack/editor/view/ui/dialog/CreateNewResolutionDialog.java @@ -27,7 +27,7 @@ import com.kotcrab.vis.ui.widget.VisRadioButton; import com.kotcrab.vis.ui.widget.VisTable; import com.kotcrab.vis.ui.widget.VisTextButton; import com.kotcrab.vis.ui.widget.VisTextField; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.validator.StringNameValidator; import games.rednblack.h2d.common.H2DDialog; import games.rednblack.editor.HyperLap2DFacade; diff --git a/src/main/java/games/rednblack/editor/view/ui/dialog/NewProjectDialog.java b/src/main/java/games/rednblack/editor/view/ui/dialog/NewProjectDialog.java index 22ead789..fad8e10a 100755 --- a/src/main/java/games/rednblack/editor/view/ui/dialog/NewProjectDialog.java +++ b/src/main/java/games/rednblack/editor/view/ui/dialog/NewProjectDialog.java @@ -24,14 +24,13 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.Stage; import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.h2d.common.H2DDialog; -import com.kotcrab.vis.ui.util.form.SimpleFormValidator; import com.kotcrab.vis.ui.widget.*; import com.kotcrab.vis.ui.widget.file.FileChooser; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.view.ui.validator.StringNameValidator; -import games.rednblack.editor.view.ui.widget.InputFileWidget; +import games.rednblack.h2d.common.view.ui.widget.InputFileWidget; import java.io.File; diff --git a/src/main/java/games/rednblack/editor/view/ui/dialog/SettingsDialog.java b/src/main/java/games/rednblack/editor/view/ui/dialog/SettingsDialog.java index e068cf1d..3c287de8 100644 --- a/src/main/java/games/rednblack/editor/view/ui/dialog/SettingsDialog.java +++ b/src/main/java/games/rednblack/editor/view/ui/dialog/SettingsDialog.java @@ -7,9 +7,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Tree; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.kotcrab.vis.ui.widget.*; -import com.puremvc.patterns.facade.Facade; -import games.rednblack.editor.HyperLap2DFacade; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.h2d.common.H2DDialog; import games.rednblack.h2d.common.view.SettingsNodeValue; diff --git a/src/main/java/games/rednblack/editor/view/ui/followers/NormalSelectionFollower.java b/src/main/java/games/rednblack/editor/view/ui/followers/NormalSelectionFollower.java index 403c63bd..88254723 100644 --- a/src/main/java/games/rednblack/editor/view/ui/followers/NormalSelectionFollower.java +++ b/src/main/java/games/rednblack/editor/view/ui/followers/NormalSelectionFollower.java @@ -29,7 +29,7 @@ import com.kotcrab.vis.ui.VisUI; import com.puremvc.patterns.observer.Notification; import games.rednblack.editor.view.ui.widget.actors.basic.PixelRect; import games.rednblack.editor.HyperLap2DFacade; -import games.rednblack.editor.proxy.CursorManager; +import games.rednblack.h2d.common.proxy.CursorManager; import games.rednblack.editor.view.stage.tools.TransformTool; import games.rednblack.editor.view.ui.widget.EmptyTarget; diff --git a/src/main/java/games/rednblack/editor/view/ui/panel/CustomVariablesPanel.java b/src/main/java/games/rednblack/editor/view/ui/panel/CustomVariablesPanel.java index 4aa88555..a1ea7b32 100644 --- a/src/main/java/games/rednblack/editor/view/ui/panel/CustomVariablesPanel.java +++ b/src/main/java/games/rednblack/editor/view/ui/panel/CustomVariablesPanel.java @@ -20,7 +20,6 @@ package games.rednblack.editor.view.ui.panel; import java.util.Map; -import com.badlogic.gdx.Gdx; import com.badlogic.gdx.scenes.scene2d.*; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.Align; @@ -33,7 +32,7 @@ import com.kotcrab.vis.ui.widget.VisTextField; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.h2d.common.UIDraggablePanel; import games.rednblack.editor.renderer.utils.CustomVariables; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; /** * Created by azakhary on 5/12/2015. diff --git a/src/main/java/games/rednblack/editor/view/ui/panel/EditSpriteAnimationPanel.java b/src/main/java/games/rednblack/editor/view/ui/panel/EditSpriteAnimationPanel.java index 7d1c48ed..6fc86f87 100644 --- a/src/main/java/games/rednblack/editor/view/ui/panel/EditSpriteAnimationPanel.java +++ b/src/main/java/games/rednblack/editor/view/ui/panel/EditSpriteAnimationPanel.java @@ -22,9 +22,7 @@ import java.util.Map; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; -import com.badlogic.gdx.utils.Align; import com.kotcrab.vis.ui.widget.VisImageButton; -import com.kotcrab.vis.ui.widget.VisLabel; import com.kotcrab.vis.ui.widget.VisTable; import com.kotcrab.vis.ui.widget.VisTextButton; import com.kotcrab.vis.ui.widget.VisTextField; @@ -34,7 +32,7 @@ import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.view.ui.validator.EmptyOrDefaultValidator; import games.rednblack.h2d.common.UIDraggablePanel; import games.rednblack.editor.renderer.data.FrameRange; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; /** * Created by azakhary on 5/12/2015. diff --git a/src/main/java/games/rednblack/editor/view/ui/panel/ImportPanelMediator.java b/src/main/java/games/rednblack/editor/view/ui/panel/ImportPanelMediator.java index 6c39d735..5839e816 100644 --- a/src/main/java/games/rednblack/editor/view/ui/panel/ImportPanelMediator.java +++ b/src/main/java/games/rednblack/editor/view/ui/panel/ImportPanelMediator.java @@ -36,7 +36,7 @@ import games.rednblack.h2d.common.ProgressHandler; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.proxy.ProjectManager; import games.rednblack.editor.view.stage.UIStage; -import games.rednblack.editor.view.ui.widget.ui.HyperLapFileChooser; +import games.rednblack.h2d.common.view.ui.widget.HyperLapFileChooser; import java.awt.dnd.DropTargetDragEvent; import java.awt.dnd.DropTargetDropEvent; diff --git a/src/main/java/games/rednblack/editor/view/ui/panel/TagsPanel.java b/src/main/java/games/rednblack/editor/view/ui/panel/TagsPanel.java index b71bfdc8..d24c53a1 100644 --- a/src/main/java/games/rednblack/editor/view/ui/panel/TagsPanel.java +++ b/src/main/java/games/rednblack/editor/view/ui/panel/TagsPanel.java @@ -6,7 +6,7 @@ import com.badlogic.gdx.utils.Align; import games.rednblack.h2d.common.UIDraggablePanel; import com.kotcrab.vis.ui.widget.*; import games.rednblack.editor.HyperLap2DFacade; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/UIItemCollapsibleProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/UIItemCollapsibleProperties.java index 7667d61f..328781e7 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/UIItemCollapsibleProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/UIItemCollapsibleProperties.java @@ -25,7 +25,7 @@ import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.widget.CollapsibleWidget; import com.kotcrab.vis.ui.widget.VisImageButton; import com.kotcrab.vis.ui.widget.VisTable; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; /** * Created by azakhary on 4/15/2015. diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/UIRemovableProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/UIRemovableProperties.java index 12d6a6bb..edc58940 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/UIRemovableProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/UIRemovableProperties.java @@ -7,9 +7,8 @@ import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.util.dialog.Dialogs; import com.kotcrab.vis.ui.widget.VisImageButton; import com.kotcrab.vis.ui.widget.VisTable; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.stage.Sandbox; -import games.rednblack.h2d.common.MsgAPI; /** * Created by CyberJoe on 7/2/2015. diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIBasicItemProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIBasicItemProperties.java index 23641702..0f930818 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIBasicItemProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIBasicItemProperties.java @@ -32,11 +32,11 @@ import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.util.Validators; import com.kotcrab.vis.ui.widget.*; import games.rednblack.editor.event.ButtonToNotificationListener; -import games.rednblack.editor.view.ui.widget.components.TintButton; +import games.rednblack.h2d.common.view.ui.widget.TintButton; import games.rednblack.editor.event.CheckBoxChangeListener; import games.rednblack.editor.event.KeyboardListener; import games.rednblack.editor.view.ui.properties.UIItemProperties; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; /** * Created by azakhary on 4/15/2015. diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIBasicItemPropertiesMediator.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIBasicItemPropertiesMediator.java index f2ef0b88..179c4c31 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIBasicItemPropertiesMediator.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIBasicItemPropertiesMediator.java @@ -25,7 +25,7 @@ import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.reflect.ClassReflection; import com.badlogic.gdx.utils.reflect.ReflectionException; import games.rednblack.editor.renderer.components.light.LightBodyComponent; -import games.rednblack.editor.view.ui.widget.ui.HyperLapColorPicker; +import games.rednblack.h2d.common.view.ui.widget.HyperLapColorPicker; import games.rednblack.h2d.common.MsgAPI; import com.kotcrab.vis.ui.widget.color.ColorPicker; import com.kotcrab.vis.ui.widget.color.ColorPickerAdapter; diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UICompositeItemProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UICompositeItemProperties.java index ce8c0b6f..464949cf 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UICompositeItemProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UICompositeItemProperties.java @@ -21,7 +21,7 @@ package games.rednblack.editor.view.ui.properties.panels; import com.badlogic.gdx.utils.Align; import com.kotcrab.vis.ui.widget.VisCheckBox; import games.rednblack.editor.event.CheckBoxChangeListener; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.properties.UIItemCollapsibleProperties; /** diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIImageItemProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIImageItemProperties.java index cebea14e..eb0bf2e2 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIImageItemProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIImageItemProperties.java @@ -3,7 +3,7 @@ package games.rednblack.editor.view.ui.properties.panels; import com.badlogic.gdx.utils.Align; import com.kotcrab.vis.ui.widget.VisSelectBox; import games.rednblack.editor.event.SelectBoxChangeListener; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.properties.UIItemCollapsibleProperties; /** diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILabelItemProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILabelItemProperties.java index 7c0fc021..7cdd3c07 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILabelItemProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILabelItemProperties.java @@ -10,7 +10,7 @@ import com.kotcrab.vis.ui.widget.spinner.IntSpinnerModel; import com.kotcrab.vis.ui.widget.spinner.Spinner; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.event.*; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.properties.UIItemCollapsibleProperties; /** diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightBodyProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightBodyProperties.java index 76742ccf..83b66ac0 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightBodyProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightBodyProperties.java @@ -13,9 +13,9 @@ import games.rednblack.editor.event.CheckBoxChangeListener; import games.rednblack.editor.event.KeyboardListener; import games.rednblack.editor.event.NumberSelectorOverlapListener; import games.rednblack.editor.event.SelectBoxChangeListener; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.properties.UIRemovableProperties; -import games.rednblack.editor.view.ui.widget.components.TintButton; +import games.rednblack.h2d.common.view.ui.widget.TintButton; import java.util.HashMap; diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightBodyPropertiesMediator.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightBodyPropertiesMediator.java index e729826c..047c50c1 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightBodyPropertiesMediator.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightBodyPropertiesMediator.java @@ -12,7 +12,7 @@ import games.rednblack.editor.renderer.components.light.LightBodyComponent; import games.rednblack.editor.renderer.data.LightBodyDataVO; import games.rednblack.editor.view.stage.Sandbox; import games.rednblack.editor.view.ui.properties.UIItemPropertiesMediator; -import games.rednblack.editor.view.ui.widget.ui.HyperLapColorPicker; +import games.rednblack.h2d.common.view.ui.widget.HyperLapColorPicker; import games.rednblack.h2d.common.MsgAPI; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.math.NumberUtils; diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightItemProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightItemProperties.java index 96842aed..252c6d5c 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightItemProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightItemProperties.java @@ -26,7 +26,7 @@ import com.kotcrab.vis.ui.widget.spinner.Spinner; import games.rednblack.editor.event.CheckBoxChangeListener; import games.rednblack.editor.event.KeyboardListener; import games.rednblack.editor.event.NumberSelectorOverlapListener; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.properties.UIItemCollapsibleProperties; import games.rednblack.editor.renderer.data.LightVO; diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIPhysicsProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIPhysicsProperties.java index f52950b6..65028bbc 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIPhysicsProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIPhysicsProperties.java @@ -8,7 +8,7 @@ import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.event.CheckBoxChangeListener; import games.rednblack.editor.event.KeyboardListener; import games.rednblack.editor.event.SelectBoxChangeListener; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.properties.UIRemovableProperties; import java.util.HashMap; diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISceneProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISceneProperties.java index 844cb62b..b568de71 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISceneProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISceneProperties.java @@ -29,8 +29,8 @@ import com.kotcrab.vis.ui.widget.*; import com.kotcrab.vis.ui.widget.spinner.Spinner; import games.rednblack.editor.event.NumberSelectorOverlapListener; import games.rednblack.editor.event.SelectBoxChangeListener; -import games.rednblack.editor.utils.StandardWidgetsFactory; -import games.rednblack.editor.view.ui.widget.components.TintButton; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.widget.TintButton; import games.rednblack.editor.event.CheckBoxChangeListener; import games.rednblack.editor.event.KeyboardListener; import games.rednblack.editor.view.ui.properties.UIAbstractProperties; diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIScenePropertiesMediator.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIScenePropertiesMediator.java index 814571ef..26f0da90 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIScenePropertiesMediator.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIScenePropertiesMediator.java @@ -23,7 +23,7 @@ import com.kotcrab.vis.ui.widget.color.ColorPickerAdapter; import games.rednblack.editor.proxy.ResolutionManager; import games.rednblack.editor.renderer.data.LightsPropertiesVO; import games.rednblack.editor.renderer.data.ResolutionEntryVO; -import games.rednblack.editor.view.ui.widget.ui.HyperLapColorPicker; +import games.rednblack.h2d.common.view.ui.widget.HyperLapColorPicker; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.math.NumberUtils; diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIShaderProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIShaderProperties.java index 0be0d2b4..25fba961 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIShaderProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIShaderProperties.java @@ -25,7 +25,7 @@ import com.kotcrab.vis.ui.widget.VisLabel; import com.kotcrab.vis.ui.widget.VisSelectBox; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.event.SelectBoxChangeListener; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.properties.UIRemovableProperties; import java.util.HashMap; diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpineAnimationItemProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpineAnimationItemProperties.java index b7ec16f2..713e7141 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpineAnimationItemProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpineAnimationItemProperties.java @@ -22,7 +22,7 @@ import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Array; import com.kotcrab.vis.ui.widget.VisSelectBox; import games.rednblack.editor.event.SelectBoxChangeListener; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.properties.UIItemCollapsibleProperties; /** diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpriteAnimationItemProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpriteAnimationItemProperties.java index 149ef306..27c83ec5 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpriteAnimationItemProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UISpriteAnimationItemProperties.java @@ -29,7 +29,7 @@ import com.kotcrab.vis.ui.widget.spinner.IntSpinnerModel; import com.kotcrab.vis.ui.widget.spinner.Spinner; import games.rednblack.editor.event.NumberSelectorOverlapListener; import games.rednblack.editor.event.SelectBoxChangeListener; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.editor.view.ui.properties.UIItemCollapsibleProperties; import java.util.HashMap; diff --git a/src/main/java/games/rednblack/editor/view/ui/settings/GeneralSettings.java b/src/main/java/games/rednblack/editor/view/ui/settings/GeneralSettings.java index 893e6a12..7f6caf60 100644 --- a/src/main/java/games/rednblack/editor/view/ui/settings/GeneralSettings.java +++ b/src/main/java/games/rednblack/editor/view/ui/settings/GeneralSettings.java @@ -2,7 +2,7 @@ package games.rednblack.editor.view.ui.settings; import com.kotcrab.vis.ui.widget.VisCheckBox; import games.rednblack.editor.HyperLap2DFacade; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.h2d.common.MsgAPI; import games.rednblack.h2d.common.view.SettingsNodeValue; import games.rednblack.h2d.common.vo.EditorConfigVO; diff --git a/src/main/java/games/rednblack/editor/view/ui/settings/PluginsSettings.java b/src/main/java/games/rednblack/editor/view/ui/settings/PluginsSettings.java index 8533da5b..b68c5cf2 100644 --- a/src/main/java/games/rednblack/editor/view/ui/settings/PluginsSettings.java +++ b/src/main/java/games/rednblack/editor/view/ui/settings/PluginsSettings.java @@ -3,7 +3,7 @@ package games.rednblack.editor.view.ui.settings; import com.badlogic.gdx.utils.Align; import com.kotcrab.vis.ui.widget.VisLabel; import games.rednblack.editor.HyperLap2DFacade; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.h2d.common.view.SettingsNodeValue; public class PluginsSettings extends SettingsNodeValue { diff --git a/src/main/java/games/rednblack/editor/view/ui/settings/ProjectExportSettings.java b/src/main/java/games/rednblack/editor/view/ui/settings/ProjectExportSettings.java index 470eaa82..4effaed4 100644 --- a/src/main/java/games/rednblack/editor/view/ui/settings/ProjectExportSettings.java +++ b/src/main/java/games/rednblack/editor/view/ui/settings/ProjectExportSettings.java @@ -10,9 +10,8 @@ import com.kotcrab.vis.ui.widget.file.FileChooser; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.proxy.ProjectManager; import games.rednblack.editor.proxy.ResolutionManager; -import games.rednblack.editor.utils.StandardWidgetsFactory; -import games.rednblack.editor.view.ui.dialog.SettingsDialog; -import games.rednblack.editor.view.ui.widget.InputFileWidget; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.widget.InputFileWidget; import games.rednblack.h2d.common.MsgAPI; import games.rednblack.h2d.common.view.SettingsNodeValue; import games.rednblack.h2d.common.vo.ProjectVO; diff --git a/src/main/java/games/rednblack/editor/view/ui/settings/SandboxSettings.java b/src/main/java/games/rednblack/editor/view/ui/settings/SandboxSettings.java index 8f800d5e..a197edc6 100644 --- a/src/main/java/games/rednblack/editor/view/ui/settings/SandboxSettings.java +++ b/src/main/java/games/rednblack/editor/view/ui/settings/SandboxSettings.java @@ -2,7 +2,7 @@ package games.rednblack.editor.view.ui.settings; import com.kotcrab.vis.ui.widget.VisCheckBox; import games.rednblack.editor.HyperLap2DFacade; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; import games.rednblack.h2d.common.MsgAPI; import games.rednblack.h2d.common.view.SettingsNodeValue; import games.rednblack.h2d.common.vo.EditorConfigVO; diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/EditableSelectBox.java b/src/main/java/games/rednblack/editor/view/ui/widget/EditableSelectBox.java index b56010ab..0881b2f1 100644 --- a/src/main/java/games/rednblack/editor/view/ui/widget/EditableSelectBox.java +++ b/src/main/java/games/rednblack/editor/view/ui/widget/EditableSelectBox.java @@ -29,7 +29,7 @@ import com.badlogic.gdx.utils.Array; import com.kotcrab.vis.ui.widget.VisSelectBox; import com.kotcrab.vis.ui.widget.VisTable; import com.kotcrab.vis.ui.widget.VisTextField; -import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory; /** * Created by azakhary on 4/30/2015. diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/SandboxUI.java b/src/main/java/games/rednblack/editor/view/ui/widget/SandboxUI.java deleted file mode 100644 index be82839a..00000000 --- a/src/main/java/games/rednblack/editor/view/ui/widget/SandboxUI.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * ****************************************************************************** - * * Copyright 2015 See AUTHORS file. - * * - * * Licensed under the Apache License, Version 2.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * * - * * http://www.apache.org/licenses/LICENSE-2.0 - * * - * * Unless required by applicable law or agreed to in writing, software - * * distributed under the License is distributed on an "AS IS" BASIS, - * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * * See the License for the specific language governing permissions and - * * limitations under the License. - * ***************************************************************************** - */ - -package games.rednblack.editor.view.ui.widget; - -import com.badlogic.gdx.scenes.scene2d.Group; -import games.rednblack.editor.view.ui.widget.actors.GridView; -import games.rednblack.editor.view.ui.widget.actors.ResolutionBounds; -import games.rednblack.editor.view.stage.Sandbox; - -public class SandboxUI extends Group { - - public SandboxUI(Sandbox s) { - GridView gridView = new GridView(); - addActor(gridView); - ResolutionBounds resolutionBounds = new ResolutionBounds(s); - addActor(resolutionBounds); - } -}