From e5f1ce7788645c1831de2b66844e99aa85a07ccb Mon Sep 17 00:00:00 2001
From: TheCodeBoat <none@none>
Date: Wed, 26 Feb 2014 20:46:41 +0100
Subject: [PATCH] changed gui to new tonegodui, added new buttons

---
 .../Gui/Button/{Button.xml => Button.gui.xml} |   0
 ShootingStars/assets/Gui/Button/button.png    | Bin 557 -> 0 bytes
 .../assets/Gui/Button/buttonTransparent.png   | Bin 391 -> 347 bytes
 .../Gui/Button/buttonTransparentHover.png     | Bin 241 -> 347 bytes
 .../{Indicator.xml => Indicator.gui.xml}      |   0
 .../Gui/Menu/{Menu.xml => Menu.gui.xml}       |   0
 .../{Scrolling.xml => Scrolling.gui.xml}      |   0
 .../Gui/Window/{Window.xml => Window.gui.xml} |   0
 .../Gui/{style_map.xml => style_map.gui.xml}  |  34 +++++++++---------
 .../wyrez/shootingstars/ShootingStars.java    |   5 ++-
 .../org/wyrez/shootingstars/gui/GameGUI.java  |   8 ++---
 .../gui/controls/ButtonBase.java              |  13 +++----
 .../gui/controls/IndicatorBase.java           |  13 +++----
 13 files changed, 35 insertions(+), 38 deletions(-)
 rename ShootingStars/assets/Gui/Button/{Button.xml => Button.gui.xml} (100%)
 delete mode 100644 ShootingStars/assets/Gui/Button/button.png
 rename ShootingStars/assets/Gui/Indicator/{Indicator.xml => Indicator.gui.xml} (100%)
 rename ShootingStars/assets/Gui/Menu/{Menu.xml => Menu.gui.xml} (100%)
 rename ShootingStars/assets/Gui/Scrolling/{Scrolling.xml => Scrolling.gui.xml} (100%)
 rename ShootingStars/assets/Gui/Window/{Window.xml => Window.gui.xml} (100%)
 rename ShootingStars/assets/Gui/{style_map.xml => style_map.gui.xml} (54%)

diff --git a/ShootingStars/assets/Gui/Button/Button.xml b/ShootingStars/assets/Gui/Button/Button.gui.xml
similarity index 100%
rename from ShootingStars/assets/Gui/Button/Button.xml
rename to ShootingStars/assets/Gui/Button/Button.gui.xml
diff --git a/ShootingStars/assets/Gui/Button/button.png b/ShootingStars/assets/Gui/Button/button.png
deleted file mode 100644
index f3444f1285e02b45f73bdcef45f8cbc0544064ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq001cf000&U1^@s6T}-u(00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-T@a8A09scYtsM#0lG;<
zK~zY`)tAjq!!QtpXPj<&M^x&2^vLsb?0X<Zf-`aD;b6xJNs2a5QFRZk<iGv0_Ik&}
z275W3gd5rG`AqLvZUOAxKR^PIpfWu#AczDZlnw|4>ZsaW?eO&E2BjD9t?Q6d$^Zm7
z@v7N^nk@VcZqm_&faBrd0;L!5Ge)G8a<o>aY4}y?qh?<-!Iu!4275CXD7}C&_DD$(
zMyHej5`qc~3yTULA!@nT0GcMitaX9X3;5YbNP-F&AxH!{o=-@t`%bXTD`y2l2m$-n
zT%hy<_Aw$Q<&>yA1@>Cf)QnlCP6z?5nG2L&z&=JuY33_C*Od&$>d74<*`PIZfzk_j
zxm<8-+wFEPP~Ho03n=di=miaU0DGM6ewf7hZ%{Ab=F2?BxD*X5cO)0Bvk?SrXTQJ9
ze*%p$F62eMo+lh!0UN7QZZ{|3W`WW7mr-EU$~RP<tazqEV=U#R-fPgFz~1cd0%H}l
zk41VF!U8lzksP72_?R4yD&g{<ncYUJt$}9wkmVVw3d&Iu1hQ)NGH%^T>jd2Ve0b}+
vyoDS9OOU=r5m&*cZjXoO+dd!e{Sf;CAZX<$5wfI)00000NkvXXu0mjfkFe{E

diff --git a/ShootingStars/assets/Gui/Button/buttonTransparent.png b/ShootingStars/assets/Gui/Button/buttonTransparent.png
index 65f2f8ced37b89cc79b75b6c14c9beb66d932ec8..a4db276c71657cc97dd542b75b8146c4a8b32928 100644
GIT binary patch
literal 347
zcmeAS@N?(olHy`uVBq!ia0vp^Agsf|1|+|+yw?I!Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G^>Ak3IjAI=LDWH0gbb!ETDBqS;=AN6=oJy7U{r;B4q#=W<<ck(hh3b+JzNw`I|
zPwAL8r66pU!Uw_Yi}oKs^M`9e@AIv@ew7$`IPuQ%+PR&>;ChuMPs-{Jl{AebJFi7|
zcLZyOGZ`x@PnsbqJMmCY2Tz(yih;6Hv!tNpnT`_)ZZ2%bN=7pTCmzI*n)ft8X~_g9
zuFMvZpc4llr8(!BB{l8dHsinYz7~;U%SX{3hSL@6T0}mVA6Y*k$tnEEMZ=4`zpa?D
z+C<mwaLm@<#$3<Ta<|+wG=J;<t!t-u@^<qxvDQ!aCdfTn{ZMlARhdWUmzDaw`uv*F
YRDi=dbi=znKtD5hy85}Sb4q9e0G1JkT>t<8

literal 391
zcmeAS@N?(olHy`uVBq!ia0vp^nm{bZ!3HE_eYW-iDYhhUcNZWH1V5d3*8?fe0*}aI
z1_o|n5N2eUHAey{$X?><>&kwQiCaWVdOHK}HwFeq5l<J#5Rc<$r~mD1RuDLn{!Qrq
z)n(sJ%6;Ewmj7xGSm?_CnthT)@1bAC6Ye%fT-del_vDrehJYG1P8NsF4`<1|+s!X~
z!h((A!MobG)seS9o_@2=-~e;WrDCzE6Kno-IZeKj&*u3_?y44>0%K;2_m#PwD=$3X
zBvr&$kh_|7Ygj{O%%tu83g6jk=DHd0)@`z3GVtbQQ1xw!(mo)fH}{{AhBQ-JQ`??Z
z464)D<$IYi)o`h1dL%!#|25mujAhOgGoQcb_iL^YjVXM1<de%MpECvD-}{{0++f%1
znfY)I;}#Z+$lcL8OLki26^p&na200N?~c8o__dnl&H1dWtIoX7y1d)`!J@a$EO&4C
i=WVaO!MsIGfI;rvwY~K$OTxZ@!qd~$&t;ucLK6U`0GZ(c

diff --git a/ShootingStars/assets/Gui/Button/buttonTransparentHover.png b/ShootingStars/assets/Gui/Button/buttonTransparentHover.png
index 59fd7ba4850d3e67fa150b20f030ddc1306272a3..8b5876b207141eb0c2bb86009b8a259f587dfc3e 100644
GIT binary patch
delta 329
zcmey!c$-PFGr-TCmrII^fq{Y7)59eQNQ1Br2OE(5#`0ckqM~fQ6$1me6=O<$I4@9;
zy~NYkmHi%*kf?&`-dD3G0)<|9x;Tbp+<SX_ry!G|fJ>lM|CuNGOf7CqueFV1YPzyl
z?r&dmpRwoTo|P{x=kiPnXkHfdPM7J-);K=qn_5bpl3a!BzFt#$6mn|nfiovMRMOns
zml!B3HA@Ogp6NJ|;8yR#W~^j1LvZ53o(`TgmlR|<h*Y}e3=YjD6P%<JTSbaC?6^5$
zcJGV_>vW&}@6cB~8q@bfEa*&XhrHs^Ke8XSm&~{zT3F)qWu2|oGcDiliw5Cu|MfKO
z^psv(e#ZCr#Jx%HF5P&`TYR0bQh!GKkF1JgIr66MKQ?E|PX6_$ieY0chjU5$*$Y5l
OGkCiCxvX<aXaWG`zk^x;

delta 222
zcmcc3^pR1qGr-TCmrII^fq{Y7)59eQNNWPI7zZ1WjP=>tH&IcxUYLP_TbPky)*K0-
zAbW|YuPggKCMI5GrErUvhk!zLo-U3d9>=d<Kh1l<fP*>Uj$)+3^u8<JVhJZp8tWXo
zQr;Bv`FA<-teNm|Urulu%ck^$3}FjbFr**Z%58Dyyp9M@f+&~R1}0YF8LdscXB;jv
z{$O_%e;_V0w;?~EgxSQ-kzcsuT<K{WnVEtr#%EIZxz21-48EG;wf@Yn193<4eEeoe
UlzIDJ1v-Vn)78&qol`;+03Fata{vGU

diff --git a/ShootingStars/assets/Gui/Indicator/Indicator.xml b/ShootingStars/assets/Gui/Indicator/Indicator.gui.xml
similarity index 100%
rename from ShootingStars/assets/Gui/Indicator/Indicator.xml
rename to ShootingStars/assets/Gui/Indicator/Indicator.gui.xml
diff --git a/ShootingStars/assets/Gui/Menu/Menu.xml b/ShootingStars/assets/Gui/Menu/Menu.gui.xml
similarity index 100%
rename from ShootingStars/assets/Gui/Menu/Menu.xml
rename to ShootingStars/assets/Gui/Menu/Menu.gui.xml
diff --git a/ShootingStars/assets/Gui/Scrolling/Scrolling.xml b/ShootingStars/assets/Gui/Scrolling/Scrolling.gui.xml
similarity index 100%
rename from ShootingStars/assets/Gui/Scrolling/Scrolling.xml
rename to ShootingStars/assets/Gui/Scrolling/Scrolling.gui.xml
diff --git a/ShootingStars/assets/Gui/Window/Window.xml b/ShootingStars/assets/Gui/Window/Window.gui.xml
similarity index 100%
rename from ShootingStars/assets/Gui/Window/Window.xml
rename to ShootingStars/assets/Gui/Window/Window.gui.xml
diff --git a/ShootingStars/assets/Gui/style_map.xml b/ShootingStars/assets/Gui/style_map.gui.xml
similarity index 54%
rename from ShootingStars/assets/Gui/style_map.xml
rename to ShootingStars/assets/Gui/style_map.gui.xml
index 3d67f95..1a8adaf 100644
--- a/ShootingStars/assets/Gui/style_map.xml
+++ b/ShootingStars/assets/Gui/style_map.gui.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
-    <style control="Button" path="Gui/Button/Button.xml" />        
-    <cursors path="tonegod/gui/style/def/Common/Cursors/Cursors.xml" />
-    <audio path="tonegod/gui/style/def/Common/Audio/Audio.xml" />
-    <style control="Font" path="tonegod/gui/style/def/Fonts/Fonts.xml" />
-    <style control="Common" path="tonegod/gui/style/def/Common/Common.xml" />
-    <style control="Scrolling" path="Gui/Scrolling/Scrolling.xml" />
-    <style control="Window" path="Gui/Window/Window.xml" />        
-    <style control="Dial" path="tonegod/gui/style/def/Dial/Dial.xml" />
-    <style control="Menu" path="Gui/Menu/Menu.xml" />
-    <style control="Label" path="tonegod/gui/style/def/Label/Label.xml" />
-    <style control="Slider" path="tonegod/gui/style/def/Slider/Slider.xml" />
-    <style control="Spinner" path="tonegod/gui/style/def/Spinner/Spinner.xml" />
-    <style control="TextField" path="tonegod/gui/style/def/TextField/TextField.xml" />
-    <style control="TabControl" path="tonegod/gui/style/def/Tabs/Tabs.xml" />
-    <style control="ChatBox" path="tonegod/gui/style/def/ChatBox/ChatBox.xml" />
-    <style control="Indicator" path="Gui/Indicator/Indicator.xml" />
-    <style control="ColorWheel" path="tonegod/gui/style/def/Common/Extras/ColorWheel.xml" />
+    <style control="Button" path="Gui/Button/Button.gui.xml" />        
+    <cursors path="tonegod/gui/style/def/Common/Cursors/Cursors.gui.xml" />
+    <audio path="tonegod/gui/style/def/Common/Audio/Audio.gui.xml" />
+    <style control="Font" path="tonegod/gui/style/def/Fonts/Fonts.gui.xml" />
+    <style control="Common" path="tonegod/gui/style/def/Common/Common.gui.xml" />
+    <style control="Scrolling" path="Gui/Scrolling/Scrolling.gui.xml" />
+    <style control="Window" path="Gui/Window/Window.gui.xml" />        
+    <style control="Dial" path="tonegod/gui/style/def/Dial/Dial.gui.xml" />
+    <style control="Menu" path="Gui/Menu/Menu.gui.xml" />
+    <style control="Label" path="tonegod/gui/style/def/Label/Label.gui.xml" />
+    <style control="Slider" path="tonegod/gui/style/def/Slider/Slider.gui.xml" />
+    <style control="Spinner" path="tonegod/gui/style/def/Spinner/Spinner.gui.xml" />
+    <style control="TextField" path="tonegod/gui/style/def/TextField/TextField.gui.xml" />
+    <style control="TabControl" path="tonegod/gui/style/def/Tabs/Tabs.gui.xml" />
+    <style control="ChatBox" path="tonegod/gui/style/def/ChatBox/ChatBox.gui.xml" />
+    <style control="Indicator" path="Gui/Indicator/Indicator.gui.xml" />
+    <style control="ColorWheel" path="tonegod/gui/style/def/Common/Extras/ColorWheel.gui.xml" />
 </root>
 
diff --git a/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java b/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java
index ad604bf..12b31c7 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java
@@ -69,7 +69,7 @@ public class ShootingStars extends SimpleApplication {
     @Override
     public void simpleInitApp() {
         //screen = new Screen(this);
-        screen = new Screen(this, "Gui/style_map.xml");
+        screen = new Screen(this, "Gui/style_map.gui.xml");
         
         registerTypes();
         initGUI();
@@ -106,8 +106,7 @@ public class ShootingStars extends SimpleApplication {
         container.registerType(StateManager.class, true);
         container.registerType(SQLiteConnector.class);
         container.registerType(ScoreComparator.class);
-        container.registerType(HighscoreManager.class, true);        
-        //container.registerType(Screen.class, true);
+        container.registerType(HighscoreManager.class, true);
         container.registerType(ScreenHelper.class, true);
         container.registerType(AudioDataManager.class, true);
         container.registerType(YTDownloader.class);
diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java b/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java
index a173c7a..d0a9013 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java
@@ -16,8 +16,6 @@
  */
 package org.wyrez.shootingstars.gui;
 
-import com.jme3.asset.AssetManager;
-import com.jme3.font.BitmapFont;
 import com.jme3.input.event.MouseButtonEvent;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector2f;
@@ -30,10 +28,8 @@ import org.wyrez.shootingstars.gui.listener.GameListener;
 import org.wyrez.shootingstars.helper.ScreenHelper;
 import tonegod.gui.controls.buttons.Button;
 import tonegod.gui.controls.extras.Indicator;
-import tonegod.gui.controls.lists.Dial;
 import tonegod.gui.controls.text.Label;
 import tonegod.gui.controls.windows.Panel;
-import tonegod.gui.controls.windows.Window;
 import tonegod.gui.core.Screen;
 
 /**
@@ -75,8 +71,8 @@ public class GameGUI extends Panel implements Gui{
         float startPointYMenu = screenHelper.calcY(200f);
 
         float labelFontSize = screenHelper.calcX(20f);
-
-        btnStart = new ButtonBase(screen, new Vector2f(startPointx, startPointy),
+        
+        btnStart = new ButtonBase(screen, new Vector2f(startPointx, startPointy), 
                 new Vector2f(screenHelper.calcX(200f), screenHelper.calcY(40f))) {
             @Override
             public void onButtonMouseLeftUp(MouseButtonEvent evt, boolean toggled) {
diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/controls/ButtonBase.java b/ShootingStars/src/org/wyrez/shootingstars/gui/controls/ButtonBase.java
index cb794c2..8b5d44d 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/gui/controls/ButtonBase.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/gui/controls/ButtonBase.java
@@ -22,6 +22,7 @@ import com.jme3.math.Vector2f;
 import com.jme3.math.Vector4f;
 import tonegod.gui.controls.buttons.Button;
 import tonegod.gui.controls.buttons.ButtonAdapter;
+import tonegod.gui.core.ElementManager;
 import tonegod.gui.core.Screen;
 
 /**
@@ -30,32 +31,32 @@ import tonegod.gui.core.Screen;
  */
 public class ButtonBase extends ButtonAdapter {
 
-    public ButtonBase(Screen screen, Vector2f position) {
+    public ButtonBase(ElementManager screen, Vector2f position) {
         super(screen, position);
         init();
     }
 
-    public ButtonBase(Screen screen, Vector2f position, Vector2f dimensions) {
+    public ButtonBase(ElementManager screen, Vector2f position, Vector2f dimensions) {
         super(screen, position, dimensions);
         init();
     }
 
-    public ButtonBase(Screen screen, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg) {
+    public ButtonBase(ElementManager screen, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg) {
         super(screen, position, dimensions, resizeBorders, defaultImg);
         init();
     }
 
-    public ButtonBase(Screen screen, String UID, Vector2f position) {
+    public ButtonBase(ElementManager screen, String UID, Vector2f position) {
         super(screen, UID, position);
         init();
     }
 
-    public ButtonBase(Screen screen, String UID, Vector2f position, Vector2f dimensions) {
+    public ButtonBase(ElementManager screen, String UID, Vector2f position, Vector2f dimensions) {
         super(screen, UID, position, dimensions);
         init();
     }
 
-    public ButtonBase(Screen screen, String UID, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg) {
+    public ButtonBase(ElementManager screen, String UID, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg) {
         super(screen, UID, position, dimensions, resizeBorders, defaultImg);
         init();
     }
diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/controls/IndicatorBase.java b/ShootingStars/src/org/wyrez/shootingstars/gui/controls/IndicatorBase.java
index 8fcb69d..1a7a731 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/gui/controls/IndicatorBase.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/gui/controls/IndicatorBase.java
@@ -19,6 +19,7 @@ package org.wyrez.shootingstars.gui.controls;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector4f;
 import tonegod.gui.controls.extras.Indicator;
+import tonegod.gui.core.ElementManager;
 import tonegod.gui.core.Screen;
 
 /**
@@ -27,32 +28,32 @@ import tonegod.gui.core.Screen;
  */
 public class IndicatorBase extends Indicator {
 
-    public IndicatorBase(Screen screen, Vector2f position, Orientation orientation) {
+    public IndicatorBase(ElementManager screen, Vector2f position, Orientation orientation) {
         super(screen, position, orientation);
         init();
     }
 
-    public IndicatorBase(Screen screen, Vector2f position, Vector2f dimensions, Orientation orientation) {
+    public IndicatorBase(ElementManager screen, Vector2f position, Vector2f dimensions, Orientation orientation) {
         super(screen, position, dimensions, orientation);
         init();
     }
 
-    public IndicatorBase(Screen screen, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg, Orientation orientation) {
+    public IndicatorBase(ElementManager screen, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg, Orientation orientation) {
         super(screen, position, dimensions, resizeBorders, defaultImg, orientation);
         init();
     }
 
-    public IndicatorBase(Screen screen, String UID, Vector2f position, Orientation orientation) {
+    public IndicatorBase(ElementManager screen, String UID, Vector2f position, Orientation orientation) {
         super(screen, UID, position, orientation);
         init();
     }
 
-    public IndicatorBase(Screen screen, String UID, Vector2f position, Vector2f dimensions, Orientation orientation) {
+    public IndicatorBase(ElementManager screen, String UID, Vector2f position, Vector2f dimensions, Orientation orientation) {
         super(screen, UID, position, dimensions, orientation);
         init();
     }
 
-    public IndicatorBase(Screen screen, String UID, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg, Orientation orientation) {
+    public IndicatorBase(ElementManager screen, String UID, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg, Orientation orientation) {
         super(screen, UID, position, dimensions, resizeBorders, defaultImg, orientation);
         init();
     }