Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[3759] branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ ebli/visuallibrary
|
From: <had...@us...> - 2008-08-11 14:17:05
|
Revision: 3759
http://fudaa.svn.sourceforge.net/fudaa/?rev=3759&view=rev
Author: hadouxad
Date: 2008-08-11 14:17:07 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
- ajout etat supplementaire poru le jtree: si la widget est masquee, affiche icone differente
- Mise en place de l editor du graphe
- Mise en place de l editor du calque
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxPanel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java 2008-08-11 13:07:36 UTC (rev 3758)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java 2008-08-11 14:17:07 UTC (rev 3759)
@@ -7,6 +7,7 @@
import org.fudaa.ebli.trace.TraceLigne;
import org.fudaa.ebli.visuallibrary.layout.OverlayLayoutGap;
import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.InplaceEditorProvider;
import org.netbeans.api.visual.action.TextFieldInplaceEditor;
import org.netbeans.api.visual.action.WidgetAction;
import org.netbeans.api.visual.widget.LabelWidget;
@@ -55,6 +56,8 @@
WidgetAction editorAction = ActionFactory
.createInplaceEditorAction(this);
+
+
// -- ajout de l action au label correspondant --//
intern.getActions().addAction(editorAction);
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-08-11 13:07:36 UTC (rev 3758)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-08-11 14:17:07 UTC (rev 3759)
@@ -1,17 +1,31 @@
package org.fudaa.ebli.visuallibrary.calque;
import java.awt.Dimension;
+import java.awt.FlowLayout;
import java.awt.Graphics2D;
import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.util.Collections;
+import java.util.EnumSet;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.EbliWidget;
+import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.InplaceEditorProvider;
+import org.netbeans.api.visual.action.WidgetAction;
+import org.netbeans.api.visual.widget.Widget;
-public class EbliWidgetVueCalque extends EbliWidget {
+import com.memoire.bu.BuButton;
+import com.memoire.bu.BuPanel;
+public class EbliWidgetVueCalque extends EbliWidget implements InplaceEditorProvider<BuPanel>{
+
ZEbliCalquesPanel vue_;
public EbliWidgetVueCalque(EbliScene scene, ZEbliCalquesPanel vue) {
@@ -19,6 +33,13 @@
vue_ = vue;
setPreferredSize(new Dimension(200, 200));
setMinimumSize(new Dimension(200, 200));
+
+ //-- creation de l action pour editor --//
+ WidgetAction editorAction = ActionFactory.createInplaceEditorAction(this);
+
+ // -- ajout de l action au widget correspondant --//
+ this.getActions().addAction(editorAction);
+
}
@Override
@@ -40,4 +61,67 @@
g.translate(-rec.x, -rec.y);
}
+
+ //-- methodes implements InplaceEditorProvider --//
+
+ /**
+ * Methode appeleee pour creer un editor correspondant
+ */
+public BuPanel createEditorComponent(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget) {
+ // TODO Auto-generated method stub
+
+
+
+ final BuPanel panelTest=new BuPanel(new FlowLayout(FlowLayout.CENTER));
+ panelTest.add(new JLabel("test panel"));
+ BuButton boutonTest =new BuButton("bouton cool");
+ boutonTest.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+ // TODO Auto-generated method stub
+ panelTest.add(new JLabel("bouton appuy\xE9"));
+ panelTest.validate();
+ JFrame frameTruc=new JFrame();
+ frameTruc.getContentPane().add(new JLabel("bouton appuy\xE9"));
+ frameTruc.setSize(200,200);
+ frameTruc.setVisible(true);
+ }
+
+ });
+ panelTest.add(boutonTest);
+
+
+ return panelTest;
}
+
+public EnumSet<org.netbeans.api.visual.action.InplaceEditorProvider.ExpansionDirection> getExpansionDirections(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, BuPanel editor) {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+public Rectangle getInitialEditorComponentBounds(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, BuPanel editor, Rectangle viewBounds) {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+public void notifyClosing(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, BuPanel editor, boolean commit) {
+ // TODO Auto-generated method stub
+
+}
+
+public void notifyOpened(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, BuPanel editor) {
+ // TODO Auto-generated method stub
+
+}
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java 2008-08-11 13:07:36 UTC (rev 3758)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java 2008-08-11 14:17:07 UTC (rev 3759)
@@ -5,13 +5,19 @@
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.util.EnumSet;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
import javax.swing.JMenuItem;
+import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import org.fudaa.ctulu.CtuluResource;
import org.fudaa.ebli.courbe.EGAxe;
import org.fudaa.ebli.courbe.EGConfigureActionPalette;
+import org.fudaa.ebli.courbe.EGFillePanel;
import org.fudaa.ebli.courbe.EGGraphe;
import org.fudaa.ebli.courbe.EGGrapheModelListener;
import org.fudaa.ebli.courbe.EGObject;
@@ -19,11 +25,17 @@
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.EbliWidget;
import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.InplaceEditorProvider;
import org.netbeans.api.visual.action.PopupMenuProvider;
+import org.netbeans.api.visual.action.WidgetAction;
import org.netbeans.api.visual.laf.LookFeel;
import org.netbeans.api.visual.model.ObjectState;
import org.netbeans.api.visual.widget.Widget;
+import sun.security.krb5.internal.PAEncTSEnc;
+
+import com.memoire.bu.BuButton;
+import com.memoire.bu.BuPanel;
import com.sun.org.apache.xerces.internal.impl.xs.opti.DefaultNode;
@@ -32,7 +44,7 @@
* @author adrien hadoux
*
*/
-public class EbliWidgetGraphe extends EbliWidget{
+public class EbliWidgetGraphe extends EbliWidget implements InplaceEditorProvider<BuPanel>{
private EGGraphe graphe;
private EbliNodeDefault nodeLegende=null;
@@ -51,6 +63,12 @@
setGraphe(_graphe);
+ //-- creation de l action pour editor --//
+ WidgetAction editorAction = ActionFactory.createInplaceEditorAction(this);
+
+ // -- ajout de l action au widget correspondant --//
+ this.getActions().addAction(editorAction);
+
}
@@ -137,5 +155,59 @@
}
+
+ //-- methodes implements InplaceEditorProvider --//
+
+ /**
+ * Methode appeleee pour creer un editor EGFillePanel correspondant a la vue
+ */
+ public /*EGFillePanel*/ BuPanel createEditorComponent(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget) {
+
+ //-- creation du menu d'actions--//
+ final JMenu menu = new JMenu();
+ menu.setName("menu du graphe");
+ menu.setText("menu du graphe");
+ // creation du panel Egfille correspondant
+ EGFillePanel panelGraphe=new EGFillePanel(this.graphe);
+
+ //--remplissage du menu --//
+ panelGraphe.fillSpecificMenu(menu);
+
+ //FIXME : comment construire le Jmenu principal ainsi que le tree qui qffiche les courbes ???
+
+
+ return panelGraphe;
+ }
+
+ public EnumSet<org.netbeans.api.visual.action.InplaceEditorProvider.ExpansionDirection> getExpansionDirections(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, /*EGFillePanel*/BuPanel editor) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Rectangle getInitialEditorComponentBounds(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, /*EGFillePanel*/BuPanel editor, Rectangle viewBounds) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void notifyClosing(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, /*EGFillePanel*/BuPanel editor, boolean commit) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void notifyOpened(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, /*EGFillePanel*/BuPanel editor) {
+ // TODO Auto-generated method stub
+
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java 2008-08-11 13:07:36 UTC (rev 3758)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java 2008-08-11 14:17:07 UTC (rev 3759)
@@ -90,6 +90,14 @@
// -- on rend visible la widget en fonction de la checkbox
node.getCreator().getWidget().setVisible((((EbliCheckBoxPanel) editor).checkBox).isSelected());
node.getCreator().getWidget().getEbliScene().refresh();
+
+ //-- mise a jour de l icone --//
+ if(((EbliCheckBoxPanel) editor).checkBox.isSelected())
+ ((EbliCheckBoxPanel) editor).labelRenderer.setIcon(renderer.iconLeafEnabled);
+
+ else
+ ((EbliCheckBoxPanel) editor).labelRenderer.setIcon(renderer.iconLeafDisabled);
+
}
});
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxPanel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxPanel.java 2008-08-11 13:07:36 UTC (rev 3758)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxPanel.java 2008-08-11 14:17:07 UTC (rev 3759)
@@ -29,6 +29,8 @@
add(checkBox);
}
setOpaque(false);
+
+
}
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java 2008-08-11 13:07:36 UTC (rev 3758)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java 2008-08-11 14:17:07 UTC (rev 3759)
@@ -32,13 +32,13 @@
Color selectionBorderColor, selectionForeground, selectionBackground, textForeground, textBackground;
- private Icon iconLeafEnabled=CtuluResource.CTULU.getIcon("crystal22_previsualiser");
- // private Icon iconLeafDisabled=CtuluResource.CTULU.getIcon("crystal22_previsualiser");
+ public Icon iconLeafEnabled=CtuluResource.CTULU.getIcon("crystal22_previsualiser");
+ public Icon iconLeafDisabled=CtuluResource.CTULU.getIcon("crystal22_cacher");
- private Icon iconSubDirectorie=CtuluResource.CTULU.getIcon("reouvrir_26");
+ public Icon iconSubDirectorie=CtuluResource.CTULU.getIcon("reouvrir_26");
- private Icon iconRoot=CtuluResource.CTULU.getIcon("maison_32");
+ public Icon iconRoot=CtuluResource.CTULU.getIcon("maison_32");
protected EbliCheckBoxPanel getLeafRenderer() {
@@ -91,7 +91,12 @@
returnValue.setText(node.getTitle());
returnValue.setSelected(node.getCreator().getWidget().isVisible());
- returnLabel=new BuLabel(this.iconLeafEnabled);
+
+ returnLabel=new BuLabel(this.iconLeafEnabled);
+
+
+
+ returnLabel.setEnabled(node.getCreator().getWidget().isVisible());
}
} /*else if (!leaf && !((DefaultMutableTreeNode) value).isRoot()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
