Prefs: add icon on the prefs dialog 12/13912/2
Calixte DENIZET [Wed, 5 Mar 2014 10:46:04 +0000 (11:46 +0100)]
Change-Id: Ied5ba1dce2cb935d7bc6afdf10777d40e660dba2

scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/images/icons/32x32/apps/preferences-system.png [new file with mode: 0644]
scilab/modules/preferences/src/java/org/scilab/modules/preferences/XConfigManager.java

index 0959ad4..617d1c1 100755 (executable)
@@ -386,6 +386,7 @@ images/icons/32x32/apps/rrze_table.png \
 images/icons/32x32/apps/scilab.png \
 images/icons/32x32/apps/system-search.png \
 images/icons/32x32/apps/utilities-system-monitor.png \
+images/icons/32x32/apps/preferences-system.png \
 images/icons/32x32/emblems/emblem-readonly.png \
 images/icons/48x48/emblems/emblem-readonly.png \
 images/icons/64x40/mimetypes/application-x-scilab-champ.png \
index 9fbcfe1..c2570d1 100644 (file)
@@ -1043,6 +1043,7 @@ images/icons/32x32/apps/rrze_table.png \
 images/icons/32x32/apps/scilab.png \
 images/icons/32x32/apps/system-search.png \
 images/icons/32x32/apps/utilities-system-monitor.png \
+images/icons/32x32/apps/preferences-system.png \
 images/icons/32x32/emblems/emblem-readonly.png \
 images/icons/48x48/emblems/emblem-readonly.png \
 images/icons/64x40/mimetypes/application-x-scilab-champ.png \
diff --git a/scilab/modules/gui/images/icons/32x32/apps/preferences-system.png b/scilab/modules/gui/images/icons/32x32/apps/preferences-system.png
new file mode 100644 (file)
index 0000000..6e52db7
Binary files /dev/null and b/scilab/modules/gui/images/icons/32x32/apps/preferences-system.png differ
index 2737523..3802a51 100644 (file)
@@ -33,6 +33,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.swing.ImageIcon;
 import javax.swing.JDialog;
 
 import org.w3c.dom.Document;
@@ -44,6 +45,7 @@ import org.w3c.dom.NodeList;
 import org.scilab.modules.commons.ScilabCommons;
 import org.scilab.modules.commons.ScilabCommonsUtils;
 import org.scilab.modules.commons.ScilabConstants;
+import org.scilab.modules.commons.gui.FindIconHelper;
 import org.scilab.modules.commons.xml.XConfiguration;
 import org.scilab.modules.localization.Messages;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog;
@@ -110,6 +112,7 @@ public final class XConfigManager extends XCommonManager {
 
         // Set up Swing Side
         dialog = new JDialog(topWindow, Messages.gettext("Scilab Preferences"), true);
+        dialog.setIconImage(new ImageIcon(FindIconHelper.findIcon("preferences-system", "256x256")).getImage());
         topSwing = dialog.getContentPane();
         topSwing.setLayout(new BorderLayout());
         // AWT implies to set layout at construction time.