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

[jswordcvs at crosswire.org]

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

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

Index: Desktop.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/Desktop.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** Desktop.java	2 Aug 2005 11:44:00 -0000	1.50
--- Desktop.java	21 Aug 2005 20:38:04 -0000	1.51
***************
*** 38,41 ****
--- 38,42 ----
  import java.util.Set;
  
+ import javax.swing.BorderFactory;
  import javax.swing.ButtonGroup;
  import javax.swing.ImageIcon;
***************
*** 267,274 ****
          sptBooks.setLeftComponent(views.getDesktop());
          sptBooks.setResizeWeight(0.8D);
-         sptBooks.setDividerSize(7);
          sptBooks.setOpaque(true);
          sptBooks.setBorder(null);
  
          // The toolbar needs to be in the outermost container, on the border
          // And the only other item in that container can be CENTER
--- 268,280 ----
          sptBooks.setLeftComponent(views.getDesktop());
          sptBooks.setResizeWeight(0.8D);
          sptBooks.setOpaque(true);
          sptBooks.setBorder(null);
  
+         Object splitPaneUI = sptBooks.getUI();
+         if (splitPaneUI instanceof javax.swing.plaf.basic.BasicSplitPaneUI)
+         {
+             ((javax.swing.plaf.basic.BasicSplitPaneUI) splitPaneUI).getDivider().setBorder(null);
+         }
+ 
          // The toolbar needs to be in the outermost container, on the border
          // And the only other item in that container can be CENTER
***************
*** 278,285 ****
          contentPane.add(toolbar, BorderLayout.NORTH);
  
          // Put everything else in its own panel
          corePanel = new JPanel(new BorderLayout());
          corePanel.add(barStatus, BorderLayout.SOUTH);
-         corePanel.add(sptBooks, BorderLayout.CENTER);
          contentPane.add(corePanel, BorderLayout.CENTER);
          setJMenuBar(createMenuBar(toolbar));
--- 284,295 ----
          contentPane.add(toolbar, BorderLayout.NORTH);
  
+         JPanel mainPanel = new JPanel(new BorderLayout());
+         mainPanel.setBorder(BorderFactory.createEmptyBorder(1, 5, 1, 5));
+         mainPanel.add(sptBooks, BorderLayout.CENTER);
+ 
          // Put everything else in its own panel
          corePanel = new JPanel(new BorderLayout());
+         corePanel.add(mainPanel, BorderLayout.CENTER);
          corePanel.add(barStatus, BorderLayout.SOUTH);
          contentPane.add(corePanel, BorderLayout.CENTER);
          setJMenuBar(createMenuBar(toolbar));

Index: StatusBar.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/StatusBar.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** StatusBar.java	22 Jun 2005 03:50:49 -0000	1.11
--- StatusBar.java	21 Aug 2005 20:38:04 -0000	1.12
***************
*** 34,37 ****
--- 34,39 ----
  import javax.swing.JComponent;
  import javax.swing.JLabel;
+ import javax.swing.JSeparator;
+ import javax.swing.SwingConstants;
  
  import org.crosswire.bibledesktop.display.URLEvent;
***************
*** 68,75 ****
      private void initialize()
      {
-         lbl_message.setBorder(BorderFactory.createEtchedBorder());
          lbl_message.setText(Msg.STATUS_DEFAULT.toString());
  
-         pnl_progr.setBorder(BorderFactory.createEtchedBorder());
          Font font = pnl_progr.getFont();
          pnl_progr.setFont(font.deriveFont(6.0F));
--- 70,75 ----
***************
*** 81,93 ****
          */
  
-         lbl_name.setBorder(BorderFactory.createEtchedBorder());
          lbl_name.setText(' ' + Msg.getVersionedApplicationTitle() + ' ');
  
!         this.setBorder(BorderFactory.createLoweredBevelBorder());
          this.setLayout(new GridBagLayout());
  
!         this.add(lbl_message, new GridBagConstraints(0, 0, 1, 1, 0.5, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
!         this.add(pnl_progr,   new GridBagConstraints(1, 0, 1, 1, 0.5, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
!         this.add(lbl_name,    new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
      }
  
--- 81,97 ----
          */
  
          lbl_name.setText(' ' + Msg.getVersionedApplicationTitle() + ' ');
  
!         this.setBorder(BorderFactory.createEtchedBorder());
          this.setLayout(new GridBagLayout());
  
!         JSeparator separator = new JSeparator(SwingConstants.VERTICAL);
!         JSeparator separator2 = new JSeparator(SwingConstants.VERTICAL);
! 
!         this.add(lbl_message, new GridBagConstraints(0, 0, 1, 1, 0.5, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
!         this.add(separator,   new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.VERTICAL, new Insets(0, 0, 0, 0), 0, 0));
!         this.add(pnl_progr,   new GridBagConstraints(2, 0, 1, 1, 0.5, 0.0, GridBagConstraints.EAST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
!         this.add(separator2,  new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.VERTICAL, new Insets(0, 0, 0, 0), 0, 0));
!         this.add(lbl_name,    new GridBagConstraints(4, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));        
      }