From 580bdaa245a00c570e56c3fab612049bd4e6ef05 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 7 Oct 2022 07:35:49 -0400 Subject: [PATCH] this is done --- main | Bin 9000 -> 9312 bytes main.c | 37 +++++++++++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/main b/main index 0ce566d76fd3e835ef27321e741b4f664ff9aa35..8859a16009a98efdccc9ac9f2b0e5d27bf3affab 100755 GIT binary patch delta 3816 zcmZ`+4Qx}_6+YL#NgU%O#x-eLobY({QaiYLE=pNoDZH4_x^8gNlrkc*)}~3Et*_)2 z!jx7Sc2d-#3RNbLR@GD?v>(VMi$#DYhO&xQ(G($6p(;XXibzyZ1-f*NShP|G$-euZ zLFrf>o%hZ?_k8D`bM86!-3&i79nC)6I7Y-a5m5n={RUCdSafFpf4dHNlNZJp?*vDvX2yIpp*%!yk2e~Ml61E zaYHPVBAW-Yy8E-kmw=GTwVV9peZ2y6{$L}QhH|{VahCg}f%wV0{)DYo#WG<~2-1L* zPkI}$`+1z)2N`B@{tR+o%i8hANlQ{k-2D~#<-wsEiV z7Tb~@RmiVOHRMlKgf#AwR5?HdSC2vQtSq=eN#mo6BdT$S)J^_iH*r1^Kj-$vGF`6t zInN!P5?oS<`!$~X5d}3K;KL$Y?KvLKJLwcon}P6JjfbTWKa=8;8qcQV=gR&ql=F(7 zSdRNrE)hB4egUbCLA^fZk~Ll@G~rS$v_?~sa99rUvne4vo}cT7-e~;f!aE6%kN{he zazN%4IJ{k$+a;}Po=WeJ@9QxBYAa6CC4Yqtk95bz$iAGLDP9&-1EsXnGTT=DWJ_;z5 zq|yK+8YI<5o4qovA+KKEt+UW8@qJR+3z-pYaVIU`u9PAKE#;L}E5L<~3dX>DcC=uo zFXa%{N;2lCHRZJYfEWFkZ9v+DU#7Qr??4hwIZcU(@)X9+);Mj3eac!qJBrHfupDq- zK6;1z(HW__@f!+@5CMFzMnzGm?f|WeW;Uth0rz8*^KR-V7ga=hs66r~dQ_xTiBgrK z@m2~zD(h}VCBHz21LTOF_XryU(ex+T0kHL8!NFv?$h&~Tpce*DAa6FMA>*JJD)ETP zEt9rx{)Vdc62Hj$7s$G|Mh$M|+wLuEIrG3`-&-q|`Gu`5lm0@)Q65&vTZnkTdt(}_ zPoZ#G9Bw?CaDdw;I1z>E&MT%9s_8_P&h9(ms!?IbvsR($Bn?!V%;Zbj{@N#jDjkg-_7N0a0ii;jDL%I4Cr`b=; z>?apCciQkdeVF&zY)-I`vw5S*`52otx}9tAJmU06EQhhoagjb-Sq_kDIXxw(LWWz@JvY%Gg;%j*_Nq61*;Vk`Lr|=V00lOWh-n+~8 zwnr0H>(RZeAyIyByS~46^OS}o_nB^anrJIhyy_yrNpo!c|tG1{H_6uV<=1Hr#&7B5INfK1Wj=l|vj_ zH=tE*yYco1gE!uWDFh>Q)Kq3d2G0>%obcl zui+d%)5~|KaTrpJNnnt9jUcETo88NX#8YJ=|)ZYNDmNDR|Fnx_n+PKp(nk z^K*A$Nx!-C%O~1fqBBM7lJu_#?m?9};hZ;bunxhidCf6X^RsaO z;v&vYA6)Gr-cw0uC z&0l8ruxKM{djnE_5eJYrNlZeD-N?*E-z zL%!FSU$VXscduam3D6Z|zi-V`SC(Aib{!tasuQ3qqO_FK&9|urQ7lDH0y%A51#jC6E zkhe@EuB!3B5S2aCioGQK?6Y_L+;(+@w49q zeFcbZTaTW6>+!vkF(X~!RXep+2ud;Ss-Bau9 z6l1@nu3dhHs7fWOlt9y<493UE{FT>(pN8x_-V)vkyfdfgq-Bih#+}vGW8-6X?8SppQTwf{uXD7Pdp61E373AJhlx1?e#00wIa^E1;Y) MEN^1n#&uc!FV-1=4*&oF delta 3613 zcmZ`+eQZdDs^6PvqKCfU&@tYrd)d;`j%#~=nX!amY)HDIZ)S=` zx}<-?n$q1t@`PkRd6F(QC0&q1ikAqcj`%{nQxT(nImNq!)<{Y^FL#s2*G-&v#J(!8 zk7l~;v9Bsz8pXLBB<@M^_BY6vl5X%e5v?tw(nQY45@EFA2oI#B30dXwB$q?6!88F9{sp7qGTfUeY|7-V@v1ssGJVm2TTc^ORs&W0nr9DSixs7Z9c=B3ZN_ z+>_uAf_n$tr{MNrK5}RriY(yV2WM;elpF$gKxu(of6F7{Sed~}Bz!7-Dna(6h^MEu zC0QToC2x=tRJtA<7dX}WCTUUHg}6GoQ)B7}vE6d{#>`oycpEu(2FnmFSJJ73Ob4H@ z31SX>puGhvo}^W1vk!}zG?Oeb?SK`1nBPa(gk6TU&t|}Rk}NSe!pn1*KQ-rR!|ikC z=7Seext*o~LT_LN?i!Sn>%XGOEm8l+;*Ph?oW%sD8wp!)&U-lWcQ_*mwWMqYCLOsee-0qU6`{aSLgQAsPhze zz1c^_;nAyADF)EOaY(C=Fp74v+!^s?fG1>&5_ z>H&lk$K20c@}Bq&z?Zg!`%vQIR}W??gej{1^I@fBck zVx#EWdSSi(U9sOH&FIs`XLPsC#zu6nZ5bQTn{73C_S!sQGjYJ56fw}m7i&a`<~%zI+LJh`}V*JI-ybRa&jS|4nuCc zeb>T^@x`mqU#uZsmCr+dZ+*tT;0^d!bOru7BKO$J@Tp+Kt{uC#qk+k>1YI^ITcIhV zuP%K%?ece1nOQoTWE2g~n_Ln7SK%~IrZVUR$K28@@6!VBZVdd54$#^EOB`!|t!n?t;1kKvv%6;LY2%bj15UT~LAa8O~!DXU6jP@(Ij_*fQQMu}2 z5Bi7pR$Cr?dbIz+r{L6?obUT@_TL=k4M#J+bv&k@E_)|^0XBr2C&}nN<0!D3{Znuo z{iB3Wp@?q4dh}$al2}4I3$wV_fZJu0D`EZD66dW`gDHn;W z2rOjN#@FNOoE~!IwvTUViQFq%nV=`txK@4^7$USp?ZB`blp36>Uapz4_E)Tw{(^mY}Cy_9DI8wgNm9oe`qW!O1WBVOj z*tYh#E2{ET7mt44RRUYu<&Cky0JV=|gjsa3Yia>{fv4o6z>?VR*hgDh8gbdQ$bo^R zL;fvB?${u<99p$}A$EFO5r&sT(dXEi{eO>jZf?#)7iTX3BzY?Ih6W6~H#p=N=Tl%NLy%V75 z=gIAj)AVJ~wl2&2^g;K}S+{=I{o%YmGgr@U!7yC6`96K?qMEn%&ABmcJv0t;GN65; z^nzvUrpXWY<{}4xJfL3&^1w^T0U!^&5;+LukghDQd28q;H!l7NYX~7~?1X0D6eQKiYO^iBEpAOV$r8+2p6kv_hzXBst22VD7g*KQJU9 zHD;ANn0{gDniY;~M2k9z+(@!}1~iQMMN_`A4P(KZz`FtOKD>v=yo!x6w_dlbx~k$f z42jRqLZ0K#_*Fd7wPiI;Ls-ecmS#`{1RE?N5cF8!qNNt3g79yS#RHN-ZX(=ZjZjGY PfJbjETg#lf>BorderLeft; + ng.ng_TopEdge = window->BorderTop; ng.ng_Height = 12; ng.ng_Width = 0; ng.ng_GadgetText = NULL; @@ -259,7 +259,7 @@ struct Gadget *buildUI(void) { ng.ng_Flags = PLACETEXT_IN; // Timer display - ng.ng_Width = WINDOW_WIDTH - WINDOW_CHROME_WIDTH * 2; + ng.ng_Width = window->Width - window->BorderLeft - window->BorderRight; ng.ng_TextAttr = &Topaz160; ng.ng_Height = 20; @@ -276,7 +276,7 @@ struct Gadget *buildUI(void) { ng.ng_Height = 12; // start/stop button - ng.ng_Width = (WINDOW_WIDTH - WINDOW_CHROME_WIDTH * 2) / 2; + ng.ng_Width = (window->Width - window->BorderLeft - window->BorderRight) / 2; ng.ng_TopEdge += 18; if (timerIsRunning) { ng.ng_GadgetText = "_Stop"; @@ -295,7 +295,7 @@ struct Gadget *buildUI(void) { ); // reset button - ng.ng_LeftEdge += (WINDOW_WIDTH - WINDOW_CHROME_WIDTH * 2) / 2; + ng.ng_LeftEdge += ng.ng_Width; // lol reuse it ng.ng_GadgetText = "_Reset"; ng.ng_GadgetID = RESET_BUTTON_ID; @@ -310,7 +310,7 @@ struct Gadget *buildUI(void) { // hours slider ng.ng_LeftEdge = 85; - ng.ng_Width = (WINDOW_WIDTH - WINDOW_CHROME_WIDTH * 2) - 85 + 4; + ng.ng_Width = window->Width - window->BorderLeft - window->BorderRight - ng.ng_LeftEdge + 4; ng.ng_TopEdge += 12; // The level is also displayed to the left of the slider by default. // We need to leave space for its rendering, which is done separately @@ -580,6 +580,26 @@ int openAboutWindow(void) { TAG_DONE ); + ng.ng_TopEdge += 15; + currentGadget = CreateGadget( + TEXT_KIND, + currentGadget, + &ng, + GTTX_Text, "Sound: Reception bell by cdrk (CC-BY 4.0)", + GTTX_CopyText, TRUE, + TAG_DONE + ); + + ng.ng_TopEdge += 10; + currentGadget = CreateGadget( + TEXT_KIND, + currentGadget, + &ng, + GTTX_Text, "freesound.org/people/cdrk/sounds/264594/", + GTTX_CopyText, TRUE, + TAG_DONE + ); + AddGList(aboutWindow, glist, -1, -1, NULL); RefreshGList(glist, aboutWindow, NULL, -1); GT_RefreshWindow(aboutWindow, NULL); @@ -855,6 +875,7 @@ int main() { handleTimerMessage(); } + // open up the about menu outside of event handling if (openAboutWindowNext) { if (openAboutWindow()) terminated = TRUE;