From 432b01539d0d613093ad9300cd941b34c6762053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Wed, 7 Dec 2016 07:16:17 +0800 Subject: [PATCH] Added to show the team logo when choosing team. --- PokemonGoIV/0Main.vb | 18 +++++- oxt/AddonConfiguration.xcu | 6 +- oxt/PokemonGoIV/0Main.xba | 18 +++++- oxt/icons/team-instinct.png | Bin 2028 -> 0 bytes oxt/icons/team-instinct.svg | 82 ++++++++++++++++++++++++ oxt/icons/team-mystic.png | Bin 2319 -> 0 bytes oxt/icons/team-mystic.svg | 121 ++++++++++++++++++++++++++++++++++++ oxt/icons/team-valor.png | Bin 2390 -> 0 bytes oxt/icons/team-valor.svg | 87 ++++++++++++++++++++++++++ 9 files changed, 323 insertions(+), 9 deletions(-) delete mode 100644 oxt/icons/team-instinct.png create mode 100644 oxt/icons/team-instinct.svg delete mode 100644 oxt/icons/team-mystic.png create mode 100644 oxt/icons/team-mystic.svg delete mode 100644 oxt/icons/team-valor.png create mode 100644 oxt/icons/team-valor.svg diff --git a/PokemonGoIV/0Main.vb b/PokemonGoIV/0Main.vb index 6edd1aa..de8e044 100644 --- a/PokemonGoIV/0Main.vb +++ b/PokemonGoIV/0Main.vb @@ -93,9 +93,6 @@ Function fnAskParam As aFindIVParam oDialog.getControl ("cbxBest3").setVisible (False) oDialog.getControl ("lstApprasal2").setVisible (False) - ' TODO: To be removed. - oDialog.getControl ("imgTeam").getModel.setPropertyValue ("ImageURL", fnGetImageUrl ("TeamValor")) - If oDialog.execute = 0 Then aQuery.bIsCancelled = True fnAskParam = aQuery @@ -609,10 +606,15 @@ End Sub ' subRdoTeamRedItemChanged_itemStateChanged: When the team is selected. Sub subRdoTeamRedItemChanged_itemStateChanged (oEvent As object) Dim oDialog As Object, oList As Object, oText As Object + Dim oImageModel As Object Dim mItems () As String oDialog = oEvent.Source.getContext + oImageModel = oDialog.getControl ("imgTeam").getModel + oImageModel.setPropertyValue ("ImageURL", _ + fnGetImageUrl ("TeamValor")) + mItems = Array ( _ "Overall, your [Pokémon] simply amazes me. It can accomplish anything!", _ "Overall, your [Pokémon] is a strong Pokémon. You should be proud!", _ @@ -667,10 +669,15 @@ End Sub ' subRdoTeamBlueItemChanged_itemStateChanged: When the blue team is selected. Sub subRdoTeamBlueItemChanged_itemStateChanged (oEvent As object) Dim oDialog As Object, oList As Object, oText As Object + Dim oImageModel As Object Dim mItems () As String oDialog = oEvent.Source.getContext + oImageModel = oDialog.getControl ("imgTeam").getModel + oImageModel.setPropertyValue ("ImageURL", _ + fnGetImageUrl ("TeamMystic")) + mItems = Array ( _ "Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon!", _ "Overall, your [Pokémon] has certainly caught my attention.", _ @@ -725,10 +732,15 @@ End Sub ' subRdoTeamYellowItemChanged_itemStateChanged: When the yellow team is selected. Sub subRdoTeamYellowItemChanged_itemStateChanged (oEvent As object) Dim oDialog As Object, oList As Object, oText As Object + Dim oImageModel As Object Dim mItems () As String oDialog = oEvent.Source.getContext + oImageModel = oDialog.getControl ("imgTeam").getModel + oImageModel.setPropertyValue ("ImageURL", _ + fnGetImageUrl ("TeamInstinct")) + mItems = Array ( _ "Overall, your [Pokémon] looks like it can really battle with the best of them!", _ "Overall, your [Pokémon] is really strong!", _ diff --git a/oxt/AddonConfiguration.xcu b/oxt/AddonConfiguration.xcu index 32a65b9..96afac1 100644 --- a/oxt/AddonConfiguration.xcu +++ b/oxt/AddonConfiguration.xcu @@ -36,17 +36,17 @@ - %origin%/icons/team-valor.png + %origin%/icons/team-valor.svg - %origin%/icons/team-mystic.png + %origin%/icons/team-mystic.svg - %origin%/icons/team-instinct.png + %origin%/icons/team-instinct.svg diff --git a/oxt/PokemonGoIV/0Main.xba b/oxt/PokemonGoIV/0Main.xba index f14bfcf..a7f17d6 100644 --- a/oxt/PokemonGoIV/0Main.xba +++ b/oxt/PokemonGoIV/0Main.xba @@ -95,9 +95,6 @@ Function fnAskParam As aFindIVParam oDialog.getControl ("cbxBest3").setVisible (False) oDialog.getControl ("lstApprasal2").setVisible (False) - ' TODO: To be removed. - oDialog.getControl ("imgTeam").getModel.setPropertyValue ("ImageURL", fnGetImageUrl ("TeamValor")) - If oDialog.execute = 0 Then aQuery.bIsCancelled = True fnAskParam = aQuery @@ -611,10 +608,15 @@ End Sub ' subRdoTeamRedItemChanged_itemStateChanged: When the team is selected. Sub subRdoTeamRedItemChanged_itemStateChanged (oEvent As object) Dim oDialog As Object, oList As Object, oText As Object + Dim oImageModel As Object Dim mItems () As String oDialog = oEvent.Source.getContext + oImageModel = oDialog.getControl ("imgTeam").getModel + oImageModel.setPropertyValue ("ImageURL", _ + fnGetImageUrl ("TeamValor")) + mItems = Array ( _ "Overall, your [Pokémon] simply amazes me. It can accomplish anything!", _ "Overall, your [Pokémon] is a strong Pokémon. You should be proud!", _ @@ -669,10 +671,15 @@ End Sub ' subRdoTeamBlueItemChanged_itemStateChanged: When the blue team is selected. Sub subRdoTeamBlueItemChanged_itemStateChanged (oEvent As object) Dim oDialog As Object, oList As Object, oText As Object + Dim oImageModel As Object Dim mItems () As String oDialog = oEvent.Source.getContext + oImageModel = oDialog.getControl ("imgTeam").getModel + oImageModel.setPropertyValue ("ImageURL", _ + fnGetImageUrl ("TeamMystic")) + mItems = Array ( _ "Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon!", _ "Overall, your [Pokémon] has certainly caught my attention.", _ @@ -727,10 +734,15 @@ End Sub ' subRdoTeamYellowItemChanged_itemStateChanged: When the yellow team is selected. Sub subRdoTeamYellowItemChanged_itemStateChanged (oEvent As object) Dim oDialog As Object, oList As Object, oText As Object + Dim oImageModel As Object Dim mItems () As String oDialog = oEvent.Source.getContext + oImageModel = oDialog.getControl ("imgTeam").getModel + oImageModel.setPropertyValue ("ImageURL", _ + fnGetImageUrl ("TeamInstinct")) + mItems = Array ( _ "Overall, your [Pokémon] looks like it can really battle with the best of them!", _ "Overall, your [Pokémon] is really strong!", _ diff --git a/oxt/icons/team-instinct.png b/oxt/icons/team-instinct.png deleted file mode 100644 index 45b58d9c20b5cff098937db7bad67f386b8a03b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2028 zcmV-P)@L%o3)6h@G~m9U>j3wp5&gNkBRZjBN#U z&{{1mXhB8`>X(`sN??K3iH=pK1cOs(aVoZ00)bFwXhj6_#(==K=X#HYll7KEyEH!5M9xoP2}wMk!rg|h!(jjla1&HD7(exZSSzsvjCy` z;5RdJOa3fv!GqS?j7gG6WZHq~yVpKTnRBJicbgcUDY#=n8W5@UpZDw~e{M_11LH?L zhg7XaPGR^E`^1h9^Sp=XlXgLL4*;jiJz<}G16PU=W+KE?rBcP+JtW(A0OlqDS`Me* zB97xY`Jw6#-*(3jCqGo3sPWB@*LaQ#-o5JT8+JVQry-MdKd>L*(&-&pmZ$a3@bGw+ z9~wI4TBTU-tJKO@{N9`W8P#{Isi%uyHv)Vku%ODl+VDblV0+p8~L<6Q~58gM!aOkt-{szAaC zP5jeX=3a%5MOg{tb#ic4kUzMp)kgH38gofpegKG~_W&b1HmVYIh%RNKhP&l~?g6$* zYmI-h;BHTOc!%r~kxi&RuW)mB<|w}s$WdW2ASwDQB0OvrM1t2Ps_Ov+;63psGCUg; z7I#NmDy$G?F)$Tq0n*w6!(xF|z?ZtQJD9L^UV47?WKSeydZel88nFVAC89DH2&FOx zuBHQpZP_KI!25s*+^20hnIgKuZi(LB8*n{FFm}{4#!?;zDFue5s6!aOgX%1hR+Jy% z>U|hlsqnGDX@L_i%o4c2%ZsU2DrUVivHAUe0xWajq1HAY6Hg-Ky+>6S05bs#I0!TY zlLVR+cBt@?D2qULg02Cr5tV7Bb9$}5d1~m}yo)^BYO44MD%4qdmC`PxTw1|AvM2KxX9J<{MKh+nyMC))s4=KpBu| z*GxzzYl`ha^lQ#7;lHQ)ZiZzTr+i>EQ&;9g^t@}?YrEAKgc__sWU=eIg+OI{@kD`V zY>nnwfynkYN=%kZja$Yj?lhyZn+FDP#6!&}(?IW!G;W>#=}xRH5jiDB=D9|S1+rr% zJ@?c0TPnW>nc+(MhXdk4fM{KCRKnsd01@)_1kM!wW*yFg>xh*wrD@5H76yD0n zDV>v~JRw8kEuQnhU+qBTjwH^j3r>Z40K>l|Bt?*y6;b^LE?s>nd~IndgS+#6r%&)tOSk5NYMsNVp` zM0EA#GnIAk2s(ECYtxj`PcI=gFpRV^Nla?(}Du zyxrg19n)V!e|G6RqVl@Jl2HBj{4V|0bvFPcjJ0AQ*H30Z#%etZvPzS!|#CqVAq8p&h z2@j1fLl`f}lfAjV`^*7y)555VK87$pT%W#HM4tu@`f@%jXAq=Mt?s&Qupzh?bOxXX z_jYg2!UKch*DzQj`bgW+Q-Xs9ZcqXGvrCUCJcpHdod3(`Nd5y&Z6B=qwCGd-0000< KMNUMnLSTZ2JkhcM diff --git a/oxt/icons/team-instinct.svg b/oxt/icons/team-instinct.svg new file mode 100644 index 0000000..f255e59 --- /dev/null +++ b/oxt/icons/team-instinct.svg @@ -0,0 +1,82 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/oxt/icons/team-mystic.png b/oxt/icons/team-mystic.png deleted file mode 100644 index 7523dfa76335255ca259cb41720df9f4e84b541b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2319 zcmV+q3GnubP)RzZT?mT~f?sa7Az-_j8CU=@iuL8coZW*_S#qh3pEOAod zgZj-{OXQUN z$&HA^kDPItq^#tgEKpphmQnkwq>$AK>cUn?^g4c5r?Y|xZ`4B!yKhTM}vtxi@W zxD+^|EHRY1iDA=-*UJ})XL4sc(+p(Oh3z-=5-0|C9#FuvE-JY-#oOvPN~kB#pP&7y zncY`bN`jXRZ3CN(u{mf;o!^gOb~>_0yA$33js=b`lYLWXb83<;=op<)c$H)`fN>bl zAiFQDseg(^-TU>%eW^sebh%7F2Kxr^0b-4Z9?aL4+WdTMJ20Y*;QMrS&IfJ9abd7D z{azn}y^6rSz{!=`VvcJSaVM}Haes``ngcDPKJD=*Gud--=5;PjJ>A>N1$$2>a#sRZ z0DBC6Be<(V`MgZ`dIh&4zr6mV9%F0(1$YOk6|)mTCzX3uVw${YQlV+&YvnEL^<%RY zSq;!jFjzYBZ@@w`ZXPyw_fZ8G+t4p90A5G5fx9&Fqt$&Fl`9C4$h7?)^h2Nns0Cb^ zJ96g6<(o#d0@z|);$U`iP@CS6>})$Ol0E<&9uq=8^qf3=*<$g3#hB$cafr5y^1vwMMlQY=ROgd-Wy-ibU&Zl?x7{+ z=cuq7s*wX*7c{3=_O}iosO7`=cxDqpYlPMVpY{uxHEiLYV-7vF-3J^kaT)L?&}y>D zz%h~8nw~hnVejb}Q~K4~hWL}g>agg|s3n|+Ec!wkAUI80ie$nXvRyDW(Upb zEdcQa*)v?pZU{?eXsD9Y&5eYe5t!oG+2TTNHQkths)~UGI4@IE9lnlMKI`T#fK)X zMojI^7E?UO%fPeUmMwH0$R2QyjG2<|kPzk$aYzhQFxKC2NCaSi+y@9+Qu6>3nOp|Q zW4c|DU5$a0n-Rgq-HZ3Yi=^3JOxKi(_AYR|WV6ggXPInM(3EwM!bOIk_t7h&d2xdjIzucqrFOl-h*B7&J7?~ z5vErwSl@+ z#CAW$7bA7u#XbFu`^81cO!lf6y#0A~E4SDfFqaJm!NK(1KzVEHF~(D2iZSd+VSfzd zP6ZHpfkk72K@kjt1FI14TIA*og`iduIE#J;4E8gM?>x5>-26hRa6zScup&XNI4_8T@L~NsT1zRO$xd{*JAijVS>VK=Id##H2?EqKw0%30 z9(Lv?^}Hzldp0MDzz+yu0q-A~$!} zuy{WCR2eydbDR|#tL7X|!5$R$y&d3ZJO9hswz%JpbwLS+Ebn zn&NOZj_#!**~>rZu?l@^B)pS ztXTVC*>%?sgHo`jq5b$s(K|pb=m9ym-by+bM+|W;P~ROI7(7sdhdeY)*l1t^a6J`X zz5oOp!sgW3)z%)Af>P;1uv%n`f|k@`n@QYHwT(4tawKjs<5*x0kPystFjG_&rB7*3 zw&e2y1~n{1W@7=&xrYI?nnKWAe``>anrvvNK?+5S3^om>UKzh7`Ih?r-)j0`P%Tbm za?b+igvHosEg!z8V$6cQCsVWu@@%Aa-N*Hn;>z&5uqAaxrQ2gj1QQE$<03a`X=dc8m^Y)F4T=X(%ZP=W;elP{gk;vpG pfL#R9S1~(a=uPKo?NDaLe*%ec*UJxl9oPT>002ovPDHLkV1g2tRbK!A diff --git a/oxt/icons/team-mystic.svg b/oxt/icons/team-mystic.svg new file mode 100644 index 0000000..e193049 --- /dev/null +++ b/oxt/icons/team-mystic.svg @@ -0,0 +1,121 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/oxt/icons/team-valor.png b/oxt/icons/team-valor.png deleted file mode 100644 index df5bbcb630def1f684e94b456d3aaf82a581ab72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2390 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 IM6N<$g0DxBWdHyG diff --git a/oxt/icons/team-valor.svg b/oxt/icons/team-valor.svg new file mode 100644 index 0000000..35452ac --- /dev/null +++ b/oxt/icons/team-valor.svg @@ -0,0 +1,87 @@ + + + +image/svg+xml \ No newline at end of file