[jsword-svn] bibledesktop/java/main/org/crosswire/bibledesktop/book s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book
In directory www.crosswire.org:/tmp/cvs-serv23428/java/main/org/crosswire/bibledesktop/book

Modified Files:
	BibleViewPane.java DictionaryPane.java 
Log Message:
Willie Thean's laf changes.
Added ability to specify proxy for http download.
Changed default logging to INFO.

Index: BibleViewPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/BibleViewPane.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** BibleViewPane.java	22 Jun 2005 03:50:49 -0000	1.20
--- BibleViewPane.java	21 Aug 2005 20:38:04 -0000	1.21
***************
*** 23,26 ****
--- 23,27 ----
  
  import java.awt.BorderLayout;
+ import java.awt.Dimension;
  import java.io.File;
  import java.io.FileReader;
***************
*** 30,36 ****
  import java.io.Writer;
  
- import javax.swing.BorderFactory;
  import javax.swing.JFileChooser;
! import javax.swing.JPanel;
  import javax.swing.event.EventListenerList;
  import javax.swing.filechooser.FileFilter;
--- 31,36 ----
  import java.io.Writer;
  
  import javax.swing.JFileChooser;
! import javax.swing.UIManager;
  import javax.swing.event.EventListenerList;
  import javax.swing.filechooser.FileFilter;
***************
*** 41,44 ****
--- 41,45 ----
  import org.crosswire.bibledesktop.passage.KeySidebar;
  import org.crosswire.common.swing.desktop.Clearable;
+ import org.crosswire.common.swing.desktop.TabbedPanePanel;
  import org.crosswire.common.swing.desktop.Titleable;
  import org.crosswire.common.swing.desktop.event.TitleChangedEvent;
***************
*** 59,63 ****
   * @author Joe Walker [joe at eireneh dot com]
   */
! public class BibleViewPane extends JPanel implements Titleable, Clearable, TitleChangedListener
  {
      /**
--- 60,64 ----
   * @author Joe Walker [joe at eireneh dot com]
   */
! public class BibleViewPane extends TabbedPanePanel implements Titleable, Clearable, TitleChangedListener
  {
      /**
***************
*** 107,112 ****
          });
  
!         this.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
          this.setLayout(new BorderLayout());
          this.add(pnlSelect, BorderLayout.NORTH);
          this.add(pnlPassg, BorderLayout.CENTER);
--- 108,115 ----
          });
  
!         pnlSelect.setBorder(UIManager.getBorder("SelectPanel.border")); //$NON-NLS-1$
! 
          this.setLayout(new BorderLayout());
+         this.setMinimumSize(new Dimension(0, 0));
          this.add(pnlSelect, BorderLayout.NORTH);
          this.add(pnlPassg, BorderLayout.CENTER);

Index: DictionaryPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DictionaryPane.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** DictionaryPane.java	22 Jun 2005 03:50:49 -0000	1.24
--- DictionaryPane.java	21 Aug 2005 20:38:04 -0000	1.25
***************
*** 22,32 ****
  package org.crosswire.bibledesktop.book;
  
- import java.awt.BorderLayout;
  import java.awt.Component;
  import java.awt.FlowLayout;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
  
- import javax.swing.BorderFactory;
  import javax.swing.JComboBox;
  import javax.swing.JList;
--- 22,31 ----
  package org.crosswire.bibledesktop.book;
  
  import java.awt.Component;
+ import java.awt.Dimension;
  import java.awt.FlowLayout;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
  
  import javax.swing.JComboBox;
  import javax.swing.JList;
***************
*** 63,67 ****
   * @author Joe Walker [joe at eireneh dot com]
   */
! public class DictionaryPane extends JPanel implements BookDataDisplay
  {
      /**
--- 62,66 ----
   * @author Joe Walker [joe at eireneh dot com]
   */
! public class DictionaryPane extends JSplitPane implements BookDataDisplay
  {
      /**
***************
*** 137,146 ****
          sptMain.setBottomComponent(scrDisplay);
          sptMain.setBorder(null);
-         sptMain.setDividerSize(8);
  
!         this.setLayout(new BorderLayout(5, 5));
!         this.add(scrDicts, BorderLayout.NORTH);
!         this.add(sptMain, BorderLayout.CENTER);
!         this.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
      }
  
--- 136,157 ----
          sptMain.setBottomComponent(scrDisplay);
          sptMain.setBorder(null);
  
!         Object sptMainUI = sptMain.getUI();
!         if (sptMainUI instanceof javax.swing.plaf.basic.BasicSplitPaneUI)
!         {
!             ((javax.swing.plaf.basic.BasicSplitPaneUI) sptMainUI).getDivider().setBorder(null);
!         }
! 
!         this.setMinimumSize(new Dimension(0, 0));
!         this.setOrientation(JSplitPane.VERTICAL_SPLIT);
!         this.setTopComponent(scrDicts);
!         this.setBottomComponent(sptMain);
!         this.setBorder(null);
! 
!         Object thisUI = this.getUI();
!         if (thisUI instanceof javax.swing.plaf.basic.BasicSplitPaneUI)
!         {
!             ((javax.swing.plaf.basic.BasicSplitPaneUI) thisUI).getDivider().setBorder(null);
!         }
      }