From: <sh...@us...> - 2010-01-07 10:45:47
|
Revision: 15275 http://cdk.svn.sourceforge.net/cdk/?rev=15275&view=rev Author: shk3 Date: 2010-01-07 10:45:40 +0000 (Thu, 07 Jan 2010) Log Message: ----------- renamed "stable" gui to "application" Modified Paths: -------------- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/JChemPaintMenuBar.java jchempaint/branches/3_0/src/main/org/openscience/jchempaint/application/JChemPaint.java Added Paths: ----------- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/resources/JCPGUI_application.properties Removed Paths: ------------- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/resources/JCPGUI_stable.properties Modified: jchempaint/branches/3_0/src/main/org/openscience/jchempaint/JChemPaintMenuBar.java =================================================================== --- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/JChemPaintMenuBar.java 2010-01-07 10:21:52 UTC (rev 15274) +++ jchempaint/branches/3_0/src/main/org/openscience/jchempaint/JChemPaintMenuBar.java 2010-01-07 10:45:40 UTC (rev 15275) @@ -41,7 +41,7 @@ private static final long serialVersionUID = -8358165408129203644L; - private String guiString = "stable"; + private String guiString; private JChemPaintMenuHelper menuHelper=new JChemPaintMenuHelper(); Modified: jchempaint/branches/3_0/src/main/org/openscience/jchempaint/application/JChemPaint.java =================================================================== --- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/application/JChemPaint.java 2010-01-07 10:21:52 UTC (rev 15274) +++ jchempaint/branches/3_0/src/main/org/openscience/jchempaint/application/JChemPaint.java 2010-01-07 10:45:40 UTC (rev 15275) @@ -96,6 +96,7 @@ public class JChemPaint { public static int instancecounter = 1; + public final static String GUI_APPLICATION="application"; @SuppressWarnings("static-access") public static void main(String[] args) { @@ -621,7 +622,7 @@ chemModel.setID(title); f.addWindowListener(new JChemPaintPanel.AppCloser()); f.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); - JChemPaintPanel p = new JChemPaintPanel(chemModel, "stable", debug, null); + JChemPaintPanel p = new JChemPaintPanel(chemModel, GUI_APPLICATION, debug, null); f.setPreferredSize(new Dimension(1000, 500)); f.add(p); f.pack(); Added: jchempaint/branches/3_0/src/main/org/openscience/jchempaint/resources/JCPGUI_application.properties =================================================================== --- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/resources/JCPGUI_application.properties (rev 0) +++ jchempaint/branches/3_0/src/main/org/openscience/jchempaint/resources/JCPGUI_application.properties 2010-01-07 10:45:40 UTC (rev 15275) @@ -0,0 +1,117 @@ +# $RCSfile$ +# $Author: egonw $ +# $Date: 2007-01-04 18:26:00 +0100 (Thu, 04 Jan 2007) $ +# $Revision: 7634 $ +# $Author: egonw $ +# $Date: 2007-01-04 18:26:00 +0100 (Thu, 04 Jan 2007) $ +# $Revision: 7634 $ +# +# Copyright (C) 2004-2009 Egon Willighagen, Christoph Steinbeck, Stefan Kuhn +# +# Contact: jch...@li... +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License +# as published by the Free Software Foundation; either version 2.1 +# of the License, or (at your option) any later version. +# All we ask is that proper credit is given for our work, which includes +# - but is not limited to - adding the above copyright notice to the beginning +# of your source code files, and to any copyright notice that you may distribute +# with programs based on this work. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# + +# This file is the place where all the parameters determining +# the GUI of JChemPaint are stored. It only contains the menu +# ordering,*not* the actions. Those are in JChemPaint.properties. + +# Textual parameters (menu titles, button titles etc) are +# stored in JCPBundle.properties. Note that for every menu you +# need an entry in JCPMenuTextMaker.init() for it's text. This entry +# is then picked up by the GnuText system. + +# @ before an entry means it's a submenu (so if there is @x in some menu, an x menu definition must exist +# + after an entry means it will become a check box menu item not checked at startup +# ++ after an entry means it will become a check box menu item checked at startup + +####################################################### +# title of this GUI # +####################################################### + +Title=JChemPaint + +####################################################### +# menubar definition # +####################################################### +menubar=file edit view atomMenu bondMenu tools templates + +file=new open save saveAs - export print - close - exit +edit=undo redo - cut copy copyAsSmiles paste - eraser selectAll - options +view=toolbar++ statusbar++ menubar++ insertstructure++ - zoomin zoomout zoomoriginal - cleanup @flip @hydrogen - @language +atomMenu=@formalCharge @hydrogen @isotopeChange @radical @pseudoSymbols pseudoStar @valence - @symbolChange +bondMenu=bond up_bond down_bond undefined_bond undefined_stereo_bond +tools=cleanup - createSMILES createInChI +help=help tutorial - feedback about license +templates=pasteTemplate - alkaloids beta_lactams carbohydrates inositols \ + lipids nucleosides porphyrins steroids miscellaneous + +hydrogen=hydroon hydrooff +language= +flip=flipHorizontal flipVertical +formalCharge=plus minus +valence= valenceOff valence1 valence2 valence3 valence4 valence5 valence6 valence7 valence8 +radical=convertToRadical convertFromRadical + +####################################################### +# popup menu definitions # +####################################################### + +atompopup=@formalCharge @hydrogen @isotopeChange @radical \ + @pseudoSymbols pseudoStar @valence - @symbolChange - cut copy eraser selectFromChemObject \ + selectAll - showChemObjectProperties showACProperties +pseudopopup=makeNormal - cut copy eraser selectFromChemObject \ + selectAll - showChemObjectProperties showACProperties +symbolChange=periodictable enterelement - @commonSymbols @alkaliMetals \ + @alkaliEarthMetals @transitionMetals @metals @metalloids @halogenSymbols \ + @nobelSymbols +isotopeChange=majorPlusThree majorPlusTwo majorPlusOne \ + major majorMinusOne majorMinusTwo majorMinusThree +commonSymbols=symbolH symbolC symbolN symbolO symbolS symbolF \ + symbolP symbolCl symbolBr symbolI +alkaliMetals=symbolLi symbolNa symbolK symbolRb symbolCs symbolFr +alkaliEarthMetals=symbolBe symbolMg symbolCa symbolSr symbolBa symbolRa +transitionMetals=symbolSc symbolTi symbolV symbolCr symbolMn symbolFe \ + symbolCo symbolNi symbolCu symbolZn symbolY symbolZr symbolNb symbolMo \ + symbolTc symbolRu symbolRh symbolPd symbolAg symbolCd symbolHf symbolTa \ + symbolW symbolRe symbolOs symbolIr symbolPt symbolAu symbolHg symbolRf \ + symbolDb symbolSg symbolBh symbolHs symbolMt symbolDs symbolRg +metals=symbolAl symbolGa symbolIn symbolSn symbolTl symbolPb symbolBi +metalloids=symbolB symbolSi symbolGe symbolAs symbolSb symbolTe symbolPo +nonmetalls=symbolC symbolN symbolO symbolP symbolS symbolSe +halogenSymbols=symbolF symbolCl symbolBr symbolI +nobelSymbols=symbolHe symbolNe symbolAr +pseudoSymbols=pseudoR pseudoR1 pseudoR2 pseudoR3 pseudoR4 pseudoRX +bondpopup=bond up_bond down_bond undefined_bond \ + undefined_stereo_bond - cut copy eraser selectFromChemObject selectAll - \ + showChemObjectProperties showACProperties +chemmodelpopup= @hydrogen cleanup - cut copy eraser selectFromChemObject \ + selectAll - toolbar++ statusbar++ menubar++ insertstructure++ + +####################################################### +# toolbar definition # +####################################################### + +uppertoolbar=new open save print select lasso eraser zoomin zoomout undo redo \ + cut copy paste flipHorizontal flipVertical rotate +lowertoolbar=C H O N P S F Cl Br I plus minus enterelement periodictable +righttoolbar=triangle square pentagon hexagon benzene octagon pasteTemplate +lefttoolbar=bond up_bond down_bond undefined_bond undefined_stereo_bond Property changes on: jchempaint/branches/3_0/src/main/org/openscience/jchempaint/resources/JCPGUI_application.properties ___________________________________________________________________ Added: svn:executable + * Deleted: jchempaint/branches/3_0/src/main/org/openscience/jchempaint/resources/JCPGUI_stable.properties =================================================================== --- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/resources/JCPGUI_stable.properties 2010-01-07 10:21:52 UTC (rev 15274) +++ jchempaint/branches/3_0/src/main/org/openscience/jchempaint/resources/JCPGUI_stable.properties 2010-01-07 10:45:40 UTC (rev 15275) @@ -1,117 +0,0 @@ -# $RCSfile$ -# $Author: egonw $ -# $Date: 2007-01-04 18:26:00 +0100 (Thu, 04 Jan 2007) $ -# $Revision: 7634 $ -# $Author: egonw $ -# $Date: 2007-01-04 18:26:00 +0100 (Thu, 04 Jan 2007) $ -# $Revision: 7634 $ -# -# Copyright (C) 2004-2009 Egon Willighagen, Christoph Steinbeck, Stefan Kuhn -# -# Contact: jch...@li... -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License -# as published by the Free Software Foundation; either version 2.1 -# of the License, or (at your option) any later version. -# All we ask is that proper credit is given for our work, which includes -# - but is not limited to - adding the above copyright notice to the beginning -# of your source code files, and to any copyright notice that you may distribute -# with programs based on this work. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# - -# This file is the place where all the parameters determining -# the GUI of JChemPaint are stored. It only contains the menu -# ordering,*not* the actions. Those are in JChemPaint.properties. - -# Textual parameters (menu titles, button titles etc) are -# stored in JCPBundle.properties. Note that for every menu you -# need an entry in JCPMenuTextMaker.init() for it's text. This entry -# is then picked up by the GnuText system. - -# @ before an entry means it's a submenu (so if there is @x in some menu, an x menu definition must exist -# + after an entry means it will become a check box menu item not checked at startup -# ++ after an entry means it will become a check box menu item checked at startup - -####################################################### -# title of this GUI # -####################################################### - -Title=JChemPaint - -####################################################### -# menubar definition # -####################################################### -menubar=file edit view atomMenu bondMenu tools templates - -file=new open save saveAs - export print - close - exit -edit=undo redo - cut copy copyAsSmiles paste - eraser selectAll - options -view=toolbar++ statusbar++ menubar++ insertstructure++ - zoomin zoomout zoomoriginal - cleanup @flip @hydrogen - @language -atomMenu=@formalCharge @hydrogen @isotopeChange @radical @pseudoSymbols pseudoStar @valence - @symbolChange -bondMenu=bond up_bond down_bond undefined_bond undefined_stereo_bond -tools=cleanup - createSMILES createInChI -help=help tutorial - feedback about license -templates=pasteTemplate - alkaloids beta_lactams carbohydrates inositols \ - lipids nucleosides porphyrins steroids miscellaneous - -hydrogen=hydroon hydrooff -language= -flip=flipHorizontal flipVertical -formalCharge=plus minus -valence= valenceOff valence1 valence2 valence3 valence4 valence5 valence6 valence7 valence8 -radical=convertToRadical convertFromRadical - -####################################################### -# popup menu definitions # -####################################################### - -atompopup=@formalCharge @hydrogen @isotopeChange @radical \ - @pseudoSymbols pseudoStar @valence - @symbolChange - cut copy eraser selectFromChemObject \ - selectAll - showChemObjectProperties showACProperties -pseudopopup=makeNormal - cut copy eraser selectFromChemObject \ - selectAll - showChemObjectProperties showACProperties -symbolChange=periodictable enterelement - @commonSymbols @alkaliMetals \ - @alkaliEarthMetals @transitionMetals @metals @metalloids @halogenSymbols \ - @nobelSymbols -isotopeChange=majorPlusThree majorPlusTwo majorPlusOne \ - major majorMinusOne majorMinusTwo majorMinusThree -commonSymbols=symbolH symbolC symbolN symbolO symbolS symbolF \ - symbolP symbolCl symbolBr symbolI -alkaliMetals=symbolLi symbolNa symbolK symbolRb symbolCs symbolFr -alkaliEarthMetals=symbolBe symbolMg symbolCa symbolSr symbolBa symbolRa -transitionMetals=symbolSc symbolTi symbolV symbolCr symbolMn symbolFe \ - symbolCo symbolNi symbolCu symbolZn symbolY symbolZr symbolNb symbolMo \ - symbolTc symbolRu symbolRh symbolPd symbolAg symbolCd symbolHf symbolTa \ - symbolW symbolRe symbolOs symbolIr symbolPt symbolAu symbolHg symbolRf \ - symbolDb symbolSg symbolBh symbolHs symbolMt symbolDs symbolRg -metals=symbolAl symbolGa symbolIn symbolSn symbolTl symbolPb symbolBi -metalloids=symbolB symbolSi symbolGe symbolAs symbolSb symbolTe symbolPo -nonmetalls=symbolC symbolN symbolO symbolP symbolS symbolSe -halogenSymbols=symbolF symbolCl symbolBr symbolI -nobelSymbols=symbolHe symbolNe symbolAr -pseudoSymbols=pseudoR pseudoR1 pseudoR2 pseudoR3 pseudoR4 pseudoRX -bondpopup=bond up_bond down_bond undefined_bond \ - undefined_stereo_bond - cut copy eraser selectFromChemObject selectAll - \ - showChemObjectProperties showACProperties -chemmodelpopup= @hydrogen cleanup - cut copy eraser selectFromChemObject \ - selectAll - toolbar++ statusbar++ menubar++ insertstructure++ - -####################################################### -# toolbar definition # -####################################################### - -uppertoolbar=new open save print select lasso eraser zoomin zoomout undo redo \ - cut copy paste flipHorizontal flipVertical rotate -lowertoolbar=C H O N P S F Cl Br I plus minus enterelement periodictable -righttoolbar=triangle square pentagon hexagon benzene octagon pasteTemplate -lefttoolbar=bond up_bond down_bond undefined_bond undefined_stereo_bond This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |