From: <za...@us...> - 2012-03-29 09:30:51
|
Revision: 16632 http://pcgen.svn.sourceforge.net/pcgen/?rev=16632&view=rev Author: zaister Date: 2012-03-29 09:30:41 +0000 (Thu, 29 Mar 2012) Log Message: ----------- Rename/refactor the "Experience Table" panel in the preferences to "Defaults" as it already contains more than just XP stuff now, and will get more character creation defaults, such as characters' default preview sheet. Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties Trunk/pcgen/code/src/java/pcgen/resources/lang/cleaned.properties Added Paths: ----------- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/DefaultsPanel.java Removed Paths: ------------- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/ExperiencePanel.java Modified: Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java 2012-03-28 23:03:59 UTC (rev 16631) +++ Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java 2012-03-29 09:30:41 UTC (rev 16632) @@ -102,7 +102,7 @@ import pcgen.gui.utils.WholeNumberField; import pcgen.gui2.prefs.CharacterStatsPanel; import pcgen.gui2.prefs.CopySettingsPanel; -import pcgen.gui2.prefs.ExperiencePanel; +import pcgen.gui2.prefs.DefaultsPanel; import pcgen.gui2.prefs.HouseRulesPanel; import pcgen.gui2.prefs.LanguagePanel; import pcgen.gui2.prefs.MonsterPanel; @@ -469,8 +469,8 @@ // "Monsters" private PCGenPrefsPanel monsterPanel; - // "Experience" - private PCGenPrefsPanel experiencePanel; + // "Defaults" + private PCGenPrefsPanel defaultsPanel; private PCGenPrefsPanel sourcesPanel; @@ -617,8 +617,8 @@ // Monsters monsterPanel.setOptionsBasedOnControls(); - // Experience - experiencePanel.setOptionsBasedOnControls(); + // Defaults + defaultsPanel.setOptionsBasedOnControls(); // Tab Options switch (mainTabPlacementCombo.getSelectedIndex()) @@ -983,7 +983,7 @@ monsterPanel.applyOptionValuesToControls(); // Experience - experiencePanel.applyOptionValuesToControls(); + defaultsPanel.applyOptionValuesToControls(); // Colors prereqQualifyColor.setForeground(new Color(SettingsHandler @@ -1200,7 +1200,7 @@ // Copy Settings copySettingsPanel.applyOptionValuesToControls(); copySettingsPanel.registerAffectedPanel(characterStatsPanel); - copySettingsPanel.registerAffectedPanel(experiencePanel); + copySettingsPanel.registerAffectedPanel(defaultsPanel); copySettingsPanel.registerAffectedPanel(languagePanel); } @@ -2407,10 +2407,10 @@ characterNode.add(new DefaultMutableTreeNode(in_monsters)); monsterPanel = new MonsterPanel(); settingsPanel.add(monsterPanel, monsterPanel.getTitle()); - experiencePanel = new ExperiencePanel(); + defaultsPanel = new DefaultsPanel(); characterNode - .add(new DefaultMutableTreeNode(experiencePanel.getTitle())); - settingsPanel.add(experiencePanel, experiencePanel.getTitle()); + .add(new DefaultMutableTreeNode(defaultsPanel.getTitle())); + settingsPanel.add(defaultsPanel, defaultsPanel.getTitle()); rootNode.add(characterNode); appearanceNode = new DefaultMutableTreeNode(in_appearance); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java 2012-03-28 23:03:59 UTC (rev 16631) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java 2012-03-29 09:30:41 UTC (rev 16632) @@ -77,7 +77,7 @@ import pcgen.gui2.prefs.CopySettingsPanel; import pcgen.gui2.prefs.DisplayOptionsPanel; import pcgen.gui2.prefs.EquipmentPanel; -import pcgen.gui2.prefs.ExperiencePanel; +import pcgen.gui2.prefs.DefaultsPanel; import pcgen.gui2.prefs.HitPointsPanel; import pcgen.gui2.prefs.HouseRulesPanel; import pcgen.gui2.prefs.InputPanel; @@ -130,7 +130,7 @@ private PCGenPrefsPanel hitPointsPanel; private PCGenPrefsPanel houseRulesPanel; private PCGenPrefsPanel monsterPanel; - private PCGenPrefsPanel experiencePanel; + private PCGenPrefsPanel defaultsPanel; // Appearance panels private PCGenPrefsPanel colorsPanel; @@ -231,7 +231,7 @@ // Copy Settings copySettingsPanel.registerAffectedPanel(characterStatsPanel); - copySettingsPanel.registerAffectedPanel(experiencePanel); + copySettingsPanel.registerAffectedPanel(defaultsPanel); copySettingsPanel.registerAffectedPanel(languagePanel); } @@ -291,8 +291,8 @@ addPanelToTree(characterNode, houseRulesPanel); monsterPanel = new MonsterPanel(); addPanelToTree(characterNode, monsterPanel); - experiencePanel = new ExperiencePanel(); - addPanelToTree(characterNode, experiencePanel); + defaultsPanel = new DefaultsPanel(); + addPanelToTree(characterNode, defaultsPanel); rootNode.add(characterNode); appearanceNode = new DefaultMutableTreeNode(in_appearance); Copied: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/DefaultsPanel.java (from rev 16627, Trunk/pcgen/code/src/java/pcgen/gui2/prefs/ExperiencePanel.java) =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/DefaultsPanel.java (rev 0) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/DefaultsPanel.java 2012-03-29 09:30:41 UTC (rev 16632) @@ -0,0 +1,160 @@ +/* + * DefaultsPanel.java + * Copyright 2008 (C) James Dempsey + * + * 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 20/07/2008 14:21:40 + * + * $Id: $ + */ +package pcgen.gui2.prefs; + +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.util.List; + +import javax.swing.BorderFactory; +import javax.swing.JLabel; +import javax.swing.border.Border; +import javax.swing.border.TitledBorder; + +import pcgen.core.GameMode; +import pcgen.core.SettingsHandler; +import pcgen.gui2.util.JComboBoxEx; +import pcgen.gui2.tools.Utility; +import pcgen.system.LanguageBundle; + +/** + * The Class <code>DefaultsPanel</code> is responsible for + * setting various defaults for characters that can be changed + * on a per character basis, such as experience table, character + * type, and so on. + * + * Last Editor: $Author: $ + * Last Edited: $Date: $ + * + * @author James Dempsey <jde...@us...> + * @version $Revision: $ + */ +@SuppressWarnings("serial") +public class DefaultsPanel extends PCGenPrefsPanel +{ + private static String in_defaults = + LanguageBundle.getString("in_Prefs_defaults"); + private JComboBoxEx xpTableCombo = new JComboBoxEx(); + private JComboBoxEx characterTypeCombo = new JComboBoxEx(); + + /** + * Instantiates a new defaults panel. + */ + public DefaultsPanel() + { + GridBagLayout gridbag = new GridBagLayout(); + GridBagConstraints c = new GridBagConstraints(); + JLabel label; + Border etched = null; + TitledBorder title1 = + BorderFactory.createTitledBorder(etched, in_defaults); + + title1.setTitleJustification(TitledBorder.LEFT); + this.setBorder(title1); + gridbag = new GridBagLayout(); + this.setLayout(gridbag); + c = new GridBagConstraints(); + c.fill = GridBagConstraints.HORIZONTAL; + c.anchor = GridBagConstraints.NORTHWEST; + c.insets = new Insets(2, 2, 2, 2); + + Utility.buildConstraints(c, 0, 0, 2, 1, 0, 0); + label = + new JLabel(LanguageBundle + .getString("in_Prefs_xpTable") + + ": "); + gridbag.setConstraints(label, c); + this.add(label); + Utility.buildConstraints(c, 2, 0, 1, 1, 0, 0); + gridbag.setConstraints(xpTableCombo, c); + this.add(xpTableCombo); + + Utility.buildConstraints(c, 0, 1, 2, 1, 0, 0); + label = + new JLabel(LanguageBundle + .getString("in_Prefs_characterType") + + ": "); + gridbag.setConstraints(label, c); + this.add(label); + Utility.buildConstraints(c, 2, 1, 1, 1, 0, 0); + gridbag.setConstraints(characterTypeCombo, c); + this.add(characterTypeCombo); + + Utility.buildConstraints(c, 5, 20, 1, 1, 1, 1); + c.fill = GridBagConstraints.BOTH; + label = new JLabel(" "); + gridbag.setConstraints(label, c); + this.add(label); + } + + /* (non-Javadoc) + * @see pcgen.gui2.prefs.PCGenPrefsPanel#getTitle() + */ + @Override + public String getTitle() + { + return in_defaults; + } + + /* (non-Javadoc) + * @see pcgen.gui2.prefs.PreferencesPanel#applyPreferences() + */ + @Override + public void setOptionsBasedOnControls() + { + final GameMode gameMode = SettingsHandler.getGame(); + gameMode.setDefaultXPTableName(String.valueOf(xpTableCombo.getSelectedItem())); + gameMode.setDefaultCharacterType(String.valueOf(characterTypeCombo.getSelectedItem())); + } + + /* (non-Javadoc) + * @see pcgen.gui2.prefs.PreferencesPanel#initPreferences() + */ + @Override + public void applyOptionValuesToControls() + { + final GameMode gameMode = SettingsHandler.getGame(); + final String xpTableName = gameMode.getDefaultXPTableName(); + final String characterType = gameMode.getDefaultCharacterType(); + + List<String> xpTableNames = gameMode.getXPTableNames(); + List<String> characterTypes = gameMode.getCharacterTypeList(); + + xpTableCombo.removeAllItems(); + for (String name : xpTableNames) + { + xpTableCombo.addItem(name); + } + xpTableCombo.setSelectedItem(xpTableName); + + characterTypeCombo.removeAllItems(); + for (String name : characterTypes) + { + characterTypeCombo.addItem(name); + } + characterTypeCombo.setSelectedItem(characterType); + + } + +} Deleted: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/ExperiencePanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/ExperiencePanel.java 2012-03-28 23:03:59 UTC (rev 16631) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/ExperiencePanel.java 2012-03-29 09:30:41 UTC (rev 16632) @@ -1,159 +0,0 @@ -/* - * ExperiencePanel.java - * Copyright 2008 (C) James Dempsey - * - * 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 20/07/2008 14:21:40 - * - * $Id: $ - */ -package pcgen.gui2.prefs; - -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.util.List; - -import javax.swing.BorderFactory; -import javax.swing.JLabel; -import javax.swing.border.Border; -import javax.swing.border.TitledBorder; - -import pcgen.core.GameMode; -import pcgen.core.SettingsHandler; -import pcgen.gui2.util.JComboBoxEx; -import pcgen.gui2.tools.Utility; -import pcgen.system.LanguageBundle; - -/** - * The Class <code>ExperiencePanel</code> is responsible for - * displaying experience related preferences and allowing the - * preferences to be edited by the user. - * - * Last Editor: $Author: $ - * Last Edited: $Date: $ - * - * @author James Dempsey <jde...@us...> - * @version $Revision: $ - */ -@SuppressWarnings("serial") -public class ExperiencePanel extends PCGenPrefsPanel -{ - private static String in_experience = - LanguageBundle.getString("in_Prefs_experience"); - private JComboBoxEx xpTableCombo = new JComboBoxEx(); - private JComboBoxEx characterTypeCombo = new JComboBoxEx(); - - /** - * Instantiates a new monster panel. - */ - public ExperiencePanel() - { - GridBagLayout gridbag = new GridBagLayout(); - GridBagConstraints c = new GridBagConstraints(); - JLabel label; - Border etched = null; - TitledBorder title1 = - BorderFactory.createTitledBorder(etched, in_experience); - - title1.setTitleJustification(TitledBorder.LEFT); - this.setBorder(title1); - gridbag = new GridBagLayout(); - this.setLayout(gridbag); - c = new GridBagConstraints(); - c.fill = GridBagConstraints.HORIZONTAL; - c.anchor = GridBagConstraints.NORTHWEST; - c.insets = new Insets(2, 2, 2, 2); - - Utility.buildConstraints(c, 0, 0, 2, 1, 0, 0); - label = - new JLabel(LanguageBundle - .getString("in_Prefs_xpTable") - + ": "); - gridbag.setConstraints(label, c); - this.add(label); - Utility.buildConstraints(c, 2, 0, 1, 1, 0, 0); - gridbag.setConstraints(xpTableCombo, c); - this.add(xpTableCombo); - - Utility.buildConstraints(c, 0, 1, 2, 1, 0, 0); - label = - new JLabel(LanguageBundle - .getString("in_Prefs_characterType") - + ": "); - gridbag.setConstraints(label, c); - this.add(label); - Utility.buildConstraints(c, 2, 1, 1, 1, 0, 0); - gridbag.setConstraints(characterTypeCombo, c); - this.add(characterTypeCombo); - - Utility.buildConstraints(c, 5, 20, 1, 1, 1, 1); - c.fill = GridBagConstraints.BOTH; - label = new JLabel(" "); - gridbag.setConstraints(label, c); - this.add(label); - } - - /* (non-Javadoc) - * @see pcgen.gui2.prefs.PCGenPrefsPanel#getTitle() - */ - @Override - public String getTitle() - { - return in_experience; - } - - /* (non-Javadoc) - * @see pcgen.gui2.prefs.PreferencesPanel#applyPreferences() - */ - @Override - public void setOptionsBasedOnControls() - { - final GameMode gameMode = SettingsHandler.getGame(); - gameMode.setDefaultXPTableName(String.valueOf(xpTableCombo.getSelectedItem())); - gameMode.setDefaultCharacterType(String.valueOf(characterTypeCombo.getSelectedItem())); - } - - /* (non-Javadoc) - * @see pcgen.gui2.prefs.PreferencesPanel#initPreferences() - */ - @Override - public void applyOptionValuesToControls() - { - final GameMode gameMode = SettingsHandler.getGame(); - final String xpTableName = gameMode.getDefaultXPTableName(); - final String characterType = gameMode.getDefaultCharacterType(); - - List<String> xpTableNames = gameMode.getXPTableNames(); - List<String> characterTypes = gameMode.getCharacterTypeList(); - - xpTableCombo.removeAllItems(); - for (String name : xpTableNames) - { - xpTableCombo.addItem(name); - } - xpTableCombo.setSelectedItem(xpTableName); - - characterTypeCombo.removeAllItems(); - for (String name : characterTypes) - { - characterTypeCombo.addItem(name); - } - characterTypeCombo.setSelectedItem(characterType); - - } - -} Modified: Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties =================================================================== --- Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties 2012-03-28 23:03:59 UTC (rev 16631) +++ Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties 2012-03-29 09:30:41 UTC (rev 16632) @@ -3152,7 +3152,7 @@ in_Prefs_ignoreMonsterHDCap=Ignore Monster HD Cap -in_Prefs_experience=Experience Table +in_Prefs_defaults=Defaults in_Prefs_xpTable=Default experience table to be used Modified: Trunk/pcgen/code/src/java/pcgen/resources/lang/cleaned.properties =================================================================== --- Trunk/pcgen/code/src/java/pcgen/resources/lang/cleaned.properties 2012-03-28 23:03:59 UTC (rev 16631) +++ Trunk/pcgen/code/src/java/pcgen/resources/lang/cleaned.properties 2012-03-29 09:30:41 UTC (rev 16632) @@ -1351,7 +1351,7 @@ in_Prefs_ignoreMonsterHDCap=Ignore Monster HD Cap -in_Prefs_experience=Experience Table +in_Prefs_defaults=Defaults in_Prefs_xpTable=Default experience table to be used This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |