From: <jde...@us...> - 2007-02-18 03:33:09
|
Revision: 2167 http://svn.sourceforge.net/pcgen/?rev=2167&view=rev Author: jdempsey Date: 2007-02-17 19:33:09 -0800 (Sat, 17 Feb 2007) Log Message: ----------- Different icon for 'Create new NPC' button Issue#: 1648296 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui/FrameActionListener.java Trunk/pcgen/code/src/java/pcgen/gui/MainPopupMenu.java Trunk/pcgen/code/src/java/pcgen/gui/PCGen_Frame1.java Trunk/pcgen/code/src/java/pcgen/gui/PCPopupMenu.java Modified: Trunk/pcgen/code/src/java/pcgen/gui/FrameActionListener.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/FrameActionListener.java 2007-02-18 02:48:18 UTC (rev 2166) +++ Trunk/pcgen/code/src/java/pcgen/gui/FrameActionListener.java 2007-02-18 03:33:09 UTC (rev 2167) @@ -127,18 +127,17 @@ } }; - /** - * Handle File|New NPC in the menubar or the New NPC button on the - * toolbar. - */ -// WIP please leave boomer70 - ActionListener newNPCActionListener = new ActionListener() + /** + * Handle File|New NPC in the menubar or the New NPC button on the + * toolbar. + */ + ActionListener newNPCActionListener = new ActionListener() + { + public void actionPerformed(ActionEvent e) { - public void actionPerformed(ActionEvent e) - { - main.newNPCItem_actionPerformed(); - } - }; + main.newNPCItem_actionPerformed(); + } + }; /** * Handle New in the tab popup @@ -151,17 +150,16 @@ } }; - /** - * Handle New NPC in the tab popup - */ -// WIP please leave boomer70 - ActionListener newNPCPopupActionListener = new ActionListener() + /** + * Handle New NPC in the tab popup + */ + ActionListener newNPCPopupActionListener = new ActionListener() + { + public void actionPerformed(ActionEvent e) { - public void actionPerformed(ActionEvent e) - { - main.newNPCPopupItem_actionPerformed(); - } - }; + main.newNPCPopupItem_actionPerformed(); + } + }; /** * Handle File|Open in the menubar or the Open button on the Modified: Trunk/pcgen/code/src/java/pcgen/gui/MainPopupMenu.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/MainPopupMenu.java 2007-02-18 02:48:18 UTC (rev 2166) +++ Trunk/pcgen/code/src/java/pcgen/gui/MainPopupMenu.java 2007-02-18 03:33:09 UTC (rev 2167) @@ -39,7 +39,6 @@ final class MainPopupMenu extends JPopupMenu { JMenuItem newItem; -// WIP please leave boomer70 JMenuItem newNPCItem; private JMenuItem pleaseLoadItem; @@ -54,9 +53,8 @@ newItem = Utility.createMenuItem("New", frameActionListener.newPopupActionListener, "mainPopupMenu.new", 'N', null, "Create a new character", "New16.gif", true); -// WIP please leave boomer70 newNPCItem = Utility.createMenuItem("New NPC", frameActionListener.newNPCPopupActionListener, "mainPopupMenu.newNPC", (char)0, - null, "Create a new random NPC", "New16.gif", true); + null, "Create a new random NPC", "NewNPC16.gif", true); } public void show(Component invoker, int x, int y) @@ -65,12 +63,14 @@ { remove(pleaseLoadItem); add(newItem); + add(newNPCItem); super.show(invoker, x, y); } else if (!SettingsHandler.isExpertGUI()) { remove(newItem); + remove(newNPCItem); add(pleaseLoadItem); super.show(invoker, x, y); } Modified: Trunk/pcgen/code/src/java/pcgen/gui/PCGen_Frame1.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/PCGen_Frame1.java 2007-02-18 02:48:18 UTC (rev 2166) +++ Trunk/pcgen/code/src/java/pcgen/gui/PCGen_Frame1.java 2007-02-18 03:33:09 UTC (rev 2167) @@ -2550,9 +2550,8 @@ "shortcut N", "New16.gif", false); fileMenu.add(newItem); -// WIP please leave boomer70 newNPCItem = Utility.createMenuItem("mnuFileNewNPC", frameActionListener.newNPCActionListener, "file.newNPC", - null, "New16.gif", false); + null, "NewNPC16.gif", false); fileMenu.add(newNPCItem); openItem = Utility.createMenuItem("mnuFileOpen", frameActionListener.openActionListener, "file.open", Modified: Trunk/pcgen/code/src/java/pcgen/gui/PCPopupMenu.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/PCPopupMenu.java 2007-02-18 02:48:18 UTC (rev 2166) +++ Trunk/pcgen/code/src/java/pcgen/gui/PCPopupMenu.java 2007-02-18 03:33:09 UTC (rev 2167) @@ -58,9 +58,8 @@ { add(newItem = Utility.createMenuItem("New", frameActionListener.newPopupActionListener, "pcPopupMenu.new", 'N', null, "Create a new character", "New16.gif", true)); -// WIP please leave boomer70 add(newNPCItem = Utility.createMenuItem("New NPC", frameActionListener.newNPCPopupActionListener, "pcPopupMenu.newNPC", (char)0, - null, "Create a new random NPC", "New16.gif", true)); + null, "Create a new random NPC", "NewNPC16.gif", true)); add(closeItem = Utility.createMenuItem("Close", frameActionListener.closePopupActionListener, "pcPopupMenu.close", 'C', null, "Close the current character", "Close16.gif", true)); add(saveItem = Utility.createMenuItem("Save", frameActionListener.savePopupActionListener, "pcPopupMenu.save", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |