Browse Source

successful build, control bar is useless though, and background is same as the main pane (white), which is useless AF

tsdedhar 6 years ago
parent
commit
44cc4b0a89

BIN
assignments/a3/.gradle/4.7/fileHashes/fileHashes.bin


BIN
assignments/a3/.gradle/4.7/fileHashes/fileHashes.lock


BIN
assignments/a3/.gradle/4.7/taskHistory/taskHistory.bin


BIN
assignments/a3/.gradle/4.7/taskHistory/taskHistory.lock


BIN
assignments/a3/.gradle/buildOutputCleanup/buildOutputCleanup.lock


BIN
assignments/a3/.gradle/buildOutputCleanup/outputFiles.bin


BIN
assignments/a3/build/classes/java/main/Controls$1.class


BIN
assignments/a3/build/classes/java/main/Controls$2.class


BIN
assignments/a3/build/classes/java/main/Controls$3.class


BIN
assignments/a3/build/classes/java/main/Controls$4.class


BIN
assignments/a3/build/classes/java/main/Controls$5.class


BIN
assignments/a3/build/classes/java/main/Controls.class


BIN
assignments/a3/build/classes/java/main/Gallery.class


BIN
assignments/a3/build/classes/java/main/Main.class


BIN
assignments/a3/build/classes/java/main/Model.class


BIN
assignments/a3/build/classes/java/main/PicData.class


BIN
assignments/a3/build/classes/java/main/View.class


BIN
assignments/a3/build/classes/java/main/playSlider.class


BIN
assignments/a3/build/libs/a2-1.0-SNAPSHOT.jar


+ 2 - 0
assignments/a3/build/tmp/jar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

+ 3 - 6
assignments/a3/src/main/java/Controls.java

@@ -16,7 +16,7 @@ public class Controls extends JPanel implements Observer
   private JButton clear;
 
   // Bob the Builder this shit
-  public Controls(Model model, Handler handler)
+  public Controls(Model model)
   {
     // Hook up this observer so that it will be notified when the model
     // changes.
@@ -24,7 +24,6 @@ public class Controls extends JPanel implements Observer
     this.setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
     this.setPreferredSize(new Dimension(1280,75));
     this.setMinimumSize(new Dimension(320, 75));
-    //ImageIcon icon1 = new ImageIcon("/src/main/resources/playbutton.jpg");
     this.play = new JButton("Play");
     play.addActionListener(new ActionListener()
     {
@@ -46,7 +45,7 @@ public class Controls extends JPanel implements Observer
     {
       public void stateChanged(ChangeEvent e)
       {
-        if (!playback.getSettingLen() && playback.getValue() != model.getTotalVisibleLen())
+        if (!playback.getSettingLen())
         {
         }
       }
@@ -78,15 +77,13 @@ public class Controls extends JPanel implements Observer
 
   public void update(Object observable)
   {
-    int len = model.getTotalLen();
+    int len = 0;
     if (len > 0)
     {
       playback.toggleSettingLen();
       playback.setMaximum(len);
       playback.toggleSettingLen();
-      playback.setValue(model.getTotalVisibleLen());
     }
-    this.setBackground(model.controlColour);
     revalidate();
     repaint();
   }

+ 1 - 1
assignments/a3/src/main/java/Main.java

@@ -7,7 +7,7 @@ public class Main
   {
     JFrame window = new JFrame("Fotag!");
     Model model = new Model();
-    Gallery gallery = new Gallery(model)
+    Gallery gallery = new Gallery(model);
     Controls controls = new Controls(model);
     model.notifyObservers();