Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4109] branches/Prepro-0.92-SNAPSHOT
|
From: <had...@us...> - 2008-10-29 20:57:50
|
Revision: 4109
http://fudaa.svn.sourceforge.net/fudaa/?rev=4109&view=rev
Author: hadouxad
Date: 2008-10-29 20:57:44 +0000 (Wed, 29 Oct 2008)
Log Message:
-----------
corection de bug
creation du doc du post
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ctulu/src/com/memoire/bu/BuSpecificBar.java
branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluHtmlEditorPanel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerInterface.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBloqueOuDebloqueWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionResize.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActiontextEditor.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetGroupAction.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetControllerGraphe.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/tr_en.fr_txt
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogLigneCourants.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerTextEditor.java
Modified: branches/Prepro-0.92-SNAPSHOT/ctulu/src/com/memoire/bu/BuSpecificBar.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ctulu/src/com/memoire/bu/BuSpecificBar.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/ctulu/src/com/memoire/bu/BuSpecificBar.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -26,7 +26,7 @@
*/
public class BuSpecificBar
- extends BuToolBar
+ extends JToolBar
{
int w_;
/* private boolean horizontal_=true;
Modified: branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluHtmlEditorPanel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluHtmlEditorPanel.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluHtmlEditorPanel.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -15,14 +15,13 @@
import javax.swing.JMenuBar;
import javax.swing.JPanel;
-import com.hexidec.ekit.EkitCore;
+import org.fudaa.ctulu.CtuluLibString;
+import com.hexidec.ekit.EkitCore;
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuResource;
-import org.fudaa.ctulu.CtuluLibString;
-
/**
* @author fred deniger
* @version $Id: CtuluHtmlEditorPanel.java,v 1.2 2007-03-23 17:16:16 deniger Exp $
@@ -53,7 +52,7 @@
this(null, getMinimalActions());
}
- private static String getMinimalActions() {
+ public static String getMinimalActions() {
return "SR|SP|BL|IT|UD|SP|SK|SU|SB|SP|AL|AC|AR|AJ|SP|UM|SP|UL|OL|SP|*|FO";
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -8,9 +8,11 @@
import javax.swing.AbstractButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
+import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPopupMenu;
+import javax.swing.JToolBar;
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluResource;
@@ -29,9 +31,7 @@
import org.netbeans.api.visual.action.WidgetAction;
import org.netbeans.api.visual.widget.Widget;
-import com.memoire.bu.BuMenuBar;
import com.memoire.bu.BuResource;
-import com.memoire.bu.BuToolBar;
/**
* Classe qui g\xE8re les actions de contr\xF4le de la widget
@@ -368,7 +368,7 @@
}
- public BuMenuBar getMenubarComponent() {
+ public JMenuBar getMenubarComponent() {
return null;
}
@@ -382,7 +382,7 @@
return popupMenu_;
}
- public BuToolBar getToolbarComponent() {
+ public JToolBar getToolbarComponent() {
return null;
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerInterface.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerInterface.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerInterface.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -5,20 +5,19 @@
package org.fudaa.ebli.visuallibrary;
import javax.swing.JComponent;
+import javax.swing.JMenuBar;
+import javax.swing.JToolBar;
-import com.memoire.bu.BuMenuBar;
-import com.memoire.bu.BuToolBar;
-
/**
* @author deniger
*/
public interface EbliWidgetControllerInterface {
- BuMenuBar getMenubarComponent();
+ JMenuBar getMenubarComponent();
JComponent getOverviewComponent();
- BuToolBar getToolbarComponent();
+ JToolBar getToolbarComponent();
JComponent getTracableComponent();
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerTextEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerTextEditor.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerTextEditor.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -0,0 +1,92 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.JToolBar;
+
+import org.fudaa.ctulu.CtuluResource;
+import org.fudaa.ctulu.gui.CtuluHtmlEditorPanel;
+import org.fudaa.ebli.ressource.EbliResource;
+import org.fudaa.ebli.visuallibrary.actions.EbliActionEditorOneClick;
+import org.netbeans.api.visual.action.InplaceEditorProvider;
+
+import com.memoire.bu.BuMenuBar;
+import com.memoire.bu.BuPanel;
+
+/**
+ * Controller de l'editeur de texte. Permet entre autre l'action edition pour
+ * pouvoir y acc\xE9der dans certains cas.
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliWidgetControllerTextEditor extends EbliWidgetControllerMenuOnly {
+
+ EbliActionEditorOneClick<BuPanel> editorAction_;
+ CtuluHtmlEditorPanel editor_;
+
+ public EbliWidgetControllerTextEditor(EbliWidgetTextEditor _widget) {
+ super(_widget);
+ addActionSpecifiques();
+ editor_ = _widget.editorPane_;
+ }
+
+
+ public void MenuEditer() {
+ // -- executer l action d edition --//
+ editorAction_.openEditor(getWidget());
+
+ }
+
+ public void addActionSpecifiques() {
+
+ editorAction_ = new EbliActionEditorOneClick<BuPanel>((InplaceEditorProvider) widget_);
+ // -- ajout de l action au widget correspondant --//
+ widget_.getActions().addAction(editorAction_);
+
+ }
+
+ @Override
+ protected void buildPopupMenu(final JPopupMenu _menu) {
+ constructPopupMenuSpecifique(_menu);
+ // -- creation du menu commun a tous les widgets
+ constructPopupMenuBase(_menu);
+ }
+
+
+ private void constructPopupMenuSpecifique(final JPopupMenu _popup) {
+ JMenuItem menuItem = new JMenuItem(EbliResource.EBLI.getString("Editer le texte"));
+ _popup.add(menuItem, 0);
+ menuItem.setIcon(CtuluResource.CTULU.getIcon("crystal_editer"));
+ menuItem.addActionListener(new ActionListener() {
+ public void actionPerformed(final ActionEvent e) {
+ MenuEditer();
+ }
+ });
+ }
+
+
+ public JToolBar getToolbarComponent() {
+ if (editor_ != null)
+ return editor_.getToolBar(true);
+ else
+ return new JToolBar();
+ }
+
+ JMenuBar menuBar_;
+
+ public JMenuBar getMenubarComponent() {
+ if (editor_ == null)
+ return new BuMenuBar();
+
+ if (menuBar_ == null)
+ menuBar_ = editor_.getMenuBar(true, false);
+ return menuBar_;
+
+ }
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -1,6 +1,5 @@
package org.fudaa.ebli.visuallibrary;
-import java.awt.Dimension;
import java.awt.Rectangle;
import java.util.EnumSet;
@@ -30,7 +29,7 @@
public EbliWidgetTextEditor(final EbliScene scene, final CtuluHtmlEditorPanel content) {
super(scene, false);
editorPane_ = content;
-
+
intern_ = new ComponentWidget(scene, contenuHTML_);
contenuHTML_.setText(content.getDocumentText());
@@ -43,7 +42,7 @@
// -- ajout de l action au widget correspondant --//
this.getActions().addAction(editorAction);
- final EbliWidgetControllerMenuOnly controller = new EbliWidgetControllerMenuOnly(this);
+ final EbliWidgetControllerTextEditor controller = new EbliWidgetControllerTextEditor(this);
controller.setEditable(true);
setController(controller);
@@ -89,11 +88,11 @@
conteneur = new BuPanel(new BuBorderLayout());
final Rectangle rec = getClientArea();
- editorPane_.setSize(rec.width, rec.height);
- editorPane_.setPreferredSize(new Dimension(rec.width, rec.height));
- conteneur.setPreferredSize(new Dimension(rec.width, rec.height));
- conteneur.setMaximumSize(new Dimension(rec.width, rec.height));
- conteneur.setMinimumSize(new Dimension(rec.width, rec.height));
+ // editorPane_.setSize(rec.width, rec.height);
+ // editorPane_.setPreferredSize(new Dimension(rec.width, rec.height));
+ // conteneur.setPreferredSize(new Dimension(rec.width, rec.height));
+ // conteneur.setMaximumSize(new Dimension(rec.width, rec.height));
+ // conteneur.setMinimumSize(new Dimension(rec.width, rec.height));
conteneur.add(editorPane_, BuBorderLayout.CENTER);
conteneur.add(editorPane_.getToolBar(true), BuBorderLayout.NORTH);
conteneur.add(editorPane_.getMenuBar());
@@ -118,21 +117,43 @@
return null;
}
- public void notifyClosing(final org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
- final Widget widget, final BuPanel editor, final boolean commit) {
+ // public void notifyClosing(final
+ // org.netbeans.api.visual.action.InplaceEditorProvider.EditorController
+ // controller,
+ // final Widget widget, final BuPanel editor, final boolean commit) {
+ //
+ // // -- mise a jour de intern avec le contenu du ekitcore --//
+ //
+ // contenuHTML_.setText(editorPane_.getDocumentText());
+ // intern_.repaint();
+ // intern_.revalidate();
+ // this.repaint();
+ // getEbliScene().refresh();
+ // // intern_.setLabel(label.getText());
+ //
+ // }
- // -- mise a jour de intern avec le contenu du ekitcore --//
-
- contenuHTML_.setText(editorPane_.getDocumentText());
+ public void notifyClosing(final EditorController _controller, final Widget _widget, final BuPanel _editor,
+ final boolean _commit) {
+ // contenuHTML_.setText(editorPane_.getDocumentText());
intern_.repaint();
intern_.revalidate();
this.repaint();
getEbliScene().refresh();
- // intern_.setLabel(label.getText());
+ editingStop();
}
- public void notifyOpened(final org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
- final Widget widget, final BuPanel editor) {}
+ public void notifyOpened(final EditorController _controller, final Widget _widget, final BuPanel _editor) {
+ // contenuHTML_.setText(CtuluHtmlEditorPanel.showMinimalHtmlDialog("",
+ // getEbliScene().getView(), true));
+ editingStart();
+ }
+
+ // public void notifyOpened(final
+ // org.netbeans.api.visual.action.InplaceEditorProvider.EditorController
+ // controller,
+ // final Widget widget, final BuPanel editor) {}
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBloqueOuDebloqueWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBloqueOuDebloqueWidget.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBloqueOuDebloqueWidget.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -48,7 +48,7 @@
public static class DeBloque extends EbliWidgetActionBloqueOuDebloqueWidget {
public DeBloque(final EbliWidget _widget) {
- super(EbliResource.EBLI.getString("Debloquer la frame"), EbliResource.EBLI.getIcon("unblock_16"),
+ super(EbliResource.EBLI.getString("Debloquer la frame"), EbliResource.EBLI.getIcon("unlock_16.png"),
"DEBLOQUEWIDGET", _widget, false);
setDefaultToolTip(EbliResource.EBLI.getString("D\xE9bloquer la taille et la position de la frame"));
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionResize.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionResize.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionResize.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -51,7 +51,8 @@
public static class Classical extends EbliWidgetActionResize {
public Classical(final EbliWidget _widget) {
- super(EbliResource.EBLI.getString("Resize classique"), EbliResource.EBLI.getIcon("unblock_16"), "RESIZEEWIDGET",
+ super(EbliResource.EBLI.getString("Resize classique"), EbliResource.EBLI.getIcon("bas-droit"),
+ "RESIZEEWIDGET",
_widget, false);
setDefaultToolTip(EbliResource.EBLI.getString("Redimensionnement classique de la taille de la frame"));
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActiontextEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActiontextEditor.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActiontextEditor.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -30,9 +30,11 @@
// -- creation de la widget et ajout dans la scene --//
final EbliNodeDefault nodeText = new EbliNodeDefault();
nodeText.setTitle("Texte");
- final CtuluHtmlEditorPanel editor = new CtuluHtmlEditorPanel();
- editor.setDocumentText(EbliLib.getS("Double-cliquez pour \xE9diter"));
+ final CtuluHtmlEditorPanel editor = new CtuluHtmlEditorPanel(EbliLib.getS("Double-cliquez pour \xE9diter"),
+ CtuluHtmlEditorPanel.getMinimalActions());
+ // editor.setDocumentText();
+
nodeText.setCreator(new EbliWidgetCreatorTextEditor(editor));
nodeText.setPreferedSize(new Dimension(200, 200));
nodeText.setPreferedLocation(new Point(270, 225));
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetGroupAction.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetGroupAction.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetGroupAction.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -24,7 +24,10 @@
import org.fudaa.ebli.visuallibrary.EbliWidget;
import org.fudaa.ebli.visuallibrary.EbliWidgetControllerForGroup;
import org.fudaa.ebli.visuallibrary.EbliWidgetGroup;
+import org.fudaa.ebli.visuallibrary.calque.EbliWidgetControllerCalque;
+import org.fudaa.ebli.visuallibrary.calque.EbliWidgetVueCalque;
import org.fudaa.ebli.visuallibrary.creator.EbliWidgetGroupCreator;
+import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetGraphe;
import org.fudaa.ebli.visuallibrary.layout.GroupLayout;
import org.netbeans.api.visual.widget.Widget;
@@ -42,14 +45,56 @@
@Override
@SuppressWarnings("unchecked")
public void actionPerformed(final ActionEvent e) {
- final Set selectedObjects = new HashSet(scene_.getSelectedObjects());
+ Set selectedObjects = new HashSet(scene_.getSelectedObjects());
if (!selectedObjects.isEmpty()) {
+
+ //--Gestion du cas si le graphe a une legende, on veut pouvoir grouper automatiquement sa legende dans le groupe --//
+ selectedObjects = addLegendeAuto(selectedObjects);
+
+
performGroup(selectedObjects);
}
}
/**
+ * Ajoute automatiquement les legendes dans la liste a grouper.
+ *
+ * @param selectedObjects
+ * @return
+ */
+ private Set addLegendeAuto(final Set selectedObjects) {
+ Set<EbliNode> newList = new HashSet<EbliNode>(selectedObjects);
+
+ // -- check automatiquement les l\xE9gendes si il doit en ajouter --//
+ for (Object objet : selectedObjects) {
+ if (objet instanceof EbliNode) {
+ EbliNode nodeCurrent = (EbliNode) objet;
+
+ // instance de graphe
+ if (nodeCurrent.getWidget().getIntern() instanceof EbliWidgetGraphe) {
+ // -- candidat --//
+ EbliNode nodeLegende = ((EbliWidgetGraphe) nodeCurrent.getWidget().getIntern()).getNodeLegende();
+ if (nodeLegende != null)
+ newList.add(nodeLegende);// hashset donc ajoute que si la ref n
+ // existe pas deja
+ } else if (nodeCurrent.getWidget().getIntern() instanceof EbliWidgetVueCalque) {
+ // -- candidat --//
+ EbliNode nodeLegende = ((EbliWidgetControllerCalque) nodeCurrent.getWidget().getIntern().getController())
+ .getNodeLegende();
+ if (nodeLegende != null)
+ newList.add(nodeLegende);// hashset donc ajoute que si la ref n
+ // existe pas deja
+ }
+
+ }
+ }
+
+
+ return newList;
+ }
+
+ /**
* Methode qui realise le groupage des ebliNodes.
*
* @param _selectedObjects
@@ -115,6 +160,9 @@
final float rMaxX = ((float) (w - widgetBounds.width - dx)) / w;
final float rMaxY = ((float) (h - widgetBounds.height - dy)) / h;
parent.setChildConstraint(findWidget, new Rectangle2D.Float(rMinX, rMinY, rMaxX, rMaxY));
+
+
+
}
final EbliWidgetGroupCreator creator = new EbliWidgetGroupCreator();
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -13,10 +13,12 @@
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JMenu;
+import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
+import javax.swing.JToolBar;
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLibArray;
@@ -406,7 +408,7 @@
* @return
*/
@Override
- public BuMenuBar getMenubarComponent() {
+ public JMenuBar getMenubarComponent() {
if (menuCalque_ == null) {
@@ -485,7 +487,7 @@
* @return
*/
@Override
- public BuToolBar getToolbarComponent() {
+ public JToolBar getToolbarComponent() {
if (toolbarCalque_ == null) {
toolbarCalque_ = new BuToolBar();
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetControllerGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetControllerGraphe.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetControllerGraphe.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -9,9 +9,11 @@
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JMenu;
+import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
+import javax.swing.JToolBar;
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluResource;
@@ -429,7 +431,7 @@
* @return
*/
@Override
- public BuMenuBar getMenubarComponent() {
+ public JMenuBar getMenubarComponent() {
if (menuGraphe_ == null) {
menuGraphe_ = new BuMenuBar();
@@ -483,7 +485,7 @@
* @return
*/
@Override
- public BuToolBar getToolbarComponent() {
+ public JToolBar getToolbarComponent() {
if (toolbarGraphe_ == null) {
toolbarGraphe_ = new BuToolBar();
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/tr_en.fr_txt
===================================================================
(Binary files differ)
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -14,7 +14,9 @@
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JMenu;
+import javax.swing.JMenuBar;
import javax.swing.JPanel;
+import javax.swing.JToolBar;
import org.fudaa.ctulu.CtuluCommandManager;
import org.fudaa.ctulu.CtuluUndoRedoInterface;
@@ -35,6 +37,7 @@
import org.fudaa.ebli.visuallibrary.calque.CalqueLegendeWidgetAdapter;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorLegende;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque;
+import org.fudaa.ebli.visuallibrary.creator.EbliWidgetCreatorTextEditor;
import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe;
import org.fudaa.fudaa.commun.courbe.FudaaCourbeImporter;
import org.fudaa.fudaa.commun.courbe.FudaaCourbeImporter.Target;
@@ -86,9 +89,9 @@
/**
* Toolbar modifiable qui se met a jour selon la selection de la widget.
*/
- BuToolBar toolBarModifiable_ = new BuToolBar();
+ JToolBar toolBarModifiable_ = new BuToolBar();
- BuMenuBar menuModifiable_ = new BuMenuBar();
+ JMenuBar menuModifiable_ = new BuMenuBar();
/**
* Scroll qui contient le tree a droite. Ce panel est modifi\xE9 des que l on change de type d elements.
@@ -147,7 +150,7 @@
*
* @param _toolBar
*/
- public void setToolBar(final BuToolBar _toolBar) {
+ public void setToolBar(final JToolBar _toolBar) {
_toolBar.setFloatable(false);
this.add(_toolBar, BorderLayout.NORTH);
@@ -466,10 +469,23 @@
changeToolbarSpecifiqueGraphe(node.getWidget().getController(), (EbliWidgetCreatorGraphe) node.getCreator());
setTitle(previousTitleFrame + " " + node.getWidget().getController().getDescription(), false);
- } else {
+ } else if (node.getCreator() instanceof EbliWidgetCreatorTextEditor) {
+ FuLog.debug("texte editor");
+ // ((EbliWidgetCreatorTextEditor)
+ // node.getCreator()).getG().setFrame(projet_.impl_.getFrame());
+
// -- etape 1: on fout eventuellement le tree des layouts --//
changeTree(getScene());
// -- etape 2: rechargement de la toolbar specifique dans this --//
+ changeToolbar(node.getWidget().getController());
+ setTitle(previousTitleFrame);
+
+ }
+
+ else {
+ // -- etape 1: on fout eventuellement le tree des layouts --//
+ changeTree(getScene());
+ // -- etape 2: rechargement de la toolbar specifique dans this --//
changeToolbarScene();
setTitle(previousTitleFrame);
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -66,7 +66,6 @@
import com.memoire.bu.BuDesktop;
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuMenuItem;
-import com.memoire.bu.BuResource;
import com.memoire.bu.BuSeparator;
/**
@@ -385,13 +384,15 @@
@SuppressWarnings("serial")
protected void addShapeActions(final List<EbliActionAbstract> _l) {
// -- palette rectangle texte--//
- _l.add(new EbliActionSimple(EbliResource.EBLI.getString("Rectangle texte"), BuResource.BU
- .getToolIcon("crystal_couleurtexte"), "WIDGETRECTANGLE") {
- @Override
- public void actionPerformed(final ActionEvent _evt) {
- addRectangleTexte();
- }
- });
+ // _l.add(new
+ // EbliActionSimple(EbliResource.EBLI.getString("Rectangle texte"),
+ // BuResource.BU
+ // .getToolIcon("crystal_couleurtexte"), "WIDGETRECTANGLE") {
+ // @Override
+ // public void actionPerformed(final ActionEvent _evt) {
+ // addRectangleTexte();
+ // }
+ // });
// widget texte
// TODO a revoir
_l.add(new EbliWidgetActiontextEditor(getSceneCourante()));
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogLigneCourants.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogLigneCourants.java 2008-10-29 20:56:55 UTC (rev 4108)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogLigneCourants.java 2008-10-29 20:57:44 UTC (rev 4109)
@@ -64,7 +64,7 @@
BuTextField y_ = new BuTextField(5);
BuTextField x2_ = new BuTextField(5);
BuTextField y2_ = new BuTextField(5);
- BuTextField nbPoints_ = new BuTextField(5);
+ BuTextField nbPoints_ = new BuTextField(3);
// variables et pdt
private JPanel panelVariables_;
@@ -279,12 +279,12 @@
contPoint1.add(new JLabel(TrResource.getS("-")));
contPoint1.add(y_);
final JPanel contPoint2 = new JPanel(new FlowLayout(FlowLayout.CENTER));
- contPoint2.add(new JLabel("Point 1:"));
+ contPoint2.add(new JLabel("Point 2:"));
contPoint2.add(x2_);
contPoint2.add(new JLabel(TrResource.getS("-")));
contPoint2.add(y2_);
final JPanel contPoint3 = new JPanel(new FlowLayout(FlowLayout.CENTER));
- contPoint3.add(new JLabel("Nombre de points uniform\xE9ments r\xE9partis sur le segment:"));
+ contPoint3.add(new JLabel("Nb pts uniform\xE9ments r\xE9partis sur le segment:"));
contPoint3.add(nbPoints_);
nbPoints_.setText("" + 4);
@@ -293,6 +293,7 @@
conteneur.add(contPoint2);
conteneur.add(contPoint3);
conteneur.setBorder(BorderFactory.createTitledBorder(TrResource.getS("Choix du segment")));
+ conteneur.setSize(400, 250);
return conteneur;
}
@@ -331,6 +332,7 @@
content.add(choixMode_);
// -- panel des segements --//
if (panelSegment_ == null) panelSegment_ = buildSegments();
+
content.add(panelSegment_);
// -- panel des variables --//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
