Author: dandre
Date: Mon Sep 16 22:52:16 2013
New Revision: 4579
Log:
remove used 'apply changes w/o asking' in Display option panel. This option is
now in Data option panel
Modified:
trunk/AncestrisCore/ancestris.app/src/ancestris/app/OptionDisplayPanel.form
trunk/AncestrisCore/ancestris.app/src/ancestris/app/OptionDisplayPanel.java
Modified:
trunk/AncestrisCore/ancestris.app/src/ancestris/app/OptionDisplayPanel.form
==============================================================================
--- trunk/AncestrisCore/ancestris.app/src/ancestris/app/OptionDisplayPanel.form
(original)
+++ trunk/AncestrisCore/ancestris.app/src/ancestris/app/OptionDisplayPanel.form
Mon Sep 16 22:52:16 2013
@@ -39,23 +39,26 @@
<EmptySpace min="-2" pref="32" max="-2" attributes="0"/>
<Component id="jPanel1" min="-2" pref="182" max="-2"
attributes="0"/>
</Group>
- <Component id="jLabel3" alignment="0" min="-2" max="-2"
attributes="0"/>
- <Group type="102" alignment="1" attributes="0">
- <EmptySpace min="-2" pref="130" max="-2" attributes="0"/>
- <Component id="jCheckBox1" pref="456" max="32767"
attributes="0"/>
- </Group>
<Group type="102" alignment="0" attributes="0">
- <Component id="jLabel4" min="-2" max="-2"
attributes="0"/>
- <EmptySpace min="-2" pref="79" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="jCheckBox2" alignment="0" min="-2"
max="-2" attributes="0"/>
- <Component id="cbSplitJuridictions" alignment="0"
min="-2" max="-2" attributes="0"/>
- <Group type="102" alignment="0" attributes="0">
- <Component id="jSpinner1" min="-2" pref="50"
max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="jLabel6" min="-2" max="-2"
attributes="0"/>
+ <Component id="jLabel3" alignment="0" min="-2"
max="-2" attributes="0"/>
+ <Component id="jLabel4" alignment="0" min="-2"
max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace min="-2" pref="72" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" attributes="0">
+ <Group type="103" groupAlignment="0"
attributes="0">
+ <Component id="jCheckBox2" alignment="0"
min="-2" max="-2" attributes="0"/>
+ <Component id="cbSplitJuridictions"
alignment="0" min="-2" max="-2" attributes="0"/>
+ <Group type="102" alignment="0"
attributes="0">
+ <Component id="jSpinner1" min="-2"
pref="50" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="jLabel6" min="-2"
max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
- <Component id="jCheckBox3" alignment="0" min="-2"
max="-2" attributes="0"/>
+ <Component id="jCheckBox1" pref="549" max="32767"
attributes="0"/>
</Group>
</Group>
</Group>
@@ -92,20 +95,20 @@
<Component id="jPanel1" min="-2" pref="219" max="-2"
attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="jCheckBox3" alignment="3" min="-2" max="-2"
attributes="0"/>
- <Component id="jLabel4" alignment="3" min="-2" max="-2"
attributes="0"/>
- </Group>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="jSpinner1" alignment="3" min="-2" max="-2"
attributes="0"/>
- <Component id="jLabel6" alignment="3" min="-2" max="-2"
attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
+ <Group type="102" attributes="0">
+ <Group type="103" groupAlignment="3" attributes="0">
+ <Component id="jSpinner1" alignment="3" min="-2"
max="-2" attributes="0"/>
+ <Component id="jLabel6" alignment="3" min="-2"
max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
+ <Component id="cbSplitJuridictions" min="-2" max="-2"
attributes="0"/>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
+ <Component id="jCheckBox2" min="-2" max="-2"
attributes="0"/>
+ </Group>
</Group>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Component id="cbSplitJuridictions" min="-2" max="-2"
attributes="0"/>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Component id="jCheckBox2" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="32767" attributes="0"/>
+ <EmptySpace pref="137" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -131,16 +134,6 @@
</Property>
</Properties>
</Component>
- <Component class="javax.swing.JCheckBox" name="jCheckBox3">
- <Properties>
- <Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="ancestris/app/Bundle.properties"
key="OptionDisplayPanel.jCheckBox3.text"
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class,
"{key}")"/>
- </Property>
- <Property name="toolTipText" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="ancestris/app/Bundle.properties"
key="OptionDisplayPanel.jCheckBox3.toolTipText"
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class,
"{key}")"/>
- </Property>
- </Properties>
- </Component>
<Component class="javax.swing.JSpinner" name="jSpinner1">
<Properties>
<Property name="toolTipText" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
Modified:
trunk/AncestrisCore/ancestris.app/src/ancestris/app/OptionDisplayPanel.java
==============================================================================
--- trunk/AncestrisCore/ancestris.app/src/ancestris/app/OptionDisplayPanel.java
(original)
+++ trunk/AncestrisCore/ancestris.app/src/ancestris/app/OptionDisplayPanel.java
Mon Sep 16 22:52:16 2013
@@ -62,7 +62,6 @@
cbSplitJuridictions = new javax.swing.JCheckBox();
jCheckBox2 = new javax.swing.JCheckBox();
- jCheckBox3 = new javax.swing.JCheckBox();
jSpinner1 = new javax.swing.JSpinner(new SpinnerNumberModel(10, 10,
300, 5));
jLabel6 = new javax.swing.JLabel();
jLabel2 = new javax.swing.JLabel();
@@ -85,9 +84,6 @@
org.openide.awt.Mnemonics.setLocalizedText(jCheckBox2,
org.openide.util.NbBundle.getMessage(OptionDisplayPanel.class,
"OptionDisplayPanel.jCheckBox2.text")); // NOI18N
jCheckBox2.setToolTipText(org.openide.util.NbBundle.getMessage(OptionDisplayPanel.class,
"OptionDisplayPanel.jCheckBox2.toolTipText")); // NOI18N
- org.openide.awt.Mnemonics.setLocalizedText(jCheckBox3,
org.openide.util.NbBundle.getMessage(OptionDisplayPanel.class,
"OptionDisplayPanel.jCheckBox3.text")); // NOI18N
-
jCheckBox3.setToolTipText(org.openide.util.NbBundle.getMessage(OptionDisplayPanel.class,
"OptionDisplayPanel.jCheckBox3.toolTipText")); // NOI18N
-
jSpinner1.setToolTipText(org.openide.util.NbBundle.getMessage(OptionDisplayPanel.class,
"OptionDisplayPanel.jSpinner1.toolTipText")); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(jLabel6,
org.openide.util.NbBundle.getMessage(OptionDisplayPanel.class,
"OptionDisplayPanel.jLabel6.text")); // NOI18N
@@ -162,21 +158,22 @@
.addComponent(jcbOutputLanguage, 0, 209,
Short.MAX_VALUE))
.addGap(32, 32, 32)
.addComponent(jPanel1,
javax.swing.GroupLayout.PREFERRED_SIZE, 182,
javax.swing.GroupLayout.PREFERRED_SIZE))
- .addComponent(jLabel3)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING,
layout.createSequentialGroup()
- .addGap(130, 130, 130)
- .addComponent(jCheckBox1,
javax.swing.GroupLayout.DEFAULT_SIZE, 456, Short.MAX_VALUE))
.addGroup(layout.createSequentialGroup()
- .addComponent(jLabel4)
- .addGap(79, 79, 79)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jCheckBox2)
- .addComponent(cbSplitJuridictions)
+ .addComponent(jLabel3)
+ .addComponent(jLabel4))
+ .addGap(72, 72, 72)
+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
- .addComponent(jSpinner1,
javax.swing.GroupLayout.PREFERRED_SIZE, 50,
javax.swing.GroupLayout.PREFERRED_SIZE)
-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jLabel6))
- .addComponent(jCheckBox3))))
+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jCheckBox2)
+ .addComponent(cbSplitJuridictions)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(jSpinner1,
javax.swing.GroupLayout.PREFERRED_SIZE, 50,
javax.swing.GroupLayout.PREFERRED_SIZE)
+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel6)))
+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED,
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(jCheckBox1,
javax.swing.GroupLayout.DEFAULT_SIZE, 549, Short.MAX_VALUE))))
.addContainerGap())
);
@@ -205,18 +202,17 @@
.addComponent(jCheckBox1)))
.addComponent(jPanel1,
javax.swing.GroupLayout.PREFERRED_SIZE, 219,
javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, 18)
-
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(jCheckBox3)
- .addComponent(jLabel4))
-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(jSpinner1,
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jLabel6))
-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(cbSplitJuridictions)
-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jCheckBox2)
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE))
+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel4)
+ .addGroup(layout.createSequentialGroup()
+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jSpinner1,
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel6))
+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(cbSplitJuridictions)
+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jCheckBox2)))
+ .addContainerGap(137, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
@@ -235,7 +231,6 @@
jComboBox2.setSelectedItem(LookAndFeelProvider.getProviderFromName(stopts.getJvmParameter("--laf")));
jCheckBox1.setSelected(ancestris.app.AppOptions.isRestoreViews());
-//XXX: to be removed (see optiondatapanel)
setAutoCommit(editPrefs.get("isAutoCommit", ""));
setUndos(gedcomPrefs.get("numberOfUndos", ""));
cbSplitJuridictions.setSelected(CoreOptions.getInstance().isSplitJurisdictions());
//XXX: setOpenEditor(editPrefs.get("isOpenEditor", ""));
@@ -257,7 +252,6 @@
stopts.applyChanges();
ancestris.app.AppOptions.setRestoreViews(jCheckBox1.isSelected());
-//XXX: editPrefs.put("isAutoCommit", getAutoCommit());
gedcomPrefs.put("numberOfUndos", getUndos());
CoreOptions.getInstance().setSplitJurisdictions(cbSplitJuridictions.isSelected());
@@ -282,7 +276,6 @@
private javax.swing.JCheckBox cbSplitJuridictions;
private javax.swing.JCheckBox jCheckBox1;
private javax.swing.JCheckBox jCheckBox2;
- private javax.swing.JCheckBox jCheckBox3;
private javax.swing.JComboBox jComboBox2;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
@@ -373,14 +366,6 @@
return locales[i];
}
- void setAutoCommit(String str) {
- jCheckBox3.setSelected(str.equals("true") ? true : false);
- }
-
- String getAutoCommit() {
- return jCheckBox3.isSelected() ? "true" : "false";
- }
-
void setUndos(String str) {
if (str.equals("-1")) {
str = "10";
---------------------------------------------------------------------
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]
