From 519f8a9bb137a8a6a6e7e1aad5d075baa017ea34 Mon Sep 17 00:00:00 2001 From: dP Date: Sun, 7 Nov 2021 02:41:06 +0300 Subject: [PATCH] Fix tooltips for new client list buttons --- bin/data/cmclient-5.grf | Bin 135208 -> 135210 bytes grf/cmclient/sprites/toolbar.png | Bin 3851 -> 4534 bytes src/lang/english.txt | 4 +++- src/network/network_gui.cpp | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/data/cmclient-5.grf b/bin/data/cmclient-5.grf index 4cc09957fbf90d711d6f0d4e78b1d7c837c434f2..4ef806766a9945c8252e745571869404b031c320 100644 GIT binary patch delta 229 zcmZ3nfMeAHjt$}Zj9rr>^kwQFh%qvDhpHP0Fy@TsT z;svV3Cl=kvIN@}oq(kh4*p5{v)HXP-a9-iKL3f6B zhggSLhYkw^BO~Jr<_l~G!aGiYg+6pdOo-?__V58a0|SFI0|NsK12+RV!{m?pg&rUs z9Zelh9T6StALPyuJ8^7*=#6Wvj3BV#!3NtE4>ugxA@-7g$JG}%Har9yr_{|#af5?`ns(7vGiK#-B~ zfz<-B8(xfzHv&&+zbL#QdO_@f=n0PlVmCZbXkS>=A$G&@ME!-p9gZDh2OKx(F3|1} z>k#X3e3|rO$BW$;*bZ8C907}b=!lpR(UJFX1v>)+gEIpI0}BH;12+Q$!{o2}`5q_4 zR)}|qb>w#FbU1a)Vq}~lcH-Cz(H*Tfu7RAe;lYL}D;};`wc_E9t1oVBc-SG<;oBkB e;RI2A((=ZE8%H;Ab%>o%ZeC-seT@NQ-F*P+-(}MP diff --git a/grf/cmclient/sprites/toolbar.png b/grf/cmclient/sprites/toolbar.png index 40d24dd3632e8f1b02bd874bae6cf615f0f09851..56faff63e469764f9a91fe620b0a59e9eef2c260 100644 GIT binary patch delta 4046 zcmeB{+orr>EhFRP$?F)?>swk{T6$*u|Nno*iWO6)OerZTNl8ih^QYm@3!4`^1peG% z;4oqMbA{p0ABH~{82%h!P>SQQU|?Y2EbxddW??ot?@_<7sOE;eu<8r<|SIp|}x8L=4%L>t9jIepM$Tgrk}N$kzC z`>nzZGQQa)WQm<;DqEBD`+(C;u3{|_Ydg8H_3U$cSGLU5oyjO0BPzVbHbHU6noq&J zx1-tI)@Hi;i-! zLBd?#)rqb8%CF~nnNB(6aOcN&jbq<^4qh_g+h!I0(0gC&XY&iMef1@HCaqP-Uhfrj z^}r(o&y9?qInEj^e8?+x?#1SftqEJc1sO_3PTIF&<7UwfVTWTjaC4Ly2Jw{5PYQa< z#c5j4c6n>2nPKeI1#m#lx@x@_eV zhlv`O&a!t0q-C>fi5;qP*s}uT*nY;aU?v5XC9~qr}tQzj{ z++k{H<%bZbwO`XV-^~ku_$X-2YhAhN6ZqB4gmczhXY6uZ`?f41zy0inyG2I#lk7ga z9xB}N!uVf$|ny|=Ee z{`)tfkcM3iWs_&E7uWfo${m)-w8HG)B&epHiUc)@=f7RBbheWugr+?c$<@7UG#wixd_2)L*}y{QrK!Uamb?D$j0tzSM4q>AU+0x~<37S8K?uy&&7?FgL;aU(p8 zr(P+sU9APZ?uyJSJj}`t79X@&*7GoC;u?0I7zX9~NV};!?yO4MYo^u}dO%0{C4=(x zzDakZ0;LVLHGTS-zu%g1=8(t6x(&)RJ?yxSPWmfm=5|{Ce!%Rwy*Jd?|7bl>lKM1Z zlgiJv8?{o|Ts}36Tuxlp^>UUyhmH)>v(9TNT31th4nFx3ca%p*&-;Af?PL32_cS-H z_?ftq>GR502EXdNwLbp-=gY2{_w2>wXJ6l19^5mdt>;DZY-O%?H_00_;$q#d?cVXd zac6O;j`M4V$*H>kL=#dsK00Ksll8ydW%>LA0!G#cI#hEO&G20E`rw(xd!O%npS&nx z!-k4GjA|Zk$5u}9+?t?}@iu0WzhS^x_GYUm#*f2!w`Nzxuean}EL=ZLtF2>-f9e(s zW$EY6#T)(n#F|Bq>Ca%&auW+~`Dyb}w)-Ggx!}$cqq%Pw)~%43lO44{_E@~djf^kL zX4u=atl78og3Lx2{{%66-QaA#&G$dgzJ0RZ#9ikeGkdn$v%yl%KX?(p2L!J2O4!Y5e+}o~@>ulin42d7jA`9)nU7Cbd~honjcO4;(YwrXE<| zqgh=1{?N_|5*jm?UMmW?a?M)6)v(s(@%h@@Cw|0k$}^bJE)nh%m+Mw7a{5oi>o517 z>gBl?`?6|BZ=S^NUcIUK#?4^O%?e64Lr#7C+`Luf>vis<%MvPfS_b{@c_z>+eCD02 z(be9v+cIBYTwVSBeSThEzJ1M(-Mjbyf877f`dR(F1Z|_n(wwQ6j@5}uT=i-y)i4Wh zxcPiH|7`AOWv43rPd3X{_nKH8&pu~&>}dj{Sy}Pxldd}i=WA{B+O68MZ$D?9pVj{E zGwUt{pTE}>VE36>N+6}(;lLJ+>2-H4PnT zF5)-W4cmh)_1YZEWZK*N`5BML<{Hj;(ZnWkPV8U>kHHQB=Es&SlZy*}d_3%asC?^l zM(+tGwU0WIid4>XJbQNO=+o61+j>{3u9Qj(GtrT`e=o_v(k#39sEe0Rg?+@l^)CuP z@3l(&v*5Rok9v^W=OgDhZP<@H{42Q6d(CCV{07Nly~xgKYaHsA@~p974?F*%^!jcs z@#crY9}PGCs?qwn@Rs&^0g2%B=NG=+`2Q)PZh8Kah)rR4&j+8E=&!!?xHakI?OS0L zCtk4cxqiL-b@KVmzc(FSzjey;-^TXU#}yvG(~FU{W>HJ^IlbqLANL+MwTD5>E7`-O zSr#UnoG5uyXOM7GeWH)Ou4cX1z2oQm?}}MT#tYx*bJV(fH$iE7m2pF)li>GD!ZYqK zEYNFf;$Ta(;D|Lk-od@ps7zmC=b7KyvySCzpSpj)WA=lZ`@go8*~r=*{-P?*KJi7X zW6kk{$Cu6hd1G#Z>hy`8HsZ55#O^824>+VL!M@Wwp}eTlXZo92hnZ(hEG^9BtDo^@ z)9KU-k*7~wC-$`bK2R}FyN#Ls^2URrKm2#^j@q>%$IO&@QLejzoCnVet!W|GS3b!p z5)k&8(c-sj_pJ~EHmC0A+n1@SFpD=&kepq+BYJ+?q*cAmg#z#So+wE^jxnF1e`3ju zM#ZlCuh{S1oyaZx>O1ezIVD|3e+0^g99*-zp1k9NL=RjSXNjI-FNeMUYl34^s82EYT6U=!PD_m$ace` zxpQ8WpVg}`^IfW?HtB9>!nBP$XWri=>?`A7*DPfC%9}U^*BCMzukHvh zU08UUx!28H&p+F1-%f?cTeB8TYkOs8A)j?F0U+Ezozck z!6Ku)drNyws6VUUz2^Hp=~eDs{H)&bKo^ z?lzaxUiQd`-O+qH)AETA>W!o$C&vmjh`v^CeEF0sd|K3Fugz)4hKN!db4pRnZPvz*&tEUzV7PvgTe)BSjPqrV^(!K_ z*=-7)c}h_KzM6~L(=E%c%6*NRdU)^jwA~8(0+U`V|JXDs;*9EUxRyWpEUahkC zK2hSnYtl@W>5nq^UfB|r@?zV@Qz_ObMArC($8+VV%$Qy|$uBD^!um{b=cA&f%jECw zKJ)9B=;`{bsLiIDJ*(qPUx!L~?lSpWWc5_*eSdnb@qtaME5$4iZ#$`yu=2(`rq>2_ zRSb_m{^i^)ZpP_SS!0y$tMNa5($_}InQu9+^w{UB?)dmxuDz|E*CpeT#+Mm;!)kn# z`a-0ub9r{I=TP+6btL2D(-xjNrh|LG{occXIkw(uql@5{+Cs3 zg?V{XW0Vclg{42=o@-sdyeO+|SIrd_5pc}C&X;b%{ukSZ(bn}?S z8m8UjyL^q*%8GxdmT$4C*S}#rclxwU?l*VS--(^i^)}qR_T{wRy}$P?(PgPWy?t4< z;>&QYupHm+z3(_Z*``gay1qs)c+CyQyvjOO?)m?7-#VUIaJ5cUV#mLpvnSTAm;dl} z!Tn>of)URe1o^V|%gt?93Dil6i5EHZU#)}vJhRw7ySmyZ;?c$dvYIzs42v2)QzkcS z%+=W8vT=dOrFk{gA!aq7p9p3<{o=`4R6pZ|%Ko@_@p^Oj81efQ%WJSH+0C2xVgB{3 zo@lOR^~)FTXYkJ!W_;fC^V*lk=IYfd67SPLzt`IodG?pj#`cU~@fF-YK0f<)X6(oi z4B$xD63fZ9O0u<`_s{jQ_=ZpKGT&tTEWPj|M{6yYS+eLnMCf^SfIGEOCTUW1iBm63NSFP~l`TtU5ucasasmOk}WmVtR_&G~&Y?rsMUzODI zXpxBY>OZEg`^q<3cdR!1YR3KM_~gcm{x);tY)<|!<#phgx$RQFtLVZAF1Nq#n-8pc zcQNaazRicDx=iP5i`k`rGdz1(eeS$v!s&B=^?%&ja%qES=mZ7^1_n=8KbLh*2~7Y$ CMZJFj delta 3358 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 E0Egjr#sB~S diff --git a/src/lang/english.txt b/src/lang/english.txt index 0aed74a4e5..a54dc5ae57 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -5973,4 +5973,6 @@ CM_STR_NETWORK_SERVER_LIST_FILTER_TEAMGAME : CM_STR_NETWORK_SERVER_LIST_FILTER_TOOLTIP :{BLACK}Filter this community CM_STR_CONFIG_SETTING_ENABLE_POLYRAIL_TERRAFORM :Enable experimental auto-terraforming with polyrail -CM_STR_CONFIG_SETTING_ENABLE_POLYRAIL_TERRAFORM_HELPTEXT :Allows to use experimental auto-terraforming mode with polyrail tool (by pressing Fn modifier). \ No newline at end of file +CM_STR_CONFIG_SETTING_ENABLE_POLYRAIL_TERRAFORM_HELPTEXT :Allows to use experimental auto-terraforming mode with polyrail tool (by pressing Fn modifier). +CM_STR_NETWORK_CLIENT_LIST_WATCH_TOOLTIP :{BLACK}Watch this company +CM_STR_NETWORK_CLIENT_LIST_HQ_TOOLTIP :{BLACK}View company headquarters diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index b524146b8a..a854024bfe 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1663,10 +1663,10 @@ private: /* CityMania code start */ auto company = Company::GetIfValid(company_id); if (company != nullptr) { - ButtonCommon *hq_button = new CompanyButton(CM_SPR_HQ, STR_NETWORK_CLIENT_LIST_CHAT_COMPANY_TOOLTIP, COLOUR_ORANGE, company_id, &NetworkClientListWindow::CMOnClickCompanyHQ); + ButtonCommon *hq_button = new CompanyButton(CM_SPR_HQ, CM_STR_NETWORK_CLIENT_LIST_HQ_TOOLTIP, COLOUR_ORANGE, company_id, &NetworkClientListWindow::CMOnClickCompanyHQ); if (company->location_of_HQ == INVALID_TILE) hq_button->disabled = true; this->buttons[line_count].emplace_back(hq_button); - this->buttons[line_count].emplace_back(new CompanyButton(CM_SPR_WATCH, STR_NETWORK_CLIENT_LIST_CHAT_COMPANY_TOOLTIP, COLOUR_ORANGE, company_id, &NetworkClientListWindow::CMOnClickCompanyWatch)); + this->buttons[line_count].emplace_back(new CompanyButton(CM_SPR_WATCH, CM_STR_NETWORK_CLIENT_LIST_WATCH_TOOLTIP, COLOUR_ORANGE, company_id, &NetworkClientListWindow::CMOnClickCompanyWatch)); } /* CityMania code end */ this->buttons[line_count].emplace_back(chat_button);