From: <za...@us...> - 2006-04-13 11:26:17
|
Revision: 786 Author: zaister Date: 2006-04-13 04:26:02 -0700 (Thu, 13 Apr 2006) ViewCVS: http://svn.sourceforge.net/pcgen/?rev=786&view=rev Log Message: ----------- [ 1454516 ] Better OUTPUTNAME support in UI Added OUTPUTNAME support for spells Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java Trunk/pcgen/code/src/java/pcgen/core/PObject.java Trunk/pcgen/code/src/java/pcgen/core/SettingsHandler.java Trunk/pcgen/code/src/java/pcgen/gui/ChooseSpellDialog.java Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java Trunk/pcgen/code/src/java/pcgen/gui/prop/LanguageBundle.properties Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/SpellModel.java Trunk/pcgen/code/src/java/pcgen/gui/utils/PObjectNode.java Modified: Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java 2006-04-13 05:12:09 UTC (rev 785) +++ Trunk/pcgen/code/src/java/pcgen/core/EquipmentModifier.java 2006-04-13 11:26:02 UTC (rev 786) @@ -895,7 +895,7 @@ final List metaFeats = getSpellMetafeats(listEntry); String spellName = getSpellName(listEntry); - if (SettingsHandler.guiUsesOutputName()) + if (SettingsHandler.guiUsesOutputNameSpells()) { final Spell aSpell = Globals.getSpellNamed(spellName); Modified: Trunk/pcgen/code/src/java/pcgen/core/PObject.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PObject.java 2006-04-13 05:12:09 UTC (rev 785) +++ Trunk/pcgen/code/src/java/pcgen/core/PObject.java 2006-04-13 11:26:02 UTC (rev 786) @@ -4580,7 +4580,7 @@ { String aString = toString(); - if (SettingsHandler.guiUsesOutputName()) + if (SettingsHandler.guiUsesOutputNameEquipment()) { aString = getOutputName(); } Modified: Trunk/pcgen/code/src/java/pcgen/core/SettingsHandler.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/SettingsHandler.java 2006-04-13 05:12:09 UTC (rev 785) +++ Trunk/pcgen/code/src/java/pcgen/core/SettingsHandler.java 2006-04-13 11:26:02 UTC (rev 786) @@ -212,7 +212,8 @@ private static String postExportCommandStandard = ""; //$NON-NLS-1$ private static String postExportCommandPDF = ""; //$NON-NLS-1$ private static boolean hideMonsterClasses = false; - private static boolean guiUsesOutputName = false; + private static boolean guiUsesOutputNameEquipment = false; + private static boolean guiUsesOutputNameSpells= false; private static int singleChoicePreference = Constants.CHOOSER_SINGLECHOICEMETHOD_NONE; private static int lastTipShown = -1; private static boolean showMemoryArea = false; @@ -671,11 +672,16 @@ return getOptions().getProperty("gmgen.options." + optionName, defaultValue); //$NON-NLS-1$ } - public static void setGUIUsesOutputName(final boolean argUseOutputName) + public static void setGUIUsesOutputNameEquipment(final boolean argUseOutputNameEquipment) { - guiUsesOutputName = argUseOutputName; + guiUsesOutputNameEquipment = argUseOutputNameEquipment; } + public static void setGUIUsesOutputNameSpells(final boolean argUseOutputNameSpells) + { + guiUsesOutputNameSpells = argUseOutputNameSpells; + } + public static void setGame(final String g) { final GameMode newMode = SystemCollections.getGameModeNamed(g); @@ -1153,7 +1159,8 @@ setGearTab_SellRate(sellRate); setGrimHPMode(getPCGenOption("grimHPMode", false)); //$NON-NLS-1$ setGrittyACMode(getPCGenOption("grittyACMode", false)); //$NON-NLS-1$ - setGUIUsesOutputName(getPCGenOption("GUIUsesOutputName", false)); //$NON-NLS-1$ + setGUIUsesOutputNameEquipment(getPCGenOption("GUIUsesOutputNameEquipment", false)); //$NON-NLS-1$ + setGUIUsesOutputNameSpells(getPCGenOption("GUIUsesOutputNameSpells", false)); //$NON-NLS-1$ setHideMonsterClasses(getPCGenOption("hideMonsterClasses", false)); //$NON-NLS-1$ setHPMaxAtFirstLevel(getPCGenOption("hpMaxAtFirstLevel", true)); //$NON-NLS-1$ setHPPct(getPCGenOption("hpPct", 100)); //$NON-NLS-1$ @@ -1509,7 +1516,8 @@ setPCGenOption("GearTab.sellRate", getGearTab_SellRate()); //$NON-NLS-1$ setPCGenOption("grimHPMode", isGrimHPMode()); //$NON-NLS-1$ setPCGenOption("grittyACMode", isGrittyACMode()); //$NON-NLS-1$ - setPCGenOption("GUIUsesOutputName", guiUsesOutputName()); //$NON-NLS-1$ + setPCGenOption("GUIUsesOutputNameEquipment", guiUsesOutputNameEquipment()); //$NON-NLS-1$ + setPCGenOption("GUIUsesOutputNameSpells", guiUsesOutputNameSpells()); //$NON-NLS-1$ setPCGenOption("hideMonsterClasses", hideMonsterClasses()); //$NON-NLS-1$ setPCGenOption("hpMaxAtFirstLevel", isHPMaxAtFirstLevel()); //$NON-NLS-1$ setPCGenOption("hpPct", getHPPct()); //$NON-NLS-1$ @@ -2359,11 +2367,16 @@ return weaponProfPrintout; } - public static boolean guiUsesOutputName() + public static boolean guiUsesOutputNameEquipment() { - return guiUsesOutputName; + return guiUsesOutputNameEquipment; } + public static boolean guiUsesOutputNameSpells() + { + return guiUsesOutputNameSpells; + } + /** * Checks to see if the user has set a value for this key * @param aKey Modified: Trunk/pcgen/code/src/java/pcgen/gui/ChooseSpellDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/ChooseSpellDialog.java 2006-04-13 05:12:09 UTC (rev 785) +++ Trunk/pcgen/code/src/java/pcgen/gui/ChooseSpellDialog.java 2006-04-13 11:26:02 UTC (rev 786) @@ -759,7 +759,7 @@ if (s.levelForKey(caster, casterName, pc) == baseSpellLevel) { - if (SettingsHandler.guiUsesOutputName()) + if (SettingsHandler.guiUsesOutputNameSpells()) { spellsOfLevel.add(new SpellShell(s)); } Modified: Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java 2006-04-13 05:12:09 UTC (rev 785) +++ Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java 2006-04-13 11:26:02 UTC (rev 786) @@ -197,7 +197,8 @@ private static String in_tabAbilities = PropertyFactory.getString("in_Prefs_tabAbilities"); private static String in_unitSetType = PropertyFactory.getString("in_Prefs_unitSetType"); private static String in_useAutoWaitCursor = PropertyFactory.getString("in_Prefs_useAutoWaitCursor"); - private static String in_useOutputNames = PropertyFactory.getString("in_Prefs_useOutputNames"); + private static String in_useOutputNamesEquipment = PropertyFactory.getString("in_Prefs_useOutputNamesEquipment"); + private static String in_useOutputNamesSpells = PropertyFactory.getString("in_Prefs_useOutputNamesSpells"); private static String in_wandMax = PropertyFactory.getString("in_Prefs_wandMax"); private static String in_warnFirstLevelUp = PropertyFactory.getString("in_Prefs_warnFirstLevelUp"); private static String in_weaponProfPrintout = PropertyFactory.getString("in_Prefs_weaponProfPrintout"); @@ -279,7 +280,8 @@ // "Monsters" private JCheckBox useMonsterDefault = new JCheckBox(); - private JCheckBox useOutputNames = new JCheckBox(); + private JCheckBox useOutputNamesEquipment = new JCheckBox(); + private JCheckBox useOutputNamesSpells = new JCheckBox(); private JCheckBox waitCursor = new JCheckBox(); private JCheckBox weaponProfPrintout; private JComboBoxEx abilityPurchaseModeCombo; @@ -688,7 +690,8 @@ SettingsHandler.setShowImagePreview(showImagePreview.isSelected()); SettingsHandler.setToolBarShown(showToolbar.isSelected()); SettingsHandler.setUseWaitCursor(waitCursor.isSelected()); - SettingsHandler.setGUIUsesOutputName(useOutputNames.isSelected()); + SettingsHandler.setGUIUsesOutputNameEquipment(useOutputNamesEquipment.isSelected()); + SettingsHandler.setGUIUsesOutputNameSpells(useOutputNamesSpells.isSelected()); SettingsHandler.setSingleChoicePreference(cmbChoiceMethods.getSelectedIndex()); SettingsHandler.setUseFeatBenefits(!featDescriptionShown.isSelected()); SettingsHandler.setShowSkillModifier(showSkillModifier.isSelected()); @@ -1147,7 +1150,8 @@ showSkillModifier.setSelected(SettingsHandler.getShowSkillModifier()); showToolbar.setSelected(SettingsHandler.isToolBarShown()); toolTipTextShown.setSelected(SettingsHandler.isToolTipTextShown()); - useOutputNames.setSelected(SettingsHandler.guiUsesOutputName()); + useOutputNamesEquipment.setSelected(SettingsHandler.guiUsesOutputNameEquipment()); + useOutputNamesSpells.setSelected(SettingsHandler.guiUsesOutputNameSpells()); waitCursor.setSelected(SettingsHandler.getUseWaitCursor()); // Look and feel @@ -1522,7 +1526,8 @@ options.put(in_showToolTips, toolTipTextShown); options.put(in_singleChoiceOption, cmbChoiceMethods); options.put(in_useAutoWaitCursor, waitCursor); - options.put(in_useOutputNames, useOutputNames); + options.put(in_useOutputNamesEquipment, useOutputNamesEquipment); + options.put(in_useOutputNamesSpells, useOutputNamesSpells); for (final Iterator it = options.entrySet().iterator(); it.hasNext(); ) { Modified: Trunk/pcgen/code/src/java/pcgen/gui/prop/LanguageBundle.properties =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/prop/LanguageBundle.properties 2006-04-13 05:12:09 UTC (rev 785) +++ Trunk/pcgen/code/src/java/pcgen/gui/prop/LanguageBundle.properties 2006-04-13 11:26:02 UTC (rev 786) @@ -2458,8 +2458,10 @@ in_Prefs_removeTemp=Remove temporary character sheet files on exit -in_Prefs_useOutputNames=Display "OutputName" for items +in_Prefs_useOutputNamesEquipment=Display "OutputName" for equipment +in_Prefs_useOutputNamesSpells=Display "OutputName" for spells + in_Prefs_singleChoiceOption=Chooser single choice behaviour in_Prefs_cmNone=None Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/SpellModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/SpellModel.java 2006-04-13 05:12:09 UTC (rev 785) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/SpellModel.java 2006-04-13 11:26:02 UTC (rev 786) @@ -365,7 +365,14 @@ switch (column) { case COL_NAME: - return fn.toString(); + if (SettingsHandler.guiUsesOutputNameSpells()) + { + return (aSpell != null) ? aSpell.getOutputName(): fn.toString(); + } + else + { + return fn.toString(); + } case COL_SCHOOL: return (aSpell != null) ? aSpell.getSchool() : null; Modified: Trunk/pcgen/code/src/java/pcgen/gui/utils/PObjectNode.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/utils/PObjectNode.java 2006-04-13 05:12:09 UTC (rev 785) +++ Trunk/pcgen/code/src/java/pcgen/gui/utils/PObjectNode.java 2006-04-13 11:26:02 UTC (rev 786) @@ -337,7 +337,7 @@ } else if (item instanceof PObject) { - if (pcgen.core.SettingsHandler.guiUsesOutputName()) + if (pcgen.core.SettingsHandler.guiUsesOutputNameEquipment()) { name = ((PObject) item).getOutputName(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |