From: <ha...@us...> - 2012-04-05 12:17:08
|
Revision: 16973 http://jmol.svn.sourceforge.net/jmol/?rev=16973&view=rev Author: hansonr Date: 2012-04-05 12:16:58 +0000 (Thu, 05 Apr 2012) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/DisplayPanel.java trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java Modified: trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/DisplayPanel.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/DisplayPanel.java 2012-04-05 12:09:32 UTC (rev 16972) +++ trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/DisplayPanel.java 2012-04-05 12:16:58 UTC (rev 16973) @@ -25,22 +25,18 @@ import org.jmol.api.*; import org.jmol.console.JmolFrame; -import org.jmol.console.KeyJMenuItem; import org.jmol.i18n.GT; -import org.openscience.jmol.app.jmolpanel.GuiMap; import org.openscience.jmol.app.jmolpanel.JmolPanel; import java.awt.*; import java.awt.event.*; import java.awt.print.*; import javax.swing.*; -import javax.swing.event.*; public class DisplayPanel extends JPanel implements JmolFrame, ComponentListener, Printable { StatusBar status; - GuiMap guimap; JmolViewer viewer; private String displaySpeed; @@ -62,7 +58,6 @@ jmolPanel = jmol; frame = jmol.frame; status = jmol.status; - guimap = jmol.guimap; border = jmol.jmolApp.border; haveDisplay = jmol.jmolApp.haveDisplay; startupDimension = new Dimension(jmol.startupWidth, jmol.startupHeight); @@ -313,31 +308,6 @@ } } - private MenuListener menuListener = new MenuListener() { - public void menuSelected(MenuEvent e) { - String menuKey = KeyJMenuItem.getKey(e.getSource()); - if (menuKey.equals("display") || menuKey.equals("tools")) - setMenuState(); - } - public void menuDeselected(MenuEvent e) { - } - public void menuCanceled(MenuEvent e) { - } - }; - - public MenuListener getMenuListener() { - return menuListener; - } - - void setMenuState() { - guimap.setSelected("perspectiveCheck", viewer.getPerspectiveDepth()); - guimap.setSelected("hydrogensCheck", viewer.getShowHydrogens()); - guimap.setSelected("measurementsCheck", viewer.getShowMeasurements()); - guimap.setSelected("axesCheck", viewer.getShowAxes()); - guimap.setSelected("boundboxCheck", viewer.getShowBbcage()); - guimap.setEnabled("openJSpecViewScript", isRotateMode()); - } - public Action[] getActions() { return new Action[] { Modified: trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java 2012-04-05 12:09:32 UTC (rev 16972) +++ trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java 2012-04-05 12:16:58 UTC (rev 16973) @@ -27,6 +27,7 @@ import org.jmol.api.JmolAdapter; import org.jmol.api.JmolViewer; import org.jmol.console.JmolConsole; +import org.jmol.console.KeyJMenuItem; import org.jmol.export.JmolFileDropper; import org.jmol.export.dialog.Dialog; import org.jmol.export.history.HistoryFile; @@ -95,6 +96,8 @@ import javax.swing.JToolBar; import javax.swing.SwingConstants; import javax.swing.UIManager; +import javax.swing.event.MenuEvent; +import javax.swing.event.MenuListener; public class JmolPanel extends JPanel implements SplashInterface, JsonNioClient { @@ -118,11 +121,11 @@ protected SplashInterface splash; protected JFrame consoleframe; protected JsonNioServer service; - protected GuiMap guimap = new GuiMap(); protected int qualityJPG = -1; protected int qualityPNG = -1; protected String imageType; + protected GuiMap guimap = new GuiMap(); private ExecuteScriptAction executeScriptAction; private PreferencesDialog preferencesDialog; private StatusListener myStatusListener; @@ -931,10 +934,29 @@ menu.add(mi); } } - menu.addMenuListener(display.getMenuListener()); + menu.addMenuListener(new MenuListener() { + public void menuSelected(MenuEvent e) { + String menuKey = KeyJMenuItem.getKey(e.getSource()); + if (menuKey.equals("display") || menuKey.equals("tools")) + setMenuState(); + } + public void menuDeselected(MenuEvent e) { + } + public void menuCanceled(MenuEvent e) { + } + }); return menu; } + void setMenuState() { + guimap.setSelected("perspectiveCheck", viewer.getPerspectiveDepth()); + guimap.setSelected("hydrogensCheck", viewer.getShowHydrogens()); + guimap.setSelected("measurementsCheck", viewer.getShowMeasurements()); + guimap.setSelected("axesCheck", viewer.getShowAxes()); + guimap.setSelected("boundboxCheck", viewer.getShowBbcage()); + guimap.setEnabled("openJSpecViewScript", display.isRotateMode()); + } + private static class ActionChangedListener implements PropertyChangeListener { AbstractButton button; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |