diff options
| author | Ninad Sathaye <ninad@nanorex.com> | 2008-08-21 18:45:56 +0000 |
|---|---|---|
| committer | Ninad Sathaye <ninad@nanorex.com> | 2008-08-21 18:45:56 +0000 |
| commit | 17ddad741f4e1fafd9714bd6228a9c0376bb1c9c (patch) | |
| tree | ee6470f95a854af0850114ff09e4ace50a97c777 | |
| parent | d31ad22c539409227ef55891229736c9ee9426ce (diff) | |
| download | nanoengineer-theirix-17ddad741f4e1fafd9714bd6228a9c0376bb1c9c.tar.gz nanoengineer-theirix-17ddad741f4e1fafd9714bd6228a9c0376bb1c9c.zip | |
removed toolsDoneAction (was only used in old updateDashboard method) , other minor cleanup
| -rwxr-xr-x | cad/src/command_support/Command.py | 2 | ||||
| -rw-r--r-- | cad/src/commands/Paste/PasteFromClipboard_Command.py | 2 | ||||
| -rw-r--r-- | cad/src/ne1_ui/Ui_MainWindowWidgetConnections.py | 2 | ||||
| -rw-r--r-- | cad/src/ne1_ui/Ui_MainWindowWidgets.py | 14 | ||||
| -rwxr-xr-x | cad/src/ne1_ui/WhatsThisText_for_MainWindow.py | 18 |
5 files changed, 8 insertions, 30 deletions
diff --git a/cad/src/command_support/Command.py b/cad/src/command_support/Command.py index 8a2e646c8..a729ff1fa 100755 --- a/cad/src/command_support/Command.py +++ b/cad/src/command_support/Command.py @@ -519,7 +519,7 @@ class basicCommand(anyCommand): actions should have an effect. Warning: this is False while a command is still being entered (i.e. - during the calls of Enter and init_gui, and the first call of update_gui). + during the calls of Enter and init_gui). But it's not a good idea to rely on that behavior -- if you do, you should redefine this function to guarantee it, and add suitable comments near the places which *could* in principle be modified to set .currentCommand to the diff --git a/cad/src/commands/Paste/PasteFromClipboard_Command.py b/cad/src/commands/Paste/PasteFromClipboard_Command.py index 0902da4df..4a79803ed 100644 --- a/cad/src/commands/Paste/PasteFromClipboard_Command.py +++ b/cad/src/commands/Paste/PasteFromClipboard_Command.py @@ -84,7 +84,7 @@ class PasteFromClipboard_Command(BuildAtoms_Command): _superclass.Enter(self) self.pastable = None #k would it be nicer to preserve it from the past?? # note, this is also done redundantly in init_gui. - self.pastables_list = [] # should be ok, since update_gui comes after + self.pastables_list = [] # should be ok, since model_changed comes after #this... def init_gui(self): diff --git a/cad/src/ne1_ui/Ui_MainWindowWidgetConnections.py b/cad/src/ne1_ui/Ui_MainWindowWidgetConnections.py index da4e10cae..4c27ce01f 100644 --- a/cad/src/ne1_ui/Ui_MainWindowWidgetConnections.py +++ b/cad/src/ne1_ui/Ui_MainWindowWidgetConnections.py @@ -248,7 +248,7 @@ def setupUi(win): SIGNAL("triggered()"), win.toolsBuildAtoms) - win.connect(win.toolsDoneAction,SIGNAL("triggered()"),win.toolsDone) + win.connect(win.toolsExtrudeAction,SIGNAL("triggered()"),win.toolsExtrude) win.connect(win.toolsFuseChunksAction,SIGNAL("triggered()"),win.toolsFuseChunks) diff --git a/cad/src/ne1_ui/Ui_MainWindowWidgets.py b/cad/src/ne1_ui/Ui_MainWindowWidgets.py index b64ff3d97..f36b156c8 100644 --- a/cad/src/ne1_ui/Ui_MainWindowWidgets.py +++ b/cad/src/ne1_ui/Ui_MainWindowWidgets.py @@ -21,6 +21,8 @@ from PyQt4.Qt import QToolButton from utilities.icon_utilities import geticon from utilities.prefs_constants import displayRulers_prefs_key from ne1_ui.NE1_QWidgetAction import NE1_QWidgetAction +# Dock widgets +from ne1_ui.Ui_ReportsDockWidget import Ui_ReportsDockWidget def setupUi(win): """ @@ -954,15 +956,7 @@ def setupUi(win): win.CircleSelAction = QtGui.QAction(MainWindow) win.HexagonSelAction = QtGui.QAction(MainWindow) - # This needs to stay until I talk with Bruce about UpdateDashboard(), - # which calls a method of toolsDoneAction in Command.py. Mark 2007-12-20 - win.toolsDoneAction = QtGui.QAction(MainWindow) - win.toolsDoneAction.setIcon( - geticon("ui/actions/Properties Manager/Done.png")) - win.toolsDoneAction.setObjectName("toolsDoneAction") - # Dock widgets - from ne1_ui.Ui_ReportsDockWidget import Ui_ReportsDockWidget win.reportsDockWidget = Ui_ReportsDockWidget(win) def retranslateUi(win): @@ -1957,8 +1951,8 @@ def retranslateUi(win): win.viewDefviewAction.setIconText(QtGui.QApplication.translate("MainWindow", "Orientations", None, QtGui.QApplication.UnicodeUTF8)) win.viewDefviewAction.setToolTip(QtGui.QApplication.translate("MainWindow", "Default Views", None, QtGui.QApplication.UnicodeUTF8)) - win.toolsDoneAction.setText(QtGui.QApplication.translate("MainWindow", "Done", None, QtGui.QApplication.UnicodeUTF8)) - win.toolsDoneAction.setIconText(QtGui.QApplication.translate("MainWindow", "Done", None, QtGui.QApplication.UnicodeUTF8)) + + win.modifyStretchAction.setText(QtGui.QApplication.translate("MainWindow", "S&tretch", None, QtGui.QApplication.UnicodeUTF8)) win.modifyStretchAction.setIconText(QtGui.QApplication.translate("MainWindow", "Stretch", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/cad/src/ne1_ui/WhatsThisText_for_MainWindow.py b/cad/src/ne1_ui/WhatsThisText_for_MainWindow.py index c3958194f..e9e800cba 100755 --- a/cad/src/ne1_ui/WhatsThisText_for_MainWindow.py +++ b/cad/src/ne1_ui/WhatsThisText_for_MainWindow.py @@ -1728,23 +1728,7 @@ def createWhatsThisTextForMainWindowWidgets(win): "</p>" win. simPlotToolAction.setWhatsThis( simPlotToolActionText ) - - # - # Dashboard Buttons - # - - # Done - - toolsDoneActionText = \ - "<u><b>Done</b></u>"\ - "<p>"\ - "<img source=\"ui/actions/Properties Manager/Done.png\"><br> "\ - "Completes the current operation and enters the "\ - "default mode."\ - "</p>" - - win.toolsDoneAction.setWhatsThis( toolsDoneActionText ) - + # # Jigs # |