Revision 38906

View differences:

branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/MDIFrame.java
1185 1185

  
1186 1186
        ActionInfoManager actionManager = PluginsLocator.getActionInfoManager();
1187 1187
        ActionInfoStatusCache cache = actionManager.createActionStatusCache();
1188
        IconTheme icontheme = ToolsSwingLocator.getIconThemeManager().getCurrent();
1188 1189
        
1189 1190
        Iterator e = controlClass.keySet().iterator();
1190 1191

  
......
1194 1195
            ActionInfo action = actionManager.getAction(actionlName);
1195 1196
            if( action!=null ) {
1196 1197
	            if( control instanceof AbstractButton ) {
1197
	            	AbstractButton button = (AbstractButton) control;
1198
	            	button.setIcon(action.getIcon());
1198

  
1199
                    AbstractButton button = (AbstractButton) control;
1200

  
1201
	                if (control instanceof javax.swing.JMenuItem) {
1202
	                    
1203
	                    if (action.getIconName() != null && action.getIconName().length() > 0) {
1204
	                        
1205
	                        if( icontheme.exists(action.getIconName()) ) {
1206
	                            button.setIcon(action.getIcon());
1207
	                        }
1208
	                    }
1209
	                    
1210
	                } else {
1211
	                    button.setIcon(action.getIcon());
1212
	                }
1199 1213
	            }
1200 1214
            }
1201 1215
        }

Also available in: Unified diff