Forráskód Böngészése

giving up on icons

tsdedhar 6 éve
szülő
commit
7185805cb4

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


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


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


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


BIN
assignments/a2/.gradle/buildOutputCleanup/buildOutputCleanup.lock


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


BIN
assignments/a2/build/classes/java/main/previewPanel.class


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


+ 2 - 2
assignments/a2/src/main/java/Controls.java

@@ -24,8 +24,8 @@ 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(icon1);
+    //ImageIcon icon1 = new ImageIcon("/src/main/resources/playbutton.jpg");
+    this.play = new JButton("Play");
     play.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)

+ 3 - 3
assignments/a2/src/main/java/Sidepane.java

@@ -125,13 +125,13 @@ class previewPanel extends JPanel
 {
   private Model model;
   private JSlider slider;
-  private JLabel label;
+  //private JLabel label;
   private previewLine preview;
   
   public previewPanel(Model m)
   {
     this.model = m;
-    this.label = new JLabel("Thiccness");
+    //this.label = new JLabel("Thiccness");
     this.slider = new JSlider(1, 50, model.getThiccness());
     this.slider.addChangeListener(new ChangeListener()
       {
@@ -145,7 +145,7 @@ class previewPanel extends JPanel
     this.setPreferredSize(new Dimension(280, 240));
     this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
     this.add(preview);
-    this.add(label);
+    //this.add(label);
     this.add(slider);
   }
 }