From ab198d6778626e70115683db383b42619e7471da Mon Sep 17 00:00:00 2001 From: Grayson Riffe Date: Tue, 21 Jan 2025 00:42:05 -0600 Subject: [PATCH] Add icon and resume --- Mainspring/res/mainspring.ico | Bin 0 -> 6178 bytes Mainspring/resource.rc | 2 ++ Mainspring/src/Application.cpp | 3 ++- Mainspring/src/resources.h | 27 ++++++++++++++++----------- 4 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 Mainspring/res/mainspring.ico diff --git a/Mainspring/res/mainspring.ico b/Mainspring/res/mainspring.ico new file mode 100644 index 0000000000000000000000000000000000000000..eb76040539d5eb68cc7ca0726ffdc25e5bf5ba8a GIT binary patch literal 6178 zcmX9?1z6MH*Z*#8V-m6qm;nt7En@jAdRGgG}0kCLL~e# z5S5l19eeTrKKFU$ma~&jNJMgwcdmYLcdg4%>&D64somM>X}}$5dp=_HQ(+N1sXFGTlgx6cb=;Nc^&i>k^tv{^YFYRAeZX*K^XqYD7URsO zF@XOOTr!aHpxX1S{M41Qx@9rd`ZohEV-(rr6>e@r+P&6z<`20f2qd~i-2l9gN0Iim z$W@xgb0Q(g2MqX-M;W8_$0^$ZnI-BUTPBfCEPI9E!u3^d4`z6ukulX6>(SB|{yJ9a|XyTY^p5qj;7X ztSA7x{{FC>Z~@Y)gDUl5#Z{1HYqA?CtxL?8snm-cKr)G%-&KrG5+=4E&RBtydV^p8 zQu@V;q3`G)#bsV%#L34+fky&WSJ#|fFCfG~eMi9}dU1NlvKzQELQn$? zLn9ym%wC3KKeGI+0)7RDKT>G~kFJN&!nPzl#ndW5{0sTfTL@l&g^Z=wR|hA>ZgiIIrJXH^C2y{L#wQyA+-|0i zo_y?Rl4?<_L=^ytu*-Juvz3|z+9!idLid(-xn%{}GRb+uh<8DI;%PodpU&_s`+(wo z)_<^HP08lvXNr@So>WQRcB4Gg@lT%(@13E6Y0RZJ)8E0oqm!wnlu6rU{uaPOWc9-^ zUlD*YMos6&r+=(K4dnmE;z4cOX~}N)#en`OAOy6=vf7 zsc;n-@8i@CQ@Ggt(1w8MNjZ?CfS3UYD-NNf)P4I+4n!XlI_vAfq8<+4KI1aq-lyC>NukJ}iAe%UA4Jc<^!0uVb#zA6Qh78oYARQ|g zs9A72SkxVuqQ!uJG(VFTpP)@{m;&ybJ5Ug$V`BLGy@ z3}^Uf_v*aBU|q4CrK8Ce2iy#W*5uD}BM`$Yc^#0}avvdw1IwEPP71eOG1lGHK{|dn zx)7l5`QUO1j#=unRVm&Oz%|<>J3;pMaMLrDM}Ax3SG-Zq*HFyR(G8ze%QKI={PB#a z%%FYo$?+4uc;nZ^^^Na3DnoT3GhuO|vvsXGu8*AJoyV#S6W}C%N~fBA-(VEKwt9}n zU)l2H8ZD3(x{9;G2=XW&0Q>@$6zp2i%c5Z68mkLA-d3K&1i|KEmhaC7q1LmtN6rxt zZ`3Q6%1VgTJGE#n>;`D?ZU}zGflkfe(((OJt0u(Wt#t)UG5kNOz|XT5^_-;xsj;ho zTX6=2E>56Ia)J}{Dj$CM3Y#sVLBGw(=>aOzMAALrL?xpSu2eUdV)d#4%MDE!!_(7;1o})271wgf)#)7Y_sr z!>VI3R2bWSumy_0gf_(tJz50va*| zRb34P3Jy1+nBIlamAsB5^ToOw`DodC4;7r*`8(CE&n{p7N;S|~@5m|V#RbD2pDs6S zhV(L8aZoIZA)`ah0eUOx9yc3y5e;I8A&q==ol(3~#5=pcJ4T-JqIp?!eQ z-D3#t6`$8y{QZ+xz<`hZ?f#6EYOr)3)8Qi*??2 z4g!hFXC7=T=}V`p!LV+T0#a*T?#tUMPgB(lZ>-XV`MSU}uLgRfK7BvbbYdx5jO3OI zX$TnRnB;X&QET$mR{DQilqbcX&wOGyAbHM7gz2VQwh z#S>>}>$+^;x=-=6hw@@A>+%pL)(%Rd# zVf#ZXQkqp02E_w*sCCf=VM6El^W;P(j3!HH$%D}dG@j?Yq?TRuB4Mb7Y|C*L$z&b) z)K}}WoM++>b`hY`0h2Kb?!sQREmP9#PoEa70LGBKcbXA6bAaIC>+N6TP*5MTd#Z<06qk3kgvojeQ>_Lx)WbRqtu@DNjgKyCb0F1d$%Ls1>G z27OQvyhBr51jMkHX0)meVj-UP*k^tNXjESP)j5%Sb3NzNA8dRDJpkf6>Jmnu&yLw)mbKSYgp$)hlqVogB^vga71Yq`7}%PNs8?@QRZzi zg+!eSK3LHOS(_EB{d=|srgbV_N{-DT%gY(bcZq37x`1bpib`^iy&ouM-YijK1Bu|Z z=Bat*nVksYa;ng$h~*Tj7g`Zi+DxjF3$1;+x?i}jXmpdDBuz#*&x4`AoYPp& zP_s;X)wO3TRBgpsdw-lTkCx1BlsbGlI!MAw24_>e{KYm?6sC7>iDq`A!kFPDRHefc7#;!I^2{c9oc^H1-8LdGD;>N!Z7u?RZi#_#`&;rt zIeHxw`~zN3enS7D5joCG3v0nE_6cHsUXHWztE3#P&*8WRxV?n&Yg1NaZC&mHx5?9L z^*mUpD}Uvna(=A{c-dSowI`khl-Ihm2?1_du(C`*QR;4i&5T;5B zj>zi~?o?Zao3Q*Saab7cCE$9IcW{8|7isyI*)T=@i3nC!duAruC!jtjfXh#;v(Xo8 z!fk|GPtyLG*rk?hL7^q?8+(1_-pXFZYOPB^IsmytfeuK34Xh*`w9sgcEp~!-feeLw z#`dU)4t#1^SQen?OZiZ4RAZod|C7Ik71DcTeuJn90fN4;a`cV_0^};Wx4DcV(=D8l z`$esczO%J0GUVI6+eofg%~G#iW<}ILn-P%{n*tJByKW+_uBWibLI6pW)_r9 zdH}UiIH=m-w{K&2{P!mhw+qiDXXgHblPqzf#aJzE?yT42E)p7B6W2Py2pOxl2H(EY zghrw%vObQeUy+3RmNL)p=?}7fl;-+xa0TGJ0@4!8q05gVIKPR$rQUEV~q(jB?wIT(Y?a!2g|6VlAwNckos-D-t`5MTrLC zksx9tlemRMNEX9a>KplPc3E!lS)m2aB{io-j<^q*o@ZI$Xtyv!(ZFF&J zw`5Uc=9NADQ>~W|=PYp=5Y#H)5$qFVM!QS`cgO3G^grOp!(Z>wsV;cz+3hMdL(5`7 z-vAdeUZpERbtng+|h~~&! z&-8V6;g^w3qR~qw*UUoM{i(5txhTET~9w zRjJ2P9|ENDSzhLe?1H+G)FR0rD)w1Vvpd zt?rCjQJF7tFjm=XjLP$s?7rz={zC8fvVUnG?>j*!pbqda@HlDR5duS1CVg~DjXHQCx zTeE^{s&)3Ur#{<5G{SHhRO0@e z23kIUpn8BiWv9-lq{?@or`@HztZrQLUiwMK3l%c@~z7M zDSE~;iW*n&gw@5=jI+|~1g~nH5Vk#1f)L>51cZz^Xvfh%{ro7a5#s3^@pUJ`P){m^ z5Ew3oD_`^@&UZd~+VU9bsqX4s$$zXqQ&#;;4ko?D`Ck?PZEfq&h7?Y z5d{`x2PPR?4wZ3D-Znl*x1&S4rTmMO`5earzHxaAZ!Hz5s)c2r?i=>+?*sxC$n{jz zf90m*{Q{n19eukk56IDr{pFvqUQBJ~kbdGY_GWsVYBhF#H=xq9{?|#kp|5pdcXbfK z2xl1EqWfmy*3CCBTkZr=S`CTxY|=&mDYjN$1;L&*&s3@rjst&PPMO}fCNK6&gYU+k zeKvMPW_;E1mp|51C74a#v~&f8Kxn8i`0~<(Xth_7PmMx+oB<82U#3~>^biPbqFRAq zV!!u${7L~hB2zefM*qYxg^fx=BDDX*mIm$Ai}FiT5zMDGvuzbR!qZ0FQk@``q_N}R z-222dzS7SGM+jnL!K_)KQyItf$K%OwgGo&!#s_ey#Rg`!@-N=w@hq@1EJEf53;r?! zD)Y(=B~`cTXpJw2rFJm?iDNe{hUTO&fS8OKz+DPvdjhwDnOm4!fRtCfZCzBVTY@UT z71Xi9MF^bXmh3Dk{1VGjW8~B7n2_3LJmn~C_hVmSiexg7@-v`1f#D9{^)Fh7oi?WN zw&I3279AtLc4Y4bLX9qA1b1WF)Rc{iT5~09Ma@zABVNIOsW>_RQ^t*7y)=~Hy?`#g zp;zxROK_E#3y{L|V{;gY0V~tDs1fol z;l&wb0j|%w^w$82$e^rp(ll!g?T$TC%XaIHYdsZ)@MVi3B%FSKw3Q)B1|W1q``*c6 z@GIbIHNx}c%$lWP#HE6;S(3W|L7*+x)=o1;wyHyDJ8Q*7Mc0jBw@_(s3czVvBQ+rB z*S?yy5Bk<}=@L&D@BQH|$$<99w&&P)8{vhW-s z!*;y(AZ1MOQ5%uCK)_93rD;1o7Xj#Y)=8409P0lb4WmJpIKqmvy^B>cV2b)u*Dj0K z764a2PsvZHxszaWc1L4zRt9ipzSPbG9uw|Sc9K2{E=c8W@f2C;S+vfW*sI&=d3XbS zJCQ^`)f}?3-Fh5?UGBm2soD3$^3PZGjJSQqJXv-i0g2Pn4!_r{}B?%PGYP z22Ep5B?AtJdY=W{ug8Vs1#j&Q3QoeOSdinxP)nyddxbN6Jp*v9(=GM)X<1yxMs#w? zBy@GjY55)fy^+C^5PE95{@KHCnRHvafTESYstW@Xb)tzM`af|KB>M3n+o58eE_|+r z4tRW+?V!6$=XTK&!?2LGx?!jXQz<$6#4uyH2$N4TTQYvkqC7o5&ESycS!dQd#qto1 z)1l>x+nnGdoxAB@RpH8y-Ms`a8XF8J)r`n-n_monTd|;fF(S{!Bs3@?aj`sen0Gza zb+bEb5YFV}Xan*tyJJ)FCM5oHAdizC<2~NH{TZdsqL4kZObSoZOy|dIo+H#Vhq{8l zRW<_$q*#OQbON1)5W3%}1?N&>HHW9jj|ZTt>4e-bw>jIgG|rf0RS}X`ebK$*G@Km` zG;`zX6Afv7a^x$CU_yXt^lxZ+gKsNAu>H=>GAGVRmTjgde42a6Um-VcUpQTQFD~lS;oS{i z8m+WEW%+pX{sh36jqGS%NMh!_OQi*0Rh&aZEG>(_6_4~30O~06lLz56-{vra%Bt?e z0au$(=I8Ou$5gTn4AMt&-QWeRsv3`+=`BPq?43bpc7baX6G)S;vPN!cx~VUGUr(eE zq7uUqK94g)AY2@4THY1WLtk9N<%3biMg>Rs8;$jfy0_|N@5WXl*cI8!E(KchyGfr? zeEU4lL>tNa7-35=WkyFlfLB;c7z>vjFO)?F&+j-@3E#+FYp+m*h_Oair?$U)t{M1g zVueO-V%nXJcRYP(8&K2?-oGp_najG)huVj~^i26Qhjs}WpLksTV<<+)Dt5QLZN0~8 zd^~52NX>NTPDD=7-`TBouj-}~lVTN`Pm*)Oe?uGRlv||)+t?sHj;wWM$%_6!OT{)i znk`mwXLVuOeX`fufeC`idMfn|D^?g4qSMa7;rf71CZ$M*UMvS6>wD?eSs7Dx&w^&j zD*M9}gkCE(A;5boZj?fjGb*8mcT0Ow2vRQD9FZ31_L0#0GLtfAMLb$(gE1^w-}(&y zOf!KY?6#lxwu$VyVf;SG@iLvny$`kQlX>rdO=CxX90XeUdGv?n4VSIba`ej1QX&lC zuuhe{o8#`kFD2DSFEQhoqay^=xLj1c*@?NE5B-756{Su=Y5z*H`y~AcqCVNO((lParam); SetWindowText(dlg, app->m_appName); + SendMessage(dlg, WM_SETICON, ICON_BIG, reinterpret_cast(LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICONMAIN)))); POINT cursor = {}; GetCursorPos(&cursor); @@ -71,9 +72,9 @@ namespace mainspring { SetTimer(dlg, 1, 50, nullptr); } else { - SetDlgItemText(dlg, IDC_BUTTONSTARTPAUSE, "Start"); KillTimer(dlg, 1); app->m_elapsedSaved += app->getElapsed(); + SetDlgItemText(dlg, IDC_BUTTONSTARTPAUSE, !app->m_elapsedSaved ? "Start" : "Resume"); } app->m_timing = !app->m_timing; diff --git a/Mainspring/src/resources.h b/Mainspring/src/resources.h index 5f0d28a..a5b7ae2 100644 --- a/Mainspring/src/resources.h +++ b/Mainspring/src/resources.h @@ -1,18 +1,23 @@ // Win32 resources + +// Icon +#define IDI_ICONMAIN 101 + // Dialog -#define IDD_DIALOGMAIN 101 +#define IDD_DIALOGMAIN 201 // Menu -#define IDR_MENUMAIN 201 -#define ID_FILE_NEW 202 -#define ID_FILE_SAVE 203 -#define ID_FILE_SAVEAS 204 -#define ID_FILE_OPEN 205 -#define ID_FILE_EXIT 206 +#define IDR_MENUMAIN 301 +#define ID_FILE_NEW 302 +#define ID_FILE_SAVE 303 +#define ID_FILE_SAVEAS 304 +#define ID_FILE_OPEN 305 +#define ID_FILE_EXIT 306 -#define ID_HELP_ABOUT 211 +#define ID_HELP_ABOUT 311 // Controls (text and buttons) -#define IDC_BUTTONSTARTPAUSE 1001 -#define IDC_STATICTITLE 1002 -#define IDC_STATICTIME 1003 +#define IDC_BUTTONSTARTPAUSE 1001 +#define IDC_STATICTITLE 1002 +#define IDC_STATICTIME 1003 +#define IDC_STATICICON 1004