Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4279] branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/ fudaa/tr/post
|
From: <had...@us...> - 2008-12-08 18:24:24
|
Revision: 4279
http://fudaa.svn.sourceforge.net/fudaa/?rev=4279&view=rev
Author: hadouxad
Date: 2008-12-08 18:24:20 +0000 (Mon, 08 Dec 2008)
Log Message:
-----------
***** Correction du Bug zoom:*****
l'affichage du calque est op?\195?\169rationnel et proportionnel a sa widget!
en utilisant la m?\195?\169thode
calquePanel_.restaurer();
Mais the question is: Is the method optimized?
(tout est dans EbliWidgetVueCalque)
**** Evolution: Fonction duplcation layout ****
possibilit?\195?\169 via le clic sur un bouton de dupliquer int?\195?\169gralement le contenu d'un layout et de g?\195?\169n?\195?\169rer une nouvelle trpostLayoutfille pour l'occasion
Menu actions du trpostlayout
Modified Paths:
--------------
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/TrPostProjet.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostActionDuplicateLayout.java
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-12-08 16:30:11 UTC (rev 4278)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2008-12-08 18:24:20 UTC (rev 4279)
@@ -3,6 +3,8 @@
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Point;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.HashSet;
@@ -17,6 +19,8 @@
import javax.swing.JMenuBar;
import javax.swing.JPanel;
import javax.swing.JToolBar;
+import javax.swing.event.InternalFrameEvent;
+import javax.swing.event.InternalFrameListener;
import org.fudaa.ctulu.CtuluCommandManager;
import org.fudaa.ctulu.CtuluUndoRedoInterface;
@@ -114,6 +118,8 @@
TrPostProjet projet_;
+ Dimension oldSize_;
+
/**
* Constructeur de la fenetre.
*/
@@ -142,7 +148,46 @@
panelSouthSuiviSouris_ = new JLabel();
this.add(panelSouthSuiviSouris_, BorderLayout.SOUTH);
+
+ oldSize_=getSize();
+ //-- ajout du controller en cas de resize --//
+ this.addComponentListener(new ComponentListener(){
+ @Override
+ public void componentHidden(ComponentEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void componentMoved(ComponentEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void componentResized(ComponentEvent e) {
+ // TODO Auto-generated method stub
+// Dimension size=getSize();
+// System.out.println("Size nouvelle:"+size);
+// if(size!=oldSize_ ){
+// controller_.getSceneCourante().resizeInnerWidget(size,oldSize_);
+//
+// //-- stockage de la taille comme ancienne size --//
+// oldSize_=size;
+// }
+ }
+
+ @Override
+ public void componentShown(ComponentEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+
+ });
+
+
+
}
/**
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-12-08 16:30:11 UTC (rev 4278)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2008-12-08 18:24:20 UTC (rev 4279)
@@ -60,6 +60,7 @@
import org.fudaa.fudaa.tr.post.actions.TrPostActionChangeSceneForWidget;
import org.fudaa.fudaa.tr.post.actions.TrPostActionChooseAndCreateCalque;
import org.fudaa.fudaa.tr.post.actions.TrPostActionDuplicate;
+import org.fudaa.fudaa.tr.post.actions.TrPostActionDuplicateLayout;
import org.fudaa.fudaa.tr.post.dialogSpec.TrPostWizardCreateScope;
import org.jdesktop.swingx.ScrollPaneSelector;
@@ -193,7 +194,10 @@
// comboMultiScenes_.addActionListener(this);
// comboMultiScenes_.setMaximumSize(comboMultiScenes_.getPreferredSize());
// comboMultiScenes_.setMinimumSize(comboMultiScenes_.getPreferredSize());
-
+
+
+
+
}
// public BuComboBox getComboMultiScenes() {
@@ -536,6 +540,7 @@
// -- action de duplication --//
// init.add(new EbliWidgetActionDuplicate(getSceneCourante()));
init.add(new TrPostActionDuplicate(getSceneCourante(), projet_));
+ init.add(new TrPostActionDuplicateLayout(getSceneCourante(), projet_));
init.add(new TrPostActionChangeSceneForWidget(getSceneCourante(), projet_));
init.add(null);
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java 2008-12-08 16:30:11 UTC (rev 4278)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java 2008-12-08 18:24:20 UTC (rev 4279)
@@ -1360,13 +1360,15 @@
/**
* Cree une nouvelle fenetre dans le post contenant son jeu de layouts
*/
- public void createNewLayoutFrame() {
+ public TrPostLayoutFille createNewLayoutFrame() {
final TrPostLayoutFille newLayoutFille = new TrPostLayoutFille(this);
newLayoutFille.setTitle(newLayoutFille.getTitle() + " N\xB0 " + (++idx));
// addFillesLayout(newLayoutFille);
impl_.addInternalFrame(newLayoutFille);
+
+ return newLayoutFille;
}
}
\ No newline at end of file
Added: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostActionDuplicateLayout.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostActionDuplicateLayout.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostActionDuplicateLayout.java 2008-12-08 18:24:20 UTC (rev 4279)
@@ -0,0 +1,61 @@
+package org.fudaa.fudaa.tr.post.actions;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.fudaa.ebli.visuallibrary.EbliScene;
+import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionDuplicate;
+import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionDuplicateLayout;
+import org.fudaa.fudaa.tr.common.TrResource;
+import org.fudaa.fudaa.tr.post.TrPostCommonImplementation;
+import org.fudaa.fudaa.tr.post.TrPostLayoutFille;
+import org.fudaa.fudaa.tr.post.TrPostProjet;
+
+import com.memoire.bu.BuDialogChoice;
+
+
+/**
+ * Action qui duplique le layout en en creant un nouveau.
+ * @author Adrien Hadoux
+ *
+ */
+public class TrPostActionDuplicateLayout extends EbliWidgetActionDuplicateLayout{
+
+ TrPostProjet projet_;
+
+ public TrPostActionDuplicateLayout(final EbliScene _scene, final TrPostProjet _projet) {
+ super(_scene);
+
+ projet_ = _projet;
+ }
+
+ /**
+ * surcharge de la methode. Creation d'un nouveau layout avec le contenu du duplicata
+ */
+ @Override
+ protected EbliScene selectionneSceneNode() {
+ EbliScene dest = null;
+ TrPostLayoutFille fenetre = projet_.createNewLayoutFrame();
+ dest = fenetre.controller_.getSceneCourante();
+ return dest;
+ }
+
+ public static String[] formatteFilles(final List<TrPostLayoutFille> ls) {
+ final String[] noms = new String[ls.size()];
+ int cpt = 0;
+ for (final Iterator<TrPostLayoutFille> it = ls.iterator(); it.hasNext();) {
+ noms[cpt++] = it.next().getTitle();
+ }
+ return noms;
+ }
+
+ // public String[] formatteLayout(TrPostLayoutPanelController _controller) {
+ // String[] noms = new String[_controller.listeScenes_.size()];
+ //
+ // for (int cpt = 0; cpt < _controller.listeScenes_.size(); cpt++) {
+ // noms[cpt] = "Layout " + (cpt + 1);
+ // }
+ // return noms;
+ // }
+
+ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
