Merge pull request #81 from tiwiz/update-ui-proguard

Adds Proguard mapping icon
google · Apr 17, 2016 · e8f3492 · e8f3492
2 parents b71466e + 50bec81
commit e8f3492
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/ClassySharkWS/src/com/google/classyshark/gui/panel/IconSchemes.java b/ClassySharkWS/src/com/google/classyshark/gui/panel/IconSchemes.java
@@ -12,4 +12,5 @@ public class IconSchemes {
     public static final String NEXT_ICON_PATH = ROOT_PATH + "ic_next" + EXTENSION;
     public static final String OPEN_ICON_PATH = ROOT_PATH + "ic_open" + EXTENSION;
     public static final String EXPORT_ICON_PATH = ROOT_PATH + "ic_export" + EXTENSION;
+    public static final String MAPPING_ICON_PATH = ROOT_PATH + "ic_mappings" + EXTENSION;
 }
diff --git a/ClassySharkWS/src/com/google/classyshark/gui/panel/toolbar/Toolbar.java b/ClassySharkWS/src/com/google/classyshark/gui/panel/toolbar/Toolbar.java
@@ -202,7 +202,7 @@ public void actionPerformed(ActionEvent e) {
     private JButton buildMappingsButton() {
 
         JButton result =
-                new JButton(new ImageIcon(getClass().getResource(IconSchemes.EXPORT_ICON_PATH)));
+                new JButton(new ImageIcon(getClass().getResource(IconSchemes.MAPPING_ICON_PATH)));
 
         result.addActionListener(new ActionListener() {
             @Override
@@ -211,7 +211,7 @@ public void actionPerformed(ActionEvent e) {
             }
         });
 
-        result.setToolTipText("Mappings");
+        result.setToolTipText("Import Proguard mapping file");
         result.setBorderPainted(false);
         result.setEnabled(true);
 

diff --git a/ClassySharkWS/src/resources/ic_mappings.png b/ClassySharkWS/src/resources/ic_mappings.png