From 9915e39a94ea1e97feb3d3426d3709098be1a014 Mon Sep 17 00:00:00 2001
From: Edvard Rejthar <github@edvard.cz>
Date: Tue, 3 Sep 2024 16:00:49 +0200
Subject: [PATCH] fix is_yes gui enter button

---
 README.md                           |   6 +++---
 asset/hello-with-statement-tui.avif | Bin 0 -> 2252 bytes
 asset/hello-with-statement-tui.webp | Bin 2048 -> 0 bytes
 mininterface/GuiInterface.py        |   6 ++++--
 mininterface/TextualInterface.py    |   3 ---
 pyproject.toml                      |   2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 asset/hello-with-statement-tui.avif
 delete mode 100644 asset/hello-with-statement-tui.webp

diff --git a/README.md b/README.md
index 4f19464..9eb9393 100644
--- a/README.md
+++ b/README.md
@@ -52,12 +52,12 @@ Check out several useful methods to handle user dialogues. Here we bound the int
 
 ```python
 with run(Env) as m:
-    print(f"Your important number is {m}")
+    print(f"Your important number is {m.env.important_number}")
     boolean = m.is_yes("Is that alright?")
 ```
 
 ![Small window with the text 'Your important number'](asset/hello-with-statement.webp "With statement to redirect the output")
-![The same in terminal'](asset/hello-with-statement-tui.webp "With statement in TUI fallback")
+![The same in terminal'](asset/hello-with-statement-tui.avif "With statement in TUI fallback")
 
 # Contents
 - [Mininterface – GUI, TUI, CLI and config](#mininterface-gui-tui-cli-and-config)
@@ -95,7 +95,7 @@ The config variables needed by your program are kept in cozy dataclasses. Write
 
 Install with a single command from [PyPi](https://pypi.org/project/mininterface/).
 
-```python3
+```bash
 pip install mininterface
 ```
 
diff --git a/asset/hello-with-statement-tui.avif b/asset/hello-with-statement-tui.avif
new file mode 100644
index 0000000000000000000000000000000000000000..b27d9a27e0960dc5d33ef668b49494b9fec429d0
GIT binary patch
literal 2252
zcmZutc|4SR7azMei5bfvAz7+dMlrTxkjTC#WK4s{onee6OT<+)<yuNi4CNYy$!;o3
zS+W$ejqIbc73xa1A<TV7uh09>dw!qiEZ=j^^ZkAf1Ok!v4h|=vLji9HXq<=#yw&jl
z8mzg<cx*75gM%jLdlg6gokAc40292M??xd45RBg`xIljzzy)A9m9YVY8+@Q~)j>EN
zjw$}mxIXV9{PQ4+1OWdX89VbZu)zLa<On;Z&RP5)2zGYCL4ZIcfX#A%fC&JjC?)_$
z^vB@Bz`q}W@W+7Aesrk1Q7l9nOd(Jph=AoJpd>ix7~ltr4+C}(LC_=7Az?<GDun2-
zgC}5pb{t9v17HX`LE%BcSbUHUI0N7SG%;KUjU)K(oaw(T`#G!sk41Qwg-1}3!*duQ
z;CJuK4dLSDiWd-saP$7j!+Q(t!T}=o_c=g)AR7)m3m4~L0uuPE=wK1ZUVaI=NgWGS
zgrrD}sD;6E2?i`7DKTZw%yjF!g+eV@e6=z-w0CDnSh&a605NjF;xYFio7YWKMU)R|
zd-9Re+6kTylG^eR8y`!-wuib|&_23bo?GdX_K=L^E0RIKeQMiCZXv#H*e!MG#?Z!S
zt9*RZ+CIW{$B*UmbJ4oVq!745sTOlI>KHXbk*~HnomiI4&UoiPSU)p2d7$l=NrsJ2
zVs^7?1~Y!jM63Afn4wq=g|zmN*D=gK#4{YF)1C4ya}|?Zb&r7~bKSNuqYh_MjG&VD
zwqt<|CsST$z3|lw@e1a#3mt~;`t<jKMev2EnVp*X6pDFlkykbnLmshHB55(i%HPb*
zmxiY5N}g1Wwi3qZ`Cx9Zs^@#Eo3zh2>txhktzVR7Oet*U7W0Y6Knszv$dNsw%qr#f
z4c$JoELZ*K-ZhJTDdwJx+_JweD^=m68v+O`H{-I*9vjae(TD=1&Znwry2O0_nS0-_
zQk%}U)iq5bvR^SLbr+rrdigD%n>sY+(EOmUqc+}+eU^Sa_(7lpIgsQKdKqy+Wbwd{
zZ>r~xB_xhEMC9-_Y9ER(uHzLney+uXEO)Phn}pOq`#K&aW36Z<wC!F<|8nKH7Bo(R
zkN@bekcQ=&E_#2Md~MDnq0Aad+kQw1om&UyDoL|!`U99ikOUo!3j?=MuPSHnQa1e+
z$FL0yi0D)XtCW`%r2VJz<O_;${FeK1S4ie?qWlTkPfRBimT?OmuJZ7%kjrbn<M)*`
zuCT}fsR})VRvKg7nlfpJ(v?5q4+;u(Z%(&So4y-(s8M0JJF3gy{xHB$+r!n?JI|?6
z?+-KO1f(?MSQdP}=uGaG=xKx}DjH*#PHE^)6MtJVGaOm?QzcLe-hj%l{<}-fKxP(Z
zN0xqZf9kg8`%eCuQD*Z#NBn|tzK3fPyz?whX~BplVBW$1>L4p;V|L6Y+q^l&)0c$Q
zp&c^TT*`mcB_Uk6YM8FvvasAMQf#bC?s8QrGh>W@>FAa^!<M*fq6Zx?m3J{V?Ei$1
zxx`v~={?lwC2NCXeUP2&>@XJV-KYY}-q|xMBmJtaWGrAFUXOy1q$@RQ`d#+!%q>*=
z$R7hvt<4JLci5(e!`~tT#Ge!yP<xioAwH_m4zDR@79D+hX`)|!^scz|UY`%P$Ht!z
z+&erszGRR>MzC5@6DQK(`D<%L`$N~PqDF4kpNR^`xNpg=c%WGBmR0Mu<&BFEgp}PH
zhC5znu!E*&x|uJBS`(UX?s>g%C(qPYyEjhq^vN3{8yP&&TH8vo$O^lIa*wggk0;r)
zZv}Ea;(O8%u_Mk>UDouKb^V_;&9uOm|JZk1rBozb%U=K0t!(SflZa-0b(P|`m8FKB
z+3yRX5!@Y;ujtY7gR_6}b&3#Ye2$DnT33nLp52bscoyt!pUarW!3L0qA>QT>?Prcy
z^QJ|s^DOwioxcP`otDzflfcP-3OdMhVtCfh1U|5pp9ODaULIFDjQyrW6O5}YA%)5j
zk8OwftoVw5cm!ka>z+2y=&vg9Qpw&pThg}Y_Nl4zX7*8pwAH1tst6ZrWz>X{zl)Fj
zi&^`n&mF}R+{-P0e|Ll;M1dtEIe6FmJzLPYz89x#g@ih{<@J+XHE(FqC>C|9vBu^R
zCD&!-v9c;H=@0fnM$LRzLVF4}`DR*Hp1fD)*A#FQJKxf>0_@FMlcqW+qe_C?Yq%EW
zQdI0x*0sNj@!#-T?##G0{JrQuCkyjXragOy=yWe<k$G0%)K~Y5+PZM7wf$z*wwT_m
zRmmIZpfF3ncpKp>_vfsH&KN#8Kb7OxaM6FFv^|t+l(6rOmwihg+f`3;V0^l<!;}2O
zlli39RCD_@spZy%a_55N66HFlH@|*hT~4si6>wiW`ubTzsDHzVLwtd&K$c-o+h-bk
zLUE4&K!sW4grapVEETG@%F27@*5cIU(xl`Q<-F)>+1E(hdPm>vl)lSiM6whzoct1g
z3T<L14SJtYi^fbeHY-L|bnEOD+yHeLS(*O5DrTX&ia5fvo%3cSC3vpwvl`tC&wg38
zW*eODy-tBw$f~fuNJiG<zKR_`!@X9Kt@;s;2Y}v~JK>a|JQoHHmDG%PR8zN>x6xTG
z4NE@OSV;afR5xIW<GMH&lvz~iuxeg5Gtp=k$sK&k)HAVu9H|vqD~?b|c19S4lJDpS
zW!*{n=ZFJI`+9HYqA!%$KZzRN7!jnb#CSU`CPpAg^p9MWA+5>+i-0oKsJQ;ti05^D
z)DY%=$NEz}M_z1uXyls(Ui(%#Wt%4CaZvi%`{nq-q;=@W8q-e?V=eMwdL`}Ui3K=?
ga*dcbnZ?X9cXf4|<Lf!R{!RI*@tjWFD=H%9Un}I?xBvhE

literal 0
HcmV?d00001

diff --git a/asset/hello-with-statement-tui.webp b/asset/hello-with-statement-tui.webp
deleted file mode 100644
index bc3dc3cd3e348ca875c347d2a7f7ac9672b111bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2048
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

diff --git a/mininterface/GuiInterface.py b/mininterface/GuiInterface.py
index bc946e7..aba53b3 100644
--- a/mininterface/GuiInterface.py
+++ b/mininterface/GuiInterface.py
@@ -128,9 +128,11 @@ def buttons(self, text: str, buttons: list[tuple[str, Any]], focused: int = 1):
         label = Label(self.frame, text=text)
         label.pack(pady=10)
 
-        for text, value in buttons:
+        for i, (text, value) in enumerate(buttons):
             button = Button(self.frame, text=text, command=lambda v=value: self._ok(v))
-            button.bind("<Return>", lambda _: button.invoke())
+            if i == focused-1:
+                b = button
+                button.bind("<Return>", lambda _: b.invoke())
             button.pack(side=LEFT, padx=10)
         self.frame.winfo_children()[focused].focus_set()
         return self.mainloop()
diff --git a/mininterface/TextualInterface.py b/mininterface/TextualInterface.py
index a6e9eb8..b34fc36 100644
--- a/mininterface/TextualInterface.py
+++ b/mininterface/TextualInterface.py
@@ -20,9 +20,6 @@
 from .Redirectable import Redirectable
 from .TextInterface import TextInterface
 
-# TODO with statement hello world example image is wrong (Textual already redirects the output as GuiInterface does)
-
-
 @dataclass
 class DummyWrapper:
     """ Value wrapped, since I do not know how to get it from textual app.
diff --git a/pyproject.toml b/pyproject.toml
index ad75102..d06662d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "mininterface"
-version = "0.4.4rc3"
+version = "0.4.4rc4"
 description = "A minimal access to GUI, TUI, CLI and config"
 authors = ["Edvard Rejthar <edvard.rejthar@nic.cz>"]
 license = "GPL-3.0-or-later"