New Icons

README.md

@@ -43,3 +43,6 @@ An example for the Battleship puzzle demonstrates the proper format for XML file
 </edu.rpi.legup.Legup>
 ```
 Element values are dependent on the type of `edu.rpi.legup.puzzle`.
+
+## Licensing
+Some of the icons used in Legup were taken from or derived from the icons found on https://fonts.google.com/icons, which is licensed under the [Apache-2.0 license](https://www.apache.org/licenses/LICENSE-2.0.html).

src/main/java/edu/rpi/legup/ui/HomePanel.java

@@ -73,7 +73,7 @@ private void initButtons() {
             }
         };
 
-        ImageIcon button0Icon = new ImageIcon("src/main/resources/edu/rpi/legup/homepanel/openproof.png");
+        ImageIcon button0Icon = new ImageIcon("src/main/resources/edu/rpi/legup/images/Legup/homepanel/proof_file.png");
         this.buttons[0].setIcon(resizeButtonIcon(button0Icon, this.buttonSize, this.buttonSize));
         this.buttons[0].setHorizontalTextPosition(AbstractButton.CENTER);
         this.buttons[0].setVerticalTextPosition(AbstractButton.BOTTOM);
@@ -85,7 +85,7 @@ private void initButtons() {
                 setMaximumSize(getSize());
             }
         };
-        ImageIcon button1Icon = new ImageIcon("src/main/resources/edu/rpi/legup/homepanel/edit.png");
+        ImageIcon button1Icon = new ImageIcon("src/main/resources/edu/rpi/legup/images/Legup/homepanel/new_puzzle_file.png");
         this.buttons[1].setIcon(resizeButtonIcon(button1Icon, this.buttonSize, this.buttonSize));
         this.buttons[1].setHorizontalTextPosition(AbstractButton.CENTER);
         this.buttons[1].setVerticalTextPosition(AbstractButton.BOTTOM);
@@ -97,7 +97,7 @@ private void initButtons() {
                 setMaximumSize(getSize());
             }
         };
-        ImageIcon button2Icon = new ImageIcon("src/main/resources/edu/rpi/legup/homepanel/edit.png"); // PLACEHOLDER
+        ImageIcon button2Icon = new ImageIcon("src/main/resources/edu/rpi/legup/images/Legup/homepanel/puzzle_file.png");
         this.buttons[2].setIcon(resizeButtonIcon(button2Icon, this.buttonSize, this.buttonSize));
         this.buttons[2].setHorizontalTextPosition(AbstractButton.CENTER);
         this.buttons[2].setVerticalTextPosition(AbstractButton.BOTTOM);

src/main/java/edu/rpi/legup/ui/LegupPanel.java

@@ -6,5 +6,7 @@ public abstract class LegupPanel extends JPanel {
     /**
      * Alerts panel that it will be going visible now
      */
+
+    protected final int TOOLBAR_ICON_SCALE = 40;
     public abstract void makeVisible();
 }

src/main/java/edu/rpi/legup/ui/ProofEditorPanel.java

@@ -446,7 +446,13 @@ private void setupToolBar() {
         for (int i = 0; i < ToolbarName.values().length; i++) {
             String toolBarName = ToolbarName.values()[i].toString();
             URL resourceLocation = ClassLoader.getSystemClassLoader().getResource("edu/rpi/legup/images/Legup/" + toolBarName + ".png");
-            JButton button = new JButton(toolBarName, new ImageIcon(resourceLocation));
+
+            // Scale the image icons down to make the buttons smaller
+            ImageIcon imageIcon = new ImageIcon(resourceLocation);
+            Image image = imageIcon.getImage();
+            imageIcon = new ImageIcon(image.getScaledInstance(this.TOOLBAR_ICON_SCALE, this.TOOLBAR_ICON_SCALE, Image.SCALE_SMOOTH));
+
+            JButton button = new JButton(toolBarName, imageIcon);
             button.setFocusPainted(false);
             getToolBarButtons()[i] = button;
         }

src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java

@@ -145,7 +145,13 @@ private void setupToolBar() {
         for (int i = 0; i < ToolbarName.values().length; i++) {
             String toolBarName = ToolbarName.values()[i].toString();
             URL resourceLocation = ClassLoader.getSystemClassLoader().getResource("edu/rpi/legup/images/Legup/" + toolBarName + ".png");
-            JButton button = new JButton(toolBarName, new ImageIcon(resourceLocation));
+
+            // Scale the image icons down to make the buttons smaller
+            ImageIcon imageIcon = new ImageIcon(resourceLocation);
+            Image image = imageIcon.getImage();
+            imageIcon = new ImageIcon(image.getScaledInstance(this.TOOLBAR_ICON_SCALE, this.TOOLBAR_ICON_SCALE, Image.SCALE_SMOOTH));
+
+            JButton button = new JButton(toolBarName, imageIcon);
             button.setFocusPainted(false);
             getToolBarButtons()[i] = button;
         }

src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreePanel.java

@@ -28,7 +28,7 @@ public class TreePanel extends JPanel {
     private JPanel main;
     private TreeView treeView;
     private TreeToolbarPanel toolbar;
-    private LegupUI legupUI;
+    // private LegupUI legupUI;
 
     private JLabel status;
 

src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeToolBarButton.java

@@ -1,15 +1,18 @@
 package edu.rpi.legup.ui.proofeditorui.treeview;
 
 import javax.swing.*;
+import java.awt.Dimension;
 
 public class TreeToolBarButton extends JButton {
 
     private TreeToolBarName name;
+    private final Dimension MINIMUM_DIMENSION = new Dimension(60, 60);
 
     public TreeToolBarButton(ImageIcon imageIcon, TreeToolBarName name) {
         super(imageIcon);
         this.name = name;
-        this.setSize(60, 60);
+        this.setSize(MINIMUM_DIMENSION.width, MINIMUM_DIMENSION.height);
+        this.setMinimumSize(this.MINIMUM_DIMENSION);
     }
 
     public TreeToolBarName getToolBarName() {

src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeToolbarPanel.java

@@ -12,7 +12,8 @@ public class TreeToolbarPanel extends JPanel {
      */
     public TreeToolbarPanel(TreePanel treePanel) {
         this.treePanel = treePanel;
-        this.setLayout(new GridLayout(4, 1));
+        this.setLayout(new GridLayout(4, 1, 0, 2));
+
 
         addChild = new TreeToolBarButton(new ImageIcon(ClassLoader.getSystemResource("edu/rpi/legup/images/Legup/AddChild.png")), TreeToolBarName.ADD_CHILD);
         delChild = new TreeToolBarButton(new ImageIcon(ClassLoader.getSystemResource("edu/rpi/legup/images/Legup/DelChild.png")), TreeToolBarName.DEL_CHILD);