Prechádzať zdrojové kódy

trying cyan and black

tarfeef101 6 rokov pred
rodič
commit
19f7b997f7

+ 19 - 8
assignments/a3/src/main/java/Controls.java

@@ -13,19 +13,23 @@ import javax.swing.JFileChooser;
 public class Controls extends JPanel implements Observer, Serializable
 {
   private Model model;
-  private JButton grid;
-  private JButton list;
+  private JRadioButton grid;
+  private JRadioButton list;
   private class customListener implements ActionListener
   {
     public void actionPerformed(ActionEvent e)
     {
       if (e.getSource() == grid)
       {
+        grid.setSelected(true);
+        list.setSelected(false);
         model.switchLayout(true);
         grid.setIcon(lightGridIcon);
       }
       else
       {
+        grid.setSelected(false);
+        list.setSelected(true);
         model.switchLayout(false);
         list.setIcon(lightListIcon);
       }
@@ -194,6 +198,7 @@ public class Controls extends JPanel implements Observer, Serializable
   }
   private customListener customlistener;
   private superListener superlistener;
+  private ButtonGroup layouts;
   private ButtonGroup stars;
   private Image emptyStarImg;
   private Image fullStarImg;
@@ -240,22 +245,22 @@ public class Controls extends JPanel implements Observer, Serializable
 
     try
     {
-      this.gridImg = ImageIO.read(new File("src/main/resources/grid.png"));
+      this.gridImg = ImageIO.read(new File("src/main/resources/cyanblackgrid.png"));
     } catch(IOException e) {}
 
     try
     {
-      this.listImg = ImageIO.read(new File("src/main/resources/list.png"));
+      this.listImg = ImageIO.read(new File("src/main/resources/blackcyanlist.png"));
     } catch(IOException e) {}
     
     try
     {
-      this.lightGridImg = ImageIO.read(new File("src/main/resources/invertedgrid.png"));
+      this.lightGridImg = ImageIO.read(new File("src/main/resources/blackcyangrid.png"));
     } catch(IOException e) {}
 
     try
     {
-      this.lightListImg = ImageIO.read(new File("src/main/resources/invertedlist.png"));
+      this.lightListImg = ImageIO.read(new File("src/main/resources/cyanblacklist.png"));
     } catch(IOException e) {}
     
     try
@@ -277,12 +282,18 @@ public class Controls extends JPanel implements Observer, Serializable
     this.listIcon = new ImageIcon(listImg);
     this.folderIcon = new ImageIcon(folderImg);
     
-    this.grid = new JButton(gridIcon);
+    this.grid = new JRadioButton(gridIcon, true);
     grid.addActionListener(customlistener);
     
-    this.list = new JButton(lightListIcon);
+    this.list = new JRadioButton(lightListIcon, false);
     list.addActionListener(customlistener);
     
+    this.layouts = new ButtonGroup();
+    layouts.add(grid);
+    layouts.add(list);
+    grid.setSelected(true);
+    list.setSelected(false);
+    
     this.fileChooser = new JFileChooser();
     this.fileButton = new JButton(folderIcon);
     fileButton.addActionListener(new ActionListener()

BIN
assignments/a3/src/main/resources/blackcyangrid.png


BIN
assignments/a3/src/main/resources/blackcyanlist.png


BIN
assignments/a3/src/main/resources/cyanblackgrid.png


BIN
assignments/a3/src/main/resources/cyanblacklist.png