[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-serv12415/java/main/org/crosswire/bibledesktop/desktop

Modified Files:
	Msg.properties AboutPane.java Msg.java 
Log Message:
Add license info to "About"

Index: Msg.properties
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/Msg.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Msg.properties	22 May 2005 12:48:15 -0000	1.12
--- Msg.properties	2 Jun 2005 23:40:31 -0000	1.13
***************
*** 50,53 ****
--- 50,55 ----
  Splash.SplashImage=/images/splash.png
  AboutPane.AboutTitle=About {0}
+ AboutPane.Warranty=Warranty
+ AboutPane.Details=License
  AboutPane.TaskTabTitle=Running Tasks
  AboutPane.ErrorTabTitle=Errors

Index: AboutPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/AboutPane.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** AboutPane.java	17 May 2005 00:44:31 -0000	1.13
--- AboutPane.java	2 Jun 2005 23:40:31 -0000	1.14
***************
*** 22,25 ****
--- 22,27 ----
  package org.crosswire.bibledesktop.desktop;
  
+ import gnu.gpl.License;
+ 
  import java.awt.BorderLayout;
  import java.awt.Component;
***************
*** 39,45 ****
--- 41,50 ----
  import javax.swing.JTabbedPane;
  import javax.swing.JTable;
+ import javax.swing.JTextPane;
  import javax.swing.SwingConstants;
+ import javax.swing.text.html.HTMLEditorKit;
  
  import org.crosswire.common.swing.ActionFactory;
+ import org.crosswire.common.swing.AntiAliasedTextPane;
  import org.crosswire.common.swing.GuiUtil;
  import org.crosswire.common.swing.MapTableModel;
***************
*** 100,116 ****
          pnlSplash.add(lblInfo, BorderLayout.SOUTH);
  
!         // Put in tabs if advanced
!         if (!advanced)
!         {
!             pnlMain.add(pnlSplash);
!         }
!         else
!         {
!             JTabbedPane tabMain = new JTabbedPane();
!             pnlMain.add(tabMain, BorderLayout.CENTER);
  
!             // Add the splash
!             tabMain.add(pnlSplash, Msg.getApplicationTitle());
  
              // create and add the System Properties tab
              JTable tblProps = new JTable();
--- 105,148 ----
          pnlSplash.add(lblInfo, BorderLayout.SOUTH);
  
!         JTabbedPane tabMain = new JTabbedPane();
!         pnlMain.add(tabMain, BorderLayout.CENTER);
  
!         // Add the splash
!         String appName = Msg.getApplicationTitle();
!         tabMain.add(pnlSplash, appName);
  
+         License license = new License(appName);
+ //        Font fixedFont = new Font("Monospaced", 0, 18); //$NON-NLS-1$
+         JTextPane warranty = new AntiAliasedTextPane();
+         //warranty.setFont(fixedFont);
+         warranty.setEditable(false);
+         warranty.setEditorKit(new HTMLEditorKit());
+         warranty.setText(license.getWarranty());
+         warranty.setCaretPosition(0);
+         JScrollPane warrantyScr = new JScrollPane();
+         warrantyScr.setPreferredSize(new Dimension(500, 300));
+         warrantyScr.getViewport().add(warranty);
+         JPanel warrantyPnl = new JPanel(new BorderLayout());
+         warrantyPnl.add(warrantyScr, BorderLayout.CENTER);
+         warrantyPnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+         tabMain.add(warrantyPnl, Msg.WARRANTY_TAB_TITLE.toString());
+ 
+         JTextPane details = new AntiAliasedTextPane();
+         //details.setFont(fixedFont);
+         details.setEditable(false);
+         details.setEditorKit(new HTMLEditorKit());
+         details.setText(license.getDetails());
+         details.setCaretPosition(0);
+         JScrollPane detailScr = new JScrollPane();
+         detailScr.setPreferredSize(new Dimension(500, 300));
+         detailScr.getViewport().add(details);
+         JPanel detailsPnl = new JPanel(new BorderLayout());
+         detailsPnl.add(detailScr, BorderLayout.CENTER);
+         detailsPnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+         tabMain.add(detailsPnl, Msg.DETAILS_TAB_TITLE.toString());
+ 
+         // Put in tabs if advanced
+         if (advanced)
+         {
              // create and add the System Properties tab
              JTable tblProps = new JTable();
***************
*** 127,131 ****
              pnlProps.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
              tabMain.add(pnlProps, Msg.SYSTEM_PROPS_TAB_TITLE.toString());
- 
          }
      }
--- 159,162 ----

Index: Msg.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/Msg.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Msg.java	17 May 2005 00:44:31 -0000	1.16
--- Msg.java	2 Jun 2005 23:40:31 -0000	1.17
***************
*** 78,81 ****
--- 78,83 ----
      static final Msg SPLASH_IMAGE = new Msg("Splash.SplashImage"); //$NON-NLS-1$
      static final Msg ABOUT_TITLE = new Msg("AboutPane.AboutTitle"); //$NON-NLS-1$
+     static final Msg WARRANTY_TAB_TITLE = new Msg("AboutPane.Warranty"); //$NON-NLS-1$
+     static final Msg DETAILS_TAB_TITLE = new Msg("AboutPane.Details"); //$NON-NLS-1$
      static final Msg TASK_TAB_TITLE = new Msg("AboutPane.TaskTabTitle"); //$NON-NLS-1$
      static final Msg ERROR_TAB_TITLE = new Msg("AboutPane.ErrorTabTitle"); //$NON-NLS-1$