Commit 2cbd106b authored by Eric Seigne's avatar Eric Seigne
Browse files

switch to htmlview

parent b90d17f2
......@@ -2,4 +2,4 @@
#build maven project
rm -rf mvplan/target/ mvplan_core/target/
mvn package
java -jar mvplan/target/mvplan-1.6-SNAPSHOT-all.jar
java -jar mvplan/target/mvplan-1.7-SNAPSHOT-all.jar | grep MVDebug
......@@ -9,14 +9,14 @@
<parent>
<groupId>mvplan</groupId>
<artifactId>mvplan-parent</artifactId>
<version>1.6-SNAPSHOT</version>
<version>1.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>mvplan</groupId>
<artifactId>mvplan_core</artifactId>
<version>1.6-SNAPSHOT</version>
<version>1.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jgoodies</groupId>
......
......@@ -5,6 +5,7 @@
*
* @author Guy Wittig
* @version 20-Nov-2005
* @author 2019 - Éric Seigne <eric@mvplan.org>
*
* This program is part of MV-Plan
* Copywrite 2006 Guy Wittig
......
......@@ -18,7 +18,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,1,-112"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-93,0,0,4,17"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
......@@ -84,11 +84,9 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Component class="javax.swing.JTextArea" name="termsTextArea">
<Component class="javax.swing.JTextPane" name="termsTextArea">
<Properties>
<Property name="columns" type="int" value="40"/>
<Property name="editable" type="boolean" value="false"/>
<Property name="rows" type="int" value="20"/>
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[10, 10, 10, 10]"/>
</Property>
......
......@@ -88,7 +88,7 @@ public class ConditionsAcceptance extends javax.swing.JDialog {
infoLabel = new javax.swing.JLabel();
displayPanel = new javax.swing.JPanel();
termsScrollPane = new javax.swing.JScrollPane();
termsTextArea = new javax.swing.JTextArea();
termsTextArea = new javax.swing.JTextPane();
buttonPanel = new javax.swing.JPanel();
instructionsLabel = new javax.swing.JLabel();
exitButton = new javax.swing.JButton();
......@@ -120,9 +120,7 @@ public class ConditionsAcceptance extends javax.swing.JDialog {
displayPanel.setPreferredSize(new java.awt.Dimension(500, 350));
displayPanel.setLayout(new java.awt.BorderLayout());
termsTextArea.setColumns(40);
termsTextArea.setEditable(false);
termsTextArea.setRows(20);
termsTextArea.setMargin(new java.awt.Insets(10, 10, 10, 10));
termsScrollPane.setViewportView(termsTextArea);
......@@ -199,7 +197,7 @@ public class ConditionsAcceptance extends javax.swing.JDialog {
private javax.swing.JPanel infoPanel;
private javax.swing.JLabel instructionsLabel;
private javax.swing.JScrollPane termsScrollPane;
private javax.swing.JTextArea termsTextArea;
private javax.swing.JTextPane termsTextArea;
// End of variables declaration//GEN-END:variables
}
/*
* TermsDisplay.java
*
* Displays terms and conditions into a JTextArea. T&C's are obtained from
* Displays terms and conditions into a JTextPane. T&C's are obtained from
* a resource bundle mvplan/resources/conditions.
*
* @author Guy Wittig
* @version 13-May-2007
* @author 2019 - Éric Seigne <eric@mvplan.org>
*
* This program is part of MV-Plan
* Copyright 2005-2007 Guy Wittig
......@@ -35,11 +36,11 @@ import mvplan.main.Mvplan;
*/
public class ConditionsDisplay {
private JTextArea text;
private JTextPane text;
private ResourceBundle stringResource;
/** Creates a new instance of TermsDisplay */
public ConditionsDisplay(JTextArea t) {
public ConditionsDisplay(JTextPane t) {
try {
if (Mvplan.preferredLocale != null )
stringResource = ResourceBundle.getBundle("mvplan/resources/conditions", Mvplan.preferredLocale );
......@@ -52,11 +53,10 @@ public class ConditionsDisplay {
display(t);
}
public void display(JTextArea t){
t.setLineWrap(true);
t.setWrapStyleWord(true);
t.append(getResource("mvplan.conditions.heading.text")+"\n\n");
t.append(getResource("mvplan.conditions.text"));
public void display(JTextPane t){
//t.setLineWrap(true);
//t.setWrapStyleWord(true);
t.setText(getResource("mvplan.conditions.heading.text")+"\n\n"+getResource("mvplan.conditions.text"));
// Reposition back to top
t.setCaretPosition(0);
}
......
......@@ -3,6 +3,7 @@
*
* Main GUI for MV-Plan.
*
* @author 2019 - Éric Seigne <eric@videosub.fr>
* @author Guy Wittig
* @version 13-May-2007
*
......@@ -72,6 +73,7 @@ import javax.swing.JSplitPane;
import javax.swing.JTable;
import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.JTextPane;
import javax.swing.JToolBar;
import javax.swing.ListSelectionModel;
import javax.swing.border.Border;
......@@ -103,6 +105,7 @@ public class MainFrame extends JFrame {
// Change this to enable text labels in Dive and Gas panel buttons
private final static boolean BUTTON_ICONS_ONLY = true;
private final int debug = MvplanInstance.getMvplan().getDebug();
/**
* These are the data models for the main GUI currentProfile and
......@@ -175,7 +178,7 @@ public class MainFrame extends JFrame {
JTable gasTable;
JTable diveTable;
JTextArea textArea; // Main text output area
JTextPane textArea; // Main text output area
JTextField surfaceIntervalField = new JTextField();
JLabel tissueStatusLabel = new JLabel();
......@@ -229,16 +232,16 @@ public class MainFrame extends JFrame {
// Display DEBUG mode warning
if (Mvplan.DEBUG > 0) {
if (Mvplan.preferredLocale != null) {
textArea.append("Preferred locale: " + Mvplan.preferredLocale.getDisplayName() + "\n");
textArea.setText("Preferred locale: " + Mvplan.preferredLocale.getDisplayName() + "\n");
}
textArea.append("System locale: " + Locale.getDefault().getDisplayName() + "\n\n");
textArea.setText("System locale: " + Locale.getDefault().getDisplayName() + "\n\n");
textArea.append("*** DEBUG MODE - ");
textArea.setText("*** DEBUG MODE - ");
if (Mvplan.prefs.getUnits() == Mvplan.prefs.METRIC) {
textArea.append("METRIC ***\n\n");
textArea.setText("METRIC ***\n\n");
} else {
textArea.append("IMPERIAL ***\n\n");
textArea.setText("IMPERIAL ***\n\n");
}
}
......@@ -322,7 +325,7 @@ public class MainFrame extends JFrame {
rightPanel.setPreferredSize(new Dimension(300, 300));
rightPanel.setMinimumSize(new Dimension(200, 300));
rightPanel.setLayout(rightPanelLayout);
textArea = new JTextArea("", 25, 80);
textArea = new JTextPane();
textArea.setMargin(new Insets(10, 10, 10, 10));
textArea.setEditable(false);
//textArea.setFont(new Font("MONOSPACED", Font.PLAIN, 18));
......@@ -970,7 +973,7 @@ public class MainFrame extends JFrame {
* Clear dive model and display
*/
private void clearDive() {
textArea.setLineWrap(false);
//textArea.setLineWrap(false);
textArea.setText("");
currentProfile = null;
currentModel = null;
......@@ -1082,6 +1085,13 @@ public class MainFrame extends JFrame {
private void printProfileDisplayComponent() {
int h, l;
TablePreviewDialog tpd;
/* ************************ */
//erics font size for printing
if(debug > 0) System.out.println("MVDebug: printProfileDisplayComponent: ");
java.awt.Font infoFont = new java.awt.Font("Tahoma", 0, 12);
setFont(infoFont);
/* ************************ */
// Make heading like this:
// "MV-Plan GF:20/90 ZHL16B" or dislay altitude instead of model
h = (int) Math.round(Mvplan.prefs.getGfHigh() * 100);
......@@ -1154,7 +1164,7 @@ public class MainFrame extends JFrame {
/**
* Do TableGeneratorModel dive
*/
private void doTableGenerator(JTextArea text) {
private void doTableGenerator(JTextPane text) {
int[] modifiers = Mvplan.prefs.getModifiers(); // holds array of time modifiers
//boolean nothingToProcess=false;
int returnCode;
......@@ -1225,7 +1235,7 @@ public class MainFrame extends JFrame {
MvplanInstance.getMvplan().getResource("mvplan.gui.MainFrame.noSegmentsDoSurfaceInterval.title"),
JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { // Is there anything to process
p.doSurfaceInterval(Integer.parseInt(surfaceIntervalField.getText()));
textArea.append(MvplanInstance.getMvplan().getResource("mvplan.gui.MainFrame.modelUpdated.text")
textArea.setText(MvplanInstance.getMvplan().getResource("mvplan.gui.MainFrame.modelUpdated.text")
+ " " + p.getSurfaceInterval()
+ MvplanInstance.getMvplan().getResource("mvplan.minutes.shortText") + ".\n");
}
......@@ -1327,7 +1337,7 @@ public class MainFrame extends JFrame {
MvplanInstance.getMvplan().getResource("mvplan.gui.MainFrame.updateAvailableDialog.info1.text"),
MvplanInstance.getMvplan().getResource("mvplan.gui.MainFrame.updateAvailableDialog.info2.text") + " ",
MvplanInstance.getMvplan().getResource("mvplan.gui.MainFrame.updateAvailableDialog.info3.text"),
"http://wittig.net.au"); //TODO - put this in Prefs
"http://mvplan.org"); //TODO - put this in Prefs
}
updateAvailable = true;
......@@ -1380,6 +1390,7 @@ public class MainFrame extends JFrame {
s = s + "<p>\u00A9 2005-2010 Guy Wittig &lt;guy@wittig.net.au&gt;&nbsp</p>";
s = s + "<p>\u00A9 2011-2013 Maciej Kaniewski &lt;mk@firegnom.com&gt;&nbsp</p>";
s = s + "<p>\u00A9 2019 Eric Seigne &lt;eric@videosub.fr&gt;&nbsp</p>";
s = s + "<p>Join our community on http://mvplan.org</p>";
// Add localisation credit string
/*
try{
......
......@@ -3,7 +3,7 @@
*
* Displays Preferences Dialog.
*
* @author 2019 - Éric Seigne <eric@videosub.fr>
* @author 2019 - Éric Seigne <eric@mvplan.org>
* @author Guy Wittig
* @version 28-Jul-2006
*
......
......@@ -46,6 +46,12 @@ public class ProfileDisplayComponent extends AbstractDisplayComponent
*/
public ProfileDisplayComponent(List <SegmentAbstract> outputSegments, String heading)
{
/* ************************ */
//erics font size for printing
System.out.println("MVDebug: ProfileDisplayComponent: ");
java.awt.Font infoFont = new java.awt.Font("Tahoma", 0, 12);
setFont(infoFont);
this.segments=outputSegments;
this.heading=heading;
......@@ -56,7 +62,7 @@ public class ProfileDisplayComponent extends AbstractDisplayComponent
// These are estimates at construction
// TODO - calculate actuals from font metrics
setSize(300,15*(numSegments+2)+2*(int)PADY );
setSize(800,30*(numSegments+2)+2*(int)PADY );
}
......
......@@ -5,6 +5,7 @@
*
* @author Guy Wittig
* @version 04-Mar-2005
* @author 2019 - Éric Seigne <eric@mvplan.org>
*
* This program is part of MV-Plan
* Copywrite 2006 Guy Wittig
......@@ -38,14 +39,17 @@ import java.text.MessageFormat;
import java.awt.print.*;
import mvplan.main.Mvplan;
/* Required by child class */
import mvplan.segments.SegmentAbstract;
import mvplan.dive.TableGeneratorModel;
import mvplan.main.MvplanInstance;
public class TableDisplayComponent extends AbstractDisplayComponent
{
final static float GASCOLUMNS=5; // Override abstrract
private final int debug = MvplanInstance.getMvplan().getDebug();
private SegmentAbstract [][] segments;
private int longestProfile;
private int numProfiles;
......@@ -59,6 +63,14 @@ public class TableDisplayComponent extends AbstractDisplayComponent
{
this.segments=model.getSegmentArray();
this.heading=heading;
/* ************************ */
//erics font size for printing
if(debug > 0) System.out.println("MVDebug: TableDisplayComponent: "+heading);
java.awt.Font infoFont = new java.awt.Font("Tahoma", 0, 12);
setFont(infoFont);
/* ************************ */
numSegments=model.getNumSegments();
longestProfile=model.getLongestprofile();
numProfiles=model.getNumProfiles();
......@@ -70,7 +82,8 @@ public class TableDisplayComponent extends AbstractDisplayComponent
// These are estimates at construction
// TODO - calculate actuals from font metrics
setSize(500,20*(numSegments+2)+2*(int)PADY );
//setSize(500,20*(numSegments+2)+2*(int)PADY );
setSize(1000,200*(numSegments+2)+2*(int)PADY );
}
......@@ -101,6 +114,11 @@ public class TableDisplayComponent extends AbstractDisplayComponent
int i,j,cp;
int cn; // Used to manage number of columns to draw
/* ************************ */
//erics font size for printing
if(debug > 0) System.out.println("MVDebug: drawProfile: ");
/* ************************ */
SegmentAbstract s;
String symbol; // Segment type unicode symbol
......@@ -142,12 +160,16 @@ public class TableDisplayComponent extends AbstractDisplayComponent
bodyTextMetrics=bodyFont.getLineMetrics(heading,frc);
headTextMetrics=headFont.getLineMetrics(heading,frc);
if(debug > 0) System.out.println("MVDebug: drawProfile: bodyTextMetrics :" + bodyTextMetrics + " et headTextMetrics :" + headTextMetrics);
// Establish representative character width for column spacing
charWidth=(float)bodyFont.getStringBounds("X",frc).getWidth()*1.1f;
charWidth=(float)bodyFont.getStringBounds("X",frc).getWidth()*1.4f;
if(debug > 0) System.out.println("MVDebug: drawProfile: charWidth :" + charWidth);
// Determine table's line height from full character height plus cell padding
lineHeight=bodyTextMetrics.getHeight()+ (CELLPADX+CELLPADY);
if(debug > 0) System.out.println("MVDebug: drawProfile: lineHeight :" + lineHeight);
// Determine how high to set text origin over table boundary - because of descender
textOffsetY = lineHeight-CELLPADY-bodyTextMetrics.getDescent();
......
......@@ -3,6 +3,9 @@
<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties>
<Property name="name" type="java.lang.String" value="" noResource="true"/>
<Property name="size" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[0, 0]"/>
</Property>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="2"/>
......@@ -13,10 +16,11 @@
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-117,0,0,3,10"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-120,0,0,3,32"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
......@@ -30,19 +34,12 @@
<EtchetBorder/>
</Border>
<Connection PropertyName="titleX" code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.segmentLabel.text&quot;)" type="code"/>
<Property name="font" value="java.awt.Font[family=Tahoma,name=Tahoma,style=plain,size=10]"/>
</TitledBorder>
</Border>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.segmentTip.text&quot;)" type="code"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[230, 45]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[320, 70]"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
......@@ -58,10 +55,10 @@
<Connection code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.segmentTip.text&quot;)" type="code"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[300, 18]"/>
<Dimension value="null"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[210, 25]"/>
<Dimension value="null"/>
</Property>
</Properties>
<Constraints>
......@@ -81,16 +78,13 @@
<EtchetBorder/>
</Border>
<Connection PropertyName="titleX" code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.modifierLabel.text&quot;)" type="code"/>
<Property name="font" value="java.awt.Font[family=Tahoma,name=Tahoma,style=plain,size=10]"/>
</TitledBorder>
</Border>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.modifierTip.text&quot;)" type="code"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[270, 70]"/>
</Property>
<Property name="name" type="java.lang.String" value="" noResource="true"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
......@@ -116,14 +110,20 @@
<SubComponents>
<Component class="javax.swing.JTextField" name="modifierField0">
<Properties>
<Property name="columns" type="int" value="3"/>
<Property name="editable" type="boolean" value="false"/>
<Property name="columns" type="int" value="3"/>
<Property name="text" type="java.lang.String" value="0"/>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.modifierTip.text&quot;)" type="code"/>
</Property>
<Property name="enabled" type="boolean" value="false"/>
<Property name="focusable" type="boolean" value="false"/>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="modifierField1">
......@@ -133,6 +133,13 @@
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.modifierTip.text&quot;)" type="code"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
<Property name="requestFocusEnabled" type="boolean" value="false"/>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_CreateCodePost" type="java.lang.String" value="modifierField1.addFocusListener(this);"/>
......@@ -145,6 +152,12 @@
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.modifierTip.text&quot;)" type="code"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_CreateCodePost" type="java.lang.String" value="modifierField2.addFocusListener(this);"/>
......@@ -157,6 +170,12 @@
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.modifierTip.text&quot;)" type="code"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_CreateCodePost" type="java.lang.String" value="modifierField3.addFocusListener(this);"/>
......@@ -169,6 +188,12 @@
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.modifierTip.text&quot;)" type="code"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_CreateCodePost" type="java.lang.String" value="modifierField4.addFocusListener(this);"/>
......@@ -192,6 +217,15 @@
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.okButton.text&quot;)" type="code"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="okButtonActionPerformed"/>
......@@ -202,6 +236,15 @@
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="MvplanInstance.getMvplan().getResource(&quot;mvplan.gui.TableGeneratorDialog.cancelButton.text&quot;)" type="code"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="null"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelButtonActionPerformed"/>
......
......@@ -7,6 +7,7 @@
* Created on 23 November 2005, 21:15
* @author Guy Wittig
* @version 04-Mar-2005
* @author 2019 - Éric Seigne <eric@mvplan.org>
*
* This program is part of MV-Plan
* Copywrite 2006 Guy Wittig
......@@ -131,17 +132,16 @@ public class TableGeneratorDialog extends JDialog implements FocusListener {
cancelButton = new javax.swing.JButton();
setName(""); // NOI18N
setSize(new java.awt.Dimension(0, 0));
getContentPane().setLayout(new java.awt.GridBagLayout());
infoPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.segmentLabel.text"), 0, 0, null));
infoPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.segmentLabel.text")));
infoPanel.setToolTipText(MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.segmentTip.text"));
infoPanel.setMinimumSize(new java.awt.Dimension(230, 45));
infoPanel.setPreferredSize(new java.awt.Dimension(320, 70));
infoPanel.setLayout(new java.awt.GridBagLayout());
segmentSpinner.setToolTipText(MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.segmentTip.text"));
segmentSpinner.setMinimumSize(new java.awt.Dimension(300, 18));
segmentSpinner.setPreferredSize(new java.awt.Dimension(210, 25));
segmentSpinner.setMinimumSize(null);
segmentSpinner.setPreferredSize(null);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
......@@ -159,39 +159,50 @@ public class TableGeneratorDialog extends JDialog implements FocusListener {
gridBagConstraints.insets = new java.awt.Insets(10, 2, 10, 2);
getContentPane().add(infoPanel, gridBagConstraints);
inputPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.modifierLabel.text"), 0, 0, null));
inputPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.modifierLabel.text")));
inputPanel.setToolTipText(MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.modifierTip.text"));
inputPanel.setPreferredSize(new java.awt.Dimension(270, 70));
inputPanel.setName(""); // NOI18N
inputPanel.setLayout(new java.awt.GridBagLayout());
jPanel1.setPreferredSize(new java.awt.Dimension(250, 29));
modifierField0.setColumns(3);
modifierField0.setEditable(false);
modifierField0.setColumns(3);
modifierField0.setText("0");
modifierField0.setToolTipText(MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.modifierTip.text"));
modifierField0.setEnabled(false);
modifierField0.setFocusable(false);
modifierField0.setMinimumSize(null);
modifierField0.setPreferredSize(null);
jPanel1.add(modifierField0);
modifierField1.setColumns(3);
modifierField1.setText("0");
modifierField1.setToolTipText(MvplanInstance.getMvplan().getResource("mvplan.gui.TableGeneratorDialog.modifierTip.text"));
modifierField1.setMinimumSize(null);
modifierField1.setPreferredSize(null);