[Fudaa-svn-commit] SF.net SVN: fudaa:[9122] trunk/framework

[<bma...@us...>]

Revision: 9122
          http://sourceforge.net/p/fudaa/svn/9122
Author:   bmarchan
Date:     2015-04-23 12:50:42 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
Message de conditions pour certaines actions de modification

Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneDeplacementAction.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneRotationAction.java
    trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneDeplacementAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneDeplacementAction.java	2015-04-23 10:34:56 UTC (rev 9121)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneDeplacementAction.java	2015-04-23 12:50:42 UTC (rev 9122)
@@ -9,8 +9,10 @@
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+
 import javax.swing.event.InternalFrameEvent;
 import javax.swing.tree.TreeSelectionModel;
+
 import org.fudaa.ebli.calque.ZEbliCalquesPanel;
 import org.fudaa.ebli.calque.edition.BPaletteDeplacement;
 import org.fudaa.ebli.calque.edition.ZCalqueDeplacementInteraction;
@@ -115,4 +117,14 @@
     if (cqDep_!=null)
       pnCalques_.setCalqueSelectionActif();
   }
+  
+  @Override
+  public String getEnableCondition() {
+    if (sceneEditor_!=null && sceneEditor_.getScene().isRestrictedToCalqueActif()) {
+      return EbliLib.getS("Un calque \xE9ditable doit \xEAtre selectionn\xE9");
+    }
+    else {
+      return super.getEnableCondition();
+    }
+  }
 }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneRotationAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneRotationAction.java	2015-04-23 10:34:56 UTC (rev 9121)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneRotationAction.java	2015-04-23 12:50:42 UTC (rev 9122)
@@ -8,6 +8,7 @@
 package org.fudaa.ebli.calque.action;
 
 import javax.swing.tree.TreeSelectionModel;
+
 import org.fudaa.ebli.calque.edition.BPaletteRotation;
 import org.fudaa.ebli.calque.edition.ZCalqueEditable;
 import org.fudaa.ebli.calque.edition.ZEditorInterface;
@@ -61,4 +62,14 @@
   protected BPalettePanelInterface buildPaletteContent() {
     return new BPaletteRotation(sceneEditor_,formatter_);
   }
+  
+  @Override
+  public String getEnableCondition() {
+    if (sceneEditor_!=null && sceneEditor_.getScene().isRestrictedToCalqueActif()) {
+      return EbliLib.getS("Un calque \xE9ditable doit \xEAtre selectionn\xE9");
+    }
+    else {
+      return super.getEnableCondition();
+    }
+  }
 }

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-04-23 10:34:56 UTC (rev 9121)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt	2015-04-23 12:50:42 UTC (rev 9122)
@@ -907,3 +907,4 @@
 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

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