We don't need the icon manager around these parts.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3443 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/stage/tools/editor/EditorApp.java

@@ -35,7 +35,6 @@ import com.threerings.util.MessageManager;
 import com.threerings.resource.ResourceManager;
 
 import com.threerings.media.FrameManager;
-import com.threerings.media.IconManager;
 import com.threerings.media.image.ColorPository;
 import com.threerings.media.image.ImageManager;
 import com.threerings.media.sound.SoundManager;
@@ -125,7 +124,6 @@ public class EditorApp implements Runnable
         try {
             _tsrepo = new BundledTileSetRepository(_rmgr, _imgr, "tilesets");
             _tilemgr.setTileSetRepository(_tsrepo);
-            _iconmgr = new IconManager(_tilemgr, ICON_MANAGER_CONFIG);
             _crepo = new BundledComponentRepository(
                 _rmgr, _imgr, "components");
         } catch (IOException e) {
@@ -134,7 +132,6 @@ public class EditorApp implements Runnable
             return;
         }
 
-        _iconmgr.setSource("general");
         _colpos = ColorPository.loadColorPository(_rmgr);
         _soundmgr = new SoundManager(_rmgr, null, null);
         _kbdmgr = new KeyboardManager();
@@ -279,10 +276,6 @@ public class EditorApp implements Runnable
             return _msgmgr;
         }
 
-        public IconManager getIconManager () {
-            return _iconmgr;
-        }
-
         public SoundManager getSoundManager() {
             return _soundmgr;
         }
@@ -338,16 +331,11 @@ public class EditorApp implements Runnable
     protected TileSetRepository _tsrepo;
     protected ColorPository _colpos;
     protected MessageManager _msgmgr;
-    protected IconManager _iconmgr;
     protected SoundManager _soundmgr;
     protected KeyboardManager _kbdmgr;
     protected BundledComponentRepository _crepo;
     protected KeyDispatcher _keydisp;
 
-    /** The path to the config file for the icon manager. */
-    protected static final String ICON_MANAGER_CONFIG =
-        "rsrc/config/stage/iconmgr.properties";
-
     /** A debug hook that toggles debug rendering of traversable tiles. */
     protected static RuntimeAdjust.BooleanAdjust _viewFullScreen =
         new RuntimeAdjust.BooleanAdjust(

src/java/com/threerings/stage/util/StageContext.java

@@ -9,7 +9,6 @@ import com.threerings.util.KeyboardManager;
 import com.threerings.util.MessageManager;
 
 import com.threerings.media.FrameManager;
-import com.threerings.media.IconManager;
 import com.threerings.media.image.ColorPository;
 import com.threerings.media.image.ImageManager;
 import com.threerings.media.sound.SoundManager;
@@ -51,11 +50,6 @@ public interface StageContext
      */
     public MessageManager getMessageManager ();
 
-    /**
-     * Returns a reference to the icon manager used by the client.
-     */
-    public IconManager getIconManager ();
-
     /**
      * Returns a reference to the sound manager used by the client.
      */

tests/rsrc/config/stage/iconmgr.properties

@@ -1,103 +0,0 @@
-#
-# $Id: iconmgr.properties 20012 2005-03-24 23:19:41Z ray $
-#
-# Configuration for the icon manager
-
-# simple arrow images in the order: down, up, right, left
-arrows.path = media/yohoho/icons/arrows.png
-arrows.metrics = 16, 16
-
-# simpler arrows used to change values
-valuearrows.path = media/yohoho/icons/value_arrows.png
-valuearrows.metrics = 16, 15
-
-# up and down arrows with "+" and "-" in them
-zoomarrows.path = media/yohoho/icons/zoom_arrows.png
-zoomarrows.metrics = 24, 14
-
-# collapsible entry plus and minus icons
-collapse.path = media/yohoho/icons/collapse.png
-collapse.metrics = 8, 8
-
-# icons for the tabbed panes
-tabtitles.path = media/yohoho/icons/tabtitles.png
-tabtitles.metrics = 16, 16
-
-# icons for crew ranks
-ranks.path = media/yohoho/icons/crew_ranks.png
-ranks.metrics = 25, 25
-
-# icon for mateys
-matey.path = media/yohoho/icons/matey_icon.png
-matey.metrics = 25, 25
-
-# icons for radial menus
-radmenu.path = media/yohoho/icons/radial.png
-radmenu.metrics = 32, 32
-
-# icons for portal traversal
-portal.path = media/yohoho/icons/portal_arrows.png
-portal.metrics = 48, 48
-
-# icons for youser activities
-activity.path = media/yohoho/icons/activity.png
-activity.metrics = 27, 27
-
-# icons for youser activities
-puzzles.path = media/yohoho/icons/puzzles.png
-puzzles.metrics = 24, 24
-
-# icons for pirate info icons
-pirateinfo.path = media/yohoho/icons/pirate_info.png
-pirateinfo.metrics = 28, 28
-
-# icons for scrolly history
-historyscroll.path = media/yohoho/icons/history-scroll.png
-historyscroll.metrics = 14, 11 
-
-# icons for full-screen history
-historyfull.path = media/yohoho/icons/history-full.png
-historyfull.metrics = 14, 11 
-
-# icons for the duty status button
-dutystatus.path = media/yohoho/icons/duty-status.png
-dutystatus.metrics = 16, 12 
-
-hiring.path = media/yohoho/icons/hiring.png
-hiring.metrics = 17, 17
-
-# icons for the wee lock images
-lock.path = media/yohoho/icons/lock.png
-lock.metrics = 23, 18
-
-# icon for the ferry
-ferry.path = media/yohoho/icons/ferry.png
-ferry.metrics = 58, 48
-
-# icon for whisking
-whisk.path = media/yohoho/icons/whisk.png
-whisk.metrics = 12, 11
-
-# icon to indicate that a player was present for a sea battle
-sea_battle.path = media/yohoho/icons/sea_battle.png
-sea_battle.metrics = 13, 12
-
-# item menu icons
-item_action.path = media/yohoho/icons/item_actions.png
-item_action.metrics = 27, 27
-
-# portrait eye menu icons
-portrait_eyes_male.path = media/yohoho/icons/portrait_eyes_male.png
-portrait_eyes_male.metrics = 70, 25
-portrait_eyes_female.path = media/yohoho/icons/portrait_eyes_female.png
-portrait_eyes_female.metrics = 70, 25
-
-# portrait mouth menu icons
-portrait_mouths_male.path = media/yohoho/icons/portrait_mouths_male.png
-portrait_mouths_male.metrics = 70, 25
-portrait_mouths_female.path = media/yohoho/icons/portrait_mouths_female.png
-portrait_mouths_female.metrics = 70, 25
-
-# dnd icon
-dnd.path = media/yohoho/icons/dnd.png
-dnd.metrics = 32, 32