Skip to content

Commit 2f25e67

Browse files
committed
Rework frame EULA
1 parent 611f589 commit 2f25e67

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

examples/test_github_gui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
iquail.builder.CmdIcon('icon.ico'),
2020
iquail.builder.CmdNoconsole()
2121
),
22-
controller=iquail.ControllerTkinter()
22+
controller=iquail.ControllerTkinter(eula="This is a test")
2323
)

iquail/controller/controller_tkinter/controller.py

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,29 @@
1111
from .error_reporter import ErrorReporter
1212

1313

14-
class FrameAcceptEULA(FrameBaseTwoChoice):
14+
class FrameAcceptEULA(FrameBase):
1515
def __init__(self, parent, controller):
16-
super().__init__(parent, controller, "Do you accept the End-User "
17-
"License agreement",
18-
"I accept", "I refuse")
19-
la = Text(self, height=30, width=30)
20-
la.pack()
21-
la.insert(END, self.controller.eula)
22-
23-
def choice1_selected(self):
16+
super().__init__(parent, controller)
17+
label = tk.Label(self,
18+
text="Do you accept the End-User\n"
19+
"License agreement",
20+
font=controller.title_font)
21+
label.pack(side="top", fill="x", pady=10, padx=10)
22+
button1 = tk.Button(self,
23+
text="I accept",
24+
command=self.accept_eula)
25+
button1.pack(side="bottom", expand=True, padx=10, pady=1)
26+
27+
text = Text(self)
28+
text.pack()
29+
text.insert(END, self.controller.eula)
30+
31+
def accept_eula(self):
2432
if self.controller.install_custom_frame is not None:
2533
self.controller.switch_frame(self.controller.install_custom_frame)
2634
else:
2735
self.controller.switch_frame(FrameInstalling)
2836

29-
def choice2_selected(self):
30-
self.quit()
31-
3237

3338
class FrameAcceptInstall(FrameBaseAccept):
3439
def __init__(self, parent, controller):

0 commit comments

Comments
 (0)