[jsword-svn]
bibledesktop/java/main/org/crosswire/bibledesktop/book s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Tue Jan 3 06:25:49 MST 2006
Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book
In directory www.crosswire.org:/tmp/cvs-serv24517/java/main/org/crosswire/bibledesktop/book
Modified Files:
DictionaryPane.java BookListCellRenderer.java
Log Message:
Unify Daily Devotions and Readings into a single behavior.
Index: BookListCellRenderer.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/BookListCellRenderer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** BookListCellRenderer.java 2 Jan 2006 03:40:02 -0000 1.14
--- BookListCellRenderer.java 3 Jan 2006 13:25:46 -0000 1.15
***************
*** 124,132 ****
else if (type.equals(BookCategory.GLOSSARY))
{
! setIcon(ICON_DICT);
}
else if (type.equals(BookCategory.DAILY_DEVOTIONS))
{
! setIcon(ICON_DICT);
}
--- 124,132 ----
else if (type.equals(BookCategory.GLOSSARY))
{
! setIcon(ICON_GLOSS);
}
else if (type.equals(BookCategory.DAILY_DEVOTIONS))
{
! setIcon(ICON_READ);
}
***************
*** 155,158 ****
--- 155,168 ----
/**
+ * The small version icon
+ */
+ private static final ImageIcon ICON_READ = GuiUtil.getIcon("images/book-r16.png"); //$NON-NLS-1$
+
+ /**
+ * The small version icon
+ */
+ private static final ImageIcon ICON_GLOSS = GuiUtil.getIcon("images/book-g16.png"); //$NON-NLS-1$
+
+ /**
* border if we do not have focus
*/
Index: DictionaryPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DictionaryPane.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** DictionaryPane.java 2 Jan 2006 03:40:02 -0000 1.26
--- DictionaryPane.java 3 Jan 2006 13:25:46 -0000 1.27
***************
*** 72,76 ****
// This must come after the setViewportView() calls so scrolling works
! lstDicts.setSelectedValue(Defaults.getDictionary(), true);
}
--- 72,76 ----
// This must come after the setViewportView() calls so scrolling works
! lstDicts.setSelectedValue(Defaults.getDailyDevotional(), true);
}
***************
*** 378,382 ****
private BookDataDisplay display = BookDataDisplayFactory.createBookDataDisplay();
! private transient BookFilter filter = BookFilters.either(BookFilters.getDictionaries(), BookFilters.getCommentaries());
private BooksComboBoxModel mdlDicts = new BooksComboBoxModel(filter);
private transient Book dict;
--- 378,387 ----
private BookDataDisplay display = BookDataDisplayFactory.createBookDataDisplay();
! private transient BookFilter filter =
! BookFilters.either(
! BookFilters.either(BookFilters.getDictionaries(),
! BookFilters.getCommentaries()),
! BookFilters.getDailyDevotionals()
! );
private BooksComboBoxModel mdlDicts = new BooksComboBoxModel(filter);
private transient Book dict;
More information about the jsword-svn
mailing list