[jsword-svn] r1202 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop bibledesktop/src/main/java/org/crosswire/bibledesktop/display/textpane common-swing/src/main/java/org/crosswire/common/swing/desktop
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Sun Dec 10 21:34:56 MST 2006
Author: dmsmith
Date: 2006-12-10 21:34:55 -0700 (Sun, 10 Dec 2006)
New Revision: 1202
Added:
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar_de.properties
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar_fa.properties
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop_de.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop_fa.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/textpane/TextPaneBookDataDisplay.java
Log:
More Farsi work.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2006-12-10 19:49:23 UTC (rev 1201)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2006-12-11 04:34:55 UTC (rev 1202)
@@ -461,9 +461,12 @@
toggle = new JCheckBoxMenuItem(actions.getAction(DesktopActions.STATUS_TOGGLE));
toggle.setSelected(true);
menuView.add(toggle).addMouseListener(barStatus);
- toggle = new JCheckBoxMenuItem(actions.getAction(DesktopActions.JOURNAL_TOGGLE));
- toggle.setSelected(isWebJournalShowing());
- menuView.add(toggle).addMouseListener(barStatus);
+
+ // The Journal is turned off for now
+ //toggle = new JCheckBoxMenuItem(actions.getAction(DesktopActions.JOURNAL_TOGGLE));
+ //toggle.setSelected(isWebJournalShowing());
+ //menuView.add(toggle).addMouseListener(barStatus);
+
sidebarToggle = new JCheckBoxMenuItem(actions.getAction(DesktopActions.SIDEBAR_TOGGLE));
sidebarToggle.setSelected(isSidebarShowing());
menuView.add(sidebarToggle).addMouseListener(barStatus);
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.properties 2006-12-10 19:49:23 UTC (rev 1201)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.properties 2006-12-11 04:34:55 UTC (rev 1202)
@@ -370,36 +370,6 @@
WindowMode.AcceleratorKey=
WindowMode.AcceleratorKey.Modifiers=
-ToolBarToggle.Enabled=true
-ToolBarToggle.Name=Show Tool Bar
-ToolBarToggle.ShortDescription=Toggle the display of the tool bar
-ToolBarToggle.LongDescription=Toggle the display of the tool bar
-ToolBarToggle.SmallIcon=
-ToolBarToggle.LargeIcon=
-ToolBarToggle.MnemonicKey=B
-ToolBarToggle.AcceleratorKey=B
-ToolBarToggle.AcceleratorKey.Modifiers=ctrl
-
-ToolBarText.Enabled=true
-ToolBarText.Name=Show Tool Bar Text
-ToolBarText.ShortDescription=Toggle the display of the tool bar text
-ToolBarText.LongDescription=Toggle the display of the tool bar text
-ToolBarText.SmallIcon=
-ToolBarText.LargeIcon=
-ToolBarText.MnemonicKey=T
-ToolBarText.AcceleratorKey=
-ToolBarText.AcceleratorKey.Modifiers=
-
-ToolBarLarge.Enabled=true
-ToolBarLarge.Name=Large Tool Bar
-ToolBarLarge.ShortDescription=Toggle size of the tool bar icons
-ToolBarLarge.LongDescription=Toggle size of the tool bar icons
-ToolBarLarge.SmallIcon=
-ToolBarLarge.LargeIcon=
-ToolBarLarge.MnemonicKey=L
-ToolBarLarge.AcceleratorKey=
-ToolBarLarge.AcceleratorKey.Modifiers=
-
ToolTipToggle.Enabled=true
ToolTipToggle.Name=Show Tool Tips
ToolTipToggle.ShortDescription=Toggle display of tool tips
@@ -451,17 +421,6 @@
ViewSource.AcceleratorKey.Modifiers=ctrl
# Not currently used
-ViewToolbar.Enabled=false
-ViewToolbar.Name=Toolbar
-ViewToolbar.ShortDescription=Toggle Toolbar
-ViewToolbar.LongDescription=Toggle the display of the toolbar.
-ViewToolbar.SmallIcon=toolbarButtonGraphics/general/AlignTop16.gif
-ViewToolbar.LargeIcon=toolbarButtonGraphics/general/AlignTop24.gif
-ViewToolbar.MnemonicKey=A
-ViewToolbar.AcceleratorKey=
-ViewToolbar.AcceleratorKey.Modifiers=
-
-# Not currently used
Scripting.Enabled=false
Scripting.Name=Scripting ...
Scripting.ShortDescription=Scripting
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop_de.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop_de.properties 2006-12-10 19:49:23 UTC (rev 1201)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop_de.properties 2006-12-11 04:34:55 UTC (rev 1202)
@@ -225,8 +225,6 @@
Headings.Name=Show Headings
Headings.ShortDescription=Show Headings
Headings.LongDescription=Show Headings
-Headings.SmallIcon=
-Headings.LargeIcon=
Headings.MnemonicKey=
Headings.AcceleratorKey=
Headings.AcceleratorKey.Modifiers=
@@ -259,27 +257,6 @@
WindowMode.AcceleratorKey=
WindowMode.AcceleratorKey.Modifiers=
-ToolBarToggle.Name=Zeige Werkzeugleiste
-ToolBarToggle.ShortDescription=Schalte Werzeugleiste an/aus
-ToolBarToggle.LongDescription=Schalte Werzeugleiste an/aus
-ToolBarToggle.MnemonicKey=B
-ToolBarToggle.AcceleratorKey=B
-ToolBarToggle.AcceleratorKey.Modifiers=ctrl
-
-ToolBarText.Name=Zeige Werkzeugleisten Symbol-Text
-ToolBarText.ShortDescription=Schalte Werkzeugleisten Symbol-Text an/aus
-ToolBarText.LongDescription=Schalte Werkzeugleisten Symbol-Text an/aus
-ToolBarText.MnemonicKey=T
-ToolBarText.AcceleratorKey=
-ToolBarText.AcceleratorKey.Modifiers=
-
-ToolBarLarge.Name=Grosse Werkzeugleiste
-ToolBarLarge.ShortDescription=Schalte Werkzeugleiste gross/klein
-ToolBarLarge.LongDescription=Schalte Werkzeugleiste gross/klein
-ToolBarLarge.MnemonicKey=L
-ToolBarLarge.AcceleratorKey=
-ToolBarLarge.AcceleratorKey.Modifiers=
-
ToolTipToggle.Name=Zeige Werkzeug Hilfen
ToolTipToggle.ShortDescription=Schalte Werkzeug Hilfen an/aus
ToolTipToggle.LongDescription=Schalte Werkzeug Hilfen an/aus
@@ -316,14 +293,6 @@
ViewSource.AcceleratorKey.Modifiers=ctrl
# Not currently used
-ViewToolbar.Name=Werkzeugleiste
-ViewToolbar.ShortDescription=Schalte Werkzeugleiste an/aus
-ViewToolbar.LongDescription=Schalte Werkzeugleiste an/aus.
-ViewToolbar.MnemonicKey=A
-ViewToolbar.AcceleratorKey=
-ViewToolbar.AcceleratorKey.Modifiers=
-
-# Not currently used
Scripting.Name=Skript ...
Scripting.ShortDescription=Skript Ausf\u00fchrung
Scripting.LongDescription=F\u00fchre Kommandos in einer Skriptsprache aus.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop_fa.properties 2006-12-10 19:49:23 UTC (rev 1201)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop_fa.properties 2006-12-11 04:34:55 UTC (rev 1202)
@@ -173,8 +173,6 @@
Forward.Name=\u062C\u0644\u0648
Forward.ShortDescription=\u062C\u0644\u0648 \u0628\u0631\u0648
Forward.LongDescription\u0628\u0631\u0648 \u062C\u0644\u0648 \u0628\u0647 \u0628\u062E\u0634\u0647 \u0628\u062F\u06CC =.
-Forward.SmallIcon=toolbarButtonGraphics/navigation/Forward16.gif
-Forward.LargeIcon=toolbarButtonGraphics/navigation/Forward24.gif
Forward.MnemonicKey=
# KeyEvent.VK_RIGHT
Forward.AcceleratorKey=0x27
@@ -279,28 +277,6 @@
WindowMode.AcceleratorKey=
WindowMode.AcceleratorKey.Modifiers=
-ToolBarToggle.Name=squat
-xxx=\u0646\u0634\u0627\u0646 \u062F\u0627\u062F\u0646\u0647 \u0628\u0627\u0631\u0647 \u0627\u0628\u0632\u0627\u0631
-ToolBarToggle.ShortDescription=\u0639\u0648\u200C\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0646\u0645\u0627\u06CC\u0634\u0647 \u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631
-ToolBarToggle.LongDescription=\u0639\u0648\u200C\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0646\u0645\u0627\u06CC\u0634\u0647 \u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631
-TToolBarToggle.MnemonicKey=
-ToolBarToggle.AcceleratorKey=
-ToolBarToggle.AcceleratorKey.Modifiers=
-
-ToolBarText.Name=\u0646\u0648\u0634\u062A\u0627\u0631\u06CC \u0646\u0634\u0627\u0646 \u062F\u0627\u062F\u0646\u0647 \u0628\u0627\u0631\u0647 \u0627\u0628\u0632\u0627\u0631
-ToolBarText.ShortDescription=\u0646\u0648\u0634\u062A\u0627\u0631\u06CC \u0639\u0648\u200C\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0646\u0645\u0627\u06CC\u0634\u0647 \u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631
-ToolBarText.LongDescription=\u0646\u0648\u0634\u062A\u0627\u0631\u06CC \u0639\u0648\u200C\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0646\u0645\u0627\u06CC\u0634\u0647 \u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631
-ToolBarText.MnemonicKey=
-ToolBarText.AcceleratorKey=
-ToolBarText.AcceleratorKey.Modifiers=
-
-ToolBarLarge.Name=\u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631\u0647 \u0628\u0632\u0631\u06AF
-ToolBarLarge.ShortDescription=\u0639\u0648\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0627\u0646\u062F\u0627\u0632\u0647\u0621 \u062F\u06A9\u0645\u0647 \u0647\u0627\u06CC \u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631
-ToolBarLarge.LongDescription=\u0639\u0648\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0627\u0646\u062F\u0627\u0632\u0647\u0621 \u062F\u06A9\u0645\u0647 \u0647\u0627\u06CC \u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631
-ToolBarLarge.MnemonicKey=
-ToolBarLarge.AcceleratorKey=
-ToolBarLarge.AcceleratorKey.Modifiers=
-
ToolTipToggle.Name=\u0646\u0634\u0627\u0646 \u062F\u0627\u062F\u0646\u0647 \u062A\u0648\u0636\u06CC\u062D\u0647 \u0627\u0628\u0632\u0627\u0631
ToolTipToggle.ShortDescription=\u0639\u0648\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0646\u0645\u0627\u06CC\u0634\u0647 \u062A\u0648\u0636\u06CC\u062D\u0647 \u0627\u0628\u0632\u0627\u0631
ToolTipToggle.LongDescription=\u0639\u0648\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0646\u0645\u0627\u06CC\u0634\u0647 \u062A\u0648\u0636\u06CC\u062D\u0647 \u0627\u0628\u0632\u0627\u0631
@@ -337,14 +313,6 @@
ViewSource.AcceleratorKey.Modifiers=ctrl
# Not currently used
-ViewToolbar.Name=Toolbar
-ViewToolbar.ShortDescription=Toggle Toolbar
-ViewToolbar.LongDescription=Toggle the display of the toolbar.
-ViewToolbar.MnemonicKey=A
-ViewToolbar.AcceleratorKey=
-ViewToolbar.AcceleratorKey.Modifiers=
-
-# Not currently used
Scripting.Name=Scripting ...
Scripting.ShortDescription=Scripting
Scripting.LongDescription=Run some commands in a scripting language.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/textpane/TextPaneBookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/textpane/TextPaneBookDataDisplay.java 2006-12-10 19:49:23 UTC (rev 1201)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/textpane/TextPaneBookDataDisplay.java 2006-12-11 04:34:55 UTC (rev 1202)
@@ -170,26 +170,30 @@
HyperlinkEvent.EventType type = ev.getEventType();
JTextPane pane = (JTextPane) ev.getSource();
- String[] parts = getParts(ev.getDescription());
+ String url = ev.getDescription();
+ String[] parts = getParts(url);
if (type == HyperlinkEvent.EventType.ACTIVATED)
{
- String url = ev.getDescription();
- if (parts[1].charAt(0) == '#')
+ // There are some errors which make an empty url
+ if (parts[1].length() > 0)
{
- log.debug(MessageFormat.format(SCROLL_TO_URL, new Object[] { url }));
- // This must be relative to the current document
- // in which case we assume that it is an in page reference.
- // We ignore the frame case (example code within JEditorPane
- // JavaDoc).
- // Remove the leading #
- url = url.substring(1);
- pane.scrollToReference(url);
+ if (parts[1].charAt(0) == '#')
+ {
+ log.debug(MessageFormat.format(SCROLL_TO_URL, new Object[] { url }));
+ // This must be relative to the current document
+ // in which case we assume that it is an in page reference.
+ // We ignore the frame case (example code within JEditorPane
+ // JavaDoc).
+ // Remove the leading #
+ url = url.substring(1);
+ pane.scrollToReference(url);
+ }
+ else
+ {
+ // Fully formed, so we hand it off to be processed
+ fireActivateURL(new URLEvent(this, parts[0], parts[1]));
+ }
}
- else
- {
- // Fully formed, so we hand it off to be processed
- fireActivateURL(new URLEvent(this, parts[0], parts[1]));
- }
}
else
{
Added: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar_de.properties
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar_de.properties (rev 0)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar_de.properties 2006-12-11 04:34:55 UTC (rev 1202)
@@ -0,0 +1,20 @@
+ToolBarToggle.Name=Zeige Werkzeugleiste
+ToolBarToggle.ShortDescription=Schalte Werzeugleiste an/aus
+ToolBarToggle.LongDescription=Schalte Werzeugleiste an/aus
+ToolBarToggle.MnemonicKey=B
+ToolBarToggle.AcceleratorKey=B
+ToolBarToggle.AcceleratorKey.Modifiers=ctrl
+
+ToolBarText.Name=Zeige Werkzeugleisten Symbol-Text
+ToolBarText.ShortDescription=Schalte Werkzeugleisten Symbol-Text an/aus
+ToolBarText.LongDescription=Schalte Werkzeugleisten Symbol-Text an/aus
+ToolBarText.MnemonicKey=T
+ToolBarText.AcceleratorKey=
+ToolBarText.AcceleratorKey.Modifiers=
+
+ToolBarLarge.Name=Grosse Werkzeugleiste
+ToolBarLarge.ShortDescription=Schalte Werkzeugleiste gross/klein
+ToolBarLarge.LongDescription=Schalte Werkzeugleiste gross/klein
+ToolBarLarge.MnemonicKey=L
+ToolBarLarge.AcceleratorKey=
+ToolBarLarge.AcceleratorKey.Modifiers=
\ No newline at end of file
Added: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar_fa.properties
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar_fa.properties (rev 0)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar_fa.properties 2006-12-11 04:34:55 UTC (rev 1202)
@@ -0,0 +1,20 @@
+ToolBarToggle.Name=\u0646\u0634\u0627\u0646 \u062F\u0627\u062F\u0646\u0647 \u0628\u0627\u0631\u0647 \u0627\u0628\u0632\u0627\u0631
+ToolBarToggle.ShortDescription=\u0639\u0648\u200C\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0646\u0645\u0627\u06CC\u0634\u0647 \u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631
+ToolBarToggle.LongDescription=\u0639\u0648\u200C\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0646\u0645\u0627\u06CC\u0634\u0647 \u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631
+TToolBarToggle.MnemonicKey=
+ToolBarToggle.AcceleratorKey=
+ToolBarToggle.AcceleratorKey.Modifiers=
+
+ToolBarText.Name=\u0646\u0648\u0634\u062A\u0627\u0631\u06CC \u0646\u0634\u0627\u0646 \u062F\u0627\u062F\u0646\u0647 \u0628\u0627\u0631\u0647 \u0627\u0628\u0632\u0627\u0631
+ToolBarText.ShortDescription=\u0646\u0648\u0634\u062A\u0627\u0631\u06CC \u0639\u0648\u200C\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0646\u0645\u0627\u06CC\u0634\u0647 \u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631
+ToolBarText.LongDescription=\u0646\u0648\u0634\u062A\u0627\u0631\u06CC \u0639\u0648\u200C\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0646\u0645\u0627\u06CC\u0634\u0647 \u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631
+ToolBarText.MnemonicKey=
+ToolBarText.AcceleratorKey=
+ToolBarText.AcceleratorKey.Modifiers=
+
+ToolBarLarge.Name=\u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631\u0647 \u0628\u0632\u0631\u06AF
+ToolBarLarge.ShortDescription=\u0639\u0648\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0627\u0646\u062F\u0627\u0632\u0647\u0621 \u062F\u06A9\u0645\u0647 \u0647\u0627\u06CC \u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631
+ToolBarLarge.LongDescription=\u0639\u0648\u0636 \u06A9\u0631\u062F\u0646\u0647 \u0627\u0646\u062F\u0627\u0632\u0647\u0621 \u062F\u06A9\u0645\u0647 \u0647\u0627\u06CC \u0628\u0627\u0631\u0647\u0621 \u0627\u0628\u0632\u0627\u0631
+ToolBarLarge.MnemonicKey=
+ToolBarLarge.AcceleratorKey=
+ToolBarLarge.AcceleratorKey.Modifiers=
More information about the jsword-svn
mailing list