From 8f17207ddf829878f427a149649365f965653ea7 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Wed, 26 Sep 2018 13:35:57 +0200 Subject: [PATCH] add buttons --- src/main/ui/buttons/BoxButton.java | 8 ++++--- src/main/ui/buttons/DeleteButton.java | 4 ++++ src/main/ui/buttons/ExitButton.java | 10 +++++++++ src/main/ui/buttons/FireButton.java | 10 +++++++++ src/main/ui/buttons/PauseResumeButton.java | 9 ++++---- src/main/ui/buttons/ReloadButton.java | 9 ++++++++ .../ui/buttons/{ => files}/ButtonDelete.png | Bin .../buttons/{ => files}/ButtonDeleteHover.png | Bin .../ui/buttons/{ => files}/ButtonEdit.png | Bin .../buttons/{ => files}/ButtonEditHover.png | Bin src/main/ui/buttons/files/ButtonExit.png | Bin 0 -> 644 bytes src/main/ui/buttons/files/ButtonExitHover.png | Bin 0 -> 538 bytes src/main/ui/buttons/files/ButtonFire.png | Bin 0 -> 677 bytes src/main/ui/buttons/files/ButtonFireHover.png | Bin 0 -> 642 bytes .../ui/buttons/{ => files}/ButtonPause.png | Bin .../buttons/{ => files}/ButtonPauseHover.png | Bin src/main/ui/buttons/files/ButtonReload.png | Bin 0 -> 643 bytes .../ui/buttons/files/ButtonReloadHover.png | Bin 0 -> 535 bytes .../ui/buttons/{ => files}/ButtonResume.png | Bin .../buttons/{ => files}/ButtonResumeHover.png | Bin .../ui/extensions/ExtensionItemContainer.java | 20 ++++++++---------- 21 files changed, 52 insertions(+), 18 deletions(-) create mode 100644 src/main/ui/buttons/ExitButton.java create mode 100644 src/main/ui/buttons/FireButton.java create mode 100644 src/main/ui/buttons/ReloadButton.java rename src/main/ui/buttons/{ => files}/ButtonDelete.png (100%) rename src/main/ui/buttons/{ => files}/ButtonDeleteHover.png (100%) rename src/main/ui/buttons/{ => files}/ButtonEdit.png (100%) rename src/main/ui/buttons/{ => files}/ButtonEditHover.png (100%) create mode 100644 src/main/ui/buttons/files/ButtonExit.png create mode 100644 src/main/ui/buttons/files/ButtonExitHover.png create mode 100644 src/main/ui/buttons/files/ButtonFire.png create mode 100644 src/main/ui/buttons/files/ButtonFireHover.png rename src/main/ui/buttons/{ => files}/ButtonPause.png (100%) rename src/main/ui/buttons/{ => files}/ButtonPauseHover.png (100%) create mode 100644 src/main/ui/buttons/files/ButtonReload.png create mode 100644 src/main/ui/buttons/files/ButtonReloadHover.png rename src/main/ui/buttons/{ => files}/ButtonResume.png (100%) rename src/main/ui/buttons/{ => files}/ButtonResumeHover.png (100%) diff --git a/src/main/ui/buttons/BoxButton.java b/src/main/ui/buttons/BoxButton.java index 4ae2ad3..f0abd39 100644 --- a/src/main/ui/buttons/BoxButton.java +++ b/src/main/ui/buttons/BoxButton.java @@ -7,6 +7,8 @@ import javafx.scene.image.ImageView; import javafx.scene.input.MouseEvent; import javafx.scene.layout.StackPane; +import java.io.File; + public class BoxButton extends StackPane { private ImageView imageView; @@ -15,9 +17,9 @@ public class BoxButton extends StackPane { private boolean isVisible; //paths zijn relatief aan deze classpath - public BoxButton(String imagePath, String imageOnHoverPath) { - this.image = new Image(getClass().getResourceAsStream(imagePath)); - this.imageOnHover = new Image(getClass().getResourceAsStream(imageOnHoverPath)); + public BoxButton(String imageName, String imageOnHoverName) { + this.image = new Image(getClass().getResourceAsStream("files" + File.separator + imageName)); + this.imageOnHover = new Image(getClass().getResourceAsStream("files" + File.separator + imageOnHoverName)); this.imageView = new ImageView(); setCursor(Cursor.DEFAULT); diff --git a/src/main/ui/buttons/DeleteButton.java b/src/main/ui/buttons/DeleteButton.java index 47ac9f9..2d91f52 100644 --- a/src/main/ui/buttons/DeleteButton.java +++ b/src/main/ui/buttons/DeleteButton.java @@ -1,5 +1,9 @@ package main.ui.buttons; +import org.omg.CORBA.Environment; + +import java.io.File; + public class DeleteButton extends BoxButton { public DeleteButton() { diff --git a/src/main/ui/buttons/ExitButton.java b/src/main/ui/buttons/ExitButton.java new file mode 100644 index 0000000..faaccd8 --- /dev/null +++ b/src/main/ui/buttons/ExitButton.java @@ -0,0 +1,10 @@ +package main.ui.buttons; + +/** + * Created by Jonas on 26/09/18. + */ +public class ExitButton extends BoxButton { + public ExitButton() { + super("ButtonExit.png", "ButtonExitHover.png"); + } +} diff --git a/src/main/ui/buttons/FireButton.java b/src/main/ui/buttons/FireButton.java new file mode 100644 index 0000000..798dbb3 --- /dev/null +++ b/src/main/ui/buttons/FireButton.java @@ -0,0 +1,10 @@ +package main.ui.buttons; + +/** + * Created by Jonas on 26/09/18. + */ +public class FireButton extends BoxButton { + public FireButton() { + super("ButtonFire.png", "ButtonFireHover.png"); + } +} diff --git a/src/main/ui/buttons/PauseResumeButton.java b/src/main/ui/buttons/PauseResumeButton.java index 779a88e..d8ca648 100644 --- a/src/main/ui/buttons/PauseResumeButton.java +++ b/src/main/ui/buttons/PauseResumeButton.java @@ -8,6 +8,7 @@ import javafx.scene.image.ImageView; import javafx.scene.input.MouseEvent; import javafx.scene.layout.StackPane; +import java.io.File; import java.util.ArrayList; import java.util.List; @@ -31,10 +32,10 @@ public class PauseResumeButton extends StackPane{ public PauseResumeButton(boolean isPaused) { this.isPaused[0] = isPaused; - this.imagePause = new Image(getClass().getResourceAsStream("ButtonPause.png")); - this.imagePauseOnHover = new Image(getClass().getResourceAsStream("ButtonPauseHover.png")); - this.imageResume = new Image(getClass().getResourceAsStream("ButtonResume.png")); - this.imageResumeOnHover = new Image(getClass().getResourceAsStream("ButtonResumeHover.png")); + this.imagePause = new Image(getClass().getResourceAsStream("files"+ File.separator+"ButtonPause.png")); + this.imagePauseOnHover = new Image(getClass().getResourceAsStream("files"+ File.separator+"ButtonPauseHover.png")); + this.imageResume = new Image(getClass().getResourceAsStream("files"+ File.separator+"ButtonResume.png")); + this.imageResumeOnHover = new Image(getClass().getResourceAsStream("files"+ File.separator+"ButtonResumeHover.png")); this.imageView = new ImageView(); setCursor(Cursor.DEFAULT); diff --git a/src/main/ui/buttons/ReloadButton.java b/src/main/ui/buttons/ReloadButton.java new file mode 100644 index 0000000..e294fba --- /dev/null +++ b/src/main/ui/buttons/ReloadButton.java @@ -0,0 +1,9 @@ +package main.ui.buttons; + +/** + * Created by Jonas on 26/09/18. + */ +public class ReloadButton extends BoxButton { + public ReloadButton() { + super("ButtonReload.png", "ButtonReloadHover.png"); } +} diff --git a/src/main/ui/buttons/ButtonDelete.png b/src/main/ui/buttons/files/ButtonDelete.png similarity index 100% rename from src/main/ui/buttons/ButtonDelete.png rename to src/main/ui/buttons/files/ButtonDelete.png diff --git a/src/main/ui/buttons/ButtonDeleteHover.png b/src/main/ui/buttons/files/ButtonDeleteHover.png similarity index 100% rename from src/main/ui/buttons/ButtonDeleteHover.png rename to src/main/ui/buttons/files/ButtonDeleteHover.png diff --git a/src/main/ui/buttons/ButtonEdit.png b/src/main/ui/buttons/files/ButtonEdit.png similarity index 100% rename from src/main/ui/buttons/ButtonEdit.png rename to src/main/ui/buttons/files/ButtonEdit.png diff --git a/src/main/ui/buttons/ButtonEditHover.png b/src/main/ui/buttons/files/ButtonEditHover.png similarity index 100% rename from src/main/ui/buttons/ButtonEditHover.png rename to src/main/ui/buttons/files/ButtonEditHover.png diff --git a/src/main/ui/buttons/files/ButtonExit.png b/src/main/ui/buttons/files/ButtonExit.png new file mode 100644 index 0000000000000000000000000000000000000000..4b92915811794aafdefe38e5e05024867ee01842 GIT binary patch literal 644 zcmV-~0(@KhQV^A%tq0 z=8Z%m5%bIyMe){6a@L6Jx!nO(6RE?y$W4jhUG#g25n~rU5WF_XaO;Vc`?SV%Y|?69#S-z5RC`$93uG zXlL-=AOSr9!0ha6ggDp-fWk4TLipOVS+i0o5DbU0%qC3hALH>jmSvr7;KKRg^!hE4 zob_T*d_HQSM5B!~HkxM}T!4VzvO=BZJiVzD6-QE$k}pf2Sy}l?C{#xchX(Kb{`VX4 z`0CGCY;`^sdmB*)TC~5v$xFJVDA?QE zIMsBYt`lBd#8Fgkk3MB1l}1ywBNa3NC7&_@kviQ^PtR4Fn_B=djEE1A8bBWA02M&O%?3>y`RKakC)w<>GC8>( z@%x=f#1Oi!@8@zkzYt2>*4Cd4(B^eH!m8RnVi@zSs`?l(kL!Q{T7Xs{c;Yh&A#@-D e6slU0v%z1^ObYv^sp)C}00001v5-E9ZdKqQ1+BTKW3u;k2a;IRzx1Ms%0ife%Y9^0m(qLS(9r}%u=F^uF2n9aWz zN%mhJsoQ;!Sb)6@q=AplNaR}+xB!$p$p%!LC{CULFMvs4^RImt%_V0{SrtH{7Xm+l c+9S1J*|v>iqPq&MB8saxJ``f4l+U_p`z@1Bo-i>Nb* z)P^+E|0OWiEXW?Zjjs;^q=&o45EUX$_!bMT8Z5&JLniqVXYD*%^8GF#{j~sf5>OMP3*6f-?Y;pUvh=U;_km z!C1KuEZ3wLdS#NV%DFB#OPp;g7K<)NHRV;HCPZYPh#W~p<5vKb9c>RIoWud$15ynt z28hCK7{b|o4BZZt=gC_FnKuAbdb6w>a8)y?{otGcsRVcLAZ}eh*_A~o2d6*hiS|Hh z0Hkg8a;#N>X#`O9TUrRW;nol2WSccqq!o#1R0p6z>T)=vbW9170l+B|lr@|U@=(hi zLIw=bfhh~vunB2F=|d#KAZmmOqeBL z9gtvSOGAZ%V)F&SPDP&1FDZbi=xa8^3x5jCXCMFPo6=(IlTFTHzCm^x_+zKtP0mAp zkqVI<>FN<NklW1}BYW$t|C+xeVUT^1&sq*CJ^T6XrGQ=Zq*bHY6YtbGzni_- z*KQn{e}KDF0S^Waj&QxmAU}i58sXsp{gIzvjD!s}PUU6QD=sDtEBAAC8Zb=t0V@L| zSe65l*(3{TTq|&2*7)QY>3QCt#SeMkrU3&SiOj^t!Z{^(uea zd!GJsTsA>`OdKQWrE!i}med<|vmJ*kiwWIRQM%|{vZc68+&C`0GF3wEh30j#e@NIG z_OQ9hca>hk+|r

2gVRQ6Xo~eite;O^%+@d|3X^Zqodt0Bj4N(*2a%X}2_4T;^5n zE2Foc#{JVK@06Wv%iyinTlf|qRr1ciMs@j10Dqk|Irc!DD5rumHP#h?d<(}p9N3b) zN#~k5Ds$I9ParltyLCeSMmeR(_mK||@aOa<=GKF(j_i!APFN%;Rw>5fsgFi3;pkWV c7|KET50jg=&o-m3?EnA(07*qoM6N<$f~BK2&j0`b literal 0 HcmV?d00001 diff --git a/src/main/ui/buttons/ButtonPause.png b/src/main/ui/buttons/files/ButtonPause.png similarity index 100% rename from src/main/ui/buttons/ButtonPause.png rename to src/main/ui/buttons/files/ButtonPause.png diff --git a/src/main/ui/buttons/ButtonPauseHover.png b/src/main/ui/buttons/files/ButtonPauseHover.png similarity index 100% rename from src/main/ui/buttons/ButtonPauseHover.png rename to src/main/ui/buttons/files/ButtonPauseHover.png diff --git a/src/main/ui/buttons/files/ButtonReload.png b/src/main/ui/buttons/files/ButtonReload.png new file mode 100644 index 0000000000000000000000000000000000000000..4440bc21fead598e4f26715a227fa116faa9137a GIT binary patch literal 643 zcmV-}0(||6P)(k;;!i|yC}xr_4pJzDF4ZAW#2+dIbTW3R zgM%PKCtVzbt}b?P5fVWQr6w^+Uqgf@G|hWnpC%+GqMHXkxZHcs;hgXLfM0N3_m6dX z@}>LxT?-Wd04ZIJ-+1lzdn26=S~z!oAt5-OR9u{p!o|^H2}uQ3%S}AFcgf=rLV5*8 zuRR|!gm`sw#E6Ct4#Bs50Gv?IryvZUR`Mv>n|P4CKw1L4)6Ng_nd81_*b1VtxU z$@(L8Jt59H48GMBp)C-bSV%-h%xK6O2Bj2A5q$i-id@OT;r%8g6R;~a%-%dtItAKI zR9sD2!F_NY{oZu2_;%STl$$T+?!-uGy^eBa1GCfJCny{KA4K(OK}ZSko)P| z7sr1_YZ(@r>;9GnSi|9 zI+p)hU0TVn!O?StkQ>tcE|Wk=3o2-tr8J^=L$*6tFS577$hFHc(HbeNt^qlDx`Wfy304Q*$Y#6jUmE)T;ghjnyMSJRW~gtJR*IatAlJlGi3umSv*U0h@2i zfo1rQO|6kyKb*=WNfu^vgQJ6sSCeB%wNI3p66|pN~Ifr?Q{a{c}H2svg4?%GcwFjBtS~Z zVWY_p&!_3{ZfLFV6pO{3-he;d==faDQ1ZU54^mnyv{Ktj%BOEjYfIgWJmWL item.isRemoveClickTrigger()); + Tooltip.install(exitButton,delete); + exitButton.show(); + exitButton.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> item.isRemoveClickTrigger()); SimpleClickButton clickButton = new SimpleClickButton(); clickButton.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> item.isClickTrigger()); - HBox buttonsBox = new HBox(clickButton, deleteButton); + HBox buttonsBox = new HBox(clickButton, exitButton); if (item.isFireButtonUsed()) { clickButton.show(); } else { - HBox.setMargin(deleteButton, new Insets(0,0,0,26)); + HBox.setMargin(exitButton, new Insets(0,0,0,24)); } - buttonsBox.setSpacing(item.isFireButtonUsed() ? 10 : 0); + buttonsBox.setSpacing(item.isFireButtonUsed() ? 8 : 0); buttonsBox.setAlignment(Pos.CENTER); GridPane.setMargin(buttonsBox, new Insets(0, 5, 0, 5)); add(buttonsBox, 4, 0);