Author: lemovice
Date: Thu Dec 12 22:15:25 2013
New Revision: 4745

Log:
Manage husband and wife buttons display (Add and link button are no more 
visible when husba,d or wife are already set)

Modified:
   
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyEditorPanel.form
   
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyEditorPanel.java

Modified: 
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyEditorPanel.form
==============================================================================
--- 
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyEditorPanel.form
       (original)
+++ 
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyEditorPanel.form
       Thu Dec 12 22:15:25 2013
@@ -42,7 +42,7 @@
                   <Component id="fatherPanel" max="32767" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="jTabbedPane1" pref="350" max="32767" 
attributes="0"/>
+              <Component id="jTabbedPane1" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
@@ -171,46 +171,46 @@
                 <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" 
handler="addHusbandButtonActionPerformed"/>
               </Events>
             </Component>
-            <Component class="javax.swing.JButton" name="editHubandButton">
+            <Component class="javax.swing.JButton" name="linktoHusbandButton">
               <Properties>
                 <Property name="icon" type="javax.swing.Icon" 
editor="org.netbeans.modules.form.editors2.IconEditor">
-                  <Image iconType="3" 
name="/ancestris/modules/editors/genealogyeditor/resources/edit.png"/>
+                  <Image iconType="3" 
name="/ancestris/modules/editors/genealogyeditor/resources/link_add.png"/>
+                </Property>
+                <Property name="text" type="java.lang.String" 
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString 
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties" 
key="FamilyEditorPanel.linktoHusbandButton.text" 
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;),
 {arguments})"/>
                 </Property>
                 <Property name="focusable" type="boolean" value="false"/>
                 <Property name="horizontalTextPosition" type="int" value="0"/>
                 <Property name="verticalTextPosition" type="int" value="3"/>
               </Properties>
               <Events>
-                <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" 
handler="editHubandButtonActionPerformed"/>
+                <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" 
handler="linktoHusbandButtonActionPerformed"/>
               </Events>
             </Component>
-            <Component class="javax.swing.JButton" name="deleteHusbandButton">
+            <Component class="javax.swing.JButton" name="editHubandButton">
               <Properties>
                 <Property name="icon" type="javax.swing.Icon" 
editor="org.netbeans.modules.form.editors2.IconEditor">
-                  <Image iconType="3" 
name="/ancestris/modules/editors/genealogyeditor/resources/edit_delete.png"/>
+                  <Image iconType="3" 
name="/ancestris/modules/editors/genealogyeditor/resources/edit.png"/>
                 </Property>
                 <Property name="focusable" type="boolean" value="false"/>
                 <Property name="horizontalTextPosition" type="int" value="0"/>
                 <Property name="verticalTextPosition" type="int" value="3"/>
               </Properties>
               <Events>
-                <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" 
handler="deleteHusbandButtonActionPerformed"/>
+                <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" 
handler="editHubandButtonActionPerformed"/>
               </Events>
             </Component>
-            <Component class="javax.swing.JButton" name="linktoHusbandButton">
+            <Component class="javax.swing.JButton" name="deleteHusbandButton">
               <Properties>
                 <Property name="icon" type="javax.swing.Icon" 
editor="org.netbeans.modules.form.editors2.IconEditor">
-                  <Image iconType="3" 
name="/ancestris/modules/editors/genealogyeditor/resources/link_add.png"/>
-                </Property>
-                <Property name="text" type="java.lang.String" 
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString 
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties" 
key="FamilyEditorPanel.linktoHusbandButton.text" 
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;),
 {arguments})"/>
+                  <Image iconType="3" 
name="/ancestris/modules/editors/genealogyeditor/resources/edit_delete.png"/>
                 </Property>
                 <Property name="focusable" type="boolean" value="false"/>
                 <Property name="horizontalTextPosition" type="int" value="0"/>
                 <Property name="verticalTextPosition" type="int" value="3"/>
               </Properties>
               <Events>
-                <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" 
handler="linktoHusbandButtonActionPerformed"/>
+                <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" 
handler="deleteHusbandButtonActionPerformed"/>
               </Events>
             </Component>
           </SubComponents>
@@ -347,46 +347,46 @@
                 <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" handler="addWifeButtonActionPerformed"/>
               </Events>
             </Component>
-            <Component class="javax.swing.JButton" name="editWifeButton">
+            <Component class="javax.swing.JButton" name="linkToWifeButton">
               <Properties>
                 <Property name="icon" type="javax.swing.Icon" 
editor="org.netbeans.modules.form.editors2.IconEditor">
-                  <Image iconType="3" 
name="/ancestris/modules/editors/genealogyeditor/resources/edit.png"/>
+                  <Image iconType="3" 
name="/ancestris/modules/editors/genealogyeditor/resources/link_add.png"/>
+                </Property>
+                <Property name="text" type="java.lang.String" 
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString 
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties" 
key="FamilyEditorPanel.linkToWifeButton.text" 
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;),
 {arguments})"/>
                 </Property>
                 <Property name="focusable" type="boolean" value="false"/>
                 <Property name="horizontalTextPosition" type="int" value="0"/>
                 <Property name="verticalTextPosition" type="int" value="3"/>
               </Properties>
               <Events>
-                <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" 
handler="editWifeButtonActionPerformed"/>
+                <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" 
handler="linkToWifeButtonActionPerformed"/>
               </Events>
             </Component>
-            <Component class="javax.swing.JButton" name="deleteWifeButton">
+            <Component class="javax.swing.JButton" name="editWifeButton">
               <Properties>
                 <Property name="icon" type="javax.swing.Icon" 
editor="org.netbeans.modules.form.editors2.IconEditor">
-                  <Image iconType="3" 
name="/ancestris/modules/editors/genealogyeditor/resources/edit_delete.png"/>
+                  <Image iconType="3" 
name="/ancestris/modules/editors/genealogyeditor/resources/edit.png"/>
                 </Property>
                 <Property name="focusable" type="boolean" value="false"/>
                 <Property name="horizontalTextPosition" type="int" value="0"/>
                 <Property name="verticalTextPosition" type="int" value="3"/>
               </Properties>
               <Events>
-                <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" 
handler="deleteWifeButtonActionPerformed"/>
+                <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" 
handler="editWifeButtonActionPerformed"/>
               </Events>
             </Component>
-            <Component class="javax.swing.JButton" name="linkToWifeButton">
+            <Component class="javax.swing.JButton" name="deleteWifeButton">
               <Properties>
                 <Property name="icon" type="javax.swing.Icon" 
editor="org.netbeans.modules.form.editors2.IconEditor">
-                  <Image iconType="3" 
name="/ancestris/modules/editors/genealogyeditor/resources/link_add.png"/>
-                </Property>
-                <Property name="text" type="java.lang.String" 
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString 
bundle="ancestris/modules/editors/genealogyeditor/panels/Bundle.properties" 
key="FamilyEditorPanel.linkToWifeButton.text" 
replaceFormat="java.text.MessageFormat.format(java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;),
 {arguments})"/>
+                  <Image iconType="3" 
name="/ancestris/modules/editors/genealogyeditor/resources/edit_delete.png"/>
                 </Property>
                 <Property name="focusable" type="boolean" value="false"/>
                 <Property name="horizontalTextPosition" type="int" value="0"/>
                 <Property name="verticalTextPosition" type="int" value="3"/>
               </Properties>
               <Events>
-                <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" 
handler="linkToWifeButtonActionPerformed"/>
+                <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" 
handler="deleteWifeButtonActionPerformed"/>
               </Events>
             </Component>
           </SubComponents>
@@ -468,7 +468,7 @@
             </DimensionLayout>
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="childrensListPanel" alignment="1" pref="319" 
max="32767" attributes="0"/>
+                  <Component id="childrensListPanel" alignment="1" pref="317" 
max="32767" attributes="0"/>
               </Group>
             </DimensionLayout>
           </Layout>
@@ -499,7 +499,7 @@
             </DimensionLayout>
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="eventsListPanel" alignment="0" pref="319" 
max="32767" attributes="0"/>
+                  <Component id="eventsListPanel" alignment="0" pref="317" 
max="32767" attributes="0"/>
               </Group>
             </DimensionLayout>
           </Layout>
@@ -533,7 +533,7 @@
             </DimensionLayout>
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="sourcesListPanel" alignment="0" pref="319" 
max="32767" attributes="0"/>
+                  <Component id="sourcesListPanel" alignment="0" pref="317" 
max="32767" attributes="0"/>
               </Group>
             </DimensionLayout>
           </Layout>
@@ -569,7 +569,7 @@
             </DimensionLayout>
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="notesListPanel" alignment="0" pref="319" 
max="32767" attributes="0"/>
+                  <Component id="notesListPanel" alignment="0" pref="317" 
max="32767" attributes="0"/>
               </Group>
             </DimensionLayout>
           </Layout>
@@ -605,7 +605,7 @@
             </DimensionLayout>
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="multimediaObjectsListPanel" alignment="0" 
pref="319" max="32767" attributes="0"/>
+                  <Component id="multimediaObjectsListPanel" alignment="0" 
pref="317" max="32767" attributes="0"/>
               </Group>
             </DimensionLayout>
           </Layout>

Modified: 
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyEditorPanel.java
==============================================================================
--- 
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyEditorPanel.java
       (original)
+++ 
trunk/AncestrisExtensions/editors.genealogyeditor/src/ancestris/modules/editors/genealogyeditor/panels/FamilyEditorPanel.java
       Thu Dec 12 22:15:25 2013
@@ -42,9 +42,9 @@
         fatherPanel = new javax.swing.JPanel();
         fatherToolBar = new javax.swing.JToolBar();
         addHusbandButton = new javax.swing.JButton();
+        linktoHusbandButton = new javax.swing.JButton();
         editHubandButton = new javax.swing.JButton();
         deleteHusbandButton = new javax.swing.JButton();
-        linktoHusbandButton = new javax.swing.JButton();
         HusbandNameLabel = new javax.swing.JLabel();
         husbandNameTextField = new javax.swing.JTextField();
         husbandBirthDateLabel = new javax.swing.JLabel();
@@ -54,9 +54,9 @@
         motherPanel = new javax.swing.JPanel();
         motherToolBar = new javax.swing.JToolBar();
         addWifeButton = new javax.swing.JButton();
+        linkToWifeButton = new javax.swing.JButton();
         editWifeButton = new javax.swing.JButton();
         deleteWifeButton = new javax.swing.JButton();
-        linkToWifeButton = new javax.swing.JButton();
         wifeLabel = new javax.swing.JLabel();
         wifeNameTextField = new javax.swing.JTextField();
         wifeBirthDateLabel = new javax.swing.JLabel();
@@ -117,6 +117,18 @@
         });
         fatherToolBar.add(addHusbandButton);
 
+        linktoHusbandButton.setIcon(new 
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/link_add.png")));
 // NOI18N
+        
linktoHusbandButton.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("FamilyEditorPanel.linktoHusbandButton.text"),
 new Object[] {})); // NOI18N
+        linktoHusbandButton.setFocusable(false);
+        
linktoHusbandButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        
linktoHusbandButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        linktoHusbandButton.addActionListener(new 
java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                linktoHusbandButtonActionPerformed(evt);
+            }
+        });
+        fatherToolBar.add(linktoHusbandButton);
+
         editHubandButton.setIcon(new 
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/edit.png")));
 // NOI18N
         editHubandButton.setFocusable(false);
         
editHubandButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
@@ -139,18 +151,6 @@
         });
         fatherToolBar.add(deleteHusbandButton);
 
-        linktoHusbandButton.setIcon(new 
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/link_add.png")));
 // NOI18N
-        
linktoHusbandButton.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("FamilyEditorPanel.linktoHusbandButton.text"),
 new Object[] {})); // NOI18N
-        linktoHusbandButton.setFocusable(false);
-        
linktoHusbandButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        
linktoHusbandButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-        linktoHusbandButton.addActionListener(new 
java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                linktoHusbandButtonActionPerformed(evt);
-            }
-        });
-        fatherToolBar.add(linktoHusbandButton);
-
         
HusbandNameLabel.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("FamilyEditorPanel.HusbandNameLabel.text"),
 new Object[] {})); // NOI18N
 
         
husbandNameTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("FamilyEditorPanel.husbandNameTextField.text"),
 new Object[] {})); // NOI18N
@@ -215,6 +215,18 @@
         });
         motherToolBar.add(addWifeButton);
 
+        linkToWifeButton.setIcon(new 
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/link_add.png")));
 // NOI18N
+        
linkToWifeButton.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("FamilyEditorPanel.linkToWifeButton.text"),
 new Object[] {})); // NOI18N
+        linkToWifeButton.setFocusable(false);
+        
linkToWifeButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        
linkToWifeButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        linkToWifeButton.addActionListener(new java.awt.event.ActionListener() 
{
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                linkToWifeButtonActionPerformed(evt);
+            }
+        });
+        motherToolBar.add(linkToWifeButton);
+
         editWifeButton.setIcon(new 
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/edit.png")));
 // NOI18N
         editWifeButton.setFocusable(false);
         
editWifeButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
@@ -237,18 +249,6 @@
         });
         motherToolBar.add(deleteWifeButton);
 
-        linkToWifeButton.setIcon(new 
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/link_add.png")));
 // NOI18N
-        
linkToWifeButton.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("FamilyEditorPanel.linkToWifeButton.text"),
 new Object[] {})); // NOI18N
-        linkToWifeButton.setFocusable(false);
-        
linkToWifeButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        
linkToWifeButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-        linkToWifeButton.addActionListener(new java.awt.event.ActionListener() 
{
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                linkToWifeButtonActionPerformed(evt);
-            }
-        });
-        motherToolBar.add(linkToWifeButton);
-
         
wifeLabel.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("FamilyEditorPanel.wifeLabel.text"),
 new Object[] {})); // NOI18N
 
         
wifeNameTextField.setText(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("FamilyEditorPanel.wifeNameTextField.text"),
 new Object[] {})); // NOI18N
@@ -314,7 +314,7 @@
         );
         childrensPanelLayout.setVerticalGroup(
             
childrensPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(childrensListPanel, 
javax.swing.GroupLayout.Alignment.TRAILING, 
javax.swing.GroupLayout.DEFAULT_SIZE, 321, Short.MAX_VALUE)
+            .addComponent(childrensListPanel, 
javax.swing.GroupLayout.Alignment.TRAILING, 
javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE)
         );
 
         
jTabbedPane1.addTab(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("FamilyEditorPanel.childrensPanel.TabConstraints.tabTitle"),
 new Object[] {}), new 
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/child.png")),
 childrensPanel); // NOI18N
@@ -329,7 +329,7 @@
         );
         eventsPanelLayout.setVerticalGroup(
             
eventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(eventsListPanel, 
javax.swing.GroupLayout.DEFAULT_SIZE, 321, Short.MAX_VALUE)
+            .addComponent(eventsListPanel, 
javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE)
         );
 
         
jTabbedPane1.addTab(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("FamilyEditorPanel.eventsPanel.TabConstraints.tabTitle"),
 new Object[] {}), new 
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/event.png")),
 eventsPanel); // NOI18N
@@ -344,7 +344,7 @@
         );
         sourcesPanelLayout.setVerticalGroup(
             
sourcesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(sourcesListPanel, 
javax.swing.GroupLayout.DEFAULT_SIZE, 321, Short.MAX_VALUE)
+            .addComponent(sourcesListPanel, 
javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE)
         );
 
         jTabbedPane1.addTab("Sources", new 
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/Source.png")),
 sourcesPanel); // NOI18N
@@ -359,7 +359,7 @@
         );
         notesPanelLayout.setVerticalGroup(
             
notesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(notesListPanel, 
javax.swing.GroupLayout.DEFAULT_SIZE, 321, Short.MAX_VALUE)
+            .addComponent(notesListPanel, 
javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE)
         );
 
         
jTabbedPane1.addTab(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("FamilyEditorPanel.notesPanel.TabConstraints.tabTitle"),
 new Object[] {}), new 
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/Note.png")),
 notesPanel); // NOI18N
@@ -375,7 +375,7 @@
         );
         galleryPanelLayout.setVerticalGroup(
             
galleryPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(multimediaObjectsListPanel, 
javax.swing.GroupLayout.DEFAULT_SIZE, 321, Short.MAX_VALUE)
+            .addComponent(multimediaObjectsListPanel, 
javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE)
         );
 
         
jTabbedPane1.addTab(java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("ancestris/modules/editors/genealogyeditor/panels/Bundle").getString("FamilyEditorPanel.galleryPanel.TabConstraints.tabTitle"),
 new Object[] {}), new 
javax.swing.ImageIcon(getClass().getResource("/ancestris/modules/editors/genealogyeditor/resources/Media.png")),
 galleryPanel); // NOI18N
@@ -432,7 +432,8 @@
 
             if (individualEditorDialog.show() == DialogDescriptor.OK_OPTION) {
                 mHusband = individualEditorPanel.commit();
-
+                addHusbandButton.setVisible(false);
+                linktoHusbandButton.setVisible(false);
             } else {
                 mFamily.getGedcom().undoUnitOfWork(false);
             }
@@ -471,6 +472,7 @@
         
individualEditorDialog.setDialogId(IndividualEditorPanel.class.getName());
 
         if (individualEditorDialog.show() == DialogDescriptor.OK_OPTION) {
+            individualEditorPanel.commit();
         }
     }//GEN-LAST:event_editWifeButtonActionPerformed
 
@@ -521,6 +523,7 @@
         if (individualsListDialog.show() == DialogDescriptor.OK_OPTION) {
             mHusband = individualsListPanel.getSelectedIndividual();
             addHusbandButton.setVisible(false);
+            linktoHusbandButton.setVisible(false);
             husbandNameTextField.setText(mHusband.getName());
             husbandBirthDateTextField.setText(mHusband.getBirthAsString());
             husbandDeathDateTextField.setText(mHusband.getDeathAsString());
@@ -547,6 +550,7 @@
         if (individualsListDialog.show() == DialogDescriptor.OK_OPTION) {
             mWife = individualsListPanel.getSelectedIndividual();
             addWifeButton.setVisible(false);
+            linkToWifeButton.setVisible(false);
             wifeNameTextField.setText(mWife.getName());
             wifeBirthDateTextField.setText(mWife.getBirthAsString());
             wifeDeathDateTextField.setText(mWife.getDeathAsString());
@@ -606,6 +610,7 @@
         mHusband = mFamily.getHusband();
         if (mHusband != null) {
             addHusbandButton.setVisible(false);
+            linktoHusbandButton.setVisible(false);
             husbandNameTextField.setText(mHusband.getName());
             husbandBirthDateTextField.setText(mHusband.getBirthAsString());
             husbandDeathDateTextField.setText(mHusband.getDeathAsString());
@@ -618,6 +623,7 @@
         mWife = mFamily.getWife();
         if (mWife != null) {
             addWifeButton.setVisible(false);
+            linkToWifeButton.setVisible(false);
             wifeNameTextField.setText(mWife.getName());
             wifeBirthDateTextField.setText(mWife.getBirthAsString());
             wifeDeathDateTextField.setText(mWife.getDeathAsString());

---------------------------------------------------------------------
Site Web Ancestris : http://www.ancestris.org

<*> Pour vous desinscrire de cette liste, envoyez un mail a :
              [email protected]
<*> Pour obtenir de l'aide sur les commandes de la liste :
              [email protected]

Pour obtenir tous les messages lies a ce fil de discussion, cliquez sur le 
lien ci-dessous, cela ouvrira votre logiciel de messagerie. Il vous suffira 
d'envoyer le message :
              [email protected]

Reply via email to