From: <ha...@us...> - 2006-09-18 03:39:31
|
Revision: 5588 http://svn.sourceforge.net/jmol/?rev=5588&view=rev Author: hansonr Date: 2006-09-17 20:39:23 -0700 (Sun, 17 Sep 2006) Log Message: ----------- popup menu enhancements; fix for show selection halos on menu not loading Halo shape Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java trunk/Jmol/src/org/jmol/viewer/Eval.java trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2006-09-18 03:07:29 UTC (rev 5587) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2006-09-18 03:39:23 UTC (rev 5588) @@ -563,7 +563,8 @@ { "distanceAngstroms", "select *; set measure angstroms" }, { "distancePicometers", "select *; set measure picometers" }, - { "pickingMenu", "pickOff pickCenter pickLabel pickAtom pickChain pickElement pickGroup pickMolecule pickSite pickSpin" }, + { "pickingMenu", "pickOff pickCenter pickLabel pickAtom pickChain " + + "pickElement pickGroup pickMolecule pickSite pickSpin" }, { "pickOff" , "set picking off" }, { "pickCenter" , "set picking center" }, // { "pickDraw" , "set picking draw" }, @@ -576,6 +577,19 @@ { "pickSite" , "set picking site" }, { "pickSpin" , "set picking spin" }, + { "showMenu" , "showFile showIsosurface showMeasure showMo showModel " + + "showOrient showPDBHeader showSpacegroup showSymmetry extractMOL" }, + { "showFile", "show file"}, + { "showIsosurface", "show isosurface"}, + { "showMeasure", "show measure"}, + { "showMo", "show mo"}, + { "showModel", "show model"}, + { "showOrient", "show orientation"}, + { "showPDBHeader", "show PDBHeader"}, + { "showSpacegroup", "show spacegroup"}, + { "showSymmetry", "show symmetry"}, + { "extractMOL", "getproperty extractModel \"visible\" "}, + { "crystalMenu", "axesMenu bbcageMenu uccageMenu" }, { "axesMenu", "axesOff axesDotted axesByPixelMenu axesByAngstromMenu colorAxesMenu" }, @@ -658,7 +672,7 @@ { "rasmolColors", "set color rasmol" }, { "jmolColors", "set color jmol" }, - { "consoleMenu", "consoleOn consoleOff" }, + { "consoleMenu", "consoleOn consoleOff showMenu" }, { "consoleOn", "console" }, { "consoleOff", "console off" }, @@ -1121,8 +1135,19 @@ { "pickMolecule" , GT._("Select molecule") }, { "pickSite" , GT._("Select site") }, { "pickSpin" , GT._("Spin") }, + + { "showMenu" , GT._( "Show") }, + { "showFile", GT._("file")}, + { "showIsosurface", GT._( "isosurface")}, + { "showMeasure", GT._("measure")}, + { "showMo", GT._("molecular orbital")}, + { "showModel", GT._("model")}, + { "showOrient", GT._("orientation")}, + { "showPDBHeader", GT._("PDBHeader")}, + { "showSpacegroup", GT._("spacegroup")}, + { "showSymmetry", GT._("symmetry")}, + { "extractMOL", GT._("extract MOL data")}, - { "crystalMenu", GT._("Crystal") }, { "axesMenu", GT._("Axes") }, @@ -1195,7 +1220,7 @@ { "colorUccageHotPink", GT._("Hot Pink") }, { "optionsMenu", GT._("Options") }, - { "showSelectionsCheckbox", GT._("Show Selection Halos" ) }, + { "showSelectionsCheckbox", GT._("Show Selected Atoms" ) }, { "showHydrogensCheckbox", GT._("Show Hydrogens") }, { "showMeasurementsCheckbox", GT._("Show Measurements") }, { "perspectiveDepthCheckbox", GT._("Perspective Depth") }, Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Eval.java 2006-09-18 03:07:29 UTC (rev 5587) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2006-09-18 03:39:23 UTC (rev 5588) @@ -3637,7 +3637,6 @@ switch (statement[2].tok) { case Token.on: case Token.selected: - viewer.loadShape(JmolConstants.SHAPE_HALOS); showHalo = true; case Token.off: case Token.none: Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2006-09-18 03:07:29 UTC (rev 5587) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2006-09-18 03:39:23 UTC (rev 5588) @@ -2756,6 +2756,7 @@ } public void setSelectionHaloEnabled(boolean selectionHaloEnabled) { + loadShape(JmolConstants.SHAPE_HALOS); modelManager.setSelectionHaloEnabled(selectionHaloEnabled); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |