From: <cpm...@us...> - 2008-07-24 23:45:41
|
Revision: 7238 http://pcgen.svn.sourceforge.net/pcgen/?rev=7238&view=rev Author: cpmeister Date: 2008-07-24 23:45:48 +0000 (Thu, 24 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.form branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java branches/cdomui/code/src/java/pcgen/gui/tools/ChooserPane.java branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java branches/cdomui/code/src/java/pcgen/gui/util/JTablePane.java branches/cdomui/code/src/java/pcgen/gui/util/JTableSortingHeader.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeTablePane.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java branches/cdomui/code/src/java/pcgen/gui/util/panes/FlippingSplitPane.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBoxModel.java Modified: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form 2008-07-24 23:45:48 UTC (rev 7238) @@ -16,7 +16,7 @@ <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/> - <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,2,0,0,1,-46"/> + <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,16,0,0,1,-77"/> </AuxValues> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> @@ -33,7 +33,7 @@ </Properties> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="2" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="2" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="1.0" weightY="0.0"/> </Constraint> </Constraints> @@ -94,7 +94,7 @@ </Properties> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> @@ -130,7 +130,7 @@ </Properties> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> @@ -164,7 +164,7 @@ </Properties> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> @@ -191,7 +191,7 @@ </Properties> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> @@ -283,7 +283,7 @@ </Properties> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> @@ -439,5 +439,50 @@ </Component> </SubComponents> </Container> + <Component class="javax.swing.JLabel" name="jLabel8"> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="okButton"> + <Properties> + <Property name="text" type="java.lang.String" value="OK"/> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="cancelButton"> + <Properties> + <Property name="text" type="java.lang.String" value="Cancel"/> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> </SubComponents> </Form> Modified: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -57,6 +57,9 @@ jLabel3 = new javax.swing.JLabel(); comboSelectionBox4 = new pcgen.gui.tools.ComboSelectionBox(); jComboBox7 = new javax.swing.JComboBox(); + jLabel8 = new javax.swing.JLabel(); + okButton = new javax.swing.JButton(); + cancelButton = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); getContentPane().setLayout(new java.awt.GridBagLayout()); @@ -90,6 +93,7 @@ gridBagConstraints.gridheight = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); getContentPane().add(jPanel3, gridBagConstraints); jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Alignment", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); @@ -101,6 +105,7 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 0, 4); getContentPane().add(jPanel1, gridBagConstraints); jPanel4.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Gender", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); @@ -112,6 +117,7 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(0, 4, 4, 4); getContentPane().add(jPanel4, gridBagConstraints); jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Race", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); @@ -121,7 +127,7 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 0); + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); getContentPane().add(jPanel2, gridBagConstraints); jPanel5.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Stats", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); @@ -183,6 +189,7 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); getContentPane().add(jPanel5, gridBagConstraints); jPanel6.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Classes", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); @@ -253,8 +260,26 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); getContentPane().add(jPanel6, gridBagConstraints); + getContentPane().add(jLabel8, new java.awt.GridBagConstraints()); + okButton.setText("OK"); + okButton.setMaximumSize(new java.awt.Dimension(75, 23)); + okButton.setMinimumSize(new java.awt.Dimension(75, 23)); + okButton.setPreferredSize(new java.awt.Dimension(75, 23)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); + getContentPane().add(okButton, gridBagConstraints); + + cancelButton.setText("Cancel"); + cancelButton.setMaximumSize(new java.awt.Dimension(75, 23)); + cancelButton.setMinimumSize(new java.awt.Dimension(75, 23)); + cancelButton.setPreferredSize(new java.awt.Dimension(75, 23)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); + getContentPane().add(cancelButton, gridBagConstraints); + pack(); }// </editor-fold>//GEN-END:initComponents @@ -276,6 +301,7 @@ } // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JButton cancelButton; private pcgen.gui.tools.ComboSelectionBox comboSelectionBox1; private pcgen.gui.tools.ComboSelectionBox comboSelectionBox2; private pcgen.gui.tools.ComboSelectionBox comboSelectionBox3; @@ -297,6 +323,7 @@ private javax.swing.JLabel jLabel5; private javax.swing.JLabel jLabel6; private javax.swing.JLabel jLabel7; + private javax.swing.JLabel jLabel8; private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel2; private javax.swing.JPanel jPanel3; @@ -306,6 +333,7 @@ private javax.swing.JScrollPane jScrollPane1; private javax.swing.JTable jTable1; private javax.swing.JTextField jTextField1; + private javax.swing.JButton okButton; // End of variables declaration//GEN-END:variables } Modified: branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.form 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.form 2008-07-24 23:45:48 UTC (rev 7238) @@ -10,7 +10,7 @@ <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/> - <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-60,0,0,2,31"/> + <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-20,0,0,2,21"/> </AuxValues> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> @@ -29,15 +29,6 @@ <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/> <SubComponents> - <Container class="javax.swing.JPanel" name="jPanel1"> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription"> - <JSplitPaneConstraints position="left"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/> - </Container> <Container class="pcgen.gui.util.panes.FlippingSplitPane" name="flippingSplitPane2"> <Properties> <Property name="dividerSize" type="int" value="7"/> @@ -53,16 +44,6 @@ <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/> <SubComponents> - <Component class="pcgen.gui.util.panes.InfoPane" name="infoPane1"> - <Properties> - <Property name="title" type="java.lang.String" value="Skill Info"/> - </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription"> - <JSplitPaneConstraints position="top"/> - </Constraint> - </Constraints> - </Component> <Container class="javax.swing.JPanel" name="jPanel2"> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription"> @@ -70,19 +51,22 @@ </Constraint> </Constraints> - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> <SubComponents> <Container class="javax.swing.JScrollPane" name="jScrollPane2"> <Properties> <Property name="horizontalScrollBarPolicy" type="int" value="31"/> <Property name="verticalScrollBarPolicy" type="int" value="21"/> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[300, 75]"/> + </Property> </Properties> <AuxValues> <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> </AuxValues> <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="60" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="First"/> </Constraint> </Constraints> @@ -109,6 +93,7 @@ </Column> </Table> </Property> + <Property name="enabled" type="boolean" value="false"/> </Properties> </Component> </SubComponents> @@ -118,8 +103,8 @@ <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> </AuxValues> <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> - <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="1.0"/> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="Center"/> </Constraint> </Constraints> @@ -136,8 +121,8 @@ <Data value="4"/> </Column> <Column editable="false" title="Class" type="java.lang.Object"/> - <Column editable="false" title="Skill Points" type="java.lang.Integer"/> - <Column editable="false" title="Points Left" type="java.lang.Integer"/> + <Column editable="false" title="Points Spent" type="java.lang.Integer"/> + <Column editable="false" title="Points Gained" type="java.lang.Integer"/> </Table> </Property> </Properties> @@ -146,8 +131,25 @@ </Container> </SubComponents> </Container> + <Component class="pcgen.gui.tools.InfoPane" name="infoPane1"> + <Properties> + <Property name="title" type="java.lang.String" value="Skill Info"/> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription"> + <JSplitPaneConstraints position="left"/> + </Constraint> + </Constraints> + </Component> </SubComponents> </Container> + <Component class="pcgen.gui.filter.FilteredTreeViewPanel" name="filteredTreeViewPanel1"> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription"> + <JSplitPaneConstraints position="left"/> + </Constraint> + </Constraints> + </Component> </SubComponents> </Container> </SubComponents> Modified: branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -24,37 +24,33 @@ */ // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents private void initComponents() { - java.awt.GridBagConstraints gridBagConstraints; flippingSplitPane1 = new pcgen.gui.util.panes.FlippingSplitPane(); - jPanel1 = new javax.swing.JPanel(); flippingSplitPane2 = new pcgen.gui.util.panes.FlippingSplitPane(); - infoPane1 = new pcgen.gui.tools.InfoPane(); jPanel2 = new javax.swing.JPanel(); jScrollPane2 = new javax.swing.JScrollPane(); jTable2 = new javax.swing.JTable(); jScrollPane1 = new javax.swing.JScrollPane(); jTable1 = new javax.swing.JTable(); + infoPane1 = new pcgen.gui.tools.InfoPane(); + filteredTreeViewPanel1 = new pcgen.gui.filter.FilteredTreeViewPanel(); setLayout(new java.awt.BorderLayout()); flippingSplitPane1.setDividerSize(7); flippingSplitPane1.setContinuousLayout(true); flippingSplitPane1.setOneTouchExpandable(true); - flippingSplitPane1.setLeftComponent(jPanel1); flippingSplitPane2.setDividerSize(7); flippingSplitPane2.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); flippingSplitPane2.setContinuousLayout(true); flippingSplitPane2.setOneTouchExpandable(true); - infoPane1.setTitle("Skill Info"); - flippingSplitPane2.setTopComponent(infoPane1); + jPanel2.setLayout(new java.awt.BorderLayout()); - jPanel2.setLayout(new java.awt.GridBagLayout()); - jScrollPane2.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); jScrollPane2.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); + jScrollPane2.setPreferredSize(new java.awt.Dimension(300, 75)); jTable2.setModel(new javax.swing.table.DefaultTableModel( new Object [][] { @@ -74,14 +70,10 @@ return types [columnIndex]; } }); + jTable2.setEnabled(false); jScrollPane2.setViewportView(jTable2); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.ipady = 60; - gridBagConstraints.weightx = 1.0; - jPanel2.add(jScrollPane2, gridBagConstraints); + jPanel2.add(jScrollPane2, java.awt.BorderLayout.PAGE_START); jTable1.setModel(new javax.swing.table.DefaultTableModel( new Object [][] { @@ -91,7 +83,7 @@ {new Integer(4), null, null, null} }, new String [] { - "Level", "Class", "Skill Points", "Points Left" + "Level", "Class", "Points Spent", "Points Gained" } ) { Class[] types = new Class [] { @@ -111,26 +103,25 @@ }); jScrollPane1.setViewportView(jTable1); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - jPanel2.add(jScrollPane1, gridBagConstraints); + jPanel2.add(jScrollPane1, java.awt.BorderLayout.CENTER); flippingSplitPane2.setRightComponent(jPanel2); + infoPane1.setTitle("Skill Info"); + flippingSplitPane2.setLeftComponent(infoPane1); + flippingSplitPane1.setRightComponent(flippingSplitPane2); + flippingSplitPane1.setLeftComponent(filteredTreeViewPanel1); add(flippingSplitPane1, java.awt.BorderLayout.CENTER); }// </editor-fold>//GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables + private pcgen.gui.filter.FilteredTreeViewPanel filteredTreeViewPanel1; private pcgen.gui.util.panes.FlippingSplitPane flippingSplitPane1; private pcgen.gui.util.panes.FlippingSplitPane flippingSplitPane2; private pcgen.gui.tools.InfoPane infoPane1; - private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel2; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JScrollPane jScrollPane2; Modified: branches/cdomui/code/src/java/pcgen/gui/tools/ChooserPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/ChooserPane.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/tools/ChooserPane.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -30,6 +30,7 @@ public class ChooserPane extends FlippingSplitPane { + private static final long serialVersionUID = -8364721218562027273L; private FlippingSplitPane subSplitPane; private InfoPane infoPane; Modified: branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -37,7 +37,6 @@ import javax.swing.SwingUtilities; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; -import pcgen.gui.filter.FilterableTreeViewModel; import pcgen.gui.util.treeview.TreeViewModel; /** @@ -47,6 +46,7 @@ public class ComboSelectionBox extends JPanel implements ItemSelectable { + private static final long serialVersionUID = 4240590146578106112L; private FilteredSelectionDialog dialog = null; private ComboSelectionBoxModel model; private JComboBox comboBox; @@ -60,13 +60,13 @@ private void initComponents() { - model = new ComboSelectionBoxModel(); - comboBox = new JComboBox(model); + comboBox = new JComboBox(); setBorder(comboBox.getBorder()); comboBox.setBorder(BorderFactory.createEmptyBorder()); button = new JButton(new ButtonAction()); + button.setEnabled(false); button.setMargin(new java.awt.Insets(0, 0, 0, 0)); add(comboBox, BorderLayout.CENTER); @@ -81,10 +81,13 @@ button.setEnabled(enabled); } - public void setTreeViewModel(FilterableTreeViewModel<?> viewmodel) + public void setComboSelectionBoxModel(ComboSelectionBoxModel model) { - model.setTreeViewModel(viewmodel); - + this.model = model; + ComboBoxModel boxmodel = new ComboBoxModel(model.getComboBoxData(), + model.getTreeViewModel()); + comboBox.setModel(boxmodel); + button.setEnabled(true); } public Object getSelectedItem() @@ -129,6 +132,8 @@ dialog = new FilteredSelectionDialog((Dialog) window); } } + dialog.restoreState(dialog.createState(model.getCharacter(), + model.getTreeViewModel())); SwingUtilities.invokeLater( new Runnable() { @@ -148,34 +153,19 @@ } - private static class ComboSelectionBoxModel extends DefaultComboBoxModel + private static class ComboBoxModel extends DefaultComboBoxModel implements ListDataListener { - private TreeViewModel<?> viewmodel; private ListModel model; - public void setTreeViewModel(TreeViewModel<?> viewmodel) + public ComboBoxModel(Object[] items, TreeViewModel<?> viewmodel) { - this.viewmodel = viewmodel; - int comboSize = super.getSize(); - if (model != null) - { - model.removeListDataListener(this); - int oldsize = getSize(); - model = null; - fireIntervalRemoved(this, comboSize, oldsize - 1); - } + super(items); model = viewmodel.getDataModel(); model.addListDataListener(this); - fireIntervalAdded(this, comboSize, getSize() - 1); } - public TreeViewModel<?> getTreeViewModel() - { - return viewmodel; - } - @Override public int getSize() { Added: branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBoxModel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBoxModel.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBoxModel.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -0,0 +1,45 @@ +/* + * ComboSelectionBoxModel.java + * Copyright 2008 Connor Petty <cpm...@us...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Created on Jul 24, 2008, 2:20:11 PM + */ +package pcgen.gui.tools; + +import pcgen.gui.facade.CharacterFacade; +import pcgen.gui.filter.FilterableTreeViewModel; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public interface ComboSelectionBoxModel +{ + + /** + * Note: The returned data should not be the same as the data used in the + * <code>FilterableTreeViewModel</code> returned by <code>getTreeViewModel()</code> + * . Data from the <code>FilterableTreeViewModel</code> model is automatically added to the <code>JComboBox</code>'s model. + * @return an array of objects + */ + public Object[] getComboBoxData(); + + public CharacterFacade getCharacter(); + + public FilterableTreeViewModel<?> getTreeViewModel(); + +} Modified: branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form 2008-07-24 23:45:48 UTC (rev 7238) @@ -55,6 +55,15 @@ <Properties> <Property name="text" type="java.lang.String" value="OK"/> <Property name="enabled" type="boolean" value="false"/> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="okButtonActionPerformed"/> @@ -68,6 +77,15 @@ <Component class="javax.swing.JButton" name="cancelButton"> <Properties> <Property name="text" type="java.lang.String" value="Cancel"/> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelButtonActionPerformed"/> Modified: branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -88,6 +88,9 @@ okButton.setText("OK"); okButton.setEnabled(false); + okButton.setMaximumSize(new java.awt.Dimension(75, 23)); + okButton.setMinimumSize(new java.awt.Dimension(75, 23)); + okButton.setPreferredSize(new java.awt.Dimension(75, 23)); okButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { okButtonActionPerformed(evt); @@ -100,6 +103,9 @@ getContentPane().add(okButton, gridBagConstraints); cancelButton.setText("Cancel"); + cancelButton.setMaximumSize(new java.awt.Dimension(75, 23)); + cancelButton.setMinimumSize(new java.awt.Dimension(75, 23)); + cancelButton.setPreferredSize(new java.awt.Dimension(75, 23)); cancelButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { cancelButtonActionPerformed(evt); Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTablePane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTablePane.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTablePane.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -43,6 +43,7 @@ public class JTablePane extends JScrollPane { + private static final long serialVersionUID = 4706817975828759006L; private final DynamicTableColumnModelListener listener = new DynamicTableColumnModelListener() { Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTableSortingHeader.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTableSortingHeader.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTableSortingHeader.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -45,6 +45,7 @@ public class JTableSortingHeader extends JTableHeader implements MouseListener { + private static final long serialVersionUID = -2459707147524421794L; private static final Icon ASCENDING_ICON = ResourceManager.getImageIcon(ResourceManager.Icons.Down16); private static final Icon DESCENDING_ICON = ResourceManager.getImageIcon(ResourceManager.Icons.Up16); private static final ButtonModel defaultModel = new DefaultButtonModel(); Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTreeTablePane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTreeTablePane.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTreeTablePane.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -30,6 +30,8 @@ public class JTreeTablePane extends JTablePane { + private static final long serialVersionUID = -2581915114516430509L; + public JTreeTablePane() { this(null); @@ -49,7 +51,7 @@ @Override public void setModel(SortableTableModel model) { - //TODO: log something + //TODO: log something } public void setTreeTableModel(TreeTableModel model) Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -51,6 +51,7 @@ public class JTreeViewPane extends JTablePane { + private static final long serialVersionUID = -819160273659674383L; private static final TreeView<Object> searchView = new TreeView<Object>() { Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -49,6 +49,7 @@ public class JTreeViewSelectionPane extends JTreeViewPane implements ItemSelectable { + private static final long serialVersionUID = -4024848218899529700L; private static final Object COLUMN_ID = new Object(); public static enum SelectionType Modified: branches/cdomui/code/src/java/pcgen/gui/util/panes/FlippingSplitPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/panes/FlippingSplitPane.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/util/panes/FlippingSplitPane.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -71,7 +71,7 @@ public class FlippingSplitPane extends JSplitPane { - static final long serialVersionUID = -6343545558990369582L; + private static final long serialVersionUID = -6343545558990369582L; /** * Icon for Center item in popup menu. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |