diff options
| author | Mark Sims <mark@nanorex.com> | 2008-12-12 17:14:25 +0000 |
|---|---|---|
| committer | Mark Sims <mark@nanorex.com> | 2008-12-12 17:14:25 +0000 |
| commit | c44e28da64688a6a2eea6ec3724ee9210f8712c4 (patch) | |
| tree | 83b03a6a14ffca1a7372e5547a03a8a83b71224d | |
| parent | 5b76e86059fdde1eeb4fb63f10696f62703aa536 (diff) | |
| download | nanoengineer-theirix-c44e28da64688a6a2eea6ec3724ee9210f8712c4.tar.gz nanoengineer-theirix-c44e28da64688a6a2eea6ec3724ee9210f8712c4.zip | |
Final fix for bug 2943.
| -rw-r--r-- | cad/src/ne1_ui/WhatsThisText_for_CommandToolbars.py | 2 | ||||
| -rw-r--r-- | cad/src/ne1_ui/toolbars/Ui_ProteinFlyout_v2.py | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/cad/src/ne1_ui/WhatsThisText_for_CommandToolbars.py b/cad/src/ne1_ui/WhatsThisText_for_CommandToolbars.py index d15b2326e..c4ec7bde7 100644 --- a/cad/src/ne1_ui/WhatsThisText_for_CommandToolbars.py +++ b/cad/src/ne1_ui/WhatsThisText_for_CommandToolbars.py @@ -327,6 +327,8 @@ def whatsThisTextForProteinCommandToolbar(commandToolbar): # into abs paths (from their original rel paths). # Partially fixes bug 2943. --mark 2008-12-07 fix_whatsthis_text_and_links(commandToolbar.subControlActionGroup) + fix_whatsthis_text_and_links(commandToolbar.subControlActionGroupForModelProtein) + fix_whatsthis_text_and_links(commandToolbar.subControlActionGroupForSimulateProtein) return diff --git a/cad/src/ne1_ui/toolbars/Ui_ProteinFlyout_v2.py b/cad/src/ne1_ui/toolbars/Ui_ProteinFlyout_v2.py index 225b1f2d5..f7f9e42c9 100644 --- a/cad/src/ne1_ui/toolbars/Ui_ProteinFlyout_v2.py +++ b/cad/src/ne1_ui/toolbars/Ui_ProteinFlyout_v2.py @@ -185,28 +185,28 @@ class ProteinFlyout_v2(Ui_AbstractFlyout): self.subControlActionGroupForModelProtein.setExclusive(True) self.buildPeptideAction = \ - NE1_QWidgetAction(self.subControlActionGroup, win = self.win) + NE1_QWidgetAction(self.subControlActionGroupForModelProtein, win = self.win) self.buildPeptideAction.setText("Insert Peptide") self.buildPeptideAction.setCheckable(True) self.buildPeptideAction.setIcon( geticon("ui/actions/Command Toolbar/BuildProtein/InsertPeptide.png")) self.editRotamersAction = \ - NE1_QWidgetAction(self.subControlActionGroup, win = self.win) + NE1_QWidgetAction(self.subControlActionGroupForModelProtein, win = self.win) self.editRotamersAction.setText("Rotamers") self.editRotamersAction.setCheckable(True) self.editRotamersAction.setIcon( geticon("ui/actions/Command Toolbar/BuildProtein/EditRotamers.png")) self.compareProteinsAction = \ - NE1_QWidgetAction(self.subControlActionGroup, win = self.win) + NE1_QWidgetAction(self.subControlActionGroupForModelProtein, win = self.win) self.compareProteinsAction.setText("Compare") self.compareProteinsAction.setCheckable(True) self.compareProteinsAction.setIcon( geticon("ui/actions/Command Toolbar/BuildProtein/Compare.png")) self.displayProteinStyleAction = \ - NE1_QWidgetAction(self.subControlActionGroup, win = self.win) + NE1_QWidgetAction(self.subControlActionGroupForModelProtein, win = self.win) self.displayProteinStyleAction.setText("Edit Style") self.displayProteinStyleAction.setCheckable(True) self.displayProteinStyleAction.setIcon( @@ -233,28 +233,28 @@ class ProteinFlyout_v2(Ui_AbstractFlyout): self.subControlActionGroupForSimulateProtein.setExclusive(True) self.rosetta_fixedbb_design_Action = \ - NE1_QWidgetAction(self.subControlActionGroup, win = self.win) + NE1_QWidgetAction(self.subControlActionGroupForSimulateProtein, win = self.win) self.rosetta_fixedbb_design_Action.setText("Fixed BB") self.rosetta_fixedbb_design_Action.setCheckable(True) self.rosetta_fixedbb_design_Action.setIcon( geticon("ui/actions/Command Toolbar/BuildProtein/FixedBackbone.png")) self.rosetta_backrub_Action = \ - NE1_QWidgetAction(self.subControlActionGroup, win = self.win) + NE1_QWidgetAction(self.subControlActionGroupForSimulateProtein, win = self.win) self.rosetta_backrub_Action.setText("Backrub") self.rosetta_backrub_Action.setCheckable(True) self.rosetta_backrub_Action.setIcon( geticon("ui/actions/Command Toolbar/BuildProtein/Backrub.png")) self.editResiduesAction = \ - NE1_QWidgetAction(self.subControlActionGroup, win = self.win) + NE1_QWidgetAction(self.subControlActionGroupForSimulateProtein, win = self.win) self.editResiduesAction.setText("Residues") self.editResiduesAction.setCheckable(True) self.editResiduesAction.setIcon( geticon("ui/actions/Command Toolbar/BuildProtein/Residues.png")) self.rosetta_score_Action = \ - NE1_QWidgetAction(self.subControlActionGroup, win = self.win) + NE1_QWidgetAction(self.subControlActionGroupForSimulateProtein, win = self.win) self.rosetta_score_Action.setText("Score") self.rosetta_score_Action.setCheckable(True) self.rosetta_score_Action.setIcon( |