Retina icons support

src/main/com/mucommander/ui/action/AbstractActionDescriptor.java

@@ -116,7 +116,7 @@ private String getStandardLabel() {
      * @param actionId a String identification of MuAction
      * @return the standard icon image corresponding to the specified MuAction, <code>null</code> if none was found
      */
-    private static ImageIcon getStandardIcon(String actionId) {
+    protected static ImageIcon getStandardIcon(String actionId) {
         // Look for an icon image file with the /action/<action id>.png path and use it if it exists
         String iconPath = getStandardIconPath(actionId);
         return ResourceLoader.getResourceAsURL(iconPath) == null ? null : IconManager.getIcon(iconPath);

src/main/com/mucommander/ui/action/impl/ChangeLocationAction.java

@@ -37,7 +37,7 @@
  */
 public class ChangeLocationAction extends ActiveTabAction {
 
-    public ChangeLocationAction(MainFrame mainFrame, Map<String, Object> properties) {
+    ChangeLocationAction(MainFrame mainFrame, Map<String, Object> properties) {
         super(mainFrame, properties);
     }
 

src/main/com/mucommander/ui/action/impl/OpenLocationAction.java

@@ -60,7 +60,7 @@ public OpenLocationAction(MainFrame mainFrame, Map<String, Object> properties, F
     /**
      * Creates a new OpenLocationAction instance using the provided FileURL and label.
      */
-    public OpenLocationAction(MainFrame mainFrame, Map<String, Object> properties, FileURL url, String label) {
+    private OpenLocationAction(MainFrame mainFrame, Map<String, Object> properties, FileURL url, String label) {
         super(mainFrame, properties);
 
         this.url = url;

src/main/com/mucommander/ui/action/impl/PopupLeftDriveButtonAction.java

@@ -34,7 +34,7 @@
  */
 public class PopupLeftDriveButtonAction extends MuAction implements ActiveTabListener {
 
-    public PopupLeftDriveButtonAction(MainFrame mainFrame, Map<String,Object> properties) {
+    PopupLeftDriveButtonAction(MainFrame mainFrame, Map<String, Object> properties) {
         super(mainFrame, properties);
 
         mainFrame.getLeftPanel().getTabs().addActiveTabListener(this);

src/main/com/mucommander/ui/action/impl/PopupRightDriveButtonAction.java

@@ -34,7 +34,7 @@
  */
 public class PopupRightDriveButtonAction extends MuAction implements ActiveTabListener {
 
-    public PopupRightDriveButtonAction(MainFrame mainFrame, Map<String,Object> properties) {
+    PopupRightDriveButtonAction(MainFrame mainFrame, Map<String, Object> properties) {
         super(mainFrame, properties);
 
         mainFrame.getRightPanel().getTabs().addActiveTabListener(this);

src/main/com/mucommander/ui/action/impl/RevealInDesktopAction.java

@@ -29,7 +29,7 @@
 import com.mucommander.ui.dialog.InformationDialog;
 import com.mucommander.ui.main.MainFrame;
 
-import javax.swing.KeyStroke;
+import javax.swing.*;
 import java.awt.event.KeyEvent;
 import java.util.Map;
 
@@ -42,7 +42,7 @@
  */
 public class RevealInDesktopAction extends ParentFolderAction {
 
-    public RevealInDesktopAction(MainFrame mainFrame, Map<String,Object> properties) {
+    RevealInDesktopAction(MainFrame mainFrame, Map<String, Object> properties) {
         super(mainFrame, properties);
 
         setEnabled(DesktopManager.canOpenInFileManager());
@@ -91,7 +91,16 @@ public KeyStroke getDefaultKeyStroke() {
 
         @Override
         public String getLabel() {
-            return Translator.get(ActionProperties.getActionLabelKey(RevealInDesktopAction.Descriptor.ACTION_ID), DesktopManager.canOpenInFileManager()?DesktopManager.getFileManagerName():Translator.get("file_manager"));
+            return Translator.get(ActionProperties.getActionLabelKey(RevealInDesktopAction.Descriptor.ACTION_ID),
+                    DesktopManager.canOpenInFileManager() ? DesktopManager.getFileManagerName() : Translator.get("file_manager"));
+        }
+
+        @Override
+        public ImageIcon getIcon() {
+		    if (OsFamily.getCurrent() == OsFamily.MAC_OS_X) {
+                return super.getStandardIcon("Finder");
+            }
+            return super.getIcon();
         }
 
         public MuAction createAction(MainFrame mainFrame, Map<String,Object> properties) {

src/main/com/mucommander/ui/main/DrivePopupButton.java

@@ -129,7 +129,7 @@ public class DrivePopupButton extends PopupButton implements BookmarkListener, C
      *
      * @param folderPanel the FolderPanel instance this button will be added to
      */
-    public DrivePopupButton(FolderPanel folderPanel) {
+    DrivePopupButton(FolderPanel folderPanel) {
         this.folderPanel = folderPanel;
 
         // Listen to location events to update the button when the current folder changes
@@ -352,10 +352,14 @@ public JPopupMenu getPopupMenu() {
                 if (!location.contains("://")) {
                     AbstractFile file = FileFactory.getFile(location);
                     if (file != null) {
-                        Image icon = FileIconsCache.getInstance().getImageIcon(file);
+                        Icon icon = FileIconsCache.getInstance().getIcon(file);
                         if (icon != null) {
-                            item.setIcon(new ImageIcon(icon));
+                            item.setIcon(icon);
                         }
+//                        Image image = FileIconsCache.getInstance().getImageIcon(file);
+//                        if (image != null) {
+//                            item.setIcon(new ImageIcon(image));
+//                        }
                     }
                 } else if (location.startsWith("ftp://") || location.startsWith("sftp://") || location.startsWith("http://")) {
                     item.setIcon(IconManager.getIcon(IconManager.IconSet.FILE, CustomFileIconProvider.NETWORK_ICON_NAME));

src/main/com/mucommander/utils/FileIconsCache.java

@@ -21,6 +21,7 @@
 import com.mucommander.commons.file.FileFactory;
 import com.mucommander.commons.file.FileURL;
 import com.mucommander.ui.icon.FileIcons;
+import ru.trolsoft.macosx.RetinaImageIcon;
 
 import javax.swing.*;
 import java.awt.*;
@@ -99,7 +100,10 @@ public Icon getIcon(String path) {
 
     public Image getImageIcon(AbstractFile file) {
         Icon icon = getIcon(file);
-        if (icon instanceof ImageIcon) {
+System.out.println("> " + icon.getClass().getName());
+        if (icon instanceof RetinaImageIcon) {
+            return ((RetinaImageIcon) icon).getImage();
+        } else if (icon instanceof ImageIcon) {
             return ((ImageIcon)icon).getImage();
         } else {
             int w = icon.getIconWidth();

src/main/ru/trolsoft/macosx/RetinaImageIcon.java

@@ -17,8 +17,6 @@
  */
 package ru.trolsoft.macosx;
 
-import sun.swing.ImageIconUIResource;
-
 import javax.swing.*;
 import java.awt.*;
 import java.awt.image.ImageObserver;