[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/ui JmolPopupStructure.properties,1.24,1.25 JmolPopupSwing.java,1.8,1.9 JmolPopupWords.properties,1.21,1.22

[Michael T H. <mic...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27777/src/org/openscience/jmol/ui

Modified Files:
	JmolPopupStructure.properties JmolPopupSwing.java 
	JmolPopupWords.properties 
Log Message:
many color changes


Index: JmolPopupStructure.properties
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/ui/JmolPopupStructure.properties,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JmolPopupStructure.properties	26 Feb 2004 15:55:54 -0000	1.24
+++ JmolPopupStructure.properties	29 Feb 2004 21:17:53 -0000	1.25
@@ -1,7 +1,8 @@
 popupMenu=selectMenu atomMenu bondMenu labelMenu - \
 zoomMenu - \
 axesMenu bbcageMenu uccageMenu - \
-perspectiveDepthCheckbox orientationRasMolChimeCheckbox - \
+rasmolChimeMenu - \
+perspectiveDepthCheckbox \
 showHydrogensCheckbox showVectorsCheckbox showMeasurementsCheckbox - \
 testFlag1Checkbox testFlag2Checkbox testFlag3Checkbox
 
@@ -51,13 +52,6 @@
 colortype=
 colorcharge=
 
-animateMenu=play nextframe prevframe rewind revplay
-play=animate play
-nextframe=animate next
-prevframe=animate prev
-rewind=animate rewind
-revplay=animate revplay
-
 zoomMenu=zoom100 zoom150 zoom200 zoom400 zoom800
 zoom100=zoom 100
 zoom150=zoom 150
@@ -65,6 +59,13 @@
 zoom400=zoom 300
 zoom800=zoom 800
 
+rasmolChimeMenu= rasmolChimeCompatibility - \
+rasmolColors axesOrientationRasmolCheckbox zeroBasedXyzRasmolCheckbox
+
+rasmolChimeCompatibility=set color rasmol; set zeroBasedXyzRasmol on; \
+set axesOrientationRasmol on; select *; cpk off; wireframe
+rasmolColors=set color rasmol
+
 # axes
 axesMenu=axesOff axesDotted axes1 axes3 axes5 axes10 \
   axes0.1 axes0.25 - \

Index: JmolPopupSwing.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/ui/JmolPopupSwing.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JmolPopupSwing.java	18 Jan 2004 15:12:03 -0000	1.8
+++ JmolPopupSwing.java	29 Feb 2004 21:17:53 -0000	1.9
@@ -68,8 +68,8 @@
     for (Enumeration keys = htCheckbox.keys(); keys.hasMoreElements(); ) {
       String key = (String)keys.nextElement();
       JCheckBoxMenuItem jcbmi = (JCheckBoxMenuItem)htCheckbox.get(key);
-      //      System.out.println("found:" + key);
       boolean b = viewer.getBooleanProperty(key);
+      //System.out.println("found:" + key + " & it is:" + b);
       jcbmi.setState(b);
     }
     show(component, x, y);
@@ -85,7 +85,7 @@
 
   class CheckboxMenuItemListener implements ItemListener {
     public void itemStateChanged(ItemEvent e) {
-      //  System.out.println("CheckboxMenuItemListener() " + e.getSource());
+      //System.out.println("CheckboxMenuItemListener() " + e.getSource());
       JCheckBoxMenuItem jcmi = (JCheckBoxMenuItem)e.getSource();
       viewer.setBooleanProperty(jcmi.getActionCommand(), jcmi.getState());
     }
@@ -121,6 +121,7 @@
         String word = getWord(item);
         JMenuItem jmi;
         if (item.endsWith("Checkbox")) {
+          //System.out.println("I see a cheeckbox named:" + item);
           JCheckBoxMenuItem jcmi = new JCheckBoxMenuItem(word);
           String basename = item.substring(0, item.length() - 8);
           jcmi.setActionCommand(basename);

Index: JmolPopupWords.properties
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/ui/JmolPopupWords.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JmolPopupWords.properties	22 Feb 2004 12:17:15 -0000	1.21
+++ JmolPopupWords.properties	29 Feb 2004 21:17:53 -0000	1.22
@@ -39,7 +39,7 @@
 colortype=Type
 colorcharge=Charge
 
-orientationRasMolChimeCheckbox=Axes RasMol/Chime
+axesOrientationRasmolCheckbox=Axes Orientation RasMol/Chime
 
 testFlag1Checkbox=Test Flag 1
 testFlag2Checkbox=Test Flag 2