[Lexi-checkins] lexi/src/com/jmonkey/office/lexi/support FontChooser.java,1.8,1.9

[Stephen C. <cr...@us...>]

Update of /cvsroot/lexi/lexi/src/com/jmonkey/office/lexi/support
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20710/src/com/jmonkey/office/lexi/support

Modified Files:
	FontChooser.java 
Log Message:
Reworked the User Options dialog so that it has conventional Ok, Reset
and Cancel buttons.  Reworked the dialog's tabbed pane infrastructure
and added a pane for file type options.


Index: FontChooser.java
===================================================================
RCS file: /cvsroot/lexi/lexi/src/com/jmonkey/office/lexi/support/FontChooser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FontChooser.java	11 Oct 2005 14:23:54 -0000	1.8
--- FontChooser.java	15 Oct 2005 06:09:57 -0000	1.9
***************
*** 124,136 ****
      
      JPanel main = new JPanel();
!     JPanel buttonPanes = new JPanel();
!     JPanel listPanes = new JPanel();
!     JPanel fontPanes = new JPanel();
!     JPanel optionPanes = new JPanel();
!     JPanel previewPanes = new JPanel();
      main.setLayout(new BorderLayout());
!     buttonPanes.setLayout(new FlowLayout());
!     fontPanes.setLayout(new BorderLayout());
!     optionPanes.setLayout(new GridLayout(3, 2));
  
      Registry reg = m_app.getRegistry();
--- 124,136 ----
      
      JPanel main = new JPanel();
!     JPanel buttonPanel = new JPanel();
!     JPanel listPanel = new JPanel();
!     JPanel fontPanel = new JPanel();
!     JPanel optionPanel = new JPanel();
!     JPanel previewPanel = new JPanel();
      main.setLayout(new BorderLayout());
!     buttonPanel.setLayout(new FlowLayout());
!     fontPanel.setLayout(new BorderLayout());
!     optionPanel.setLayout(new GridLayout(3, 2));
  
      Registry reg = m_app.getRegistry();
***************
*** 148,155 ****
      
      JScrollPane scroller = new JScrollPane(m_fontList);
!     listPanes.add(scroller);
  
!     fontPanes.add(listPanes, BorderLayout.WEST);
!     fontPanes.add(optionPanes, BorderLayout.EAST);
      
      int[] sizes = m_app.getFontSizes();
--- 148,155 ----
      
      JScrollPane scroller = new JScrollPane(m_fontList);
!     listPanel.add(scroller);
  
!     fontPanel.add(listPanel, BorderLayout.WEST);
!     fontPanel.add(optionPanel, BorderLayout.EAST);
      
      int[] sizes = m_app.getFontSizes();
***************
*** 161,166 ****
      m_sizeBox.addItemListener(this);
  
!     optionPanes.add(m_sizeBox);
!     optionPanes.add(new JSeparator());
      m_boldBox = new JCheckBox("Bold", false);
      m_boldBox.addItemListener(this);
--- 161,166 ----
      m_sizeBox.addItemListener(this);
  
!     optionPanel.add(m_sizeBox);
!     optionPanel.add(new JSeparator());
      m_boldBox = new JCheckBox("Bold", false);
      m_boldBox.addItemListener(this);
***************
*** 195,201 ****
      m_fontList.setSelectedValue(fontFamily, true);
      
!     optionPanes.add(m_plainBox);
!     optionPanes.add(m_italicBox);
!     optionPanes.add(m_boldBox);
  
      // Button Pane
--- 195,201 ----
      m_fontList.setSelectedValue(fontFamily, true);
      
!     optionPanel.add(m_plainBox);
!     optionPanel.add(m_italicBox);
!     optionPanel.add(m_boldBox);
  
      // Button Pane
***************
*** 206,211 ****
      cancelButton.setActionCommand("can-button");
      cancelButton.addActionListener(this);
!     buttonPanes.add(okButton);
!     buttonPanes.add(cancelButton);
  
      // Preview Pane
--- 206,211 ----
      cancelButton.setActionCommand("can-button");
      cancelButton.addActionListener(this);
!     buttonPanel.add(okButton);
!     buttonPanel.add(cancelButton);
  
      // Preview Pane
***************
*** 213,223 ****
      m_prevArea.setSize(200, 200);
      m_prevArea.setEditable(false);
!     previewPanes.add(m_prevArea);
      paintPreviewArea(true);
  
      // Add Stuff to Main
!     main.add(fontPanes, BorderLayout.NORTH);
!     main.add(previewPanes, BorderLayout.CENTER);
!     main.add(buttonPanes, BorderLayout.SOUTH);
  
      getContentPane().add(main);
--- 213,223 ----
      m_prevArea.setSize(200, 200);
      m_prevArea.setEditable(false);
!     previewPanel.add(m_prevArea);
      paintPreviewArea(true);
  
      // Add Stuff to Main
!     main.add(fontPanel, BorderLayout.NORTH);
!     main.add(previewPanel, BorderLayout.CENTER);
!     main.add(buttonPanel, BorderLayout.SOUTH);
  
      getContentPane().add(main);