Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2009-12-08 00:56:21
|
Revision: 5542
http://fudaa.svn.sourceforge.net/fudaa/?rev=5542&view=rev
Author: deniger
Date: 2009-12-08 00:56:13 +0000 (Tue, 08 Dec 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2009-12-08 00:52:32 UTC (rev 5541)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2009-12-08 00:56:13 UTC (rev 5542)
@@ -278,18 +278,19 @@
/**
* Remplace un item menu en provenance de Bu par une action, plus g\xE9n\xE9raliste.
+ *
* @param _command La commande.
* @return L'action de remplacement, ou null si la commande n'existait pas.
*/
protected EbliActionAbstract replaceItemByAction(String _command) {
- JMenuItem it=((JMenuItem)getMainMenuBar().getMenuItem(_command));
- if (it==null) return null;
- BuMenu mn=(BuMenu)getMainMenuBar().getMenuForAction(_command);
- if (mn==null) return null;
- int idx=mn.indexOf(_command);
- if (idx==-1) return null;
+ JMenuItem it = ((JMenuItem) getMainMenuBar().getMenuItem(_command));
+ if (it == null) return null;
+ BuMenu mn = (BuMenu) getMainMenuBar().getMenuForAction(_command);
+ if (mn == null) return null;
+ int idx = mn.indexOf(_command);
+ if (idx == -1) return null;
- EbliActionAbstract act=new EbliActionSimple(it.getText(),it.getIcon(),it.getActionCommand()) {
+ EbliActionAbstract act = new EbliActionSimple(it.getText(), it.getIcon(), it.getActionCommand()) {
public void actionPerformed(ActionEvent _evt) {
FudaaCommonImplementation.this.actionPerformed(_evt);
}
@@ -297,45 +298,48 @@
act.setDefaultToolTip(it.getToolTipText());
act.setKey(it.getAccelerator());
mn.remove(idx);
- mn.insert(act,idx)
+ mn.insert(act, idx)
// Pour rester compatible avec Bu.
- .setName("mi"+_command);
-
+ .setName("mi" + _command);
+
return act;
}
-
+
/**
* Cr\xE9ation des actions sp\xE9cifiques a Fudaa.
*/
private void buildActions() {
EbliActionAbstract act;
- act=replaceItemByAction("TOUTSELECTIONNER");
- if (act!=null) EbliActionMap.getInstance().addAction(act);
- act=replaceItemByAction("RECHERCHER");
- if (act!=null) EbliActionMap.getInstance().addAction(act);
+ act = replaceItemByAction("TOUTSELECTIONNER");
+ if (act != null) EbliActionMap.getInstance().addAction(act);
+ act = replaceItemByAction("RECHERCHER");
+ if (act != null) EbliActionMap.getInstance().addAction(act);
- act=new EbliActionSimple(CtuluLib.getS("Inverser la s\xE9lection"),BuResource.BU.getIcon("aucun"),"INVERSESELECTION") {
+ act = new EbliActionSimple(CtuluLib.getS("Inverser la s\xE9lection"), BuResource.BU.getIcon("aucun"),
+ "INVERSESELECTION") {
public void actionPerformed(ActionEvent _evt) {
FudaaCommonImplementation.this.actionPerformed(_evt);
}
};
- act.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_I,InputEvent.CTRL_MASK));
+ act.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_I, InputEvent.CTRL_MASK));
EbliActionMap.getInstance().addAction(act);
- act=new EbliActionSimple(CtuluLib.getS("Effacer la s\xE9lection"),BuResource.BU.getIcon("effacer"),"CLEARSELECTION") {
+ act = new EbliActionSimple(CtuluLib.getS("Effacer la s\xE9lection"), BuResource.BU.getIcon("effacer"),
+ "CLEARSELECTION") {
public void actionPerformed(ActionEvent _evt) {
FudaaCommonImplementation.this.actionPerformed(_evt);
}
};
- act.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK));
+ act.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK
+ | InputEvent.SHIFT_MASK));
EbliActionMap.getInstance().addAction(act);
-
- act=replaceItemByAction("DUPLIQUER");
+
+ act = replaceItemByAction("DUPLIQUER");
act.setEnabled(false);
- if (act!=null) EbliActionMap.getInstance().addAction(act);
+ if (act != null) EbliActionMap.getInstance().addAction(act);
}
-
+
/**
* Methode a surcharger pour ajouter ces propres panneaux de pref.
*/
@@ -463,8 +467,8 @@
((CtuluSelectionInterface) frame).inverseSelection();
}
} else if (action.equals("AIDE")) {
- //displayHelp(null);
- displayHelpPDF(getInformationsSoftware().baseManUrl());
+ // displayHelp(null);
+ displayHelpPDF(getInformationsSoftware().baseManUrl());
} else if (action.equals("AIDE_INDEX")) {
displayHelp(getInformationsSoftware().baseManUrl());
} else if (action.equals("INDEX_ALPHA")) {
@@ -488,26 +492,25 @@
return _dest.addMenuItem(FudaaLib.getS("Console"), "CONSOLE", FudaaResource.FUDAA.getIcon("tail"), FudaaTee
.isCreated());
}
-
-
+
FudaaHelpPDFViewer frameHelpPDF_;
-
+
/**
* Affiche la fenetre de viewer pdf
*/
- public void displayHelpPDF(String url){
- if(frameHelpPDF_==null){
- frameHelpPDF_=new FudaaHelpPDFViewer(url,this,false);
- }
- //-- ajout de la fenetre --//:
- this.addInternalFrame(frameHelpPDF_);
+ public void displayHelpPDF(String url) {
+ if (frameHelpPDF_ == null) {
+ frameHelpPDF_ = new FudaaHelpPDFViewer(url, this, false);
+ }
+ // -- ajout de la fenetre --//:
+ this.addInternalFrame(frameHelpPDF_);
}
-
+
protected void rebuildEditionMenu(final BuMenu _dest) {
- int indSelect=_dest.indexOf("TOUTSELECTIONNER");
- _dest.remove(indSelect+2);
- _dest.insert(EbliActionMap.getInstance().getAction("INVERSESELECTION"),indSelect+1);
- _dest.insert(EbliActionMap.getInstance().getAction("CLEARSELECTION"),indSelect+2);
+ int indSelect = _dest.indexOf("TOUTSELECTIONNER");
+ _dest.remove(indSelect + 2);
+ _dest.insert(EbliActionMap.getInstance().getAction("INVERSESELECTION"), indSelect + 1);
+ _dest.insert(EbliActionMap.getInstance().getAction("CLEARSELECTION"), indSelect + 2);
addConsoleMenu(_dest);
}
@@ -815,10 +818,10 @@
*/
public void init() {
super.init();
-
+
buildActions();
rebuildEditionMenu((BuMenu) getMainMenuBar().getMenu("MENU_EDITION"));
-
+
final BuToolBar tb = getMainToolBar();
// on place la nouvelle action apres le ranger Palettes
final int idx = findRangerPalette(tb);
@@ -996,15 +999,15 @@
_analyze.printResume();
}
if (_analyze.getFatalError() != null) {
- final CtuluAnalyze.Field f = _analyze.getFatalError();
- String deb = f.getMessage();
+ final String f = _analyze.getFatalError();
+ String deb = f;
if (_analyze.containsErrors()) {
- deb += CtuluLibString.LINE_SEP + CtuluAnalyze.getResume(_analyze.getErrorCanal(), 5);
+ deb += CtuluLibString.LINE_SEP + _analyze.getErrorResume();
}
error(_analyze.getDesc(), deb, false);
return true;
} else if (_analyze.containsErrors()) {
- error(_analyze.getDesc(), CtuluAnalyze.getResume(_analyze.getErrorCanal(), 5), false);
+ error(_analyze.getDesc(), _analyze.getErrorResume());
}
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-06-07 15:40:02
|
Revision: 6284
http://fudaa.svn.sourceforge.net/fudaa/?rev=6284&view=rev
Author: bmarchan
Date: 2011-06-07 15:39:55 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Fix : Pb avec le glasspane de l'appli qui ne fonctionnait qu'une seule fois.
Modified Paths:
--------------
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2011-06-07 11:53:23 UTC (rev 6283)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2011-06-07 15:39:55 UTC (rev 6284)
@@ -1197,7 +1197,7 @@
}
/**
- * Ajoute un glasspane \xE0\xA0 l'application.
+ * Ajoute un glasspane \xE0\xA0l'application et l'active.
*/
public void setGlassPaneStop() {
if (glassPaneStop_ == null) {
@@ -1252,13 +1252,12 @@
}
/**
- * Enleve le glasspane.
+ * Desactive le glasspane.
*/
public void unsetGlassPaneStop() {
if (SwingUtilities.isEventDispatchThread()) {
if (glassPaneStop_ != null) {
glassPaneStop_.setVisible(false);
- ((JFrame) getFrame()).getRootPane().remove(glassPaneStop_);
}
} else {
BuLib.invokeLater(getUnsetGlassPaneRunnable());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-09-06 16:37:49
|
Revision: 6365
http://fudaa.svn.sourceforge.net/fudaa/?rev=6365&view=rev
Author: bmarchan
Date: 2011-09-06 16:37:43 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
Fix : Correction maj largeur colonne a l'ajout d'un composant
Modified Paths:
--------------
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2011-09-06 16:36:48 UTC (rev 6364)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2011-09-06 16:37:43 UTC (rev 6365)
@@ -102,7 +102,6 @@
import com.memoire.bu.BuUserPreferencesPanel;
import com.memoire.fu.Fu;
import com.memoire.fu.FuLog;
-import org.fudaa.ebli.commun.EbliComponentFactory;
import org.fudaa.fudaa.commun.FudaaPreferences;
import org.fudaa.fudaa.commun.exetools.FudaaManageExeTools;
@@ -143,6 +142,11 @@
*/
public static final String RIGHT_COMPONENT_IN_SCROLL = "useScrollPane";
+ /**
+ * Ajoute le composant de la fenetre rendue active \xE0 la colonne de droite.
+ * Fait apparaitre la colonne si celle ci \xE9tait invisible.
+ * @param _comp La fenetre rendue active.
+ */
private void addRightComponent(final CtuluFilleWithComponent _comp) {
if (oldRightComponent_ == null || _comp == null) { return; }
_comp.majComponent(oldRightComponent_);
@@ -160,11 +164,18 @@
}
toUse = rightC_;
}
+ // B.M. : Pour moi, le dimensionnement de la colonne et la visibilit\xE9 n'ont
+ // rien a faire ici.
+ // Logiquement, les BuColumn devraient avoir une taille par defaut dans
+ // BuMainPanel, taille surcharg\xE9e dans BuPreferences.applyOnMainPanel().
+ // Cependant, vu le nombre d'appli qui gere les BuColumn de mani\xE8re bizarre,
+ // on laisse comme ca.
getMainPanel().getRightColumn().setVisible(true);
Dimension preferredSize = getMainPanel().getRightColumn().getPreferredSize();
if(preferredSize.width<=0){
preferredSize.width=175;
getMainPanel().getRightColumn().setPreferredSize(preferredSize);
+ getMainPanel().updateSplits();
}
getMainPanel().getRightColumn().addToggledComponent(_comp.getComponentTitle(), "TOGGLE_SPEC",
BuResource.BU.getToolIcon("arbre"), toUse, toUse.isVisible(), this).setToolTipText(
@@ -237,6 +248,11 @@
}
+ /**
+ * Retire de la colonne droite le composant li\xE9 \xE0 la fenetre interne rendue
+ * inactive. Fait disparaitre la colonne si plus aucun composant dans cette
+ * colonne.
+ */
private void removeRightComponent() {
getMainPanel().getRightColumn().removeToggledComponent("TOGGLE_SPEC");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-09-14 12:20:46
|
Revision: 6430
http://fudaa.svn.sourceforge.net/fudaa/?rev=6430&view=rev
Author: bmarchan
Date: 2011-09-14 12:20:39 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
Fix : Correction sur l'ajout des boutons export sur la toolbar
Modified Paths:
--------------
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2011-09-14 09:01:14 UTC (rev 6429)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2011-09-14 12:20:39 UTC (rev 6430)
@@ -895,34 +895,34 @@
if (idx > 0) {
tb.add(btRanger, idx);
}
+
if (buildExportDataToolIcon()) {
+ final BuToolButton bt=new BuToolButton();
+ initExportDataButton(bt);
+ tb.add(bt);
+ }
+
+ if (buildImageToolIcon()) {
+ final BuToolButton btCopie=new BuToolButton();
+ initExportImageToClipborad(btCopie);
+ final BuToolButton bt=new BuToolButton() {
- if (buildExportDataToolIcon()) {
- final BuToolButton bt = new BuToolButton();
- initExportDataButton(bt);
- tb.add(bt);
- }
- if (buildImageToolIcon()) {
+ @Override
+ public void setEnabled(final boolean _b) {
+ btCopie.setEnabled(_b);
+ super.setEnabled(_b);
+ }
+ };
- final BuToolButton btCopie = new BuToolButton();
- initExportImageToClipborad(btCopie);
- final BuToolButton bt = new BuToolButton() {
- @Override
- public void setEnabled(final boolean _b) {
- btCopie.setEnabled(_b);
- super.setEnabled(_b);
- }
- };
+ initExportImageButton(bt);
+ tb.add(bt);
+ tb.add(btCopie);
+ }
+
+ if (buildFudaaReportTool()) {
+ tb.add(createFudaaReportToolButton());
+ }
- initExportImageButton(bt);
- tb.add(bt);
- tb.add(btCopie);
- }
- if (buildFudaaReportTool()) {
- tb.add(createFudaaReportToolButton());
- }
-
- }
final BuMenu mn = (BuMenu) getMainMenuBar().getMenu("MENU_FENETRES");
if (mn != null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-12-17 07:05:48
|
Revision: 8145
http://fudaa.svn.sourceforge.net/fudaa/?rev=8145&view=rev
Author: deniger
Date: 2012-12-17 07:05:42 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2012-12-17 07:05:20 UTC (rev 8144)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2012-12-17 07:05:42 UTC (rev 8145)
@@ -1079,6 +1079,18 @@
}
@Override
+ public boolean manageAnalyzeAndIsFatal(final CtuluLog _analyze) {
+ if (_analyze == null) {
+ return false;
+ }
+ if (!_analyze.isEmpty()) {
+ _analyze.printResume();
+ CtuluAnalyzeGUI.showDialogErrorFiltre(_analyze, this, _analyze.getDesc(), false);
+ }
+ return _analyze.containsSevereError();
+ }
+
+ @Override
public boolean manageErrorOperationAndIsFatal(final CtuluIOOperationSynthese _opResult) {
if (_opResult == null) {
error(FudaaLib.getS("L'op\xE9ration a \xE9chou\xE9"));
@@ -1092,6 +1104,20 @@
}
return false;
}
+ @Override
+ public boolean manageErrorOperationAndIsFatal(final CtuluIOResult _opResult) {
+ if (_opResult == null) {
+ error(FudaaLib.getS("L'op\xE9ration a \xE9chou\xE9"));
+ return true;
+ }
+ if (_opResult.getClosingException() != null) {
+ CtuluLibMessage.error("FATAL :can't close " + _opResult.getAnalyze().getResource());
+ }
+ if (_opResult.getAnalyze() != null) {
+ return manageAnalyzeAndIsFatal(_opResult.getAnalyze());
+ }
+ return false;
+ }
public void message(final String _msg) {
message(BuResource.BU.getString("Message"), _msg, false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-22 10:33:08
|
Revision: 8359
http://fudaa.svn.sourceforge.net/fudaa/?rev=8359&view=rev
Author: deniger
Date: 2013-03-22 10:33:02 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
am?\195?\169lioration aide
Modified Paths:
--------------
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2013-03-22 10:31:37 UTC (rev 8358)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2013-03-22 10:33:02 UTC (rev 8359)
@@ -575,8 +575,8 @@
} else {
JFrame frame = new JFrame();
frame.setContentPane(frameHelpPDF_.getContentPane());
- frame.setPreferredSize(new Dimension(500, 600));
- frame.setSize(new Dimension(500, 600));
+ frame.setPreferredSize(new Dimension(800, 800));
+ frame.setSize(new Dimension(800, 800));
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
frame.setVisible(true);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-01-30 16:44:07
|
Revision: 9004
http://sourceforge.net/p/fudaa/svn/9004
Author: bmarchan
Date: 2015-01-30 16:44:00 +0000 (Fri, 30 Jan 2015)
Log Message:
-----------
Tooltip sur menu aide
Modified Paths:
--------------
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2015-01-30 13:38:00 UTC (rev 9003)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2015-01-30 16:44:00 UTC (rev 9004)
@@ -938,7 +938,7 @@
tb.add(createFudaaReportToolButton());
}
- final BuMenu mn = (BuMenu) getMainMenuBar().getMenu("MENU_FENETRES");
+ BuMenu mn = (BuMenu) getMainMenuBar().getMenu("MENU_FENETRES");
if (mn != null) {
mn.remove(0);
@@ -955,6 +955,14 @@
it.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.CTRL_MASK));
mn.add(it, 0);
}
+
+ mn = (BuMenu) getMainMenuBar().getMenu("MENU_AIDE");
+ if (mn!=null) {
+ JMenuItem www=mn.getItem(mn.indexOf("WWW_ACCUEIL"));
+ if (www!=null) {
+ www.setToolTipText(getInformationsSoftware().http);
+ }
+ }
}
public void initExportDataButton(final AbstractButton _bt) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X