[jsword-svn] r1575 - in trunk: bibledesktop/src/main/resources common common/src/main/java/org/crosswire/common/config common-swing/src/main/java/org/crosswire/common/config/swing common-swing/src/main/java/org/crosswire/common/swing common-swing/src/main/java/org/crosswire/common/swing/desktop
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Sat Jul 28 09:18:16 MST 2007
Author: dmsmith
Date: 2007-07-28 09:18:14 -0700 (Sat, 28 Jul 2007)
New Revision: 1575
Modified:
trunk/bibledesktop/src/main/resources/config.properties
trunk/bibledesktop/src/main/resources/config.xml
trunk/bibledesktop/src/main/resources/config_de.properties
trunk/bibledesktop/src/main/resources/config_fa.properties
trunk/bibledesktop/src/main/resources/config_fa.txt
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/ConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/Field.properties
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/FieldMap.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TabbedConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/CWScrollPane.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiUtil.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg.properties
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg_de.properties
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg_fa.properties
trunk/common/JSwordDictionary.txt
trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java
trunk/common/src/main/java/org/crosswire/common/config/Choice.java
trunk/common/src/main/java/org/crosswire/common/config/Config.java
trunk/common/src/main/java/org/crosswire/common/config/FontChoice.java
trunk/common/src/main/java/org/crosswire/common/config/IntOptionsChoice.java
Log:
Documentation improvements, including fixing spelling.
Major change to Config. (More to do)
Modified: trunk/bibledesktop/src/main/resources/config.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config.properties 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/bibledesktop/src/main/resources/config.properties 2007-07-28 16:18:14 UTC (rev 1575)
@@ -1,88 +1,104 @@
# The naming convention for the keys in the file is to match that of the
# keys of the options in the config.xml file.
# Since the keys may have spaces these need to be escaped here.
-
-Bibles.RetainCurrent.path=Bibles.Use Current Bible
+Bibles.name=Bibles
+Bibles.RetainCurrent.name=Use Current Bible
Bibles.RetainCurrent.help=New Bible Views use the last chosen Bible. Otherwise, use the default Bible.
-Bibles.DefaultBible.path=Bibles.Default Bible
+Bibles.DefaultBible.name=Default Bible
Bibles.DefaultBible.help=Which of the available Bibles is the default.
-Bibles.DefaultDictionary.path=Bibles.Default Dictionary
+Bibles.DefaultDictionary.name=Default Dictionary
Bibles.DefaultDictionary.help=Which of the available Dictionaries is the default.
-Bibles.DefaultCommentary.path=Bibles.Default Commentary
+Bibles.DefaultCommentary.name=Default Commentary
Bibles.DefaultCommentary.help=Which of the available Commentaries is the default.
-Bibles.DefaultDailyDevotional.path=Bibles.Default Daily Devotional
+Bibles.DefaultDailyDevotional.name=Default Daily Devotional
Bibles.DefaultDailyDevotional.help=Which of the available Daily Devotionals is the default.
-Bibles.DefaultGreekDefinitions.path=Bibles.Default Greek Definitions (Strong''s)
+Bibles.DefaultGreekDefinitions.name=Default Greek Definitions (Strong''s)
Bibles.DefaultGreekDefinitions.help=Which of the available Greek Definitions (Strong''s) is the default.
-Bibles.DefaultHebrewDefinitions.path=Bibles.Default Hebrew Definitions (Strong''s)
+Bibles.DefaultHebrewDefinitions.name=Default Hebrew Definitions (Strong''s)
Bibles.DefaultHebrewDefinitions.help=Which of the available Hebrew Definitions (Strong''s) is the default.
-Bibles.DefaultGreekParse.path=Bibles.Default Greek Morphology/Parsing Guides
+Bibles.DefaultGreekParse.name=Default Greek Morphology/Parsing Guides
Bibles.DefaultGreekParse.help=Which of the available Greek Morphology/Parsing Guides is the default.
-Bibles.DefaultHebrewParse.path=Bibles.Default Hebrew Morphology/Parsing Guides
+Bibles.DefaultHebrewParse.name=Default Hebrew Morphology/Parsing Guides
Bibles.DefaultHebrewParse.help=Which of the available Hebrew Morphology/Parsing Guides is the default.
-BibleDisplay.Reuse.path=Bible Display.Open links in same Bible View
+
+BibleDisplay.name=Bible Display
+BibleDisplay.Reuse.name=Open links in same Bible View
BibleDisplay.Reuse.help=Reuse Bible View for links.
-BibleDisplay.MaxPickers.path=Bible Display.Parallel Bible Limit
+BibleDisplay.MaxPickers.name=Parallel Bible Limit
BibleDisplay.MaxPickers.help=Limit the number of Bibles to show at once.
-BibleDisplay.Commentaries.path=Bible Display.List Commentaries with Bibles
+BibleDisplay.Commentaries.name=List Commentaries with Bibles
BibleDisplay.Commentaries.help=List Commentaries with Bibles
-BibleDisplay.Sidebar.path=Bible Display.Show the Passage Sidebar
+BibleDisplay.Sidebar.name=Show the Passage Sidebar
BibleDisplay.Sidebar.help=Show the Passage Sidebar
-BibleDisplay.VersesPerTab.path=Bible Display.Verses Per Tab
+BibleDisplay.VersesPerTab.name=Verses Per Tab
BibleDisplay.VersesPerTab.help=How many verses do you want to display on a page before spilling to tabbed mode.
-BibleDisplay.RankedVerses.path=Bible Display.Default Number of Matched Verses
+BibleDisplay.RankedVerses.name=Default Number of Matched Verses
BibleDisplay.RankedVerses.help=How many verses do you want to return from a Matched search.
-BibleDisplay.ConfigurableFont.path=Bible Display.Select Font
+BibleDisplay.ConfigurableFont.name=Select Font
BibleDisplay.ConfigurableFont.help=The font to be used to display books.
-BibleDisplay.AntiAliasDisplay.path=Bible Display.Font Smoothing
+BibleDisplay.AntiAliasDisplay.name=Font Smoothing
BibleDisplay.AntiAliasDisplay.help=Font smoothing can be slow, but can help the appearance of some fonts.
-SwordBook.BookSearchPath.path=Sword Books.Additional Book locations
+
+SwordBook.name=Sword Books
+SwordBook.BookSearchPath.name=Additional Book locations
SwordBook.BookSearchPath.help=Additional places to look for SWORD books.
-SwordBook.DownloadDirectory.path=Sword Books.Download Directory
+SwordBook.DownloadDirectory.name=Download Directory
SwordBook.DownloadDirectory.help=Where should we store newly downloaded books.
-Passages.PersistentNaming.path=Passages.Persistent Naming
+
+Passages.name=Passages
+Passages.PersistentNaming.name=Persistent Naming
Passages.PersistentNaming.help=Should your input of names .
-Passages.FullBookName.path=Passages.Use Full Book Names
+Passages.FullBookName.name=Use Full Book Names
Passages.FullBookName.help=Should full Bible book names or abbreviations be used.
-Passages.BlurringRules.path=Passages.Passage Expansion Rules
+Passages.BlurringRules.name=Passage Expansion Rules
Passages.BlurringRules.help=What is the default expansion - Stay within chapter boundaries or not.
Passages.BlurringRules.alternative.0=None
Passages.BlurringRules.alternative.1=Chapter
#Passages.BlurringRules.alternative.2=Book
-Passages.BookCase.path=Passages.Book Case
+Passages.BookCase.name=Book Case
Passages.BookCase.help=What case should we use to display the Bible book names.
Passages.BookCase.alternative.0=lower
Passages.BookCase.alternative.1=Sentence
Passages.BookCase.alternative.2=UPPER
-Application.Language.path=Application.Language
+
+Application.name=Application
+Application.Language.name=Language
Application.Language.help=The language of the application. (Requires restart)
-Application.InitialLayout.path=Application.Initial Layout
+Application.InitialLayout.name=Initial Layout
Application.InitialLayout.help=Do you want to start in Tabbed or Multiple Document view mode (Requires restart)
Application.InitialLayout.alternative.0=Tabbed Document Interface
Application.InitialLayout.alternative.1=Multiple Document Interface
-Application.MaxHeight.path=Application.Maximum Window Height
+Application.MaxHeight.name=Maximum Window Height
Application.MaxHeight.help=The maximum height you want the window to be
-Application.MaxWidth.path=Application.Maximum Window Width
+Application.MaxWidth.name=Maximum Window Width
Application.MaxWidth.help=The maximum width you want the window to be
-Application.UIFont.path=Application.General Font
+Application.UIFont.name=General Font
Application.UIFont.help=The font for the application (Requires restart)
# The following are not for general use and are hidden from view
-BibleDisplay.CSSOverride.path=Bible Display.CSS Override
+BibleDisplay.CSSOverride.hidden=true
+BibleDisplay.CSSOverride.name=CSS Override
BibleDisplay.CSSOverride.help=Use an alternate CSS Stylesheet.
-BibleDisplay.Converter.path=Bible Display.Converter
-BibleDisplay.Converter.help=The engine used to genterate the book display
-BibleDisplay.ConfigurableStylesheet.path=Bible Display.Configurable Stylesheet
+BibleDisplay.Converter.hidden=true
+BibleDisplay.Converter.name=Converter
+BibleDisplay.Converter.help=The engine used to generate the book display
+BibleDisplay.ConfigurableStylesheet.hidden=true
+BibleDisplay.ConfigurableStylesheet.name=Configurable Stylesheet
BibleDisplay.ConfigurableStylesheet.help=The style applied to displayed Books when using the configurable styler.
-Application.LookAndFeel.path=Application.Look and Feel
+Application.LookAndFeel.hidden=true
+Application.LookAndFeel.name=Look and Feel
Application.LookAndFeel.help=The look and feel of the application.
-Advanced.SourcePath.path=Advanced.Source Path
+Advanced.name=Advanced
+Advanced.SourcePath.hidden=true
+Advanced.SourcePath.name=Source Path
Advanced.SourcePath.help=The directories to search for source code in when investigating an exception.
-Advanced.DefaultPassageType.path=Advanced.Default Passage Type
+Advanced.DefaultPassageType.hidden=true
+Advanced.DefaultPassageType.name=Default Passage Type
Advanced.DefaultPassageType.help=What type of passage does the PassageFactory create by default.
Advanced.DefaultPassageType.alternative.0=Speed (Rocket)
Advanced.DefaultPassageType.alternative.1=Write Speed (Bitwise)
Advanced.DefaultPassageType.alternative.2=Size (Distinct)
Advanced.DefaultPassageType.alternative.3=Mix (Ranged)
-Advanced.IncludeAdvancedTabs.path=Advanced.Include Advanced Tabs
+Advanced.IncludeAdvancedTabs.hidden=true
+Advanced.IncludeAdvancedTabs.name=Include Advanced Tabs
Advanced.IncludeAdvancedTabs.help=Are the advanced tabs visible in the "About ..." Dialog. (Requires restart)
Modified: trunk/bibledesktop/src/main/resources/config.xml
===================================================================
--- trunk/bibledesktop/src/main/resources/config.xml 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/bibledesktop/src/main/resources/config.xml 2007-07-28 16:18:14 UTC (rev 1575)
@@ -36,8 +36,6 @@
<!ATTLIST option
key CDATA #REQUIRED
static (true|false) 'true'
- hidden (true|false) 'false'
- priority NMTOKEN '5'
type (string|boolean|int-options|string-options|string-array|file|path|directory|number|font|class|custom|password) #REQUIRED
class CDATA #IMPLIED
separator CDATA #IMPLIED
@@ -80,13 +78,13 @@
</option>
<!-- Does not mean anything right now -->
- <option key="Bibles.DefaultDictionary" type="string-options" hidden="true">
+ <option key="Bibles.DefaultDictionary" type="string-options">
<introspect class="org.crosswire.jsword.book.Defaults" property="DictionaryByName"/>
<map name="dictionary-names"/>
</option>
<!-- Does not mean anything right now -->
- <option key="Bibles.DefaultCommentary" type="string-options" hidden="true">
+ <option key="Bibles.DefaultCommentary" type="string-options">
<introspect class="org.crosswire.jsword.book.Defaults" property="CommentaryByName"/>
<map name="commentary-names"/>
</option>
@@ -107,25 +105,25 @@
</option>
<!-- There are no Hebrew parsing guides at this time. -->
- <option key="Bibles.DefaultHebrewParse" type="string-options" hidden="true">
+ <option key="Bibles.DefaultHebrewParse" type="string-options">
<introspect class="org.crosswire.jsword.book.Defaults" property="HebrewParseByName"/>
<map name="hebrewparse-names"/>
</option>
<!-- At this time we only have one converter -->
- <option key="BibleDisplay.Converter" type="string-options" hidden="true">
+ <option key="BibleDisplay.Converter" type="string-options">
<introspect class="org.crosswire.jsword.util.ConverterFactory" property="CurrentConverterName"/>
<map name="converters"/>
</option>
<!-- We only provide one style sheet at this time -->
- <option key="BibleDisplay.ConfigurableStylesheet" type="string-options" hidden="true">
+ <option key="BibleDisplay.ConfigurableStylesheet" type="string-options">
<introspect class="org.crosswire.bibledesktop.util.ConfigurableSwingConverter" property="ResourceName"/>
<map name="cswing-styles"/>
</option>
<!-- This really only useful for developers -->
- <option key="BibleDisplay.CSSOverride" type="string" hidden="true">
+ <option key="BibleDisplay.CSSOverride" type="string">
<introspect class="org.crosswire.bibledesktop.desktop.Desktop" property="CSSOverride"/>
</option>
@@ -198,7 +196,7 @@
</option>
<!-- This really only useful for developers -->
- <option key="Application.LookAndFeel" type="class" hidden="true">
+ <option key="Application.LookAndFeel" type="class">
<introspect class="org.crosswire.common.swing.LookAndFeelUtil" property="LookAndFeel"/>
</option>
@@ -226,12 +224,12 @@
</option>
<!-- This really only useful for developers -->
- <option key="Advanced.SourcePath" type="path" priority="9" hidden="true">
+ <option key="Advanced.SourcePath" type="path">
<introspect class="org.crosswire.common.swing.ExceptionPane" property="SourcePath"/>
</option>
<!-- This really only useful for developers -->
- <option key="Advanced.DefaultPassageType" type="int-options" hidden="true">
+ <option key="Advanced.DefaultPassageType" type="int-options">
<introspect class="org.crosswire.jsword.passage.PassageKeyFactory" property="DefaultPassage"/>
<alternative number="0"/>
<alternative number="1"/>
@@ -246,24 +244,24 @@
-->
<!-- Limbo: This really only useful for developers
- <option key="Advanced.Reports.ShowErrorsInDialogBox" type="boolean" priority="8">
+ <option key="Advanced.Reports.ShowErrorsInDialogBox" type="boolean">
<introspect class="org.crosswire.common.swing.ExceptionPane" property="HelpDeskListener"/>
</option>
-->
<!-- Limbo: This really only useful for developers
- <option key="Advanced.Reports.LogErrorsInLogWindow" type="boolean" priority="8">
+ <option key="Advanced.Reports.LogErrorsInLogWindow" type="boolean">
<introspect class="org.crosswire.common.swing.ExceptionShelf" property="HelpDeskListener"/>
</option>
-->
<!-- This really only useful for developers -->
- <option key="Advanced.IncludeAdvancedTabs" type="boolean" hidden="true">
+ <option key="Advanced.IncludeAdvancedTabs" type="boolean">
<introspect class="org.crosswire.bibledesktop.desktop.AboutPane" property="Advanced"/>
</option>
<!-- Limbo: Temporarily remove Blog code
- <option key="WebJournal.Url" type="string" priority="1">
+ <option key="WebJournal.Url" type="string">
<introspect class="org.crosswire.bibledesktop.journal.BlogClientFrame" property="Url"/>
</option>
Modified: trunk/bibledesktop/src/main/resources/config_de.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_de.properties 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/bibledesktop/src/main/resources/config_de.properties 2007-07-28 16:18:14 UTC (rev 1575)
@@ -2,87 +2,98 @@
# keys of the options in the config.xml file.
# Since the keys may have spaces these need to be escaped here.
-Bibles.RetainCurrent.path=Bibeln.Benutze gerade gelesene Bibel
+Bibles.name=Bibeln
+Bibles.RetainCurrent.name=Benutze gerade gelesene Bibel
Bibles.RetainCurrent.help=New Bibelansicht soll gerade gelesene Bibel verwenden.
-Bibles.DefaultBible.path=Bibeln.Standardbibel
+Bibles.DefaultBible.name=Standardbibel
Bibles.DefaultBible.help=Welche der installierten Bibeln wird als Standardeinstellung verwendet.
-Bibles.DefaultDictionary.path=Bibeln.Standardwoerterbuch
+Bibles.DefaultDictionary.name=Standardwoerterbuch
Bibles.DefaultDictionary.help=Welches der installierten Woerterbuecher wird als Standardeinstellung verwendet.
-Bibles.DefaultCommentary.path=Bibeln.Standardkommentar
+Bibles.DefaultCommentary.name=Standardkommentar
Bibles.DefaultCommentary.help=Welche der the installierten Kommentare ist Dein bevorzugter Kommentar.
-Bibles.DefaultDailyDevotional.path=Bibeln.bevorzugte taegliche Andacht
+Bibles.DefaultDailyDevotional.name=bevorzugte taegliche Andacht
Bibles.DefaultDailyDevotional.help=Welche der installierten taeglichen Andachten soll als Standard benutzt werden.
-Bibles.DefaultGreekDefinitions.path=Bibeln.griechische Standarddefinitionen (Strongnummern)
+Bibles.DefaultGreekDefinitions.name=griechische Standarddefinitionen (Strongnummern)
Bibles.DefaultGreekDefinitions.help=Welche der installierten Griechischen Definitionen (Strongnummern) soll als Standard eingesetzt werden.
-Bibles.DefaultHebrewDefinitions.path=Bibeln. hebraeische Standarddefinitionen (Strongnummern)
+Bibles.DefaultHebrewDefinitions.name= hebraeische Standarddefinitionen (Strongnummern)
Bibles.DefaultHebrewDefinitions.help=Welche der installierten hebraeischen Definitionen (Strongs) soll als Standard eingesetzt werden.
-Bibles.DefaultGreekParse.path=Bibeln.Default Greek Morphology/Parsing Guides
+Bibles.DefaultGreekParse.name=Default Greek Morphology/Parsing Guides
Bibles.DefaultGreekParse.help=Welche der installierten Greek Morphology/Parsing Guides is the default.
-Bibles.DefaultHebrewParse.path=Bibeln.Default Hebrew Morphology/Parsing Guides
+Bibles.DefaultHebrewParse.name=Default Hebrew Morphology/Parsing Guides
Bibles.DefaultHebrewParse.help=Welche der installierten Hebrew Morphology/Parsing Guides is the default.
-BibleDisplay.Reuse.path=Bible Display.Open links in same Bible View
+
+BibleDisplay.name=Bible Display
+BibleDisplay.Reuse.name=Open links in same Bible View
BibleDisplay.Reuse.help=Reuse Bible View for links.
-BibleDisplay.MaxPickers.path=Bible Display.Parallel Bible Limit
+BibleDisplay.MaxPickers.name=Parallel Bible Limit
BibleDisplay.MaxPickers.help=Limit the number of Bibles to show at once
-BibleDisplay.Commentaries.path=Bible Display.List Commentaries with Bibles
+BibleDisplay.Commentaries.name=List Commentaries with Bibles
BibleDisplay.Commentaries.help=List Commentaries with Bibles
-BibleDisplay.Sidebar.path=Bible Display.Show the Passage Sidebar
+BibleDisplay.Sidebar.name=Show the Passage Sidebar
BibleDisplay.Sidebar.help=Show the Passage Sidebar
-BibleDisplay.VersesPerTab.path=Bible Display.Verses Per Tab
+BibleDisplay.VersesPerTab.name=Verses Per Tab
BibleDisplay.VersesPerTab.help=How many verses do you want to display on a page before spilling to tabbed mode.
-BibleDisplay.RankedVerses.path=Bible Display.Default Number of Matched Verses
+BibleDisplay.RankedVerses.name=Default Number of Matched Verses
BibleDisplay.RankedVerses.help=How many verses do you want to return from a Matched search.
-BibleDisplay.ConfigurableFont.path=Bible Display.Select Font
+BibleDisplay.ConfigurableFont.name=Select Font
BibleDisplay.ConfigurableFont.help=The font to be used to display books.
-BibleDisplay.AntiAliasDisplay.path=Bible Display.Font Smoothing
+BibleDisplay.AntiAliasDisplay.name=Font Smoothing
BibleDisplay.AntiAliasDisplay.help=Font smoothing can be slow, but can help the appearance of some fonts.
-SwordBook.BookSearchPath.path=Sword Books.Additional Book locations
+
+SwordBook.name=Sword Books
+SwordBook.BookSearchPath.name=Additional Book locations
SwordBook.BookSearchPath.help=Additional places to look for SWORD books.
-SwordBook.DownloadDirectory.path=Sword Books.Download Directory
+SwordBook.DownloadDirectory.name=Download Directory
SwordBook.DownloadDirectory.help=Where should we store newly downloaded books.
-Passages.PersistentNaming.path=Passages.Persistent Naming
+
+Passages.name=Passages
+Passages.PersistentNaming.name=Persistent Naming
Passages.PersistentNaming.help=Should your input of names .
-Passages.FullBookName.path=Passages.Use Full Book Names
+Passages.FullBookName.name=Use Full Book Names
Passages.FullBookName.help=Should full Bible book names or abbreviations be used.
-Passages.BlurringRules.path=Passages.Passage Expansion Rules
+Passages.BlurringRules.name=Passage Expansion Rules
Passages.BlurringRules.help=What is the default expansion - Stay within chapter boundaries or not.
Passages.BlurringRules.alternative.0=None
Passages.BlurringRules.alternative.1=Chapter
#Passages.BlurringRules.alternative.2=Book
-Passages.BookCase.path=Passages.Book Case
+Passages.BookCase.name=Book Case
Passages.BookCase.help=What case should we use to display the Bible book names.
Passages.BookCase.alternative.0=lower
Passages.BookCase.alternative.1=Sentence
Passages.BookCase.alternative.2=UPPER
-Application.Language.path=Application.Language
+
+Application.name=Application
+Application.Language.name=Language
Application.Language.help=The language of the application. (Requires restart)
-Application.InitialLayout.path=Application.Initial Layout
+Application.InitialLayout.name=Initial Layout
Application.InitialLayout.help=Do you want to start in Tabbed or Multiple Document view mode (Requires restart)
Application.InitialLayout.alternative.0=Tabbed Document Interface
Application.InitialLayout.alternative.1=Multiple Document Interface
-Application.MaxHeight.path=Application.Maximum Window Height
+Application.MaxHeight.name=Maximum Window Height
Application.MaxHeight.help=The maximum height you want the window to be
-Application.MaxWidth.path=Application.Maximum Window Width
+Application.MaxWidth.name=Maximum Window Width
Application.MaxWidth.help=The maximum width you want the window to be
-Application.UIFont.path=Application.General Font
+Application.UIFont.name=General Font
Application.UIFont.help=The font for the application (Requires restart)
# The following are not for general use and are hidden from view
-BibleDisplay.CSSOverride.path=Bible Display.CSS Override
+BibleDisplay.CSSOverride.name=CSS Override
BibleDisplay.CSSOverride.help=Use an alternate CSS Stylesheet.
-BibleDisplay.Converter.path=Bible Display.Converter
+BibleDisplay.Converter.name=Converter
BibleDisplay.Converter.help=The engine used to genterate the book display
-BibleDisplay.ConfigurableStylesheet.path=Bible Display.Configurable Stylesheet
+BibleDisplay.ConfigurableStylesheet.name=Configurable Stylesheet
BibleDisplay.ConfigurableStylesheet.help=The style applied to displayed Books when using the configurable styler.
-Application.LookAndFeel.path=Application.Look and Feel
+Application.LookAndFeel.name=Look and Feel
Application.LookAndFeel.help=The look and feel of the application.
-Advanced.SourcePath.path=Advanced.Source Path
+
+Advanced.name=Advanced
+Advanced.SourcePath.name=Source Path
Advanced.SourcePath.help=The directories to search for source code in when investigating an exception.
-Advanced.DefaultPassageType.path=Advanced.Default Passage Type
+Advanced.DefaultPassageType.name=Default Passage Type
Advanced.DefaultPassageType.help=What type of passage does the PassageFactory create by default.
Advanced.DefaultPassageType.alternative.0=Speed (Rocket)
Advanced.DefaultPassageType.alternative.1=Write Speed (Bitwise)
Advanced.DefaultPassageType.alternative.2=Size (Distinct)
Advanced.DefaultPassageType.alternative.3=Mix (Ranged)
-Advanced.IncludeAdvancedTabs.path=Advanced.Include Advanced Tabs
+Advanced.IncludeAdvancedTabs.name=Include Advanced Tabs
Advanced.IncludeAdvancedTabs.help=Are the advanced tabs visible in the "About ..." Dialog. (Requires restart)
Modified: trunk/bibledesktop/src/main/resources/config_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_fa.properties 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/bibledesktop/src/main/resources/config_fa.properties 2007-07-28 16:18:14 UTC (rev 1575)
@@ -2,102 +2,110 @@
# keys of the options in the config.xml file.
# Since the keys may have spaces these need to be escaped here.
-Bibles.RetainCurrent.path=\u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633.\u0627\u0632 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633 \u0627\u062E\u06CC\u0631 \u0627\u0633\u062A\u0641\u0627\u062F\u0647 \u06A9\u0646\u06CC\u062F
+Bibles.name=\u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633
+Bibles.RetainCurrent.name=\u0627\u0632 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633 \u0627\u062E\u06CC\u0631 \u0627\u0633\u062A\u0641\u0627\u062F\u0647 \u06A9\u0646\u06CC\u062F
Bibles.RetainCurrent.help=\u0647\u0631 \u0634\u0645\u0627\u062D\u0644 \u062A\u0631\u0698\u0648\u0645\u06D5\u06CC \u0642\u0628\u0644\u06CC \u06CC\u0627 \u062A\u0631\u0698\u0648\u0645\u06D5\u06CC\u0627\u0639\u062F\u06CC \u0627\u0633\u062A\u0641\u062F\u06D5 \u0645\u06CC\u06A9\u0646\u062F
-Bibles.DefaultBible.path=\u06A9\u062A\0627u0628 \u0645\u0642\u062F\u0633. \u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633 \u0647\u0627\u06CC \u0645\u0648\u062C\u0648\u062F \u0645\u062A\u0646 \u0627\u0635\u0644\u06CC \u0627\u0633\u062A
+Bibles.DefaultBible.name=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633 \u0647\u0627\u06CC \u0645\u0648\u062C\u0648\u062F \u0645\u062A\u0646 \u0627\u0635\u0644\u06CC \u0627\u0633\u062A
Bibles.DefaultBible.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633 \u0647\u0627\u06CC \u0645\u0648\u062C\u0648\u062F \u0645\u062A\u0646 \u0627\u0635\u0644\u06CC \u0627\u0633\u062A
-Bibles.DefaultDictionary.path=\u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633. \u0644\u063A\u062A \u0646\u0627\u0645\u0647 \u0627\u0635\u0644\u06CC\u06A9\u062A\u0628 \u0645\u0642\u062F\u0633 \u0647\u0627
+Bibles.DefaultDictionary.name=\u0644\u063A\u062A \u0646\u0627\u0645\u0647 \u0627\u0635\u0644\u06CC\u06A9\u062A\u0628 \u0645\u0642\u062F\u0633 \u0647\u0627
Bibles.DefaultDictionary.help=\u061F\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u0644\u063A\u062A \u0646\u0627\u0645\u0647 \u0647\u0627\u06CC \u0645\u0648\u062C\u0648\u062F \u0644\u063A\u062A \u0646\u0627\u0645\u0647 \u0627\u0635\u0644 \u0627\u0633\u062A
-Bibles.DefaultCommentary.path=\u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633. \u06A9\u062A\u0627\u0628 \u062A\u0641\u0633\u06CC\u0631 \u0627\u0635\u0644\u06CC
+Bibles.DefaultCommentary.name=\u06A9\u062A\u0627\u0628 \u062A\u0641\u0633\u06CC\u0631 \u0627\u0635\u0644\u06CC
Bibles.DefaultCommentary.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u06A9\u062A\u0628 \u062A\u0641\u0633\u06CC\u0631 \u0645\u0648\u062C\u0648\u062F\u060C \u06A9\u062A\u0627\u0628 \u0627\u0635\u0644\u06CC \u0627\u0633\u062A.
-Bibles.DefaultDailyDevotional.path=\u06A9\u062A\0627\u0628 \u0645\u0642\u062F\u0633. \u06A9\u062A\u0627\u0628 \u0631\u0627\u0632\u06AF\u0627\u0647\u0627\u0646 \u0631\u0648\u0632\u0627\u0646\u0647 \u0627\u0635\u0644\u06CC
+Bibles.DefaultDailyDevotional.name=\u06A9\u062A\u0627\u0628 \u0631\u0627\u0632\u06AF\u0627\u0647\u0627\u0646 \u0631\u0648\u0632\u0627\u0646\u0647 \u0627\u0635\u0644\u06CC
Bibles.DefaultDailyDevotional.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u06A9\u062A\u0628 \u0631\u0627\u0632\u06AF\u0627\u0646\u060C \u06A9\u062A\u0627\u0628 \u0627\u0635\u0644\u06CC \u0627\u0633\u062A.
-Bibles.DefaultGreekDefinitions.path=\u06A9\u062A\0627\u0628 \u0645\u0642\u062F\u0633. \u0645\u0639\u0627\u0646\u06CC \u0627\u0635\u0644\u06CC \u06CC\u0648\u0646\u0627\u0646\u06CC (\u0633\u062A\u0631\u0627\u0646\u06AF\u0632
+Bibles.DefaultGreekDefinitions.name=\u0645\u0639\u0627\u0646\u06CC \u0627\u0635\u0644\u06CC \u06CC\u0648\u0646\u0627\u0646\u06CC (\u0633\u062A\u0631\u0627\u0646\u06AF\u0632
Bibles.DefaultGreekDefinitions.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u0645\u0639\u0627\u0646\u06CC \u06CC\u0648\u0646\u0627\u0646\u06CC \u0645\u0648\u062C\u0648\u062F(\u0633\u062A\u0631\u0627\u0646\u06AF\u0632) \u0627\u0635\u0644\u06CC \u0627\u0633\u062A.
-Bibles.DefaultHebrewDefinitions.path=\u06A9\u062A\0627\u0628 \u0645\u0642\u062F\u0633. \u0645\u0639\u0627\u0646\u06CC \u0627\u0635\u0644\u06CC \u0639\u0628\u0631\u06CC (\u0633\u062A\u0631\u0627\u0646\u06AF\u0632
+Bibles.DefaultHebrewDefinitions.name=\u0645\u0639\u0627\u0646\u06CC \u0627\u0635\u0644\u06CC \u0639\u0628\u0631\u06CC (\u0633\u062A\u0631\u0627\u0646\u06AF\u0632
Bibles.DefaultHebrewDefinitions.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u0645\u0639\u0627\u0646\u06CC \u0645\u0648\u062C\u0648\u062F \u0639\u0628\u0631\u06CC (\u0633\u062A\u0631\u0627\u0646\u06AF\u0632) \u0645\u0639\u0646\u06CC \u0627\u0635\u0644\u06CC \u0627\u0633\u062A.
-Bibles.DefaultGreekParse.path=\u06A9\u062A\0627\u0628 \u0645\u0642\u062F\u0633.\u0631\u0627\u0647\u0646\u0645\u0627\u06CC \u0627\u0635\u0644\u06CC \u0645\u0648\u0631\u0641\u0648\u0644\u0648\u0698\u06CC \u06CC\u0648\u0646\u0627\u0646\u06CC
+Bibles.DefaultGreekParse.name=\u0631\u0627\u0647\u0646\u0645\u0627\u06CC \u0627\u0635\u0644\u06CC \u0645\u0648\u0631\u0641\u0648\u0644\u0648\u0698\u06CC \u06CC\u0648\u0646\u0627\u0646\u06CC
Bibles.DefaultGreekParse.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u0631\u0627\u0647\u0646\u0645\u0627\u0647\u0627\u06CC \u0645\u0648\u0631\u0641\u0648\u0644\u0648\u0698\u06CC \u06CC\u0648\u0646\u0627\u0646\u06CC \u0627\u0635\u0644\u06CC \u0627\u0633\u062A.
-Bibles.DefaultHebrewParse.path=\u06A9\u062A\0627\u0628 \u0645\u0642\u062F\u0633. \u0631\u0627\u0647\u0646\u0645\u0627\u06CC
+Bibles.DefaultHebrewParse.name=\u0631\u0627\u0647\u0646\u0645\u0627\u06CC
Bibles.DefaultHebrewParse.help=\u06A9\u062F\u0627\u0645\u06CC\u06A9 \u0627\u0632 \u0631\u0627\u0647\u0646\u0645\u0627\u0647\u0627\u06CC \u0645\u0648\u0631\u0641\u0648\u0644\u0648\u0698\u06CC \u0639\u0628\u0631\u06CC \u0645\u0648\u062C\u0648\u062F \u0627\u0635\u0644\u06CC \u0627\u0633\u062A.
# All above refer to the Bible tab in the settings. Lines with "Path" need a "Ketab moghadass" as initial bit. The "Help" lines are free floati8ng text explaining the box.
-# I have choses the singular Ketab moghadass on purpose to avoid silly discussions about Christians having many bibles. The plural in English obviously
+# I have chosen the singular Ketab moghadass on purpose to avoid silly discussions about Christians having many bibles. The plural in English obviously
# refers to multiplicity of translations
-BibleDisplay.Reuse.path=\u0646\u0645\u0627\u06CC\u0634 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633. \u067E\u06CC\u0648\u0646\u062F\u0647\u0627\u06CC \u0645\u0631\u0628\u0648\u0637 \u0628\u0647 \u0647\u0645\u06CC\u0646 \u062A\u0631\u062C\u0645\u0647 \u0631\u0627 \u0628\u0627\u0632 \u06A9\u0646
-BibleDisplay.Reuse.help=.\u0628\u0631\u0627\u06CC \u067E\u06CC\u0648\u0646\u062F\u0647\u0627 \u0627\u0632 \u0647\u0645\u06CC\u0646 \u062A\u0631\u062C\u0645\u0647 \u0627\u0633\u062A\u0641\u0627\u062F\u0647 \u06A9\u0646
-BibleDisplay.MaxPickers.path=\u0646\u0645\u0627\u06CC\u0634 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633.\u062C\u0646\u062F \u06A9\u062A\u0627\u0628 \u062F\u0631 \u0634\u0645\u06CC\u0644
+BibleDisplay.name=\u0646\u0645\u0627\u06CC\u0634 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633
+BibleDisplay.Reuse.name=\u067E\u06CC\u0648\u0646\u062F\u0647\u0627\u06CC \u0645\u0631\u0628\u0648\u0637 \u0628\u0647 \u0647\u0645\u06CC\u0646 \u062A\u0631\u062C\u0645\u0647 \u0631\u0627 \u0628\u0627\u0632 \u06A9\u0646
+BibleDisplay.Reuse.help=\u0628\u0631\u0627\u06CC \u067E\u06CC\u0648\u0646\u062F\u0647\u0627 \u0627\u0632 \u0647\u0645\u06CC\u0646 \u062A\u0631\u062C\u0645\u0647 \u0627\u0633\u062A\u0641\u0627\u062F\u0647 \u06A9\u0646
+BibleDisplay.MaxPickers.name=\u062C\u0646\u062F \u06A9\u062A\u0627\u0628 \u062F\u0631 \u0634\u0645\u06CC\u0644
BibleDisplay.MaxPickers.help=
-BibleDisplay.Commentaries.path=\u0646\u0645\u0627\u06CC\u0634 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633.\u06A9\u062A\u0627\u0628\u0647 \u062A\u0641\u0633\u06CC\u0631\u06CC \u0628\u0627 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633\u0647\u0627
+BibleDisplay.Commentaries.name=\u06A9\u062A\u0627\u0628\u0647 \u062A\u0641\u0633\u06CC\u0631\u06CC \u0628\u0627 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633\u0647\u0627
BibleDisplay.Commentaries.help=\u06A9\u062A\u0627\u0628\u0647\u0627 \u062A\u0641\u0633\u06CC\u0631\u06CC \u062F\u0631 \u0644\u06CC\u0633\u062A \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633\u0647\u0627\u0628\u06AF\u0633\u0631
-BibleDisplay.Sidebar.path=\u0646\u0645\u0627\u06CC\u0634 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633.
+BibleDisplay.Sidebar.name=
BibleDisplay.Sidebar.help=
-BibleDisplay.VersesPerTab.path=\u0646\u0645\u0627\u06CC\u0634 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633.\u062C\u0646\u062F \u0639\u06CC\u0627\u062A \u062F\u0631 \u0635\u0641\u0647\u061F
+BibleDisplay.VersesPerTab.name=\u062C\u0646\u062F \u0639\u06CC\u0627\u062A \u062F\u0631 \u0635\u0641\u0647\u061F
BibleDisplay.VersesPerTab.help=
-BibleDisplay.RankedVerses.path=\u0646\u0645\u0627\u06CC\u0634 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633.\u062C\u0646\u062F \u0639\u06CC\u0627\u062A \u062F\u0631 \u062C\u0648\u0627\u0628 \u0628\u0627\u0632\u0631\u0633\u06CC
+BibleDisplay.RankedVerses.name=\u062C\u0646\u062F \u0639\u06CC\u0627\u062A \u062F\u0631 \u062C\u0648\u0627\u0628 \u0628\u0627\u0632\u0631\u0633\u06CC
BibleDisplay.RankedVerses.help=
-BibleDisplay.ConfigurableFont.path=\u0646\u0645\u0627\u06CC\u0634 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633.\u0627\u0646\u062A\u062E\u0627\u0628 \u0641\u0648\u0646\u062A \u0646\u0645\u0627\u06CC\u0634 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633
+BibleDisplay.ConfigurableFont.name=\u0627\u0646\u062A\u062E\u0627\u0628 \u0641\u0648\u0646\u062A \u0646\u0645\u0627\u06CC\u0634 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633
BibleDisplay.ConfigurableFont.help=\u0641\u0648\u0646\u062A \u0646\u0645\u0627\u06CC\u0634 \u06A9\u062A\u0627\u0628\u0647\u0627
-BibleDisplay.AntiAliasDisplay.path=.\u0646\u0645\u0627\u06CC\u0634 \u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633.\u062A\u0645\u06CC\u0633 \u06A9\u0631\u062F\u0646 \u0641\u0648\u0646\u062A\u0647\u0627
+BibleDisplay.AntiAliasDisplay.name=\u062A\u0645\u06CC\u0633 \u06A9\u0631\u062F\u0646 \u0641\u0648\u0646\u062A\u0647\u0627
BibleDisplay.AntiAliasDisplay.help=\u062A\u0645\u06CC\u0633 \u06A9\u0631\u062F\u0646 \u0641\u0648\u0646\u062A \u0647\u0627 \u06A9\u0631 \u06CC\u0648\u0627\u0634 \u0647\u0633\u062A \u0648\u0644\u06CC \u0642\u0634\u0646\u06AF\u062A\u0631 \u0647\u0633\u062A \u062F\u0631 \u0628\u0639\u0633\u06CC \u0641\u06CC\u0646\u062A\u0647\u0627
# All the above refers to the presentation of the Bibles in the central viewing pane.
-
-SwordBook.BookSearchPath.path=\u0645\u062F\u0648\u0644\u0647\u0627 \u06A9\u062A\u0627\u0628\u0647\u0627.\u0641\u0647\u0631\u0633\u062A \u06A9\u062A\u0627\u0628\u0647\u0627
+SwordBook.name=\u0645\u062F\u0648\u0644\u0647\u0627 \u06A9\u062A\u0627\u0628\u0647\u0627
+SwordBook.BookSearchPath.name=\u0641\u0647\u0631\u0633\u062A \u06A9\u062A\u0627\u0628\u0647\u0627
SwordBook.BookSearchPath.help=
-SwordBook.DownloadDirectory.path=\u0645\u062F\u0648\u0644\u0647\u0627 \u06A9\u062A\u0627\u0628\u0647\u0627.\u0641\u0647\u0631\u0633\u062A
+SwordBook.DownloadDirectory.name=\u0641\u0647\u0631\u0633\u062A
SwordBook.DownloadDirectory.help=
-Passages.PersistentNaming.path=\u0642\u0633\u0645\u062A\u0647\u0627.\u062D\u0633\u0645\u0647\u0627 \u0646\u0648\u0632\u06CC
+Passages.name=\u0642\u0633\u0645\u062A\u0647\u0627
+Passages.PersistentNaming.name=\u062D\u0633\u0645\u0647\u0627 \u0646\u0648\u0632\u06CC
Passages.PersistentNaming.help=
-Passages.FullBookName.path=\u0642\u0633\u0645\u062A\u0647\u0627.\u0639\u0633\u0645 \u06A9\u062A\u0627\u0628\u0647\u0627 \u06A9\u0627\u0645\u0644
+Passages.FullBookName.name=\u0639\u0633\u0645 \u06A9\u062A\u0627\u0628\u0647\u0627 \u06A9\u0627\u0645\u0644
Passages.FullBookName.help=
-Passages.BlurringRules.path=\u0642\u0633\u0645\u062A\u0647\u0627.\u062C\u0642\u062F\u0631 \u062F\u0631 \u0647\u0631 \u0635\u0641\u0647
-Passages.BlurringRules.help=\u0628\u06CC\u0634\u062A\u0631 \u0627\u0633 \u06CC\u06A9 \u0628\u0627\u0628 \u062F\u0631 \u0647\u0631 \u0635\u0641\u0647\u061F
-Passages.BlurringRules.alternative.0=\u0647\u06CC\u062C
-Passages.BlurringRules.alternative.1=\u0628\u0627\u0628
-#Passages.BlurringRules.alternative.2=\u06A9\u062A\u0627\u0628
+Passages.BlurringRules.ignore=true
+#Passages.BlurringRules.name=\u062C\u0642\u062F\u0631 \u062F\u0631 \u0647\u0631 \u0635\u0641\u0647
+#Passages.BlurringRules.help=\u0628\u06CC\u0634\u062A\u0631 \u0627\u0633 \u06CC\u06A9 \u0628\u0627\u0628 \u062F\u0631 \u0647\u0631 \u0635\u0641\u0647\u061F
+#Passages.BlurringRules.alternative.0=\u0647\u06CC\u062C
+#Passages.BlurringRules.alternative.1=\u0628\u0627\u0628
+##Passages.BlurringRules.alternative.2=\u06A9\u062A\u0627\u0628
# The below options are relevant only for Latin type script. I have therefore taken them out. I also do not know exactly how to translate them anyway...
-Passages.BookCase.path=
+Passages.BookCase.ignore=true
+Passages.BookCase.name=
Passages.BookCase.help=
Passages.BookCase.alternative.0=
Passages.BookCase.alternative.1=
Passages.BookCase.alternative.2=
-Application.Language.path=\u0628\u0631\u0646\u0627\u0645\u0647.\u0632\u0628\u0627\u0646
-Application.Language.help=\u0632\u0628\u0627\u0646 \u0628\u0631\u0646\u0627\u0645\u0647. \u0634\u0631\u0648\u0639 \u062A\u0627\u0632\u0647 \u0644\u0632\u0645 \u0647\u0633\u062A
-Application.InitialLayout.path=\u0628\u0631\u0646\u0627\u0645\u0647.\u062A\u0631\u062A\u06CC\u0628
-Application.InitialLayout.help=\u0646\u0645\u0627\u06CC\u0634 \u0628\u0627 \u067E\u0646\u062C\u0631\u0647\u0647\u0627 \u06CC\u0627 \u0628\u0627 \u062C\u062F\u0648\u0644 \u0628\u0646\u062F
-Application.InitialLayout.alternative.0=\u062C\u062F\u0648\u0644 \u0628\u0646\u062F
-Application.InitialLayout.alternative.1=\u067E\u0646\u062C\u0631\u0647\u0647\u0627
-Application.MaxHeight.path=\u0628\u0631\u0646\u0627\u0645\u0647.\u0628\u0644\u0646\u062F\u06CC \u067E\u0646\u062C\u0631\u0647
+Application.name=\u0628\u0631\u0646\u0627\u0645\u0647
+Application.Language.name=\u0632\u0628\u0627\u0646
+Application.Language.help=\u0634\u0631\u0648\u0639 \u062A\u0627\u0632\u0647 \u0644\u0632\u0645 \u0647\u0633\u062A
+Application.InitialLayout.ignore=true
+#Application.InitialLayout.name=\u062A\u0631\u062A\u06CC\u0628
+#Application.InitialLayout.help=\u0646\u0645\u0627\u06CC\u0634 \u0628\u0627 \u067E\u0646\u062C\u0631\u0647\u0647\u0627 \u06CC\u0627 \u0628\u0627 \u062C\u062F\u0648\u0644 \u0628\u0646\u062F
+#Application.InitialLayout.alternative.0=\u062C\u062F\u0648\u0644 \u0628\u0646\u062F
+#Application.InitialLayout.alternative.1=\u067E\u0646\u062C\u0631\u0647\u0647\u0627
+Application.MaxHeight.name=\u0628\u0644\u0646\u062F\u06CC \u067E\u0646\u062C\u0631\u0647
Application.MaxHeight.help=
-Application.MaxWidth.path=\u0628\u0631\u0646\u0627\u0645\u0647.\u067E\u0647\u0646\u0627 \u067E\u0646\u062C\u0631\u0647
+Application.MaxWidth.name=\u0628\u0631\u0646\u0627\u0645\u0647.\u067E\u0647\u0646\u0627 \u067E\u0646\u062C\u0631\u0647
Application.MaxWidth.help=
-Application.UIFont.path=\u0628\u0631\u0646\u0627\u0645\u0647.\u0641\u0648\u0646\u062A \u0648\u0645\u0648\u0645\u06CC
+Application.UIFont.name=\u0641\u0648\u0646\u062A \u0648\u0645\u0648\u0645\u06CC
Application.UIFont.help=\u0641\u0648\u0646\u062A \u0628\u0631\u0646\u0627\u0645\u0647. \u0634\u0631\u0648\u0639 \u062A\u0627\u0632\u0647 \u0644\u0632\u0645 \u0647\u0633\u062A
# The following are not for general use and are hidden from view
-BibleDisplay.CSSOverride.path=Bible Display.CSS Override
+BibleDisplay.CSSOverride.name=CSS Override
BibleDisplay.CSSOverride.help=Use an alternate CSS Stylesheet.
-BibleDisplay.Converter.path=Bible Display.Converter
-BibleDisplay.Converter.help=The engine used to genterate the book display
-BibleDisplay.ConfigurableStylesheet.path=Bible Display.Configurable Stylesheet
+BibleDisplay.Converter.name=Converter
+BibleDisplay.Converter.help=The engine used to generate the book display
+BibleDisplay.ConfigurableStylesheet.name=Configurable Stylesheet
BibleDisplay.ConfigurableStylesheet.help=The style applied to displayed Books when using the configurable styler.
-Application.LookAndFeel.path=Application.Look and Feel
+Application.LookAndFeel.name=Look and Feel
Application.LookAndFeel.help=The look and feel of the application.
-Advanced.SourcePath.path=Advanced.Source Path
+Advanced.name=Advanced
+Advanced.SourcePath.name=Source Path
Advanced.SourcePath.help=The directories to search for source code in when investigating an exception.
-Advanced.DefaultPassageType.path=Advanced.Default Passage Type
+Advanced.DefaultPassageType.name=Default Passage Type
Advanced.DefaultPassageType.help=What type of passage does the PassageFactory create by default.
Advanced.DefaultPassageType.alternative.0=Speed (Rocket)
Advanced.DefaultPassageType.alternative.1=Write Speed (Bitwise)
Advanced.DefaultPassageType.alternative.2=Size (Distinct)
Advanced.DefaultPassageType.alternative.3=Mix (Ranged)
-Advanced.IncludeAdvancedTabs.path=Advanced.Include Advanced Tabs
+Advanced.IncludeAdvancedTabs.name=Include Advanced Tabs
Advanced.IncludeAdvancedTabs.help=Are the advanced tabs visible in the "About ..." Dialog. (Requires restart)
Modified: trunk/bibledesktop/src/main/resources/config_fa.txt
===================================================================
--- trunk/bibledesktop/src/main/resources/config_fa.txt 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/bibledesktop/src/main/resources/config_fa.txt 2007-07-28 16:18:14 UTC (rev 1575)
@@ -2,100 +2,102 @@
# keys of the options in the config.xml file.
# Since the keys may have spaces these need to be escaped here.
-Bibles.RetainCurrent.path=کتاب مقدس.از کتاب مقدس اخیر استفاده کنید
+Bibles.name=کتاب مقدس
+Bibles.RetainCurrent.name=از کتاب مقدس اخیر استفاده کنید
Bibles.RetainCurrent.help=هر شماحل ترژومەی قبلی یا ترژومەیاعدی استفدە میکند
-Bibles.DefaultBible.path=کتب مقدس. کدامیک از کتاب مقدس های موجود متن اصلی است
+Bibles.DefaultBible.name=کدامیک از کتاب مقدس های موجود متن اصلی است
Bibles.DefaultBible.help=کدامیک از کتاب مقدس های موجود متن اصلی است
-Bibles.DefaultDictionary.path=کتاب مقدس. لغت نامه اصلیکتب مقدس ها
+Bibles.DefaultDictionary.name=لغت نامه اصلیکتب مقدس ها
Bibles.DefaultDictionary.help=؟کدامیک از لغت نامه های موجود لغت نامه اصل است
-Bibles.DefaultCommentary.path=کتاب مقدس. کتاب تفسیر اصلی
+Bibles.DefaultCommentary.name=کتاب مقدس. کتاب تفسیر اصلی
Bibles.DefaultCommentary.help=کدامیک از کتب تفسیر موجود، کتاب اصلی است.
-Bibles.DefaultDailyDevotional.path=کتب مقدس. کتاب رازگاهان روزانه اصلی
+Bibles.DefaultDailyDevotional.name= کتاب رازگاهان روزانه اصلی
Bibles.DefaultDailyDevotional.help=کدامیک از کتب رازگان، کتاب اصلی است.
-Bibles.DefaultGreekDefinitions.path=کتب مقدس. معانی اصلی یونانی (سترانگز
+Bibles.DefaultGreekDefinitions.name= معانی اصلی یونانی (سترانگز
Bibles.DefaultGreekDefinitions.help=.کدامیک از معانی یونانی موجود(سترانگز) اصلی است.
-Bibles.DefaultHebrewDefinitions.path=(کتب مقدس. معانی اصلی عبری (سترانگز
+Bibles.DefaultHebrewDefinitions.name=( معانی اصلی عبری (سترانگز
Bibles.DefaultHebrewDefinitions.help=کدامیک از معانی موجود عبری (سترانگز) معنی اصلی است.
-Bibles.DefaultGreekParse.path=کتب مقدس.راهنمای اصلی مورفولوژی یونانی
+Bibles.DefaultGreekParse.name=راهنمای اصلی مورفولوژی یونانی
Bibles.DefaultGreekParse.help=کدامیک از راهنماهای مورفولوژی یونانی اصلی است.
-Bibles.DefaultHebrewParse.path=کتب مقدس. راهنمای
+Bibles.DefaultHebrewParse.name= راهنمای
Bibles.DefaultHebrewParse.help=کدامیک از راهنماهای مورفولوژی عبری موجود اصلی است.
# All above refer to the Bible tab in the settings. Lines with "Path" need a "Ketab moghadass" as initial bit. The "Help" lines are free floati8ng text explaining the box.
# I have choses the singular Ketab moghadass on purpose to avoid silly discussions about Christians having many bibles. The plural in English obviously
# refers to multiplicity of translations
-BibleDisplay.Reuse.path=نمایش کتاب مقدس. پیوندهای مربوط به همین ترجمه را باز کن
+BibleDisplay.name=نمایش کتاب مقدس
+BibleDisplay.Reuse.name=. پیوندهای مربوط به همین ترجمه را باز کن
BibleDisplay.Reuse.help=.برای پیوندها از همین ترجمه استفاده کن
-BibleDisplay.MaxPickers.path=نمایش کتاب مقدس. جند کتاب در شمیل
+BibleDisplay.MaxPickers.name= جند کتاب در شمیل
BibleDisplay.MaxPickers.help=Limit the number of Bibles to show at once.
-BibleDisplay.Commentaries.path=نمایش کتاب مقدس. کتابه تفسیری با کتاب مقدسها
+BibleDisplay.Commentaries.name= کتابه تفسیری با کتاب مقدسها
BibleDisplay.Commentaries.help=کتابها تفسیری در لیست کتاب مقدسهابگسر
-BibleDisplay.Sidebar.path=..نمایش کتاب مقدسShow the Passage Sidebar
+BibleDisplay.Sidebar.name=..نمایش کتاب مقدسShow the Passage Sidebar
BibleDisplay.Sidebar.help=Show the Passage Sidebar
-BibleDisplay.VersesPerTab.path=.نمایش کتاب مقدسVerses Per Tab
+BibleDisplay.VersesPerTab.name=.نمایش کتاب مقدسVerses Per Tab
BibleDisplay.VersesPerTab.help=How many verses do you want to display on a page before spilling to tabbed mode.
-BibleDisplay.RankedVerses.path=.نمایش کتاب مقدسDefault Number of Matched Verses
+BibleDisplay.RankedVerses.name=.نمایش کتاب مقدسDefault Number of Matched Verses
BibleDisplay.RankedVerses.help=How many verses do you want to return from a Matched search.
-BibleDisplay.ConfigurableFont.path=نمایش کتاب مقدس.انتخاب فونت نمایش کتاب مقدس
+BibleDisplay.ConfigurableFont.name=انتخاب فونت نمایش کتاب مقدس
BibleDisplay.ConfigurableFont.help=فونت نمایش کتابها
-BibleDisplay.AntiAliasDisplay.path=.نمایش کتاب مقدس.تمیس کردن فونتها
+BibleDisplay.AntiAliasDisplay.name=.تمیس کردن فونتها
BibleDisplay.AntiAliasDisplay.help=تمیس کردن فونت ها کر یواش هست ولی قشنگتر هست در بعسی فینتها
# All the above refers to the presentation of the Bibles in the central viewing pane.
-
-SwordBook.BookSearchPath.path=Sword Books.Additional Book locations
+SwordBook.name=Sword Books
+SwordBook.BookSearchPath.name=Additional Book locations
SwordBook.BookSearchPath.help=Additional places to look for SWORD books.
-SwordBook.DownloadDirectory.path=Sword Books.Download Directory
+SwordBook.DownloadDirectory.name=Download Directory
SwordBook.DownloadDirectory.help=Where should we store newly downloaded books.
-Passages.PersistentNaming.path=Passages.Persistent Naming
+Passages.PersistentNaming.name=Passages.Persistent Naming
Passages.PersistentNaming.help=Should your input of names .
-Passages.FullBookName.path=Passages.Use Full Book Names
+Passages.FullBookName.name=Passages.Use Full Book Names
Passages.FullBookName.help=Should full Bible book names or abbreviations be used.
-Passages.BlurringRules.path=Passages.Passage Expansion Rules
+Passages.BlurringRules.name=Passages.Passage Expansion Rules
Passages.BlurringRules.help=What is the default expansion - Stay within chapter boundaries or not.
Passages.BlurringRules.alternative.0=None
Passages.BlurringRules.alternative.1=Chapter
#Passages.BlurringRules.alternative.2=Book
-Passages.BookCase.path=Passages.Book Case
+Passages.BookCase.name=Passages.Book Case
Passages.BookCase.help=What case should we use to display the Bible book names.
Passages.BookCase.alternative.0=lower
Passages.BookCase.alternative.1=Sentence
Passages.BookCase.alternative.2=UPPER
-Application.Language.path=برنامه.زبان
+Application.Language.name=برنامه.زبان
Application.Language.help=زبان برنامه. شروع تازه لزم هست
-Application.InitialLayout.path=برنامه.ترتیب
+Application.InitialLayout.name=برنامه.ترتیب
Application.InitialLayout.help=Do you want to start in Tabbed or Multiple Document view mode (Requires restart)
Application.InitialLayout.alternative.0=Tabbed Document Interface
Application.InitialLayout.alternative.1=Multiple Document Interface
-Application.MaxHeight.path=برنامه.Maximum Window Height
+Application.MaxHeight.name=برنامه.Maximum Window Height
Application.MaxHeight.help=The maximum height you want the window to be
-Application.MaxWidth.path=برنامه.Maximum Window Width
+Application.MaxWidth.name=برنامه.Maximum Window Width
Application.MaxWidth.help=The maximum width you want the window to be
-Application.UIFont.path=برنامه.فونت ومومی
+Application.UIFont.name=برنامه.فونت ومومی
Application.UIFont.help=فونت برنامه. شروع تازه لزم هست
# The following are not for general use and are hidden from view
-BibleDisplay.CSSOverride.path=Bible Display.CSS Override
+BibleDisplay.CSSOverride.name=Bible Display.CSS Override
BibleDisplay.CSSOverride.help=Use an alternate CSS Stylesheet.
-BibleDisplay.Converter.path=Bible Display.Converter
+BibleDisplay.Converter.name=Bible Display.Converter
BibleDisplay.Converter.help=The engine used to genterate the book display
-BibleDisplay.ConfigurableStylesheet.path=Bible Display.Configurable Stylesheet
+BibleDisplay.ConfigurableStylesheet.name=Bible Display.Configurable Stylesheet
BibleDisplay.ConfigurableStylesheet.help=The style applied to displayed Books when using the configurable styler.
-Application.LookAndFeel.path=Application.Look and Feel
+Application.LookAndFeel.name=Application.Look and Feel
Application.LookAndFeel.help=The look and feel of the application.
-Advanced.SourcePath.path=Advanced.Source Path
+Advanced.SourcePath.name=Advanced.Source Path
Advanced.SourcePath.help=The directories to search for source code in when investigating an exception.
-Advanced.DefaultPassageType.path=Advanced.Default Passage Type
+Advanced.DefaultPassageType.name=Advanced.Default Passage Type
Advanced.DefaultPassageType.help=What type of passage does the PassageFactory create by default.
Advanced.DefaultPassageType.alternative.0=Speed (Rocket)
Advanced.DefaultPassageType.alternative.1=Write Speed (Bitwise)
Advanced.DefaultPassageType.alternative.2=Size (Distinct)
Advanced.DefaultPassageType.alternative.3=Mix (Ranged)
-Advanced.IncludeAdvancedTabs.path=Advanced.Include Advanced Tabs
+Advanced.IncludeAdvancedTabs.name=Advanced.Include Advanced Tabs
Advanced.IncludeAdvancedTabs.help=Are the advanced tabs visible in the "About ..." Dialog. (Requires restart)
Modified: trunk/common/JSwordDictionary.txt
===================================================================
--- trunk/common/JSwordDictionary.txt 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common/JSwordDictionary.txt 2007-07-28 16:18:14 UTC (rev 1575)
@@ -8,3 +8,4 @@
javadoc
unshaped
combo
+tabbed
Modified: trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -23,9 +23,11 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.MissingResourceException;
import java.util.ResourceBundle;
import org.crosswire.common.util.Logger;
+import org.crosswire.common.util.StringUtil;
import org.jdom.Element;
/**
@@ -34,6 +36,7 @@
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
+ * @author DM Smith [dmsmith555 at yahoo dot com]
*/
public abstract class AbstractReflectedChoice implements Choice
{
@@ -46,16 +49,54 @@
key = option.getAttributeValue("key"); //$NON-NLS-1$
- String hiddenState = option.getAttributeValue("hidden"); //$NON-NLS-1$
- hidden = Boolean.valueOf(hiddenState).booleanValue();
+ // Hidden is an optional field so it is ok for the resource to be missing.
+ try
+ {
+ String hiddenState = option.getAttributeValue("hidden"); //$NON-NLS-1$
+ hidden = Boolean.valueOf(hiddenState).booleanValue();
+ }
+ catch (MissingResourceException e)
+ {
+ hidden = false;
+ }
+ // Ignore is an optional field so it is ok for the resource to be missing.
+ try
+ {
+ String ignoreState = configResources.getString(key + ".ignore"); //$NON-NLS-1$
+ ignored = Boolean.valueOf(ignoreState).booleanValue();
+ if (ignored)
+ {
+ hidden = true;
+ return;
+ }
+ }
+ catch (MissingResourceException e)
+ {
+ ignored = false;
+ }
+
String helpText = configResources.getString(key + ".help"); //$NON-NLS-1$
assert helpText != null;
setHelpText(helpText);
- String path = configResources.getString(key + ".path"); //$NON-NLS-1$
- assert path != null;
- setFullPath(path);
+ // OPTIMIZE(dms): This is poorly done (by me!)
+ String[] pathParts = StringUtil.split(key, '.');
+ StringBuffer parentKey = new StringBuffer();
+ StringBuffer path = new StringBuffer();
+ for (int i = 0; i < pathParts.length; i++)
+ {
+ if (i > 0)
+ {
+ parentKey.append('.');
+ path.append('.');
+ }
+ parentKey.append(pathParts[i]);
+ String parent = configResources.getString(parentKey + ".name"); //$NON-NLS-1$
+ assert parent != null;
+ path.append(parent);
+ }
+ setFullPath(path.toString());
type = option.getAttributeValue("type"); //$NON-NLS-1$
@@ -119,17 +160,6 @@
log.debug("Not using " + propertyname + " from " + clazz.getName() + " because the return type of the getter is not " + getConversionClass().getName()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
throw new StartupException(Msg.CONFIG_NORETURN, new Object[] { getter.getReturnType(), getConversionClass() });
}
-
- // 2 optional config attrubites
- String priorityname = option.getAttributeValue("priority"); //$NON-NLS-1$
- if (priorityname == null)
- {
- priority = Choice.PRIORITY_NORMAL;
- }
- else
- {
- priority = Integer.parseInt(priorityname);
- }
}
/* (non-Javadoc)
@@ -154,7 +184,7 @@
public abstract String convertToString(Object orig);
/**
- * Convert from a stored string to an object to use with relfection
+ * Convert from a stored string to an object to use with reflection
*/
public abstract Object convertToObject(String orig);
@@ -207,24 +237,13 @@
}
/* (non-Javadoc)
- * @see org.crosswire.common.config.Choice#getPriority()
+ * @see org.crosswire.common.config.Choice#isIgnored()
*/
- public int getPriority()
+ public boolean isIgnored()
{
- return priority;
+ return ignored;
}
- /**
- * Sometimes we need to ensure that we configure items in a certain
- * order, the config package moves the changes to the application
- * starting with the highest priority, moving to the lowest
- * @param priority A priority level
- */
- public void setPriority(int priority)
- {
- this.priority = priority;
- }
-
/* (non-Javadoc)
* @see org.crosswire.common.config.Choice#requiresRestart()
*/
@@ -336,9 +355,9 @@
private boolean hidden;
/**
- * The priority of this config level
+ * Whether this choice should be ignored altogether.
*/
- private int priority = PRIORITY_NORMAL;
+ private boolean ignored;
/**
* The log stream
Modified: trunk/common/src/main/java/org/crosswire/common/config/Choice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/Choice.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common/src/main/java/org/crosswire/common/config/Choice.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -112,20 +112,16 @@
boolean isSaveable();
/**
- * Sometimes we need to ensure that we configure items in a certain
- * order, the config package moves the changes to the application
- * starting with the highest priority, moving to the lowest. The
- * normal priorities are 0-10 or the PRIORITY_* constants, the default
- * being PRIORITY_NORMAL
- * @return A priority level
+ * Whether this should be visible in a Config Editor.
+ * @return hidden or visible
*/
- int getPriority();
+ boolean isHidden();
/**
- * Whether this should be visible in a Config Editor.
+ * Whether this should be ignored altogether in a Config Editor.
* @return hidden or visible
*/
- boolean isHidden();
+ boolean isIgnored();
/**
* Do we need to restart the program in order for this change to have
@@ -133,39 +129,4 @@
* @return True if a restart is required
*/
boolean requiresRestart();
-
- /**
- * The highest level priority generally for system level stuff
- */
- int PRIORITY_SYSTEM = 10;
-
- /**
- * The priority level for important but non system level stuff
- */
- int PRIORITY_EXTENDER = 9;
-
- /**
- * The priority level for important but non system level stuff
- */
- int PRIORITY_HIGHEST = 8;
-
- /**
- * The priority level for normal use
- */
- int PRIORITY_NORMAL = 6;
-
- /**
- * The priority level for creating items for later configuring
- */
- int PRIORITY_CTOR = 4;
-
- /**
- * The priority level for configuring previously created items
- */
- int PRIORITY_ACCESSOR = 2;
-
- /**
- * The lowest level priority generally for system level stuff
- */
- int PRIORITY_LOWEST = 0;
}
Modified: trunk/common/src/main/java/org/crosswire/common/config/Config.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/Config.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common/src/main/java/org/crosswire/common/config/Config.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -141,7 +141,10 @@
try
{
Choice choice = ChoiceFactory.getChoice(element, configResources);
- add(choice);
+ if (!choice.isIgnored())
+ {
+ add(choice);
+ }
}
catch (StartupException e)
{
@@ -302,71 +305,10 @@
}
}
}
-// int highestChange = Choice.PRIORITY_LOWEST;
-//
-// if (force)
-// {
-// log.info("Force=true, all changes will propagate regardless"); //$NON-NLS-1$
-// }
-//
-// for (int priority = Choice.PRIORITY_SYSTEM; priority >= Choice.PRIORITY_LOWEST; priority--)
-// {
-// log.info("Settings for priority level=" + priority); //$NON-NLS-1$
-//
-// Iterator it = keys.iterator();
-// while (it.hasNext())
-// {
-// String key = (String) it.next();
-// Choice choice = getChoice(key);
-//
-// if (choice.getPriority() == priority)
-// {
-// String oldValue = choice.getString();
-// String newValue = local.getProperty(key);
-//
-// // The new value shouldn't really be blank - obviously this
-// // choice has just been added, substitute the default.
-// if (newValue == null)
-// {
-// local.put(key, oldValue);
-// newValue = oldValue;
-// }
-//
-// try
-// {
-// // If a value has not changed, we only call setString()
-// // if force==true or if a higher priority choice has
-// // changed.
-// if (force
-// || priority < highestChange
-// || !newValue.equals(oldValue))
-// {
-// log.info("Setting " + key + "=" + newValue + " (was " + oldValue + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-// choice.setString(newValue);
-//
-// if (priority > highestChange)
-// {
-// highestChange = priority;
-//
-// if (!force)
-// {
-// log.info("Change at level " + highestChange + ", all changes will propagate regardless"); //$NON-NLS-1$ //$NON-NLS-2$
-// }
-// }
-// }
-// }
-// catch (Exception ex)
-// {
-// log.warn("Failure setting " + key + "=" + newValue, ex); //$NON-NLS-1$ //$NON-NLS-2$
-// Reporter.informUser(this, new ConfigException(Msg.CONFIG_SETFAIL, ex, new Object[] { choice.getFullPath() } ));
-// }
-// }
-// }
-// }
}
/**
- * Take the data stored permanetly and copy it to the local
+ * Take the data stored permanently and copy it to the local
* storage area, using the specified stream
*/
public void setProperties(Properties prop)
Modified: trunk/common/src/main/java/org/crosswire/common/config/FontChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/FontChoice.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common/src/main/java/org/crosswire/common/config/FontChoice.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -44,7 +44,7 @@
/* @Override */
public String convertToString(Object orig)
{
- // PENDING: object=font? is this right? isn't there a converter somewhere
+ // This is a string representation of the font in the form:name.style.size
return (String) orig;
}
Modified: trunk/common/src/main/java/org/crosswire/common/config/IntOptionsChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/IntOptionsChoice.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common/src/main/java/org/crosswire/common/config/IntOptionsChoice.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -87,7 +87,8 @@
/* @Override */
public String convertToString(Object orig)
{
- return options[((Integer) orig).intValue()];
+// return options[((Integer) orig).intValue()];
+ return orig.toString();
}
/* (non-Javadoc)
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -44,7 +44,7 @@
import org.crosswire.common.util.Logger;
/**
- * Page of a Config.
+ * An abstract base of a Configuration Editor.
*
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -42,7 +42,7 @@
import org.crosswire.common.swing.CWScrollPane;
/**
- * A mutable view of Fields setting array.
+ * A further refinement of a Tree Configuration Editor
*
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
@@ -144,7 +144,7 @@
/**
* Used to update the configuration panel whenever someone selects a
- * different item form the tree on the LHS of the configuation dialog.
+ * different item form the tree on the LHS of the configuration dialog.
*/
public void selectCard()
{
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/ConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/ConfigEditor.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/ConfigEditor.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -27,7 +27,7 @@
import org.crosswire.common.config.Config;
/**
- * Some static methods for using the Config package.
+ * An abstraction of a Configuration Editor.
*
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/Field.properties
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/Field.properties 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/Field.properties 2007-07-28 16:18:14 UTC (rev 1575)
@@ -1,4 +1,3 @@
-
string=org.crosswire.common.config.swing.TextField
password=org.crosswire.common.config.swing.PasswordField
boolean=org.crosswire.common.config.swing.BooleanField
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/FieldMap.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/FieldMap.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/FieldMap.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -33,7 +33,7 @@
* This class provides mapping between Choice types and Fields.
* There is an argument that this class should be a properties file
* however the practical advantages of compile time type-checking and
- * make simplicity, overweigh the possible re-use gains of a
+ * make simplicity, outweigh the possible re-use gains of a
* properties file.
*
* @see gnu.lgpl.License for license details.
@@ -110,7 +110,7 @@
private static Map map;
/**
- * Default hashtable configuration
+ * Default map configuration
*/
static
{
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TabbedConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TabbedConfigEditor.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TabbedConfigEditor.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -35,7 +35,7 @@
import org.crosswire.common.swing.FormPane;
/**
- * Some static methods for using the Config package.
+ * A Configuration Editor that lays its pages in tabs.
*
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -52,7 +52,7 @@
import org.crosswire.common.swing.GuiUtil;
/**
- * A Tabbed view of a config class.
+ * A Configuration Editor that provides a tree for navigating to options.
*
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
@@ -191,7 +191,7 @@
/**
* Used to update the configuration panel whenever someone
* selects a different item form the tree on the LHS of the
- * configuation dialog.
+ * configuration dialog.
*/
public void selectCard()
{
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -55,7 +55,8 @@
import org.crosswire.common.util.Logger;
/**
- * A mutable view of Fields setting array.
+ * A Configuration Editor that presents configuration as a Wizard.
+ *
* <p>A few of the ideas in this code came from an article in the JDJ about
* configuration. However the Config package has a number of huge
* differences, the biggest being what it does with its config info. The
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/CWScrollPane.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/CWScrollPane.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/CWScrollPane.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -14,7 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
+ * Copyright: 2007
* The copyright to this program is held by it's authors.
*
* ID: $Id$
@@ -23,6 +23,7 @@
import java.awt.Component;
+import javax.swing.JScrollBar;
import javax.swing.JScrollPane;
import javax.swing.ScrollPaneConstants;
@@ -31,6 +32,7 @@
/**
* A ScrollPane that give appropriate cross platform behavior.
* Specifically, on the Mac the vertical and horizontal scrollbars should always appear.
+ * Further, scroll bars should show proper RTL or LTR component orientation.
*
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
@@ -67,6 +69,26 @@
return ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED;
}
+ /* (non-Javadoc)
+ * @see javax.swing.JScrollPane#createHorizontalScrollBar()
+ */
+ public JScrollBar createHorizontalScrollBar()
+ {
+ JScrollBar scroller = super.createHorizontalScrollBar();
+ GuiUtil.applyDefaultOrientation(this);
+ return scroller;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.swing.JScrollPane#createVerticalScrollBar()
+ */
+ public JScrollBar createVerticalScrollBar()
+ {
+ JScrollBar scroller = super.createVerticalScrollBar();
+ GuiUtil.applyDefaultOrientation(this);
+ return scroller;
+ }
+
private static int verticalPolicy = getXPlatformVerticalScrollBarPolicy();
private static int horizontalPolicy = getXPlatformHorizontalScrollBarPolicy();
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiUtil.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiUtil.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiUtil.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -51,7 +51,7 @@
import org.crosswire.common.util.ResourceUtil;
/**
- * Various Gui Utilities.
+ * Various GUI Utilities.
*
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
@@ -68,7 +68,7 @@
/**
* Returns the Icon associated with the name from the resources.
- * The resouce should be in the path.
+ * The resource should be in the path.
* @param name Name of the icon file i.e., help16.gif
* @return the image or null if the icon is not found.
*/
@@ -199,7 +199,7 @@
}
/**
- * Move the specified window to the centre of the screen.
+ * Move the specified window to the center of the screen.
* It is the programmer's responsibility to ensure that the window
* fits on the screen.
*
@@ -534,7 +534,7 @@
}
/**
- * Recurisvely apply default component orientation to the component and all it contains.
+ * Recursively apply default component orientation to the component and all it contains.
*
* @param comp the root of the tree to which orientation needs to be applied
* @param o the orientation to be applied
@@ -545,7 +545,7 @@
}
/**
- * Recurisvely apply component orientation to the component and all it contains.
+ * Recursively apply component orientation to the component and all it contains.
*
* @param comp the root of the tree to which orientation needs to be applied
* @param orientation the orientation to be applied
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -51,6 +51,14 @@
return new TDIViewLayout();
}
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.LayoutType#toString()
+ */
+ public String toString()
+ {
+ return Msg.TDI.toString();
+ }
+
/**
* Serialization ID
*/
@@ -70,6 +78,14 @@
return new MDIViewLayout();
}
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.LayoutType#toString()
+ */
+ public String toString()
+ {
+ return Msg.MDI.toString();
+ }
+
/**
* Serialization ID
*/
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg.java 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg.java 2007-07-28 16:18:14 UTC (rev 1575)
@@ -29,11 +29,14 @@
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
+ * @author DM Smith [dmsmith555 at yahoo dot com]
*/
public final class Msg extends MsgBase
{
// Strings for AbstractViewLayout
static final Msg UNTITLED = new Msg("AbstractViewLayout.Untitled"); //$NON-NLS-1$
+ static final Msg TDI = new Msg("LayoutType.TDI"); //$NON-NLS-1$
+ static final Msg MDI = new Msg("LayoutType.MDI"); //$NON-NLS-1$
/**
* Passthrough ctor
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg.properties
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg.properties 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg.properties 2007-07-28 16:18:14 UTC (rev 1575)
@@ -6,4 +6,6 @@
# It should have no spaces or other punctuation (e.g. _, -, ', ...)
# Properties for ViewLayout
-ViewLayout.Untitled=Untitled {0}
+AbstractViewLayout.Untitled=Untitled {0}
+LayoutType.TDI=Tabbed Document Interface
+LayoutType.MDI=Multiple Document Interface
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg_de.properties
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg_de.properties 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg_de.properties 2007-07-28 16:18:14 UTC (rev 1575)
@@ -6,4 +6,6 @@
# It should have no spaces or other punctuation (e.g. _, -, ', ...)
# Properties for ViewLayout
-ViewLayout.Untitled=Ohne Titel {0}
+AbstractViewLayout.Untitled=Ohne Titel {0}
+LayoutType.TDI=Tabbed Document Interface
+LayoutType.MDI=Multiple Document Interface
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg_fa.properties
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg_fa.properties 2007-07-27 21:12:23 UTC (rev 1574)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/Msg_fa.properties 2007-07-28 16:18:14 UTC (rev 1575)
@@ -6,4 +6,6 @@
# It should have no spaces or other punctuation (e.g. _, -, ', ...)
# Properties for ViewLayout
-ViewLayout.Untitled=\u0628\u06CC \u0646\u0627\u0645 {0}
+AbstractViewLayout.Untitled=\u0628\u06CC \u0646\u0627\u0645 {0}
+LayoutType.TDI=\u062C\u062F\u0648\u0644 \u0628\u0646\u062F
+LayoutType.MDI=\u067E\u0646\u062C\u0631\u0647\u0647\u0627
More information about the jsword-svn
mailing list