[Fudaa-svn-commit] SF.net SVN: fudaa:[9163] trunk/framework/ebli-common/src/main

[<de...@us...>]

Revision: 9163
          http://sourceforge.net/p/fudaa/svn/9163
Author:   deniger
Date:     2015-09-10 14:41:00 +0000 (Thu, 10 Sep 2015)
Log Message:
-----------
CRUE-657

Modified Paths:
--------------
    trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java
    trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt

Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java	2015-09-10 14:23:32 UTC (rev 9162)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java	2015-09-10 14:41:00 UTC (rev 9163)
@@ -18,16 +18,21 @@
 
 import com.memoire.bu.BuButton;
 import com.memoire.bu.BuCheckBoxMenuItem;
+import com.memoire.bu.BuColorIcon;
+import com.memoire.bu.BuComposedIcon;
 import com.memoire.bu.BuMenuItem;
 import com.memoire.bu.BuToggleButton;
+import java.awt.Color;
 
 /**
  * @author deniger
  * @version $Id: EbliComponentFactory.java,v 1.12 2006-09-19 14:55:55 deniger Exp $
  */
 public final class EbliComponentFactory {
-
+  
   public final static EbliComponentFactory INSTANCE = new EbliComponentFactory();
+  
+  private Color useSelectedIcon;
 
   /**
    *
@@ -36,12 +41,20 @@
     super();
   }
 
+  public Color getUseSelectedIcon() {
+    return useSelectedIcon;
+  }
+
+  public void setUseSelectedIcon(Color useSelectedIcon) {
+    this.useSelectedIcon = useSelectedIcon;
+  }
+
   private void decoreStateButton(final AbstractButton _r, final EbliActionChangeState _a) {
     _r.setAction(_a);
     _r.setSelected(_a.isSelected());
     _a.addPropertyChangeListener(new EbliSelectedChangeListener(_r));
   }
-
+  
   public void addActionsToMenu(final EbliActionInterface[] _acs, final JMenu _dest) {
     if ((_acs != null) && (_dest != null)) {
       final int n = _acs.length;
@@ -55,7 +68,7 @@
       }
     }
   }
-
+  
   public void addActionsToMenu(final EbliActionInterface[] _acs, final JPopupMenu _dest) {
     if ((_acs != null) && (_dest != null)) {
       final int n = _acs.length;
@@ -69,31 +82,35 @@
       }
     }
   }
-
+  
   public AbstractButton buildButton(final EbliActionChangeState _a) {
     final JToggleButton r = new BuToggleButton();
     decoreStateButton(r, _a);
+    if (useSelectedIcon != null && _a.getIcon() != null) {
+      BuComposedIcon selectedIcon = new BuComposedIcon(_a.getIcon(), new BuColorIcon(useSelectedIcon));
+      r.setSelectedIcon(selectedIcon);
+    }
     return r;
   }
-
+  
   public AbstractButton buildButton(final EbliActionSimple _a) {
     final AbstractButton r = new BuButton();
     r.setAction(_a);
     return r;
   }
-
+  
   public JMenuItem buildMenuItem(final EbliActionChangeState _a) {
     final BuCheckBoxMenuItem r = new BuCheckBoxMenuItem();
     decoreStateButton(r, _a);
     return r;
   }
-
+  
   public JMenuItem buildMenuItem(final EbliActionSimple _a) {
     final JMenuItem r = new BuMenuItem();
     r.setAction(_a);
     return r;
   }
-
+  
   public AbstractButton buildToolButton(final EbliActionChangeState _a) {
     final AbstractButton r = new BuToggleButton();
     decoreStateButton(r, _a);
@@ -108,23 +125,23 @@
     r.setText(_a.getTitle());
     return r;
   }
-
+  
   public AbstractButton buildToolButton(final EbliActionPaletteAbstract _a) {
     final AbstractButton r = new EbliPaletteButton(_a);
     decoreStateButton(r, _a);
     decoreToolBarButton(r);
     return r;
   }
-
+  
   public AbstractButton buildToolButton(final EbliActionSimple _a) {
     final AbstractButton r = new EbliButtonTool(_a);
     decoreToolBarButton(r);
     return r;
   }
-
+  
   public void decoreToolBarButton(final AbstractButton _r) {
     _r.setText("");
     _r.setRolloverEnabled(true);
     _r.setBorderPainted(false);
   }
-}
\ No newline at end of file
+}

Modified: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
===================================================================
--- trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt	2015-09-10 14:23:32 UTC (rev 9162)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt	2015-09-10 14:41:00 UTC (rev 9163)
@@ -907,4 +907,5 @@
 Type Nuage de points=Points fog type
 Mode contour=Contour mode
 Mode densit\xE9=Density mode
-Un calque \xE9ditable doit \xEAtre selectionn\xE9=An editable layer must be selected
\ No newline at end of file
+Un calque \xE9ditable doit \xEAtre selectionn\xE9=An editable layer must be selected
+Autom. zoom=Zoom auto
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.