Added Reset button for the override

Charlres1961 · Jan 12, 2017 · 615db3a · 615db3a
1 parent 60b710f
commit 615db3a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.git_cache_meta b/.git_cache_meta
diff --git a/ControlPage.py b/ControlPage.py
@@ -941,9 +941,13 @@ def __init__(self, master, app):
 		col,row=0,0
 		self.overrideCombo = tkExtra.Combobox(f, width=8, command=self.overrideComboChange)
 		self.overrideCombo.fill(OVERRIDES)
-		self.overrideCombo.grid(row=row, column=col, pady=0, sticky=NSEW)
+		self.overrideCombo.grid(row=row, column=col, pady=0, sticky=EW)
 		tkExtra.Balloon.set(self.overrideCombo, _("Select override type."))
 
+		b = Button(f, text="Reset", pady=0, command=self.resetOverride)
+		b.grid(row=row+1, column=col, pady=0, sticky=NSEW)
+		tkExtra.Balloon.set(b, _("Reset override to 100%"))
+
 		col += 1
 		self.overrideScale = Scale(f,
 				command=self.overrideChange,
@@ -955,13 +959,13 @@ def __init__(self, master, app):
 				resolution=1)
 		self.overrideScale.bind("<Double-1>", self.resetOverride)
 		self.overrideScale.bind("<Button-3>", self.resetOverride)
-		self.overrideScale.grid(row=row, column=col, columnspan=4, sticky=EW)
+		self.overrideScale.grid(row=row, column=col, rowspan=2, columnspan=4, sticky=EW)
 		tkExtra.Balloon.set(self.overrideScale, _("Set Feed/Rapid/Spindle Override. Right or Double click to reset."))
 
 		self.overrideCombo.set(OVERRIDES[0])
 
 		# ---
-		row += 1
+		row += 2
 		col = 0
 		b = Checkbutton(f, text=_("Spindle"),
 				image=Utils.icons["spinningtop"],