summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Sims <mark@nanorex.com>2008-03-21 05:28:01 +0000
committerMark Sims <mark@nanorex.com>2008-03-21 05:28:01 +0000
commit4b1eafe4ba155e13c523f4d3f797608e0e30b02f (patch)
tree53d9dcf92e84285df51eb2eae0b0286a2129ab6e
parentbb55054742969d3a3f7d641e8aba00f6ae343afa (diff)
downloadnanoengineer-4b1eafe4ba155e13c523f4d3f797608e0e30b02f.tar.gz
nanoengineer-4b1eafe4ba155e13c523f4d3f797608e0e30b02f.zip
Added new icon for "Insert MMP file" QAction. Added "What's This" description for "Insert > Part Library..."
-rw-r--r--cad/src/ne1_ui/Ui_MainWindowWidgets.py4
-rwxr-xr-xcad/src/ne1_ui/WhatsThisText_for_MainWindow.py18
-rw-r--r--cad/src/ui/actions/Insert/Molecular_Machine_Part.pngbin0 -> 764 bytes
3 files changed, 17 insertions, 5 deletions
diff --git a/cad/src/ne1_ui/Ui_MainWindowWidgets.py b/cad/src/ne1_ui/Ui_MainWindowWidgets.py
index 61c7e4d3a..b5c737dbd 100644
--- a/cad/src/ne1_ui/Ui_MainWindowWidgets.py
+++ b/cad/src/ne1_ui/Ui_MainWindowWidgets.py
@@ -448,6 +448,8 @@ def setupUi(win):
win.fileInsertMmpAction = QtGui.QAction(MainWindow)
win.fileInsertMmpAction.setObjectName("fileInsertMmpAction")
+ win.fileInsertMmpAction.setIcon(
+ geticon('ui/actions/Insert/Molecular_Machine_Part.png'))
win.fileInsertPdbAction = QtGui.QAction(MainWindow)
win.fileInsertPdbAction.setObjectName("fileInsertPdbAction")
@@ -456,9 +458,7 @@ def setupUi(win):
win.partLibAction.setObjectName("partLibAction")
win.partLibAction.setText("Part from Part Library...")
win.partLibAction.setIcon(geticon('ui/actions/Insert/Partlib'))
- win.partLibAction.setWhatsThis("Insert Part from Library" )
-
win.insertCommentAction = QtGui.QAction(MainWindow)
win.insertCommentAction.setIcon(geticon("ui/actions/Insert/Comment"))
win.insertCommentAction.setObjectName("insertCommentAction")
diff --git a/cad/src/ne1_ui/WhatsThisText_for_MainWindow.py b/cad/src/ne1_ui/WhatsThisText_for_MainWindow.py
index 4e75a47e1..10b43af18 100755
--- a/cad/src/ne1_ui/WhatsThisText_for_MainWindow.py
+++ b/cad/src/ne1_ui/WhatsThisText_for_MainWindow.py
@@ -107,7 +107,8 @@ def createWhatsThisTextForMainWindowWidgets(win):
fileInsertMmpActionText = \
"<b> Molecular Machine Part</b>"\
"<p>"\
- "Loads an existing .mmp file in to the current NE1 session"\
+ "<img source=\"ui/actions/Insert/Molecular_Machine_Part.png\"><br> "\
+ "Inserts an existing .mmp file into the current part."\
"</p>"
win.fileInsertMmpAction.setWhatsThis( fileInsertMmpActionText )
@@ -117,7 +118,7 @@ def createWhatsThisTextForMainWindowWidgets(win):
fileInsertPdbActionText = \
"<b> Protein Databank File</b>"\
"<p>"\
- "Loads an existing .pdb file in to the current NE1 session"\
+ "Inserts an existing .pdb file into the current part."\
"</p>"
win.fileInsertPdbAction.setWhatsThis( fileInsertPdbActionText )
@@ -858,6 +859,17 @@ def createWhatsThisTextForMainWindowWidgets(win):
win.insertPovraySceneAction.setWhatsThis(insertPovraySceneActionText )
+ # Part Library
+
+ _text = \
+ "<u><b>Part Library</b></u>"\
+ "<p>"\
+ "<img source=\"ui/actions/Insert/Partlib.png\"><br> "\
+ "Prompts the user to select an .mmp file from the NanoEngineer-1 "\
+ "Part Library to be inserted into the current part. "\
+ "</p>"
+ win.partLibAction.setWhatsThis( _text )
+
# Comment
insertCommentActionText = \
@@ -1432,7 +1444,7 @@ def createWhatsThisTextForMainWindowWidgets(win):
"<b>Build Atoms</b> allows you to build structures one atom at "\
"a time or by depositing objects that are on the paste "\
"clipboard. You can also insert structures from the "\
- "NanoEngineer-1 Parts Library.</p>"\
+ "NanoEngineer-1 Parts Library.</p>"\
"<p>"\
"It is also possible to change bond types "\
"between atoms using the <b>Bond Tool</b> or "\
diff --git a/cad/src/ui/actions/Insert/Molecular_Machine_Part.png b/cad/src/ui/actions/Insert/Molecular_Machine_Part.png
new file mode 100644
index 000000000..66a17c013
--- /dev/null
+++ b/cad/src/ui/actions/Insert/Molecular_Machine_Part.png
Binary files differ