[jsword-svn] r2016 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/book common-swing/src/main/java/org/crosswire/common/swing
dmsmith at crosswire.org
dmsmith at crosswire.org
Thu Nov 18 21:42:37 MST 2010
Author: dmsmith
Date: 2010-11-18 21:42:37 -0700 (Thu, 18 Nov 2010)
New Revision: 2016
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_de.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_fa.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_in.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_vi.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_zh.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_zh_CN.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_de.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_fa.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_in.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_vi.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_zh.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_zh_CN.properties
trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java
Log:
More migration toward fewer property files. Merged AdvancedSearchPane into Msg.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java 2010-11-19 04:42:37 UTC (rev 2016)
@@ -62,6 +62,7 @@
import org.crosswire.common.icu.NumberShaper;
import org.crosswire.common.swing.ActionFactory;
+import org.crosswire.common.swing.CWLabel;
import org.crosswire.common.swing.CWScrollPane;
import org.crosswire.common.swing.GuiUtil;
import org.crosswire.jsword.index.search.SearchType;
@@ -108,42 +109,50 @@
Color headFG = Color.BLACK;
Font headFont = temp.getFont().deriveFont(Font.BOLD);
- lblHeading = actions.createJLabel(HEAD_BASE);
+ // TRANSLATOR: Heading for the first, most useful several search options.
+ lblHeading = new CWLabel(Msg.gettext("Search for verses with the following details")).createJLabel();
lblHeading.setBorder(BorderFactory.createLineBorder(headBG, 3));
lblHeading.setBackground(headBG);
lblHeading.setForeground(headFG);
lblHeading.setFont(headFont);
lblHeading.setOpaque(true);
- lblPhrase = actions.createJLabel(PHRASE);
+ // TRANSLATOR: Label for an input box for searching of phrases.
+ lblPhrase = new CWLabel(Msg.gettext("Includes this phrase:")).createJLabel();
txtPhrase = new JTextField();
txtPhrase.getDocument().addDocumentListener(this);
txtIncludes = new JTextField();
txtIncludes.getDocument().addDocumentListener(this);
- lblIncludes = actions.createJLabel(INCLUDES);
+ // TRANSLATOR: Label for an input box for searching of all of the given words.
+ lblIncludes = new CWLabel(Msg.gettext("Includes these words:")).createJLabel();
lblIncludes.setLabelFor(txtIncludes);
txtExcludes = new JTextField();
txtExcludes.getDocument().addDocumentListener(this);
- lblExcludes = actions.createJLabel(EXCLUDES);
+ // TRANSLATOR: Label for an input box for searching of verses not containing the given words.
+ lblExcludes = new CWLabel(Msg.gettext("Excludes all these words:")).createJLabel();
lblExcludes.setLabelFor(txtExcludes);
txtSpell = new JTextField();
txtSpell.getDocument().addDocumentListener(this);
- lblSpell = actions.createJLabel(SPELL);
+ // TRANSLATOR: Label for an input box for searching of words whose spelling is unknown or varies.
+ lblSpell = new CWLabel(Msg.gettext("Something like this spelling:")).createJLabel();
lblSpell.setLabelFor(txtSpell);
txtStartsWith = new JTextField();
txtStartsWith.getDocument().addDocumentListener(this);
- lblStartsWith = actions.createJLabel(STARTS_WITH);
+ // TRANSLATOR: Label for an input box for searching of words by their prefix
+ lblStartsWith = new CWLabel(Msg.gettext("Includes words starting with:")).createJLabel();
lblStartsWith.setLabelFor(txtStartsWith);
- chkRank = new JCheckBox(actions.getAction(HEAD_RANK));
+ // TRANSLATOR: Heading for section to perform a search for the best verse match
+ chkRank = new JCheckBox(actions.addAction("HeadRank", Msg.gettext("Prioritize the found verses")));
chkRank.setBackground(headBG);
chkRank.setForeground(headFG);
chkRank.setFont(headFont);
- lblRank = actions.createJLabel(RANK);
+ // TRANSLATOR: Label for a slider how many of the best verses to show.
+ lblRank = new CWLabel(Msg.gettext("Show")).createJLabel();
setLabelRank(DisplaySelectPane.getNumRankedVerses());
lblRank.setVisible(false);
sliderRank = new JSlider(SwingConstants.HORIZONTAL, 0, DisplaySelectPane.getMaxNumRankedVerses(), DisplaySelectPane.getNumRankedVerses());
@@ -165,11 +174,14 @@
}
});
- chkRestrict = new JCheckBox(actions.getAction(HEAD_RESTRICT));
+ // TRANSLATOR: Heading for section allowing user to restrict search to parts of the Bible.
+ chkRestrict = new JCheckBox(actions.addAction("HeadRestrict", Msg.gettext("Restrict search to parts of the Bible")));
chkRestrict.setBackground(headBG);
chkRestrict.setForeground(headFG);
chkRestrict.setFont(headFont);
- lblPresets = actions.createJLabel(PRESETS);
+
+ // TRANSLATOR: Label for a dropdown with preset verse ranges for searching.
+ lblPresets = new CWLabel(Msg.gettext("Preset Ranges:")).createJLabel();
lblPresets.setVisible(false);
cboPresets = new JComboBox(presets);
cboPresets.setVisible(false);
@@ -178,19 +190,88 @@
updatePreset();
}
});
- lblRestrict = actions.createJLabel(RESTRICT);
+
+ // TRANSLATOR: Label for an input box for searching only in the specified verses
+ // This is filled in when the user enters input or picks an entry from the Preset Ranges dropdown.
+ // When the user enters input the dropdown is adjusted to show the last entry.
+ lblRestrict = new CWLabel(Msg.gettext("Include these verses:")).createJLabel();
lblRestrict.setVisible(false);
txtRestrict = new JTextField();
txtRestrict.setVisible(false);
txtRestrict.getDocument().addDocumentListener(this);
- btnRestrict = new JButton(actions.getAction(RESTRICT_SELECT));
+ // TRANSLATOR: Button to bring up the verse selection dialog
+ btnRestrict = new JButton(actions.addAction("RestrictSelect", Msg.gettext("Select")));
btnRestrict.setVisible(false);
- chkSummary = new JCheckBox(actions.getAction(HEAD_SUMMARY));
+ // TRANSLATOR: Heading for section allowing user to specify Hebrew and Greek Strong's Numbers to include or exclude from search
+ // Not currently implemented.
+ chkHebGrk = new JCheckBox(actions.addAction("HeadOriginal", Msg.gettext("Contains Strong's Hebrew and Greek")));
+ chkHebGrk.setBackground(headBG);
+ chkHebGrk.setForeground(headFG);
+ chkHebGrk.setFont(headFont);
+
+ // TRANSLATOR: Label for an input box for searching for verses containing Hebrew Strong's Numbers.
+ // Not currently implemented.
+ lblHebInc = new CWLabel(Msg.gettext("Includes Hebrew Numbers:")).createJLabel();
+ lblHebInc.setVisible(false);
+ txtHebInc = new JTextField();
+ txtHebInc.setVisible(false);
+ txtHebInc.getDocument().addDocumentListener(this);
+
+ // TRANSLATOR: Label for an input box for searching for verses not containing Hebrew Strong's Numbers.
+ // Not currently implemented.
+ lblHebExc = new CWLabel(Msg.gettext("Excludes Hebrew Numbers:")).createJLabel();
+ lblHebExc.setVisible(false);
+ txtHebExc = new JTextField();
+ txtHebExc.setVisible(false);
+ txtHebExc.getDocument().addDocumentListener(this);
+
+ // TRANSLATOR: Label for an input box for searching for verses containing Greek Strong's Numbers.
+ // Not currently implemented.
+ lblGrkInc = new CWLabel(Msg.gettext("Includes Greek Numbers:")).createJLabel();
+ lblGrkInc.setVisible(false);
+ txtGrkInc = new JTextField();
+ txtGrkInc.setVisible(false);
+ txtGrkInc.getDocument().addDocumentListener(this);
+
+ // TRANSLATOR: Label for an input box for searching for verses not containing Greek Strong's Numbers.
+ // Not currently implemented.
+ lblGrkExc = new CWLabel(Msg.gettext("Excludes Greek Numbers:")).createJLabel();
+ lblGrkExc.setVisible(false);
+ txtGrkExc = new JTextField();
+ txtGrkExc.setVisible(false);
+ txtGrkExc.getDocument().addDocumentListener(this);
+
+ // TRANSLATOR: Heading for section allowing user to specify time boundaries on search.
+ // Not currently implemented. Not sure it ever will be.
+ chkTime = new JCheckBox(actions.addAction("HeadTime", Msg.gettext("Narrow search by time period")));
+ chkTime.setBackground(headBG);
+ chkTime.setForeground(headFG);
+ chkTime.setFont(headFont);
+
+ // TRANSLATOR: Label for an input box for a timeline search for verses written after the ones given.
+ // Not currently implemented. Not sure it ever will be.
+ lblAfter = new CWLabel(Msg.gettext("Restrict to verses written after:")).createJLabel();
+ lblAfter.setVisible(false);
+ txtAfter = new JTextField();
+ txtAfter.setVisible(false);
+ txtAfter.getDocument().addDocumentListener(this);
+
+ // TRANSLATOR: Label for an input box for a timeline search for verses written before the ones given.
+ // Not currently implemented. Not sure it ever will be.
+ lblBefore = new CWLabel(Msg.gettext("Restrict to verses written before:")).createJLabel();
+ lblBefore.setVisible(false);
+ txtBefore = new JTextField();
+ txtBefore.setVisible(false);
+ txtBefore.getDocument().addDocumentListener(this);
+
+ // TRANSLATOR: Label for section showing user's search.
+ chkSummary = new JCheckBox(actions.addAction("HeadSummary", Msg.gettext("Show quick search syntax")));
chkSummary.setBackground(headBG);
chkSummary.setForeground(headFG);
chkSummary.setFont(headFont);
- lblSummary = actions.createJLabel(SUMMARY);
+ // TRANSLATOR: Label for a text box that shows, dynamically, the search syntax as the other boxes are filled in.
+ lblSummary = new CWLabel(Msg.gettext("Quick search syntax:")).createJLabel();
lblSummary.setVisible(false);
txtSummary = new JTextArea();
txtSummary.setBackground(SystemColor.control);
@@ -200,48 +281,9 @@
scrSummary = new CWScrollPane(txtSummary);
scrSummary.setVisible(false);
- // chkHebGrk = new JCheckBox(actions.getAction(HEAD_ORIGINAL));
- // chkHebGrk.setBackground(headBG);
- // chkHebGrk.setForeground(headFG);
- // chkHebGrk.setFont(headFont);
- // lblHebInc = actions.createJLabel(HEBREW_INCLUDE);
- // lblHebInc.setVisible(false);
- // txtHebInc = new JTextField();
- // txtHebInc.setVisible(false);
- // txtHebInc.getDocument().addDocumentListener(this);
- // lblHebExc = actions.createJLabel(HEBREW_EXCLUDE);
- // lblHebExc.setVisible(false);
- // txtHebExc = new JTextField();
- // txtHebExc.setVisible(false);
- // txtHebExc.getDocument().addDocumentListener(this);
- // lblGrkInc = actions.createJLabel(GREEK_INCLUDE);
- // lblGrkInc.setVisible(false);
- // txtGrkInc = new JTextField();
- // txtGrkInc.setVisible(false);
- // txtGrkInc.getDocument().addDocumentListener(this);
- // lblGrkExc = actions.createJLabel(GREEK_EXCLUDE);
- // lblGrkExc.setVisible(false);
- // txtGrkExc = new JTextField();
- // txtGrkExc.setVisible(false);
- // txtGrkExc.getDocument().addDocumentListener(this);
- //
- // chkTime = new JCheckBox(actions.getAction(HEAD_TIME));
- // chkTime.setBackground(headBG);
- // chkTime.setForeground(headFG);
- // chkTime.setFont(headFont);
- // lblAfter = actions.createJLabel(AFTER);
- // lblAfter.setVisible(false);
- // txtAfter = new JTextField();
- // txtAfter.setVisible(false);
- // txtAfter.getDocument().addDocumentListener(this);
- // lblBefore = actions.createJLabel(BEFORE);
- // lblBefore.setVisible(false);
- // txtBefore = new JTextField();
- // txtBefore.setVisible(false);
- // txtBefore.getDocument().addDocumentListener(this);
+ // TRANSLATOR: Button to initiate the close the window and initiate search.
+ btnGo = new JButton(actions.addAction("Done", Msg.gettext("Search")));
- btnGo = new JButton(actions.getAction(DONE));
-
this.setBorder(BorderFactory.createLineBorder(SystemColor.control, 5));
this.setLayout(new GridBagLayout());
int gridy = 0;
@@ -400,38 +442,36 @@
* Someone clicked the original strongs toggle button
*/
public void doHeadOriginal() {
- // boolean visible = chkHebGrk.isSelected();
- //
- // lblHebInc.setVisible(visible);
- // txtHebInc.setVisible(visible);
- // lblHebExc.setVisible(visible);
- // txtHebExc.setVisible(visible);
- // lblGrkInc.setVisible(visible);
- // txtGrkInc.setVisible(visible);
- // lblGrkExc.setVisible(visible);
- // txtGrkExc.setVisible(visible);
- //
- // if (dlgMain != null)
- // {
- // dlgMain.pack();
- // }
+ boolean visible = chkHebGrk.isSelected();
+
+ lblHebInc.setVisible(visible);
+ txtHebInc.setVisible(visible);
+ lblHebExc.setVisible(visible);
+ txtHebExc.setVisible(visible);
+ lblGrkInc.setVisible(visible);
+ txtGrkInc.setVisible(visible);
+ lblGrkExc.setVisible(visible);
+ txtGrkExc.setVisible(visible);
+
+ if (dlgMain != null) {
+ dlgMain.pack();
+ }
}
/**
* Someone clicked the original strongs toggle button
*/
public void doHeadTime() {
- // boolean visible = chkTime.isSelected();
- //
- // lblBefore.setVisible(visible);
- // txtBefore.setVisible(visible);
- // lblAfter.setVisible(visible);
- // txtAfter.setVisible(visible);
- //
- // if (dlgMain != null)
- // {
- // dlgMain.pack();
- // }
+ boolean visible = chkTime.isSelected();
+
+ lblBefore.setVisible(visible);
+ txtBefore.setVisible(visible);
+ lblAfter.setVisible(visible);
+ txtAfter.setVisible(visible);
+
+ if (dlgMain != null) {
+ dlgMain.pack();
+ }
}
/**
@@ -632,33 +672,6 @@
is.defaultReadObject();
}
- /*
- * Action constants
- */
- private static final String DONE = "Done";
- private static final String PHRASE = "Phrase";
- private static final String RESTRICT = "Restrict";
- private static final String HEAD_RANK = "HeadRank";
- private static final String RANK = "RankSomeSlider";
- private static final String HEAD_RESTRICT = "HeadRestrict";
- private static final String HEAD_BASE = "HeadBase";
- private static final String INCLUDES = "Includes";
- private static final String EXCLUDES = "Excludes";
- private static final String SPELL = "Spell";
- private static final String STARTS_WITH = "StartsWith";
- private static final String PRESETS = "Presets";
- private static final String RESTRICT_SELECT = "RestrictSelect";
- private static final String HEAD_SUMMARY = "HeadSummary";
- private static final String SUMMARY = "Summary";
- // private static final String HEAD_ORIGINAL = "HeadOriginal";
- // private static final String HEBREW_INCLUDE = "HebrewInclude";
- // private static final String HEBREW_EXCLUDE = "HebrewExclude";
- // private static final String GREEK_INCLUDE = "GreekInclude";
- // private static final String GREEK_EXCLUDE = "GreekExclude";
- // private static final String HEAD_TIME = "HeadTime";
- // private static final String AFTER = "After";
- // private static final String BEFORE = "Before";
-
/**
* In our parsing we use space quite a lot and this ensures there is only one.
*/
@@ -719,31 +732,25 @@
private JLabel lblPresets;
private JComboBox cboPresets;
protected JDialog dlgMain;
- // private JCheckBox chkHebGrk;
- // private JLabel lblHebInc;
- // private JTextField txtHebInc;
- // private JLabel lblHebExc;
- // private JTextField txtHebExc;
- // private JLabel lblGrkInc;
- // private JTextField txtGrkInc;
- // private JLabel lblGrkExc;
- // private JTextField txtGrkExc;
- // private JCheckBox chkTime;
- // private JLabel lblBefore;
- // private JTextField txtBefore;
- // private JLabel lblAfter;
- // private JTextField txtAfter;
+ private JCheckBox chkHebGrk;
+ private JLabel lblHebInc;
+ private JTextField txtHebInc;
+ private JLabel lblHebExc;
+ private JTextField txtHebExc;
+ private JLabel lblGrkInc;
+ private JTextField txtGrkInc;
+ private JLabel lblGrkExc;
+ private JTextField txtGrkExc;
+ private JCheckBox chkTime;
+ private JLabel lblBefore;
+ private JTextField txtBefore;
+ private JLabel lblAfter;
+ private JTextField txtAfter;
private JLabel lblSummary;
private JCheckBox chkSummary;
private JTextArea txtSummary;
private JScrollPane scrSummary;
- // /**
- // * The log stream
- // */
- // private static final Logger log =
- // Logger.getLogger(AdvancedSearchPane.class);
-
/**
* Serialization ID
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -1,46 +1 @@
-After.Name = Restrict to verses written after:
-
-Before.Name = Restrict to verses written before:
-
-Done.Name = _Search
-
-Excludes.Name = Excludes all these words:
-
-GreekExclude.Name = Excludes Greek Numbers:
-
-GreekInclude.Name = Includes Greek Numbers:
-
-HeadBase.Name = Search for verses with the following details
-
-HeadOriginal.Name = Contains Strong's Hebrew and Greek
-
-HeadRank.Name = Prioritize the found verses
-
-HeadRestrict.Name = Restrict search to parts of the Bible
-
-HeadSummary.Name = Show quick search syntax
-
-HeadTime.Name = Narrow search by time period
-
-HebrewExclude.Name = Excludes Hebrew Numbers:
-
-HebrewInclude.Name = Includes Hebrew Numbers:
-
-Includes.Name = Includes these words:
-
-Phrase.Name = Includes this phrase:
-
-Presets.Name = Preset Ranges:
-
-RankSomeSlider.Name = Show
-
-Restrict.Name = Include these verses:
-
-RestrictSelect.Name = Select
-
-Spell.Name = Something like this spelling:
-
-StartsWith.Name = Includes words starting with:
-
-Summary.Name = Quick search syntax:
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_de.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_de.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_de.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -1,17 +1 @@
-Done.Name=Suche
-Excludes.Name=Schlie\u00DFe diese W\u00F6rter aus\:
-HeadBase.Name=Detaillierte Sucheinstellungen
-HeadOriginal.Name=Contains Strong's Hebrew and Greek
-HeadRank.Name=Gefundene Verse priorisieren
-HeadRestrict.Name=Nur bestimmte Teile der Bibel durchsuchen
-HeadSummary.Name=Verk\u00FCrzte Such-Syntax anzeigen
-Includes.Name=Suche nach diesen W\u00F6rtern\:
-Phrase.Name=Suche nach dieser Phrase\:
-Presets.Name=Bereiche\:
-RankSomeSlider.Name=Zeige
-Restrict.Name=Diese Verse miteinbeziehen\:
-RestrictSelect.Name=Auswahl
-Spell.Name=So \u00E4hnlich\:
-StartsWith.Name=Beginnt mit\:
-Summary.Name=Verk\u00FCrzte Such-Syntax\:
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_fa.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_fa.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -1,21 +1 @@
-Done.Name=\u0642\u0628\u0648\u0644
-Excludes.Name=\u0628\u062F\u0648\u0646 \u0627\u06CC\u0646 \u06A9\u0644\u0645\u0627\u062A
-GreekExclude.Name=\u0628\u062F\u0648\u0646 \u0634\u0645\u0627\u0631\u0647\u200C\u0647\u0627 \u06CC\u0648\u0646\u0627\u0646\u06CC
-GreekInclude.Name=\u0628\u0627 \u0634\u0645\u0627\u0631\u0647\u200C\u0647\u0627 \u06CC\u0648\u0646\u0627\u0646\u06CC
-HeadBase.Name=\u062C\u0633\u062A\u062C\u0648\u06CC \u0622\u06CC\u0627\u062A \u0628\u0627 \u062C\u0632\u062B\u06CC\u0627\u062A \u0632\u06CC\u0631
-HeadOriginal.Name=\u062C\u0633\u062A\u062C\u0648 \u0628\u0627 \u0634\u0645\u0627\u0631\u0647\u200C\u0647\u0627 \u06A9\u0634\u06CC\u0634 \u0627\u0633\u062A\u0631\u0648\u0646\u06AF
-HeadRank.Name=\u062A\u0639\u062F\u0627\u062F \u0622\u06CC\u0627\u062A\u06CC \u06A9\u0647 \u0645\u06CC\u062E\u0648\u0627\u0647\u06CC\u062F \u062C\u0633\u062A\u062C\u0648 \u06A9\u0646\u06CC\u062F
-HeadRestrict.Name=\u0642\u0633\u0645\u062A\u200C\u0647\u0627 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633 \u06A9\u0647 \u0645\u06CC\u062E\u0648\u0627\u0647\u06CC\u062F \u062C\u0633\u062A\u062C\u0648 \u06A9\u0646\u06CC\u062F
-HeadSummary.Name=\u062C\u0633\u062A\u062C\u0648\u06CC \u06A9\u0627\u0645\u0644
-HebrewExclude.Name=\u0628\u062F\u0648\u0646 \u0634\u0645\u0627\u0631\u0647\u200C\u0647\u0627 \u0639\u0628\u0631\u06CC
-HebrewInclude.Name=\u0628\u0627 \u0634\u0645\u0627\u0631\u0647\u200C\u0647\u0627 \u0639\u0628\u0631\u06CC
-Includes.Name=\u0645\u062D\u062A\u0648\u06CC \u0627\u06CC\u0646 \u06A9\u0644\u0645\u0627\u062A
-Phrase.Name=\u0645\u062D\u062A\u0648\u06CC \u0622\u06CC\u0646 \u0627\u0645\u0637\u0644\u0627\u062D\:
-Presets.Name=\u0642\u0633\u0645\u062A200C\u0647\u0627 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633
-RankSomeSlider.Name=\u0622\u06CC\u0647
-Restrict.Name=\u0627\u06CC\u0646 \u0622\u06CC\u0627\u062A \u0631\u0627 \u062C\u0633\u062A\u062C\u0648 \u06A9\u0646
-RestrictSelect.Name=\u202D \u202C\u0627\u0646\u062A\u062E\u0627\u0628\u202E \u202C\u06A9\u0646
-Spell.Name=\u062F\u0627\u0631\u0627\u06CC \u0627\u0645\u0644\u0627\u0621 \u0645\u0634\u0627\u0628\u0647 \u0628\u0627
-StartsWith.Name=\u0645\u062D\u062A\u0648\u06CC \u06A9\u0644\u0645\u0627\u062A\u06CC \u06A9\u0647 \u0628\u0627 \u0627\u06CC\u0646 \u0634\u0631\u0648\u0639 \u0634\u0648\u062F\:
-Summary.Name=\u062C\u0633\u062A\u062C\u0648\u06CC \u06A9\u0627\u0645\u0644
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_in.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_in.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_in.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -1,22 +1 @@
-After.Name=Batasi ayat sesudah\:
-Before.Name=Batasi ayar sebelum\:
-Done.Name = _Cari
-Excludes.Name=Tidak mengandung kata\:
-GreekExclude.Name=Tidak mengandung Yunani Nos\:
-GreekInclude.Name=Mengandung Yunani Nos\:
-HeadBase.Name=Cari ayat dengan specifikasi
-HeadOriginal.Name=Berisikan Strong's Ibrani dan Yunani
-HeadRank.Name=Urutkan prioritas hasil pencarian
-HeadRestrict.Name=Batasan hasil pencarian
-HeadSummary.Name=Tampilan sintaksis pencarian cepat
-HebrewExclude.Name=Tidak mengandung Ibrani Nos\:
-HebrewInclude.Name=Mengandung Ibrani Nos\:
-Includes.Name=Termasuk kata\:
-Phrase.Name=Mengandung frase\:
-Presets.Name=Lingkup Kitab\:
-RankSomeSlider.Name=Tampilkan
-Restrict.Name=Termasuk ayat ini\:
-Spell.Name=Seperti pengejaan\:
-StartsWith.Name=Berawalan dengan\:
-Summary.Name=Tampilan sintaksis pencarian\:
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_vi.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_vi.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_vi.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -1,23 +1 @@
-After.Name=Gi\u1EDBi h\u1EA1n t\u00ECm ki\u1EBFm cho c\u00E2u vi\u1EBFt sau\:
-Before.Name=Gi\u1EDBi h\u1EA1n t\u00ECm ki\u1EBFm cho c\u00E1c c\u00E2u vi\u1EBFt tr\u01B0\u1EDBc\:
-Done.Name=T\u00ECm Ki\u1EBFm
-Excludes.Name=Lo\u1EA1i tr\u1EEB t\u1EA5t c\u1EA3 c\u00E1c t\u1EEB ng\u1EEF n\u00E0y\:
-GreekExclude.Name=Lo\u1EA1i tr\u00F9 s\u1ED1 Strong ti\u1EBFng Hy-l\u1EA1p
-GreekInclude.Name=Bao g\u1ED3m s\u1ED1 Strong ti\u1EBFng Hy-l\u1EA1p
-HeadBase.Name=T\u00ECm c\u00E2u v\u1EDBi chi ti\u1EBFt ti\u1EBFp theo
-HeadOriginal.Name=Bao g\u1ED3m ti\u1EBFng H\u00EA-b\u01A1-r\u01A1 v\u00E0 ti\u1EBFng Hy-l\u1EA1p c\u1EE7a Strong
-HeadRank.Name=D\u00E0nh \u01B0u ti\u00EAn c\u00E1c c\u00E2u \u0111\u01B0\u1EE3c t\u00ECm
-HeadRestrict.Name=Gi\u1EDBi h\u1EA1n t\u00ECm ki\u1EBFm cho ph\u1EA7n c\u1EE7a Kinh Th\u00E1nh
-HeadSummary.Name=Hi\u1EC7n c\u00FA ph\u00E1p t\u00ECm ki\u1EBFm nhanh
-HebrewExclude.Name=Lo\u1EA1i tr\u1EEB s\u1ED1 Strong ti\u1EBFng H\u00EA-b\u01A1-r\u01A1
-HebrewInclude.Name=Bao g\u1ED3m s\u1ED1 Strong ti\u1EBFng H\u00EA-b\u01A1-r\u01A1
-Includes.Name=Bao g\u1ED3m c\u00E1c t\u1EEB ng\u1EEF n\u00E0y\:
-Phrase.Name=Bao g\u1ED3m c\u1EE5m t\u1EEB n\u00E0y\:
-Presets.Name=Ph\u1EA7n \u0110\u1EB7t S\u1EB5n
-RankSomeSlider.Name=Hi\u1EC7n
-Restrict.Name=Ch\u1EE9a \u0111\u01B0ng c\u00E1c c\u00E2u n\u00E0y\:
-RestrictSelect.Name=Ch\u1ECDn
-Spell.Name=Ch\u00EDnh t\u1EA3 g\u1EA7n gi\u1ED1ng n\u00E0y\:
-StartsWith.Name=Bao g\u1ED3m t\u1EEB ng\u1EEF b\u1EAFt \u0111\u1EA7u v\u1EDBi\:
-Summary.Name=C\u00FA Ph\u00E1p T\u00ECm Ki\u1EBFm Nhanh
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_zh.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_zh.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_zh.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -1,12 +1 @@
-Done.Name=\u641C\u5C0B
-Excludes.Name=\u6392\u9664 \u5B57\:
-HeadBase.Name=\u9032\u968E\u641C\u5C0B
-HeadRank.Name=\u689D\u76EE\u6578\u91CF
-HeadRestrict.Name=\u9650\u5236\u641C\u5C0B
-HeadSummary.Name=\u986F\u793A\u5FEB\u901F\u641C\u5C0B\u8A9E\u6CD5
-Includes.Name=\u5305\u542B \u5B57\:
-Phrase.Name=\u5305\u542B \u53E5\u5B50\:
-Spell.Name=\u6A21\u7CCA\u641C\u5C0B\:
-StartsWith.Name=\u8D77\u982D\u7684\u5B57\u53E5\:
-Summary.Name=\u5FEB\u901F\u641C\u5C0B\u8A9E\u6CD5\:
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_zh_CN.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_zh_CN.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane_zh_CN.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -1,12 +1 @@
-Done.Name=\u641C\u5BFB
-Excludes.Name=\u6392\u9664 \u5B57\:
-HeadBase.Name=\u9AD8\u7EA7\u641C\u5BFB
-HeadRank.Name=\u6761\u76EE\u6570\u91CF
-HeadRestrict.Name=\u9650\u5236\u641C\u5BFB
-HeadSummary.Name=\u663E\u793A\u5FEB\u901F\u641C\u5BFB\u8BED\u6CD5
-Includes.Name=\u5305\u542B \u5B57\:
-Phrase.Name=\u5305\u542B \u53E5\u5B50\:
-Spell.Name=\u6A21\u7CCA\u641C\u5BFB\:
-StartsWith.Name=\u5F00\u59CB\u7684\u5B57\u53E5\:
-Summary.Name=\u5FEB\u901F\u641C\u5BFB\u8BED\u6CD5\:
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -13,12 +13,12 @@
Excludes\ Hebrew\ Numbers\:=Excludes Hebrew Numbers\:
Excludes\ all\ these\ words\:=Excludes all these words\:
File\ {0}\ is\ empty=File {0} is empty
-Include\ Greek\ Numbers=Includes Greek Numbers\:
Include\ these\ verses\:=Include these verses\:
-Include\ this\ phrase\:=Includes this phrase\:
-Include\ words\ starting\ with\:=Includes words starting with\:
+Includes\ Greek\ Numbers\:=Includes Greek Numbers\:
Includes\ Hebrew\ Numbers\:=Includes Hebrew Numbers\:
Includes\ these\ words\:=Includes these words\:
+Includes\ this\ phrase\:=Includes this phrase\:
+Includes\ words\ starting\ with\:=Includes words starting with\:
Narrow\ search\ by\ time\ period=Narrow search by time period
No\ Bible\ is\ installed=No Bible is installed
None=None
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_de.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_de.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_de.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -10,9 +10,9 @@
Excludes\ all\ these\ words\:=Schlie\u00DFe diese W\u00F6rter aus\:
File\ {0}\ is\ empty=Datei {0} ist leer
Include\ these\ verses\:=Diese Verse miteinbeziehen\:
-Include\ this\ phrase\:=Suche nach dieser Phrase\:
-Include\ words\ starting\ with\:=Beginnt mit\:
Includes\ these\ words\:=Suche nach diesen W\u00F6rtern\:
+Includes\ this\ phrase\:=Suche nach dieser Phrase\:
+Includes\ words\ starting\ with\:=Beginnt mit\:
No\ Bible\ is\ installed=Keine Bibel installiert
None=Keines
Preset\ Ranges\:=Bereiche\:
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_fa.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_fa.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -11,12 +11,12 @@
Excludes\ Hebrew\ Numbers\:=\u0628\u062F\u0648\u0646 \u0634\u0645\u0627\u0631\u0647\u200C\u0647\u0627 \u0639\u0628\u0631\u06CC
Excludes\ all\ these\ words\:=\u0628\u062F\u0648\u0646 \u0627\u06CC\u0646 \u06A9\u0644\u0645\u0627\u062A
File\ {0}\ is\ empty={0} \u062E\u0644\u06CC \u0647\u0627\u0633\u062A
-Include\ Greek\ Numbers=\u0628\u0627 \u0634\u0645\u0627\u0631\u0647\u200C\u0647\u0627 \u06CC\u0648\u0646\u0627\u0646\u06CC
Include\ these\ verses\:=\u0627\u06CC\u0646 \u0622\u06CC\u0627\u062A \u0631\u0627 \u062C\u0633\u062A\u062C\u0648 \u06A9\u0646
-Include\ this\ phrase\:=\u0645\u062D\u062A\u0648\u06CC \u0622\u06CC\u0646 \u0627\u0645\u0637\u0644\u0627\u062D\:
-Include\ words\ starting\ with\:=\u0645\u062D\u062A\u0648\u06CC \u06A9\u0644\u0645\u0627\u062A\u06CC \u06A9\u0647 \u0628\u0627 \u0627\u06CC\u0646 \u0634\u0631\u0648\u0639 \u0634\u0648\u062F\:
+Includes\ Greek\ Numbers\:=\u0628\u0627 \u0634\u0645\u0627\u0631\u0647\u200C\u0647\u0627 \u06CC\u0648\u0646\u0627\u0646\u06CC
Includes\ Hebrew\ Numbers\:=\u0628\u0627 \u0634\u0645\u0627\u0631\u0647\u200C\u0647\u0627 \u0639\u0628\u0631\u06CC
Includes\ these\ words\:=\u0645\u062D\u062A\u0648\u06CC \u0627\u06CC\u0646 \u06A9\u0644\u0645\u0627\u062A
+Includes\ this\ phrase\:=\u0645\u062D\u062A\u0648\u06CC \u0622\u06CC\u0646 \u0627\u0645\u0637\u0644\u0627\u062D\:
+Includes\ words\ starting\ with\:=\u0645\u062D\u062A\u0648\u06CC \u06A9\u0644\u0645\u0627\u062A\u06CC \u06A9\u0647 \u0628\u0627 \u0627\u06CC\u0646 \u0634\u0631\u0648\u0639 \u0634\u0648\u062F\:
No\ Bible\ is\ installed=\u0647\u06CC\u062C \u06A9\u062A\u0627\u0628 \u0646\u0636\u0628 \u0646\u0634\u062F\u0647
None=\u0647\u06CC\u062C
Preset\ Ranges\:=\u0642\u0633\u0645\u062A200C\u0647\u0627 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_in.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_in.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_in.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -11,12 +11,12 @@
Excludes\ Hebrew\ Numbers\:=Tidak mengandung Ibrani Nos\:
Excludes\ all\ these\ words\:=Tidak mengandung kata\:
File\ {0}\ is\ empty=Berkas {0} kosong
-Include\ Greek\ Numbers=Mengandung Yunani Nos\:
Include\ these\ verses\:=Termasuk ayat ini\:
-Include\ this\ phrase\:=Mengandung frase\:
-Include\ words\ starting\ with\:=Berawalan dengan\:
+Includes\ Greek\ Numbers\:=Mengandung Yunani Nos\:
Includes\ Hebrew\ Numbers\:=Mengandung Ibrani Nos\:
Includes\ these\ words\:=Termasuk kata\:
+Includes\ this\ phrase\:=Mengandung frase\:
+Includes\ words\ starting\ with\:=Berawalan dengan\:
No\ Bible\ is\ installed=Tidak ada Teks Biblika yang terinstall
None=None
Preset\ Ranges\:=Lingkup Kitab\:
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_vi.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_vi.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_vi.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -11,12 +11,12 @@
Excludes\ Hebrew\ Numbers\:=Lo\u1EA1i tr\u1EEB s\u1ED1 Strong ti\u1EBFng H\u00EA-b\u01A1-r\u01A1
Excludes\ all\ these\ words\:=Lo\u1EA1i tr\u1EEB t\u1EA5t c\u1EA3 c\u00E1c t\u1EEB ng\u1EEF n\u00E0y\:
File\ {0}\ is\ empty=T\u1EADp Tin {0} tr\u1ED1ng r\u1ED7ng
-Include\ Greek\ Numbers=Bao g\u1ED3m s\u1ED1 Strong ti\u1EBFng Hy-l\u1EA1p
Include\ these\ verses\:=Ch\u1EE9a \u0111\u01B0ng c\u00E1c c\u00E2u n\u00E0y\:
-Include\ this\ phrase\:=Bao g\u1ED3m c\u1EE5m t\u1EEB n\u00E0y\:
-Include\ words\ starting\ with\:=Bao g\u1ED3m t\u1EEB ng\u1EEF b\u1EAFt \u0111\u1EA7u v\u1EDBi\:
+Includes\ Greek\ Numbers\:=Bao g\u1ED3m s\u1ED1 Strong ti\u1EBFng Hy-l\u1EA1p
Includes\ Hebrew\ Numbers\:=Bao g\u1ED3m s\u1ED1 Strong ti\u1EBFng H\u00EA-b\u01A1-r\u01A1
Includes\ these\ words\:=Bao g\u1ED3m c\u00E1c t\u1EEB ng\u1EEF n\u00E0y\:
+Includes\ this\ phrase\:=Bao g\u1ED3m c\u1EE5m t\u1EEB n\u00E0y\:
+Includes\ words\ starting\ with\:=Bao g\u1ED3m t\u1EEB ng\u1EEF b\u1EAFt \u0111\u1EA7u v\u1EDBi\:
No\ Bible\ is\ installed=Ch\u01B0a c\u00F3 cu\u1ED1n Kinh Th\u00E1nh c\u00E0i \u0111\u1EB7t
None=Kh\u00F4ng c\u00F3
Preset\ Ranges\:=Ph\u1EA7n \u0110\u1EB7t S\u1EB5n
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_zh.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_zh.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_zh.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -8,9 +8,9 @@
Error\:\ {0}=\u932F\u8AA4\: {0}
Excludes\ all\ these\ words\:=\u6392\u9664 \u5B57\:
File\ {0}\ is\ empty=\u6A94\u6848 {0} \u662F\u7A7A\u7684
-Include\ this\ phrase\:=\u5305\u542B \u53E5\u5B50\:
-Include\ words\ starting\ with\:=\u8D77\u982D\u7684\u5B57\u53E5\:
Includes\ these\ words\:=\u5305\u542B \u5B57\:
+Includes\ this\ phrase\:=\u5305\u542B \u53E5\u5B50\:
+Includes\ words\ starting\ with\:=\u8D77\u982D\u7684\u5B57\u53E5\:
No\ Bible\ is\ installed=\u4F60\u9084\u6C92\u5B89\u88DD\u4EFB\u4F55\u7684\u8056\u7D93\u7248\u672C\uFF0C\u8ACB\u9EDE\u9078\u5DE5\u5177(Tool)-->\u66F8\u7C4D(book).\u5F8C\u9078\u64C7\u4F60\u60F3\u5B89\u88DD\u7684\u8056\u7D93\u6216\u53C3\u8003\u66F8\u3002
None=\u7121
Prioritize\ the\ found\ verses=\u689D\u76EE\u6578\u91CF
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_zh_CN.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_zh_CN.properties 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/Msg_zh_CN.properties 2010-11-19 04:42:37 UTC (rev 2016)
@@ -8,9 +8,9 @@
Error\:\ {0}=\u9519\u52A1\: {0}
Excludes\ all\ these\ words\:=\u6392\u9664 \u5B57\:
File\ {0}\ is\ empty=\u6863\u6848 {0} \u662F\u7A7A\u7684
-Include\ this\ phrase\:=\u5305\u542B \u53E5\u5B50\:
-Include\ words\ starting\ with\:=\u5F00\u59CB\u7684\u5B57\u53E5\:
Includes\ these\ words\:=\u5305\u542B \u5B57\:
+Includes\ this\ phrase\:=\u5305\u542B \u53E5\u5B50\:
+Includes\ words\ starting\ with\:=\u5F00\u59CB\u7684\u5B57\u53E5\:
No\ Bible\ is\ installed=\u4F60\u8FD8\u6CA1\u5B89\u88C5\u4EFB\u4F55\u7248\u672C\u7684\u5723\u7ECF\uFF0C\u8BF7\u70B9\u9009\u5DE5\u5177-->\u4E66\u7C4D.\u5B89\u88C5\u5723\u7ECF\u6216\u53C2\u8003\u4E66\u3002
None=\u65E0
Prioritize\ the\ found\ verses=\u6761\u76EE\u6570\u91CF
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java 2010-11-18 14:20:36 UTC (rev 2015)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java 2010-11-19 04:42:37 UTC (rev 2016)
@@ -347,7 +347,7 @@
* as a resource.<br/>
* Note: the small icon will be used when actions are tied to
* menu items and buttons.
- * @param largIconPath
+ * @param largeIconPath
* An optional specification of a 24x24 pixel image to be shown
* for the item when large items are shown. Currently, these are
* only used for the ToolBar, when a large toolbar is requested.
@@ -374,8 +374,18 @@
* widgets will behave appropriately.
* @return the stored or newly constructed action
*/
- public CWAction buildAction(String key, String name, String tooltip, String smallIconPath, String largIconPath, String acceleratorSpec, String enabled)
- {
+ public CWAction addAction(String key, String name, String tooltip, String smallIconPath, String largeIconPath, String acceleratorSpec, String enabled) {
+ CWAction cwAction = buildAction(key, name, tooltip, smallIconPath, largeIconPath, acceleratorSpec, enabled);
+ cwAction.addActionListener(this);
+ actions.put(key, cwAction);
+ return cwAction;
+ }
+
+ public CWAction addAction(String key, String name) {
+ return addAction(key, name, null, null, null, null, null);
+ }
+
+ private CWAction buildAction(String key, String name, String tooltip, String smallIconPath, String largeIconPath, String acceleratorSpec, String enabled) {
if (key == null || key.length() == 0) {
log.warn("Acronymn is missing for CWAction");
}
@@ -399,7 +409,7 @@
cwAction.putValue(Action.SHORT_DESCRIPTION, tooltip);
- cwAction.putValue(CWAction.LARGE_ICON, getIcon(largIconPath));
+ cwAction.putValue(CWAction.LARGE_ICON, getIcon(largeIconPath));
cwAction.putValue(Action.SMALL_ICON, getIcon(smallIconPath));
cwAction.putValue(Action.ACCELERATOR_KEY, getAccelerator(key, acceleratorSpec));
More information about the jsword-svn
mailing list