diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2014-08-27 01:58:57 -0400 |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2014-08-27 01:58:57 -0400 |
| commit | 86cc17e69ebc002318d62501e914dc9bb394e503 (patch) | |
| tree | 1cc689a477d359589c6ecd4f45207d1f4108f1bb | |
| parent | dfb110d8a3e9bb4a1f932e8e52a3ce8765c86cef (diff) | |
| parent | 2ced87f3e6f61b777a5cc4368527e6fc8928464f (diff) | |
| download | cpython-git-86cc17e69ebc002318d62501e914dc9bb394e503.tar.gz | |
Merge with 3.4
| -rwxr-xr-x | Lib/turtledemo/__main__.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py index 586b2a8662..d65ccac514 100755 --- a/Lib/turtledemo/__main__.py +++ b/Lib/turtledemo/__main__.py @@ -180,7 +180,7 @@ class DemoWindow(object): self.exitflag = False if filename: self.loadfile(filename) - self.configGUI(NORMAL, DISABLED, DISABLED, DISABLED, + self.configGUI(DISABLED, DISABLED, DISABLED, "Choose example from menu", "black") self.state = STARTUP @@ -225,9 +225,7 @@ class DemoWindow(object): turtle.RawTurtle.screens = [_s_] return canvas - def configGUI(self, menu, start, stop, clear, txt="", color="blue"): - self.mBar.entryconfigure(0, state=menu) - + def configGUI(self, start, stop, clear, txt="", color="blue"): self.start_btn.config(state=start, bg="#d00" if start == NORMAL else "#fca") self.stop_btn.config(state=stop, @@ -276,7 +274,7 @@ class DemoWindow(object): self.text.insert("1.0", chars) self.root.title(filename + " - a Python turtle graphics example") reload(self.module) - self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED, + self.configGUI(NORMAL, DISABLED, DISABLED, "Press start button", "red") self.state = READY @@ -284,7 +282,7 @@ class DemoWindow(object): self.refreshCanvas() self.dirty = True turtle.TurtleScreen._RUNNING = True - self.configGUI(DISABLED, DISABLED, NORMAL, DISABLED, + self.configGUI(DISABLED, NORMAL, DISABLED, "demo running...", "black") self.screen.clear() self.screen.mode("standard") @@ -300,24 +298,24 @@ class DemoWindow(object): self.state = DONE result = "stopped!" if self.state == DONE: - self.configGUI(NORMAL, NORMAL, DISABLED, NORMAL, + self.configGUI(NORMAL, DISABLED, NORMAL, result) elif self.state == EVENTDRIVEN: self.exitflag = True - self.configGUI(DISABLED, DISABLED, NORMAL, DISABLED, + self.configGUI(DISABLED, NORMAL, DISABLED, "use mouse/keys or STOP", "red") def clearCanvas(self): self.refreshCanvas() self.screen._delete("all") self.scanvas.config(cursor="") - self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED) + self.configGUI(NORMAL, DISABLED, DISABLED) def stopIt(self): if self.exitflag: self.clearCanvas() self.exitflag = False - self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED, + self.configGUI(NORMAL, DISABLED, DISABLED, "STOPPED!", "red") turtle.TurtleScreen._RUNNING = False |