| Revisão | d978bf2a4f2c5d41754811da72872999d79390df (tree) |
|---|---|
| Hora | 2018-03-15 03:33:27 |
| Autor | eshea |
| Commiter | eshea |
Modified to use empty string as fdefault value - rather than None - if no (valid) default option is provided.
test/test_radiobutton.py (diff) tkpane/lib.py (diff)| @@ -59,7 +59,7 @@ | ||
| 59 | 59 | }) |
| 60 | 60 | tkpane.lib.current_panestyle = "closey" |
| 61 | 61 | lo.build_elements({ |
| 62 | - "rb1": lambda p: tkpane.lib.RadiobuttonPane(p, "rb1", "Radiobutton1", [("Option1",1), ("Option2",2), ("Option3", 3)], "Option1") | |
| 62 | + "rb1": lambda p: tkpane.lib.RadiobuttonPane(p, "rb1", "Radiobutton1", [("Option1",1), ("Option2",2), ("Option3", 3)], "Option7") | |
| 63 | 63 | }) |
| 64 | 64 | |
| 65 | 65 |
| @@ -69,6 +69,7 @@ | ||
| 69 | 69 | entry2 = lo.pane("entry2") |
| 70 | 70 | text_pane = lo.pane("text_pane") |
| 71 | 71 | rb1 = lo.pane("rb1") |
| 72 | +rb1.required = True | |
| 72 | 73 | button1 = lo.pane("button1") |
| 73 | 74 | button2 = lo.pane("button2") |
| 74 | 75 |
| @@ -1722,14 +1722,15 @@ | ||
| 1722 | 1722 | self.prompt.grid(row=0, column=0, padx=3, pady=3, sticky=tk.EW) |
| 1723 | 1723 | self.columnconfigure(0, weight=0) |
| 1724 | 1724 | self.radio_var = tk.StringVar() |
| 1725 | - # Get the default option if it is on the list of options (if not set to None) | |
| 1725 | + # Get the default option if it is on the list of options (if not set to empty string) | |
| 1726 | 1726 | if default_option in [option[0] for option in option_list]: |
| 1727 | 1727 | default_index = [option[0] for option in option_list].index(default_option) |
| 1728 | 1728 | default_value = option_list[default_index][1] |
| 1729 | 1729 | else: |
| 1730 | - default_value = None | |
| 1731 | - self.radio_var.set(default_value) | |
| 1732 | - self.datadict[self.datakeyname] = self.radio_var.get() | |
| 1730 | + default_value = "" | |
| 1731 | + if default_value: | |
| 1732 | + self.radio_var.set(default_value) | |
| 1733 | + self.datadict[self.datakeyname] = self.radio_var.get() | |
| 1733 | 1734 | for i, option in enumerate(option_list): |
| 1734 | 1735 | if tkpane.use_ttk: |
| 1735 | 1736 | radio_btn = ttk.Radiobutton(self, text=option[0], variable=self.radio_var, value=option[1], command=self.do_button_action) |
Fork