summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Sims <mark@nanorex.com>2008-11-28 02:33:43 +0000
committerMark Sims <mark@nanorex.com>2008-11-28 02:33:43 +0000
commit8238b2e18f3e7c17409f306472fe9e23cf2f8fb9 (patch)
treef405b6e063b67641f4ae12c864a0079b7d6edf1e
parente28a658c79fe88a34049f1ff21bf2c836b96e1ee (diff)
downloadnanoengineer-8238b2e18f3e7c17409f306472fe9e23cf2f8fb9.tar.gz
nanoengineer-8238b2e18f3e7c17409f306472fe9e23cf2f8fb9.zip
Refined "What's This" descriptions for all the buttons on the "Build DNA" command toolbar. Also tweaked some PM messages, labels, icons, etc. for the DNA commands.
-rw-r--r--cad/src/PM/PM_DnaBaseNumberLabelsGroupBox.py2
-rwxr-xr-xcad/src/commands/InsertGraphene/GrapheneGeneratorPropertyManager.py5
-rw-r--r--cad/src/dna/commands/BreakStrands/BreakStrands_PropertyManager.py6
-rw-r--r--cad/src/dna/commands/BuildDuplex/DnaDuplexPropertyManager.py2
-rw-r--r--cad/src/dna/commands/ConvertDna/ConvertDna_PropertyManager.py9
-rw-r--r--cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_PropertyManager.py4
-rw-r--r--cad/src/dna/commands/JoinStrands/JoinStrands_PropertyManager.py6
-rw-r--r--cad/src/dna/commands/MakeCrossovers/MakeCrossovers_PropertyManager.py4
-rw-r--r--cad/src/dna/commands/OrderDna/OrderDna_PropertyManager.py2
-rw-r--r--cad/src/ne1_ui/WhatsThisText_for_CommandToolbars.py91
-rw-r--r--cad/src/ne1_ui/toolbars/Ui_DnaFlyout.py16
-rw-r--r--cad/src/ui/actions/Command Toolbar/BuildDna/BreakStrand.png (renamed from cad/src/ui/actions/Command Toolbar/Break_Strand.png)bin525 -> 525 bytes
-rw-r--r--cad/src/ui/actions/Command Toolbar/BuildDna/BuildDna.pngbin0 -> 738 bytes
-rw-r--r--cad/src/ui/actions/Command Toolbar/BuildDna/ConvertDna.pngbin0 -> 347 bytes
-rw-r--r--cad/src/ui/actions/Command Toolbar/BuildDna/EditDnaDisplayStyle.pngbin0 -> 864 bytes
-rw-r--r--cad/src/ui/actions/Command Toolbar/BuildDna/InsertDna.pngbin0 -> 965 bytes
-rw-r--r--cad/src/ui/actions/Command Toolbar/BuildDna/JoinStrands.png (renamed from cad/src/ui/actions/Command Toolbar/Join_Strands.png)bin253 -> 253 bytes
-rw-r--r--cad/src/ui/actions/Command Toolbar/BuildDna/MakeCrossovers.png (renamed from cad/src/ui/actions/Command Toolbar/Crossover.png)bin330 -> 330 bytes
-rw-r--r--cad/src/ui/actions/Command Toolbar/BuildDna/OrderDNA.png (renamed from cad/src/ui/actions/Command Toolbar/Order_DNA.png)bin338 -> 338 bytes
-rw-r--r--cad/src/ui/actions/Command Toolbar/BuildProtein/BuildPeptide.pngbin333 -> 0 bytes
-rw-r--r--cad/src/ui/actions/Command Toolbar/Convert3to5.pngbin353 -> 0 bytes
-rw-r--r--cad/src/ui/actions/Command Toolbar/Convert5to3.pngbin357 -> 0 bytes
-rw-r--r--cad/src/ui/actions/Command Toolbar/Dna_Display_Style.pngbin791 -> 0 bytes
-rw-r--r--cad/src/ui/actions/Help/HotTip.pngbin0 -> 1078 bytes
24 files changed, 95 insertions, 52 deletions
diff --git a/cad/src/PM/PM_DnaBaseNumberLabelsGroupBox.py b/cad/src/PM/PM_DnaBaseNumberLabelsGroupBox.py
index 9ba171ee1..1666872ad 100644
--- a/cad/src/PM/PM_DnaBaseNumberLabelsGroupBox.py
+++ b/cad/src/PM/PM_DnaBaseNumberLabelsGroupBox.py
@@ -36,7 +36,7 @@ class PM_DnaBaseNumberLabelsGroupBox(PM_GroupBox):
def __init__(self,
parentWidget,
command,
- title = 'Base number labels' ):
+ title = 'Base Number Labels' ):
"""
"""
diff --git a/cad/src/commands/InsertGraphene/GrapheneGeneratorPropertyManager.py b/cad/src/commands/InsertGraphene/GrapheneGeneratorPropertyManager.py
index 2138fe32e..e0544c9fb 100755
--- a/cad/src/commands/InsertGraphene/GrapheneGeneratorPropertyManager.py
+++ b/cad/src/commands/InsertGraphene/GrapheneGeneratorPropertyManager.py
@@ -46,8 +46,9 @@ class GrapheneGeneratorPropertyManager(EditCommand_PM):
"""
_superclass.__init__( self, command )
- msg = "Edit the Graphene sheet parameters and select <b>Preview</b> to" \
- "preview the structure. Click <b>Done</b> to insert it into the model."
+ msg = "Edit the parameters below and click the <b>Preview</b> "\
+ "button to preview the graphene sheet. Clicking <b>Done</b> "\
+ "inserts it into the model."
self.updateMessage(msg = msg)
diff --git a/cad/src/dna/commands/BreakStrands/BreakStrands_PropertyManager.py b/cad/src/dna/commands/BreakStrands/BreakStrands_PropertyManager.py
index f248e9781..fef1d89bd 100644
--- a/cad/src/dna/commands/BreakStrands/BreakStrands_PropertyManager.py
+++ b/cad/src/dna/commands/BreakStrands/BreakStrands_PropertyManager.py
@@ -76,7 +76,7 @@ class BreakStrands_PropertyManager( BreakOrJoinStrands_PropertyManager):
title = "Break Strands"
pmName = title
- iconPath = "ui/actions/Command Toolbar/Break_Strand.png"
+ iconPath = "ui/actions/Command Toolbar/BuildDna/BreakStrand.png"
def __init__( self, command ):
@@ -199,10 +199,10 @@ class BreakStrands_PropertyManager( BreakOrJoinStrands_PropertyManager):
self._loadBreakOptionsGroupbox( self._breakOptionsGroupbox )
- self._displayOptionsGroupBox = PM_GroupBox( self, title = "Display options" )
+ self._displayOptionsGroupBox = PM_GroupBox( self, title = "Display Options" )
self._loadDisplayOptionsGroupBox( self._displayOptionsGroupBox )
- self._baseNumberLabelGroupBox = PM_GroupBox( self, title = "Base number labels" )
+ self._baseNumberLabelGroupBox = PM_GroupBox( self, title = "Base Number Labels" )
self._loadBaseNumberLabelGroupBox(self._baseNumberLabelGroupBox)
diff --git a/cad/src/dna/commands/BuildDuplex/DnaDuplexPropertyManager.py b/cad/src/dna/commands/BuildDuplex/DnaDuplexPropertyManager.py
index d0d8500f3..7a8907827 100644
--- a/cad/src/dna/commands/BuildDuplex/DnaDuplexPropertyManager.py
+++ b/cad/src/dna/commands/BuildDuplex/DnaDuplexPropertyManager.py
@@ -73,7 +73,7 @@ class DnaDuplexPropertyManager( DnaOrCnt_PropertyManager ):
title = "Insert DNA"
pmName = title
- iconPath = "ui/actions/Tools/Build Structures/InsertDsDna.png"
+ iconPath = "ui/actions/Command Toolbar/BuildDna/InsertDna.png"
def __init__( self, command ):
"""
diff --git a/cad/src/dna/commands/ConvertDna/ConvertDna_PropertyManager.py b/cad/src/dna/commands/ConvertDna/ConvertDna_PropertyManager.py
index d19aeda34..e00f5af69 100644
--- a/cad/src/dna/commands/ConvertDna/ConvertDna_PropertyManager.py
+++ b/cad/src/dna/commands/ConvertDna/ConvertDna_PropertyManager.py
@@ -23,7 +23,7 @@ class ConvertDna_PropertyManager(Command_PropertyManager):
title = "Convert Dna"
pmName = title
- iconPath = "ui/actions/Command Toolbar/Convert3to5.png"
+ iconPath = "ui/actions/Command Toolbar/BuildDna/ConvertDna.png"
def __init__( self, command ):
"""
@@ -98,14 +98,13 @@ class ConvertDna_PropertyManager(Command_PropertyManager):
PM_ComboBox( pmGroupBox,
label = "Convert options:",
choices = convertChoices,
+ index = 0,
setAsDefault = True)
-
-
self._convertButton = \
PM_PushButton( pmGroupBox,
label = "",
- text = "Convert now",
+ text = "Convert Now",
spanWidth = True)
return
@@ -127,7 +126,7 @@ class ConvertDna_PropertyManager(Command_PropertyManager):
"""
if not msg:
msg = "To contert DNA, select the DNA you want to convert and "\
- " press the <b>Convert now</b> button."
+ " press the <b>Convert Now</b> button."
_superclass.updateMessage(self, msg)
return
diff --git a/cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_PropertyManager.py b/cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_PropertyManager.py
index e4a5b4013..40f311cdc 100644
--- a/cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_PropertyManager.py
+++ b/cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_PropertyManager.py
@@ -320,7 +320,7 @@ class DnaDisplayStyle_PropertyManager( Command_PropertyManager):
title = "Edit DNA Display Style"
pmName = title
- iconPath = "ui/actions/Edit/EditDnaDisplayStyle.png"
+ iconPath = "ui/actions/Command Toolbar/BuildDna/EditDnaDisplayStyle.png"
def __init__( self, command ):
@@ -492,7 +492,7 @@ class DnaDisplayStyle_PropertyManager( Command_PropertyManager):
self._loadGroupBox1( self._pmGroupBox1 )
self._pmGroupBox2 = PM_GroupBox( self,
- title = "Current display settings")
+ title = "Current Display Settings")
self._loadGroupBox2( self._pmGroupBox2 )
def _loadGroupBox1(self, pmGroupBox):
diff --git a/cad/src/dna/commands/JoinStrands/JoinStrands_PropertyManager.py b/cad/src/dna/commands/JoinStrands/JoinStrands_PropertyManager.py
index a706da87b..21fae19be 100644
--- a/cad/src/dna/commands/JoinStrands/JoinStrands_PropertyManager.py
+++ b/cad/src/dna/commands/JoinStrands/JoinStrands_PropertyManager.py
@@ -61,7 +61,7 @@ class JoinStrands_PropertyManager( BreakOrJoinStrands_PropertyManager ):
title = "Join Strands"
pmName = title
- iconPath = "ui/actions/Command Toolbar/Join_Strands.png"
+ iconPath = "ui/actions/Command Toolbar/BuildDna/JoinStrands.png"
def __init__( self, command ):
"""
@@ -110,9 +110,9 @@ class JoinStrands_PropertyManager( BreakOrJoinStrands_PropertyManager ):
"""
self._joinOptionsGroupBox = PM_GroupBox(self, title = "Join Options")
self._loadJoinOptionsGroupbox(self._joinOptionsGroupBox)
- self._displayOptionsGroupBox = PM_GroupBox( self, title = "Display options" )
+ self._displayOptionsGroupBox = PM_GroupBox( self, title = "Display Options" )
self._loadDisplayOptionsGroupBox( self._displayOptionsGroupBox )
- self._baseNumberLabelGroupBox = PM_GroupBox( self, title = "Base number labels" )
+ self._baseNumberLabelGroupBox = PM_GroupBox( self, title = "Base Number Labels" )
self._loadBaseNumberLabelGroupBox(self._baseNumberLabelGroupBox)
diff --git a/cad/src/dna/commands/MakeCrossovers/MakeCrossovers_PropertyManager.py b/cad/src/dna/commands/MakeCrossovers/MakeCrossovers_PropertyManager.py
index d7940b9a0..401a07c8d 100644
--- a/cad/src/dna/commands/MakeCrossovers/MakeCrossovers_PropertyManager.py
+++ b/cad/src/dna/commands/MakeCrossovers/MakeCrossovers_PropertyManager.py
@@ -58,7 +58,7 @@ class MakeCrossovers_PropertyManager( Command_PropertyManager,
title = "Make Crossovers"
pmName = title
- iconPath = "ui/actions/Command Toolbar/Crossover.png"
+ iconPath = "ui/actions/Command Toolbar/BuildDna/MakeCrossovers.png"
def __init__( self, command):
@@ -157,7 +157,7 @@ class MakeCrossovers_PropertyManager( Command_PropertyManager,
"""
Add the Property Manager group boxes.
"""
- self._pmGroupBox1 = PM_GroupBox( self, title = "Segments for crossover search" )
+ self._pmGroupBox1 = PM_GroupBox( self, title = "Segments for Crossover Search" )
self._loadGroupBox1( self._pmGroupBox1 )
diff --git a/cad/src/dna/commands/OrderDna/OrderDna_PropertyManager.py b/cad/src/dna/commands/OrderDna/OrderDna_PropertyManager.py
index 257f3962d..9717510cc 100644
--- a/cad/src/dna/commands/OrderDna/OrderDna_PropertyManager.py
+++ b/cad/src/dna/commands/OrderDna/OrderDna_PropertyManager.py
@@ -111,7 +111,7 @@ class OrderDna_PropertyManager(Command_PropertyManager):
title = "Order Dna"
pmName = title
- iconPath = "ui/actions/Command Toolbar/Order_DNA.png"
+ iconPath = "ui/actions/Command Toolbar/BuildDna/OrderDna.png"
def __init__( self, command ):
"""
diff --git a/cad/src/ne1_ui/WhatsThisText_for_CommandToolbars.py b/cad/src/ne1_ui/WhatsThisText_for_CommandToolbars.py
index 378c85374..6f7cfe0dc 100644
--- a/cad/src/ne1_ui/WhatsThisText_for_CommandToolbars.py
+++ b/cad/src/ne1_ui/WhatsThisText_for_CommandToolbars.py
@@ -101,7 +101,7 @@ def whatsThisTextForProteinCommandToolbar(commandToolbar):
commandToolbar.modelProteinAction.setWhatsThis(
"""<b>Model Protein</b>
<p>
- <img source=\"ui/actions/Command Toolbar/BuildProtein/BuildPeptide.png\"><br>
+ <img source=\"ui/actions/Command Toolbar/BuildProtein/ModelProtein.png\"><br>
Enter protein modeling mode. Modeling options are displayed to the right
in the flyout toolbar.
</p>""")
@@ -152,7 +152,7 @@ def whatsThisTextForProteinCommandToolbar(commandToolbar):
<p>
<img source=\"ui/actions/Command Toolbar/BuildProtein/EditProteinDisplayStyle.png\"><br>
Edit the Protein Display Style settings used whenever the
- <b>Global Display Style</b> is set to <i>Protein</i>.
+ <b>Global Display Style</b> is set to <b>Protein</b>.
</p>""")
commandToolbar.rosetta_fixedbb_design_Action.setWhatsThis(
@@ -206,65 +206,108 @@ def whatsThisTextForDnaCommandToolbar(commandToolbar):
commandToolbar.dnaDuplexAction.setWhatsThis(
"""<b>Insert DNA</b>
<p>
- Insert a double stranded (ds) DNA helix by clicking two
- points in the 3D graphics area.
+ <img source=\"ui/actions/Command Toolbar/BuildDna/InsertDna.png\"><br>
+ Insert a DNA duplex by clicking two endpoints in the graphics area.
</p>""")
commandToolbar.breakStrandAction.setWhatsThis(
"""<b>Break Strands</b>
<p>
- Enters Break Strand Mode where left clicking on a bond between DNA
- pseudo-atoms breaks the bond.
+ <img source=\"ui/actions/Command Toolbar/BuildDna/BreakStrand.png\"><br>
+ This command provides an interactive mode where the user can
+ break strands by clicking on a bond in a DNA strand. </p>
+ <p>
+ You can also join strands while in this command by dragging and
+ dropping strand arrow heads onto their strand conjugate
+ (i.e. 3' on to 5' and vice versa). </p>
+ <p>
+ <img source=\"ui/actions/Help/HotTip.png\"><br>
+ <b>Hot Tip:</b> Changing the <b>Global display style</b> to <b>CPK</b>
+ results in faster interactive graphics while in this command.
</p>""")
+
commandToolbar.joinStrandsAction.setWhatsThis(
"""<b>Join Strands</b>
<p>
- Enters Join Strand Mode where strands may be joined by dragging and
- dropping strand arrow heads on to their strand conjugate i.e. 3' on to
- 5' and vice versa.
- </p>""")
- commandToolbar.dnaOrigamiAction.setWhatsThis(
- """<b>Origami</b>
+ <img source=\"ui/actions/Command Toolbar/BuildDna/JoinStrands.png\"><br>
+ This command provides an interactive mode where the user can
+ join strands by dragging and dropping strand arrow heads onto their
+ strand conjugate (i.e. 3' on to 5' and vice versa). </p>
<p>
- Enters DNA Origami mode- currently not implemented
+ <img source=\"ui/actions/Help/HotTip.png\"><br>
+ <b>Hot Tip:</b> Changing the <b>Global display style</b> to <b>CPK</b>
+ results in faster interactive graphics while in this command.
</p>""")
commandToolbar.convertDnaAction.setWhatsThis(
"""<b>Convert DNA </b>
<p>
- Converts the selected DNA from PAM3 to PAM5 or PAM5 to PAM3.
+ <img source=\"ui/actions/Command Toolbar/BuildDna/ConvertDna.png\"><br>
+ Converts the selected DNA from PAM3 to PAM5 or PAM5 to PAM3. The only
+ reason to convert to PAM5 is to get more accurate minimizations of DNA
+ nanostructures.</p>
+ <p>
+ Here is the protocol for producing more accurate minimizations:<br>
+ 1. Make sure the current model is saved.
+ 2. Select <b>File > Save As...</b> to save the model under a new name (i.e. <i>model_name</i>_minimized).<br>
+ 3. Select <b>Build > DNA > Convert</b> to convert the entire model from PAM3 to PAM5.<br>
+ 4. Select <b>Tools > Minimize Energy</b>.<br>
+ 5. In the Minimize Energy dialog, select <b>GROMACS with ND1 force field</b> as the Physics engine.<br>
+ 6. Click the <b>Minimize Energy</b> button.<br>
+ 7. After minimize completes, convert from PAM5 to PAM3.</p>
+ <p>
+ Next, visually inspect the model for structural distortions such as
+ puckering, warping, or other unwanted strained areas that will require
+ model changes to correct. Model changes should be made in a version
+ of the model that hasn't been minimized. You can either click
+ <b>Edit > Undo</b> or save this model and reopen the previous
+ version.</p>
+ <p>
+ <img source=\"ui/actions/Help/HotTip.png\"><br>
+ <b>Hot Tip:</b> Changing the <b>Global display style</b> to <b>CPK</b> or
+ <b>DNA Cylinder</b> may make the model easier to visually inspect.</p>
+ <p>
+ <a href=PAM3_and_PAM5_Model_Descriptions>Click here for a technical
+ overview of the NanoEngineer-1 PAM3 and PAM5 reduced models.</a>
</p>""")
-
-
commandToolbar.orderDnaAction.setWhatsThis(
"""<b>Order DNA</b>
<p>
- Produces a text file containing the DNA strands and their assigned base
- pair sequences for the all strands in the <b>selected</b> node.
+ <img source=\"ui/actions/Command Toolbar/BuildDna/OrderDna.png\"><br>
+ Produces a comma-separated value (.CSV) text file containing all
+ DNA strand sequences in the model.</p>
+ <p>
+ <img source=\"ui/actions/Help/HotTip.png\"><br>
+ <b>Hot Tip:</b> This file can be used to order
+ oligos from suppliers of custom oligonucleotides such as
+ Integrated DNA Technologies and Gene Link.
</p>""")
commandToolbar.editDnaDisplayStyleAction.setWhatsThis(
"""<b>Edit (DNA Display) Style</b>
<p>
+ <img source=\"ui/actions/Command Toolbar/BuildDna/EditDnaDisplayStyle.png\"><br>
Edit the DNA Display Style settings used whenever the <b>Global Display
- Style</b> is set to <i>DNA Cylinder</i>. These settings also apply
+ Style</b> is set to <b>DNA Cylinder</b>. These settings also apply
to DNA strands and segments that have had their display style set
- to <i>DNA Cylinder</i>.
+ to <b>DNA Cylinder</b>.
</p>""")
commandToolbar.makeCrossoversAction.setWhatsThis(
"""<b>Make Crossovers</b>
<p>
+ <img source=\"ui/actions/Command Toolbar/BuildDna/MakeCrossovers.png\"><br>
Creates crossovers interactively between two or more selected DNA
segments.</p>
<p>
To create crossovers, select the DNA segments to be searched for
- potential crossover sites. Crossover sites, displayed as transparent
- green spheres on the strands, are updated as you move (rotate or
+ potential crossover sites. Transparent green spheres indicating
+ potential crossover sites are displayed as you move (rotate or
translate) a DNA segment. After you are finished moving a DNA segment,
- crossover sites are shown as a pair of white cylinders.
- Clicking on a highlighted crossover site creates the crossover.
+ crossover sites are displayed as a pair of white cylinders that can
+ be highlighted/selected. Clicking on a highlighted crossover site
+ makes a crossover.
</p>""")
return
diff --git a/cad/src/ne1_ui/toolbars/Ui_DnaFlyout.py b/cad/src/ne1_ui/toolbars/Ui_DnaFlyout.py
index de2010315..6b0bdb345 100644
--- a/cad/src/ne1_ui/toolbars/Ui_DnaFlyout.py
+++ b/cad/src/ne1_ui/toolbars/Ui_DnaFlyout.py
@@ -90,28 +90,28 @@ class DnaFlyout(Ui_AbstractFlyout):
self.dnaDuplexAction.setText("Insert DNA")
self.dnaDuplexAction.setCheckable(True)
self.dnaDuplexAction.setIcon(
- geticon("ui/actions/Tools/Build Structures/InsertDsDna.png"))
+ geticon("ui/actions/Command Toolbar/BuildDna/InsertDna.png"))
self.breakStrandAction = NE1_QWidgetAction(parentWidget,
win = self.win)
self.breakStrandAction.setText("Break Strand")
self.breakStrandAction.setCheckable(True)
self.breakStrandAction.setIcon(
- geticon("ui/actions/Command Toolbar/Break_Strand.png"))
+ geticon("ui/actions/Command Toolbar/BuildDna/BreakStrand.png"))
self.joinStrandsAction = NE1_QWidgetAction(parentWidget,
win = self.win)
self.joinStrandsAction.setText("Join Strands")
self.joinStrandsAction.setCheckable(True)
self.joinStrandsAction.setIcon(
- geticon("ui/actions/Command Toolbar/Join_Strands.png"))
+ geticon("ui/actions/Command Toolbar/BuildDna/JoinStrands.png"))
self.makeCrossoversAction = NE1_QWidgetAction(parentWidget,
win = self.win)
self.makeCrossoversAction.setText("Crossovers")
self.makeCrossoversAction.setCheckable(True)
self.makeCrossoversAction.setIcon(
- geticon("ui/actions/Command Toolbar/Crossover.png"))
+ geticon("ui/actions/Command Toolbar/BuildDna/MakeCrossovers.png"))
self.dnaOrigamiAction = NE1_QWidgetAction(parentWidget,
win = self.win)
@@ -121,22 +121,22 @@ class DnaFlyout(Ui_AbstractFlyout):
self.convertDnaAction = NE1_QWidgetAction(parentWidget,
win = self.win)
- self.convertDnaAction.setText("Convert DNA")
+ self.convertDnaAction.setText("Convert")
self.convertDnaAction.setIcon(
- geticon("ui/actions/Command Toolbar/Convert3to5.png"))
+ geticon("ui/actions/Command Toolbar/BuildDna/ConvertDna.png"))
self.orderDnaAction = NE1_QWidgetAction(parentWidget,
win = self.win)
self.orderDnaAction.setText("Order DNA")
self.orderDnaAction.setIcon(
- geticon("ui/actions/Command Toolbar/Order_DNA.png"))
+ geticon("ui/actions/Command Toolbar/BuildDna/OrderDna.png"))
self.editDnaDisplayStyleAction = NE1_QWidgetAction(parentWidget,
win = self.win)
self.editDnaDisplayStyleAction.setText("Edit Style")
self.editDnaDisplayStyleAction.setCheckable(True)
self.editDnaDisplayStyleAction.setIcon(
- geticon("ui/actions/Edit/EditDnaDisplayStyle.png"))
+ geticon("ui/actions/Command Toolbar/BuildDna/EditDnaDisplayStyle.png"))
self.subControlActionGroup = QtGui.QActionGroup(self.parentWidget)
self.subControlActionGroup.setExclusive(False)
diff --git a/cad/src/ui/actions/Command Toolbar/Break_Strand.png b/cad/src/ui/actions/Command Toolbar/BuildDna/BreakStrand.png
index 42f719943..42f719943 100644
--- a/cad/src/ui/actions/Command Toolbar/Break_Strand.png
+++ b/cad/src/ui/actions/Command Toolbar/BuildDna/BreakStrand.png
Binary files differ
diff --git a/cad/src/ui/actions/Command Toolbar/BuildDna/BuildDna.png b/cad/src/ui/actions/Command Toolbar/BuildDna/BuildDna.png
new file mode 100644
index 000000000..c7dbaa34c
--- /dev/null
+++ b/cad/src/ui/actions/Command Toolbar/BuildDna/BuildDna.png
Binary files differ
diff --git a/cad/src/ui/actions/Command Toolbar/BuildDna/ConvertDna.png b/cad/src/ui/actions/Command Toolbar/BuildDna/ConvertDna.png
new file mode 100644
index 000000000..cca7002c2
--- /dev/null
+++ b/cad/src/ui/actions/Command Toolbar/BuildDna/ConvertDna.png
Binary files differ
diff --git a/cad/src/ui/actions/Command Toolbar/BuildDna/EditDnaDisplayStyle.png b/cad/src/ui/actions/Command Toolbar/BuildDna/EditDnaDisplayStyle.png
new file mode 100644
index 000000000..e247f1b0b
--- /dev/null
+++ b/cad/src/ui/actions/Command Toolbar/BuildDna/EditDnaDisplayStyle.png
Binary files differ
diff --git a/cad/src/ui/actions/Command Toolbar/BuildDna/InsertDna.png b/cad/src/ui/actions/Command Toolbar/BuildDna/InsertDna.png
new file mode 100644
index 000000000..1178b629d
--- /dev/null
+++ b/cad/src/ui/actions/Command Toolbar/BuildDna/InsertDna.png
Binary files differ
diff --git a/cad/src/ui/actions/Command Toolbar/Join_Strands.png b/cad/src/ui/actions/Command Toolbar/BuildDna/JoinStrands.png
index 5ec1b6b06..5ec1b6b06 100644
--- a/cad/src/ui/actions/Command Toolbar/Join_Strands.png
+++ b/cad/src/ui/actions/Command Toolbar/BuildDna/JoinStrands.png
Binary files differ
diff --git a/cad/src/ui/actions/Command Toolbar/Crossover.png b/cad/src/ui/actions/Command Toolbar/BuildDna/MakeCrossovers.png
index aae591e0a..aae591e0a 100644
--- a/cad/src/ui/actions/Command Toolbar/Crossover.png
+++ b/cad/src/ui/actions/Command Toolbar/BuildDna/MakeCrossovers.png
Binary files differ
diff --git a/cad/src/ui/actions/Command Toolbar/Order_DNA.png b/cad/src/ui/actions/Command Toolbar/BuildDna/OrderDNA.png
index 9eef3414c..9eef3414c 100644
--- a/cad/src/ui/actions/Command Toolbar/Order_DNA.png
+++ b/cad/src/ui/actions/Command Toolbar/BuildDna/OrderDNA.png
Binary files differ
diff --git a/cad/src/ui/actions/Command Toolbar/BuildProtein/BuildPeptide.png b/cad/src/ui/actions/Command Toolbar/BuildProtein/BuildPeptide.png
deleted file mode 100644
index ab62409b9..000000000
--- a/cad/src/ui/actions/Command Toolbar/BuildProtein/BuildPeptide.png
+++ /dev/null
Binary files differ
diff --git a/cad/src/ui/actions/Command Toolbar/Convert3to5.png b/cad/src/ui/actions/Command Toolbar/Convert3to5.png
deleted file mode 100644
index f761ad41a..000000000
--- a/cad/src/ui/actions/Command Toolbar/Convert3to5.png
+++ /dev/null
Binary files differ
diff --git a/cad/src/ui/actions/Command Toolbar/Convert5to3.png b/cad/src/ui/actions/Command Toolbar/Convert5to3.png
deleted file mode 100644
index 6ecb15128..000000000
--- a/cad/src/ui/actions/Command Toolbar/Convert5to3.png
+++ /dev/null
Binary files differ
diff --git a/cad/src/ui/actions/Command Toolbar/Dna_Display_Style.png b/cad/src/ui/actions/Command Toolbar/Dna_Display_Style.png
deleted file mode 100644
index 52427eda3..000000000
--- a/cad/src/ui/actions/Command Toolbar/Dna_Display_Style.png
+++ /dev/null
Binary files differ
diff --git a/cad/src/ui/actions/Help/HotTip.png b/cad/src/ui/actions/Help/HotTip.png
new file mode 100644
index 000000000..9263dc5f3
--- /dev/null
+++ b/cad/src/ui/actions/Help/HotTip.png
Binary files differ