[jsword-svn]
bibledesktop/java/main/org/crosswire/bibledesktop/book s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Fri Oct 1 15:49:39 MST 2004
Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book
In directory www.crosswire.org:/tmp/cvs-serv9587/java/main/org/crosswire/bibledesktop/book
Modified Files:
Msg.properties DisplaySelectPane.java Msg.java
DisplaySelectPane.properties
Log Message:
Help for search
Index: DisplaySelectPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DisplaySelectPane.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DisplaySelectPane.java 30 Sep 2004 22:33:32 -0000 1.13
--- DisplaySelectPane.java 1 Oct 2004 22:49:37 -0000 1.14
***************
*** 3,7 ****
import java.awt.BorderLayout;
import java.awt.Color;
- import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
--- 3,6 ----
***************
*** 30,33 ****
--- 29,33 ----
import org.crosswire.common.swing.ActionFactory;
import org.crosswire.common.swing.GuiUtil;
+ import org.crosswire.common.swing.QuickHelpDialog;
import org.crosswire.common.util.Reporter;
import org.crosswire.jsword.book.Book;
***************
*** 142,151 ****
JButton btnSearch = new JButton(actions.getAction(GO_SEARCH));
! JButton btnHelp = new JButton();
! btnHelp.setBorderPainted(true);
btnHelp.setBorder(BorderFactory.createLineBorder(SystemColor.control, 5));
btnHelp.setBackground(Color.yellow);
! btnHelp.setFont(btnHelp.getFont().deriveFont(Font.BOLD));
! btnHelp.setIcon(ICON_HELP);
JButton btnAdvanced = new JButton();
--- 142,150 ----
JButton btnSearch = new JButton(actions.getAction(GO_SEARCH));
! JButton btnHelp = new JButton(actions.getAction(HELP));
btnHelp.setBorder(BorderFactory.createLineBorder(SystemColor.control, 5));
btnHelp.setBackground(Color.yellow);
! btnHelp.setText(null);
! dlgHelp = new QuickHelpDialog(GuiUtil.getFrame(this), Msg.HELP_TITLE.toString(), Msg.HELP_TEXT.toString());
JButton btnAdvanced = new JButton();
***************
*** 285,288 ****
--- 284,295 ----
/**
+ * Someone clicked help
+ */
+ public void doHelpAction()
+ {
+ dlgHelp.setVisible(true);
+ }
+
+ /**
* Sync the viewed passage with the passage text box
*/
***************
*** 476,508 ****
private static final String MORE = "More"; //$NON-NLS-1$
private static final String GO_PASSAGE = "GoPassage"; //$NON-NLS-1$
!
! // for the Search card
private static final String SEARCH_LABEL = "SearchLabel"; //$NON-NLS-1$
private static final String GO_SEARCH = "GoSearch"; //$NON-NLS-1$
private static final String SEARCH_FIELD = "SearchAction"; //$NON-NLS-1$
! private static int base = 1;
! private String title;
! private transient List listeners;
! private static final ImageIcon ICON_SEARCH = GuiUtil.getIcon("toolbarButtonGraphics/general/Find16.gif"); //$NON-NLS-1$
! private static final ImageIcon ICON_SELECT = GuiUtil.getIcon("toolbarButtonGraphics/general/Edit16.gif"); //$NON-NLS-1$
! private static final ImageIcon ICON_HELP = GuiUtil.getIcon("toolbarButtonGraphics/general/ContextualHelp16.gif"); //$NON-NLS-1$
! private static final ImageIcon ICON_MENU = GuiUtil.getIcon("toolbarButtonGraphics/general/Preferences16.gif"); //$NON-NLS-1$
! private BooksComboBoxModel mdlBible;
! private PassageSelectionPane dlgSelect;
! private ActionFactory actions;
! private JTextField txtKey;
! private JTextField txtSearch;
private JCheckBox chkMatch = null;
--- 483,514 ----
private static final String MORE = "More"; //$NON-NLS-1$
private static final String GO_PASSAGE = "GoPassage"; //$NON-NLS-1$
! private static final String HELP = "HelpAction"; //$NON-NLS-1$
private static final String SEARCH_LABEL = "SearchLabel"; //$NON-NLS-1$
private static final String GO_SEARCH = "GoSearch"; //$NON-NLS-1$
private static final String SEARCH_FIELD = "SearchAction"; //$NON-NLS-1$
! private static final ImageIcon ICON_SEARCH = GuiUtil.getIcon("toolbarButtonGraphics/general/Find16.gif"); //$NON-NLS-1$
! private static final ImageIcon ICON_SELECT = GuiUtil.getIcon("toolbarButtonGraphics/general/Edit16.gif"); //$NON-NLS-1$
! private static final ImageIcon ICON_MENU = GuiUtil.getIcon("toolbarButtonGraphics/general/Preferences16.gif"); //$NON-NLS-1$
! private static int base = 1;
! private String title;
! private transient List listeners;
! private QuickHelpDialog dlgHelp = null;
! private BooksComboBoxModel mdlBible = null;
! private PassageSelectionPane dlgSelect = null;
! private ActionFactory actions = null;
! private JTextField txtKey = null;
! private JTextField txtSearch = null;
private JCheckBox chkMatch = null;
Index: DisplaySelectPane.properties
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DisplaySelectPane.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DisplaySelectPane.properties 30 Sep 2004 22:33:32 -0000 1.5
--- DisplaySelectPane.properties 1 Oct 2004 22:49:37 -0000 1.6
***************
*** 58,67 ****
SearchAction.Name=Search
SearchAction.ShortDescription=Search for a passage.
- #SearchAction.ShortDescription=<html>Search for a passage.<br\>\
- # You can use / to join phrases, for example "<code>balaam / balak</code>" finds passages containing Balak OR Balaam<br\>\
- # Using + requires both words, e.g. "<code>aaron + moses</code>" finds passages containing both Aaron AND Moses<br\>\
- # Using a - removes words from the result e.g. "<code>lord - jesus</code>" is passages containing Lord BUT NOT Jesus<br\>\
- # Using ~2 widens the passage by 2 verses either side on any match. So "<code>perez ~1 + amminadab</code>" finds<br\>\
- # verses containting Amminadab within 1 verse of mention of Perez.
# for the Search go button
--- 58,61 ----
***************
*** 76,79 ****
--- 70,84 ----
GoSearch.AcceleratorKey.Modifiers=
+ # for the Help button
+ HelpAction.Enabled=true
+ HelpAction.Name=
+ HelpAction.ShortDescription=Quick Search Help
+ HelpAction.LongDescription=Show some quick help on how to search
+ HelpAction.SmallIcon=toolbarButtonGraphics/general/ContextualHelp16.gif
+ HelpAction.LargeIcon=toolbarButtonGraphics/general/ContextualHelp32.gif
+ HelpAction.MnemonicKey=
+ HelpAction.AcceleratorKey=
+ HelpAction.AcceleratorKey.Modifiers=
+
# for the Blah label
BlahLabel.Name=Find Verses Like:
Index: Msg.properties
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/Msg.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Msg.properties 30 Sep 2004 22:33:32 -0000 1.6
--- Msg.properties 1 Oct 2004 22:49:37 -0000 1.7
***************
*** 24,27 ****
--- 24,37 ----
DisplaySelectPane.Clear=Untitled
DisplaySelectPane.Untitled=Untitled {0}
+ DisplaySelectPane.HelpTitle=Search Quick Help
+ DisplaySelectPane.HelpText=<html><b>Search Tips.</b><br\>\
+ You can use / to join phrases, for example "<code>balaam / balak</code>" finds passages containing Balak OR Balaam<br\>\
+ Using + requires both words, e.g. "<code>aaron + moses</code>" finds passages containing both Aaron AND Moses<br\>\
+ Using a - removes words from the result e.g. "<code>lord - jesus</code>" is passages containing Lord BUT NOT Jesus<br\>\
+ Using ~2 widens the passage by 2 verses either side on any match. So "<code>perez ~1 + amminadab</code>" finds<br\>\
+ verses containting Amminadab within 1 verse of mention of Perez.
+ DisplaySelectPane.Match=Match
+ DisplaySelectPane.Advanced=Advanced
+ DisplaySelectPane.Bible=Bible:
SitesPane.AvailableBooks=Available Books
***************
*** 50,60 ****
AdvancedSearchPane.Excludes=Excludes these words:
AdvancedSearchPane.Includes=Includes all these words:
-
- KeySelectPane.Go=Go
- KeySelectPane.Keys=Select
- KeySelectPane.Match=Match
- KeySelectPane.Advanced=Advanced
- KeySelectPane.Help=\ ?\
- KeySelectPane.Bible=Bible:
- KeySelectPane.Display=Display:
- KeySelectPane.Search=Search:
--- 60,61 ----
Index: Msg.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/Msg.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Msg.java 30 Sep 2004 22:33:32 -0000 1.8
--- Msg.java 1 Oct 2004 22:49:37 -0000 1.9
***************
*** 48,51 ****
--- 48,54 ----
static final Msg CLEAR = new Msg("DisplaySelectPane.Clear"); //$NON-NLS-1$
static final Msg UNTITLED = new Msg("DisplaySelectPane.Untitled"); //$NON-NLS-1$
+ static final Msg SELECT_BIBLE = new Msg("DisplaySelectPane.Bible"); //$NON-NLS-1$
+ static final Msg SELECT_ADVANCED = new Msg("DisplaySelectPane.Advanced"); //$NON-NLS-1$
+ static final Msg SELECT_MATCH = new Msg("DisplaySelectPane.Match"); //$NON-NLS-1$
static final Msg AVAILABLE_BOOKS = new Msg("SitesPane.AvailableBooks"); //$NON-NLS-1$
***************
*** 75,86 ****
static final Msg SEARCH_INCLUDES = new Msg("AdvancedSearchPane.Includes"); //$NON-NLS-1$
! static final Msg SELECT_GO = new Msg("KeySelectPane.Go"); //$NON-NLS-1$
! static final Msg SELECT_KEYS = new Msg("KeySelectPane.Keys"); //$NON-NLS-1$
! static final Msg SELECT_MATCH = new Msg("KeySelectPane.Match"); //$NON-NLS-1$
! static final Msg SELECT_ADVANCED = new Msg("KeySelectPane.Advanced"); //$NON-NLS-1$
! static final Msg SELECT_HELP = new Msg("KeySelectPane.Help"); //$NON-NLS-1$
! static final Msg SELECT_BIBLE = new Msg("KeySelectPane.Bible"); //$NON-NLS-1$
! static final Msg SELECT_DISPLAY = new Msg("KeySelectPane.Display"); //$NON-NLS-1$
! static final Msg SELECT_SEARCH = new Msg("KeySelectPane.Search"); //$NON-NLS-1$
/**
--- 78,83 ----
static final Msg SEARCH_INCLUDES = new Msg("AdvancedSearchPane.Includes"); //$NON-NLS-1$
! static final Msg HELP_TEXT = new Msg("DisplaySelectPane.HelpText"); //$NON-NLS-1$
! static final Msg HELP_TITLE = new Msg("DisplaySelectPane.HelpTitle"); //$NON-NLS-1$
/**
More information about the jsword-svn
mailing list