Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6334] trunk/framework
|
From: <bma...@us...> - 2011-08-02 09:21:57
|
Revision: 6334
http://fudaa.svn.sourceforge.net/fudaa/?rev=6334&view=rev
Author: bmarchan
Date: 2011-08-02 09:21:50 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
Add : Constructeur composant pr?\195?\169f?\195?\169rences sans cat?\195?\169gorie
Modified Paths:
--------------
trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuContainerPreferencesPanel.java
trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTablePreferencesComponent.java
trunk/framework/fudaa-common/src/main/resources/org/fudaa/fudaa/ressource/fudaa_en.fr_txt
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuContainerPreferencesPanel.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuContainerPreferencesPanel.java 2011-08-02 08:17:30 UTC (rev 6333)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuContainerPreferencesPanel.java 2011-08-02 09:21:50 UTC (rev 6334)
@@ -22,6 +22,15 @@
private String title_;
private boolean isDirty_=false;
+ /**
+ * Construction d'un panneau avec cat\xE9gorie par d\xE9faut.
+ * @param _title Le titre du panneau
+ * @param _cmps Les composants du panneau.
+ */
+ public BuContainerPreferencesPanel(String _title, BuAbstractPreferencesComponent[] _cmps) {
+ this(null,_title,_cmps);
+ }
+
public BuContainerPreferencesPanel(String _category, String _title, BuAbstractPreferencesComponent[] _cmps) {
cmps_=_cmps;
category_=_category;
@@ -44,6 +53,9 @@
@Override
public String getCategory() {
+ if (category_==null) {
+ return super.getCategory();
+ }
return category_;
}
Modified: trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt
===================================================================
--- trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2011-08-02 08:17:30 UTC (rev 6333)
+++ trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2011-08-02 09:21:50 UTC (rev 6334)
@@ -289,6 +289,6 @@
Exporter le tableau=Export table
Exporter le tableau au format csv ou excel=Export table in csv or excel format
Export CSV du tableau des valeurs=CSV export of values table
-Limite du nombre de d\xE9cimales=Limit the number of decimals
+Limite du nombre de d\xE9cimales \xE0=Limit the number of decimals to
Nombre de d\xE9cimales=Number of decimals
Activer=Activate
\ No newline at end of file
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTablePreferencesComponent.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTablePreferencesComponent.java 2011-08-02 08:17:30 UTC (rev 6333)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTablePreferencesComponent.java 2011-08-02 09:21:50 UTC (rev 6334)
@@ -3,15 +3,11 @@
import com.memoire.bu.BuAbstractPreferencesComponent;
import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuTextField;
-import com.memoire.bu.BuVerticalLayout;
-import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
import javax.swing.event.CaretEvent;
import javax.swing.event.CaretListener;
import org.fudaa.ctulu.CtuluLib;
@@ -23,7 +19,6 @@
public class CtuluTablePreferencesComponent extends BuAbstractPreferencesComponent {
public static final String COORDS_EXPORT_NB_DIGITS="gis.coords.export.nbdigits";
private BuTextField tfExport_;
- private JLabel lbExport_;
private JCheckBox cbLimit_;
private int exportNbDec;
@@ -32,16 +27,11 @@
tfExport_=BuTextField.createIntegerField();
tfExport_.setPreferredSize(new Dimension(80,tfExport_.getPreferredSize().height));
- lbExport_=new JLabel(CtuluLib.getS("Nombre de d\xE9cimales"));
- JPanel pnDigits=new JPanel();
- pnDigits.setLayout(new FlowLayout(FlowLayout.LEFT));
- pnDigits.add(lbExport_,BorderLayout.CENTER);
- pnDigits.add(tfExport_,BorderLayout.EAST);
- cbLimit_=new JCheckBox(CtuluLib.getS("Limite du nombre de d\xE9cimales"));
- setLayout(new BuVerticalLayout());
+ cbLimit_=new JCheckBox(CtuluLib.getS("Limite du nombre de d\xE9cimales \xE0"));
+ setLayout(new FlowLayout(FlowLayout.LEFT,2,0));
add(cbLimit_);
- add(pnDigits);
+ add(tfExport_);
updateComponent();
@@ -54,7 +44,6 @@
cbLimit_.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
tfExport_.setEnabled(cbLimit_.isSelected());
- lbExport_.setEnabled(cbLimit_.isSelected());
setSavabled(!cbLimit_.isSelected() || tfExport_.getValue()!=null);
setModified(true);
}
@@ -85,13 +74,11 @@
if (exportNbDec==-1) {
tfExport_.setValue(3);
tfExport_.setEnabled(false);
- lbExport_.setEnabled(false);
cbLimit_.setSelected(false);
}
else {
tfExport_.setValue(exportNbDec);
tfExport_.setEnabled(true);
- lbExport_.setEnabled(true);
cbLimit_.setSelected(true);
}
}
Modified: trunk/framework/fudaa-common/src/main/resources/org/fudaa/fudaa/ressource/fudaa_en.fr_txt
===================================================================
--- trunk/framework/fudaa-common/src/main/resources/org/fudaa/fudaa/ressource/fudaa_en.fr_txt 2011-08-02 08:17:30 UTC (rev 6333)
+++ trunk/framework/fudaa-common/src/main/resources/org/fudaa/fudaa/ressource/fudaa_en.fr_txt 2011-08-02 09:21:50 UTC (rev 6334)
@@ -325,4 +325,5 @@
Sauvegarde des donn\xE9es=Data saving
Sauvegarde donn\xE9es compl\xE9mentaires=Visualisation data saving
Modifications correctements enregistr\xE9es=Modifications saved with sucess
-Le temps n'a pas \xE9t\xE9 trouv\xE9 pour la courbe {0}=The time model has not be found for the curve {0}
\ No newline at end of file
+Le temps n'a pas \xE9t\xE9 trouv\xE9 pour la courbe {0}=The time model has not be found for the curve {0}
+Export fichier Mascaret=Mascaret file export
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
