add in arrow presenters

DC37 · Nov 22, 2018 · 888ad81 · 888ad81
1 parent e6b6aa3
commit 888ad81
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/src/smp/presenters/api/button/AbstractImageButton.java b/src/smp/presenters/api/button/AbstractImageButton.java
@@ -2,6 +2,7 @@
 
 import smp.ImageIndex;
 import smp.ImageLoader;
+import smp.TestMain;
 import smp.components.staff.Staff;
 import smp.fx.SMPFXController;
 import javafx.event.EventHandler;
@@ -48,7 +49,7 @@ public abstract class AbstractImageButton {
     protected SMPFXController controller;
 
     /** This is the image loader class. */
-    protected ImageLoader il;
+    protected ImageLoader il = (ImageLoader) TestMain.imgLoader;
 
     /**
      * @param i The ImageView passed to the Button

diff --git a/src/smp/presenters/buttons/LeftArrowPresenter.java b/src/smp/presenters/buttons/LeftArrowPresenter.java
@@ -50,7 +50,7 @@ public LeftArrowPresenter(ImageView leftArrow) {
         super(leftArrow);
         t = new Timer();
         //TODO: create a stand-alone imageloader presenter and pass in images from there
-        getImages(ImageIndex.SCROLLBAR_LEFT2_PRESSED, ImageIndex.SCROLLBAR_LEFT2);
+        getImages(ImageIndex.SCROLLBAR_LEFT1_PRESSED, ImageIndex.SCROLLBAR_LEFT1);
 
         skipAmount = -1;
 

diff --git a/src/smp/presenters/buttons/RightArrowPresenter.java b/src/smp/presenters/buttons/RightArrowPresenter.java
@@ -59,7 +59,7 @@ public RightArrowPresenter(ImageView rightArrow) {
         super(rightArrow);
         t = new Timer();
         //TODO: create a stand-alone imageloader presenter and pass in images from there
-        getImages(ImageIndex.SCROLLBAR_LEFT2_PRESSED, ImageIndex.SCROLLBAR_LEFT2);
+        getImages(ImageIndex.SCROLLBAR_RIGHT1_PRESSED, ImageIndex.SCROLLBAR_RIGHT1);
 
         skipAmount = 1;
 

diff --git a/src/smp/presenters/buttons/RightFastArrowPresenter.java b/src/smp/presenters/buttons/RightFastArrowPresenter.java
@@ -59,7 +59,7 @@ public RightFastArrowPresenter(ImageView rightFastArrow) {
         super(rightFastArrow);
         t = new Timer();
         //TODO: create a stand-alone imageloader presenter and pass in images from there
-        getImages(ImageIndex.SCROLLBAR_LEFT2_PRESSED, ImageIndex.SCROLLBAR_LEFT2);
+        getImages(ImageIndex.SCROLLBAR_RIGHT2_PRESSED, ImageIndex.SCROLLBAR_RIGHT2);
 
         skipAmount = Double.MAX_VALUE;
 

diff --git a/src/smp/views/MainWindowController.java b/src/smp/views/MainWindowController.java
@@ -25,10 +25,14 @@
 import smp.presenters.buttons.AddButtonPresenter;
 import smp.presenters.buttons.DeleteButtonPresenter;
 import smp.presenters.buttons.DownButtonPresenter;
+import smp.presenters.buttons.LeftArrowPresenter;
+import smp.presenters.buttons.LeftFastArrowPresenter;
 import smp.presenters.buttons.LoadButtonPresenter;
 import smp.presenters.buttons.ModeButtonPresenter;
 import smp.presenters.buttons.NewButtonPresenter;
 import smp.presenters.buttons.OptionsButtonPresenter;
+import smp.presenters.buttons.RightArrowPresenter;
+import smp.presenters.buttons.RightFastArrowPresenter;
 import smp.presenters.buttons.SaveButtonPresenter;
 import smp.presenters.buttons.TempoMinusPresenter;
 import smp.presenters.buttons.TempoPlusPresenter;
@@ -220,10 +224,14 @@ public void initialize() {
     	new AddButtonPresenter(addButton);
     	new DeleteButtonPresenter(deleteButton);
     	new DownButtonPresenter(downButton);
+    	new LeftArrowPresenter(leftArrow);
+    	new LeftFastArrowPresenter(leftFastArrow);
     	new LoadButtonPresenter(loadButton);
     	new ModeButtonPresenter(modeButton);
     	new NewButtonPresenter(newButton);
     	new OptionsButtonPresenter(optionsButton);
+    	new RightArrowPresenter(rightArrow);
+    	new RightFastArrowPresenter(rightFastArrow);
     	new SaveButtonPresenter(saveButton);
     	new TempoMinusPresenter(tempoMinus);
     	new TempoPlusPresenter(tempoPlus);