From: <cpm...@us...> - 2011-03-10 03:42:19
|
Revision: 14700 http://pcgen.svn.sourceforge.net/pcgen/?rev=14700&view=rev Author: cpmeister Date: 2011-03-10 03:42:12 +0000 (Thu, 10 Mar 2011) Log Message: ----------- UI Update -Campaign info has been given more room for the images to display (it looks nicer) -fixed bug that caused to scroll bar to not be at the top of the campaign info display when a new campaign was selected Modified Paths: -------------- sandbox/uisync/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java sandbox/uisync/code/src/java/pcgen/gui2/tools/InfoPane.java Modified: sandbox/uisync/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2011-03-10 03:31:07 UTC (rev 14699) +++ sandbox/uisync/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2011-03-10 03:42:12 UTC (rev 14700) @@ -196,7 +196,7 @@ add(panel, BorderLayout.CENTER); //infoPane.setMinimumSize(new Dimension(250, 100)); - infoPane.setPreferredSize(new Dimension(250, 200)); + infoPane.setPreferredSize(new Dimension(300, 200)); add(infoPane, BorderLayout.EAST); } Modified: sandbox/uisync/code/src/java/pcgen/gui2/tools/InfoPane.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/gui2/tools/InfoPane.java 2011-03-10 03:31:07 UTC (rev 14699) +++ sandbox/uisync/code/src/java/pcgen/gui2/tools/InfoPane.java 2011-03-10 03:42:12 UTC (rev 14700) @@ -20,10 +20,16 @@ */ package pcgen.gui2.tools; +import java.io.IOException; +import java.io.StringReader; import javax.swing.BorderFactory; import javax.swing.JScrollPane; import javax.swing.JTextPane; import javax.swing.border.TitledBorder; +import javax.swing.text.BadLocationException; +import javax.swing.text.Document; +import javax.swing.text.EditorKit; +import pcgen.base.lang.UnreachableError; /** * @@ -32,48 +38,63 @@ public class InfoPane extends JScrollPane { - private JTextPane textPane; - private TitledBorder titledBorder; + private JTextPane textPane; + private TitledBorder titledBorder; - public InfoPane() - { - this("Info"); - } + public InfoPane() + { + this("Info"); + } - public InfoPane(String title) - { - super(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - this.titledBorder = BorderFactory.createTitledBorder(null, title, - TitledBorder.CENTER, - TitledBorder.DEFAULT_POSITION); - this.textPane = new JTextPane(); - initComponents(); - } + public InfoPane(String title) + { + super(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, + JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + this.titledBorder = BorderFactory.createTitledBorder(null, title, + TitledBorder.CENTER, + TitledBorder.DEFAULT_POSITION); + this.textPane = new JTextPane(); + initComponents(); + } - private void initComponents() - { - setBorder(BorderFactory.createCompoundBorder(titledBorder, getBorder())); + private void initComponents() + { + setBorder(BorderFactory.createCompoundBorder(titledBorder, getBorder())); - textPane.setEditable(false); - setViewportView(textPane); - textPane.setContentType("text/html"); - } + textPane.setEditable(false); + setViewportView(textPane); + textPane.setContentType("text/html"); + } - public String getTitle() - { - return titledBorder.getTitle(); - } + public String getTitle() + { + return titledBorder.getTitle(); + } - public void setTitle(String title) - { - titledBorder.setTitle(title); - validate(); + public void setTitle(String title) + { + titledBorder.setTitle(title); + validate(); repaint(); - } + } - public void setText(String text) - { - textPane.setText(text); - } + public void setText(String text) + { + EditorKit kit = textPane.getEditorKit(); + Document newDoc = kit.createDefaultDocument(); + try + { + kit.read(new StringReader(text), newDoc, 0); + } + catch (IOException ex) + { + throw new UnreachableError(ex); + } + catch (BadLocationException ex) + { + throw new UnreachableError(ex); + } + textPane.setDocument(newDoc); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |