Revision 13806

View differences:

trunk/frameworks/_fwAndami/src/com/iver/andami/ui/mdiFrame/MDIFrame.java
56 56
import java.awt.event.MouseEvent;
57 57
import java.awt.event.WindowAdapter;
58 58
import java.awt.event.WindowEvent;
59
import java.io.FileNotFoundException;
59 60
import java.net.URL;
60 61
import java.util.ArrayList;
61 62
import java.util.Enumeration;
......
70 71
import javax.swing.JFrame;
71 72
import javax.swing.JMenu;
72 73
import javax.swing.JMenuBar;
74
import javax.swing.JOptionPane;
73 75
import javax.swing.JPanel;
74 76
import javax.swing.JPopupMenu;
75 77
import javax.swing.JSeparator;
......
254 256
		PluginServices ps = PluginServices.getPluginServices(loader.getPluginName());
255 257

  
256 258
		JToolBarToggleButton btn;
257
		//URL image = loader.getResource(selectableTool.getIcon());
258
		ImageIcon image = PluginServices.getIconTheme().get(selectableTool.getIcon(), loader.getResource(selectableTool.getIcon()));
259
		URL image = loader.getResource(selectableTool.getIcon());
259 260

  
260 261
		if (image != null) {
261
			btn = new JToolBarToggleButton(selectableTool.getText(), image);
262
			btn = new JToolBarToggleButton(selectableTool.getText(),
263
					new ImageIcon(image));
262 264
		} else {
263 265
			logger.error(PluginServices.getText(this, "Unable_to_find_icon") +": "+selectableTool.getIcon());
264 266
			URL noIconURL = getClass().getClassLoader().getResource(noIcon);
......
344 346
		PluginServices ps = PluginServices.getPluginServices(loader.getPluginName());
345 347

  
346 348
		JToolBarButton btn;
347
		//URL image = loader.getResource(actionTool.getIcon());
348
		ImageIcon image = PluginServices.getIconTheme().get(actionTool.getIcon(), loader.getResource(actionTool.getIcon()));
349
		URL image = loader.getResource(actionTool.getIcon());
349 350

  
350 351
		if (image != null) {
351
			btn = new JToolBarButton(actionTool.getText(), image);
352
			btn = new JToolBarButton(actionTool.getText(), new ImageIcon(image));
352 353
		} else {
353 354
			logger.error(PluginServices.getText(this, "Unable_to_find_icon") +": "+actionTool.getIcon());
354 355
			URL noIconURL = getClass().getClassLoader().getResource(noIcon);
......
763 764
		String translatedText = ps.getText(text);
764 765

  
765 766
		if (menu.getIcon() != null) {
766
			ImageIcon image = PluginServices.getIconTheme().get(menu.getIcon(), loader.getResource(menu.getIcon()));
767
			if (image != null) {
768
				nuevoMenu = new JMenuItem(translatedText, image);
767
			URL url = loader.getResource(menu.getIcon());
768
			if (url != null) {
769
				nuevoMenu = new JMenuItem(translatedText, new ImageIcon(url));
769 770
			} else {
770 771
				URL noIconURL = loader.getResource(noIcon);
771 772
				nuevoMenu = new JMenuItem(translatedText, new ImageIcon(noIconURL));

Also available in: Unified diff