From eade5a14734d92c04f5669a577321318f99a47d5 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Mon, 16 Apr 2018 15:33:23 +0000 Subject: [PATCH] lazMapViewer: Add Hi-DPI palette icons as .res, remove .lrs git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6309 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/lazmapviewer/images/imagelist.txt | 6 ++ components/lazmapviewer/images/make_res.bat | 1 + components/lazmapviewer/images/tmapview.png | Bin 0 -> 1318 bytes .../lazmapviewer/images/tmapview_150.png | Bin 0 -> 2028 bytes .../lazmapviewer/images/tmapview_200.png | Bin 0 -> 2822 bytes .../lazmapviewer/images/tmvgeonames.png | Bin 0 -> 991 bytes .../lazmapviewer/images/tmvgeonames_150.png | Bin 0 -> 1534 bytes .../lazmapviewer/images/tmvgeonames_200.png | Bin 0 -> 2032 bytes components/lazmapviewer/lazmapviewerpkg.lpk | 9 ++- components/lazmapviewer/lazmapviewerpkg.pas | 5 +- components/lazmapviewer/source/mvgeonames.pas | 13 +---- .../lazmapviewer/source/mvmapviewer.pas | 8 --- .../lazmapviewer/source/mvmapviewer_icon.lrs | 54 ------------------ .../lazmapviewer/source/mvmapviewer_icons.res | Bin 0 -> 11096 bytes .../lazmapviewer/source/mvmapviewerreg.pas | 28 +++++++++ 15 files changed, 46 insertions(+), 78 deletions(-) create mode 100644 components/lazmapviewer/images/imagelist.txt create mode 100644 components/lazmapviewer/images/make_res.bat create mode 100644 components/lazmapviewer/images/tmapview.png create mode 100644 components/lazmapviewer/images/tmapview_150.png create mode 100644 components/lazmapviewer/images/tmapview_200.png create mode 100644 components/lazmapviewer/images/tmvgeonames.png create mode 100644 components/lazmapviewer/images/tmvgeonames_150.png create mode 100644 components/lazmapviewer/images/tmvgeonames_200.png delete mode 100644 components/lazmapviewer/source/mvmapviewer_icon.lrs create mode 100644 components/lazmapviewer/source/mvmapviewer_icons.res create mode 100644 components/lazmapviewer/source/mvmapviewerreg.pas diff --git a/components/lazmapviewer/images/imagelist.txt b/components/lazmapviewer/images/imagelist.txt new file mode 100644 index 000000000..7b0f87733 --- /dev/null +++ b/components/lazmapviewer/images/imagelist.txt @@ -0,0 +1,6 @@ +tmapview.png +tmapview_150.png +tmapview_200.png +tmvgeonames.png +tmvgeonames_150.png +tmvgeonames_200.png diff --git a/components/lazmapviewer/images/make_res.bat b/components/lazmapviewer/images/make_res.bat new file mode 100644 index 000000000..6cb966f51 --- /dev/null +++ b/components/lazmapviewer/images/make_res.bat @@ -0,0 +1 @@ +lazres ../source/mvmapviewer_icons.res @imagelist.txt diff --git a/components/lazmapviewer/images/tmapview.png b/components/lazmapviewer/images/tmapview.png new file mode 100644 index 0000000000000000000000000000000000000000..8854c6c24487475af868df9ef5001ebb1ff340b9 GIT binary patch literal 1318 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 N002ovPDHLkV1gLn#?b%( literal 0 HcmV?d00001 diff --git a/components/lazmapviewer/images/tmvgeonames_150.png b/components/lazmapviewer/images/tmvgeonames_150.png new file mode 100644 index 0000000000000000000000000000000000000000..1fe13f4794ff48fb8a0b2d0cc74221e9c08b7d9c GIT binary patch literal 1534 zcmV8U5b?&)ORYBx*i5HOJUsg>U>-K(AhX>DZ~W zUak9{hNfqOuTW*>LrxygVgBr?#P0f<%a_j6*x2$mH5gDqK|TxTPs7onCt)E$JgB%& zR%Qx*z8;KmvLQZpD=L-p^#JWpie~y$SFCMpIeGdz$A2zl;J~4LzHuk#^Y0TL5yioj zM0}^YQ(9Wmwm_-L32gduEqf2-5)!tRzE=G-;$pE0o?h>AB>NnL2HO$n?@3ivW!nJV zE-oT8cp1@gX*fB%zfda{n-IA<4l8R3>qC~e4bb*&8+gaZAJ@?yTCoo5282enhR@j8 zmJA?X$dd$qba=W;Q+r>qcmX^>VVil%&#{e*?uEKKpT#PEpHS%3YdvNi> zIi0mdI=y*bn_G}{s*q}984v*;Rj z4kNMX)?KS^tDCw@7js-($8k7qpN7BDv^@_ZW0>GDiXS%ZLg_MABVJQeO-}Yi@-7I@BcAO{o%H$kMNhC302YDxQaddJcBkLCiNM$dqXOOqOAPCI=Ac#}H z-r|!L;Rr@X)YjHeUVe|^Bb-S;a+ah6xq4y104vnoI(F=Y_Y_~er}(07XuvOE0Yiok zf2kS<1!`_#8@9J9uT6j|m9X}NTE9?-Jr}6xMj-_S`ADTh7&Lg8M(p9k2iz zCatxNEn=|=0Cj4(P};iBJ)KRxZ|}Ekjtr(!@sP-fRiqu)=3V@_N zJ9$*8Xcd57AeBnVk<1jLVp0j1xsaInbR@O|wGurhyiI)EwiZp2x}r0I<3lujZn8sU ztQKL}<<5(NO70dTli4?&q#}_R$5CUnCUJHd%azL)T697ys(ax$;3!7I)9)`2`y}p^ z57p9Y0SQJ%)YsPoaPoK#f&QL&O|YY^OwO8>i%5ulx+)(o{*>65EqZ|v8o4HSVMPBY z7dMMea!f>zsrkoDOR5EAWz~D>13`OU-0Wh_@OUnF4W zLWT|-p%J%paAc6`$(FaXAIbidAL(Ldt`{oria+m<3#Is;J&#qLS`Gvtkw}q9q&j0= zyLQtUk8*O;3j>gMX(qdt4j}ZqoabtU*YU$@h}CJX-hBc+sLyX)mpjpjfVB7T6yLX_ kuHN+Z0=T|yLTi&|&+7sc-aUN*Y58z~hO{Lz5! z2CwFtc%)F^|E+?bui2M!1u_n%;O1zdmss6&Q}ly6c{N9J(kVGrNX4acZr%Ekuuwm2 zZS5E*31plk5L44$osQe(0%~exZ24pj*@q7RFvNa1A`=k+-Mbs|ufjYI?B9)viHP}8 z%b34#IVL~ZJAy8~g)-Aq2^{ZA;qhFS#>8@>M9z`?^F+*xMj#N7yeE&7r43{pDq;K^ zQ`q*Gj|raSL3P#T4(I4H0g1b|6aC&F7~wIRV?{FFkNya;wXF(IAQ0f{=1Ic#WcD2_ zr1eeiCM43WTj!RUSZu@2T^U@zc7;#lKhnw9yMUzKU(nbfXG3fP z#>PFLD~6+!JK=Ms>`C28ZEdAiuHFTt|1$|suQ7Oe`>C}Xoj$?jq`y<3RMKbT3WT?B zspTz_u0*L+l9`^WHJ@GuT)%#W@^ht33JO(gH_pw%D%6i*WhWU6nC;ktIM5T}ofZ|Y zg=IfHJbgKuo250U-UP_yRb-{7p;Rg{=_#W8Tq)(}N~x)lQ75maPF{`a`e;xn+WB>> ztwfagH?=WcT|KF;`nT4+f_CSD7uXBMZ(7BU&*L@Pje%A`pvIO8%>L=O$kYr2;nVyN z9^B{t{d?Hj+L62`53$XF_In|vLVs`KsKqO=u^GtP)r;7OE&;dccafjuZ!4zs1rs;JvdR6uh!l&XE9A% z|G|H(ZTT;7Z+tMSeCWdIusrUClc!ZQXc{O{}zJ8%NTjJMZZf?n&Av3k| z^e(_(62xd9f8sZ-qNYanTrtv8cJh6GHt&D9PUjh+OEz<#B_v{KWJF|mFb(y!o$}4i z$za_YDFNeynG^AzPJWjN5L?^w)z|4X-};d$lfB5vKB&{@-o3kQ-Mo&dd7(JFc#yC? z8KF>jd0loMaC09;`gf-gi*1OS7s|8{Us995;_8)plu9M=^m%{j;#m^@9E<-Ld$w@Uu=z0M^M^$A7r;3kJkbjumBbmgkjKlVIJI44;z}(zYr@uM@zgSlSV9;O( z1`T$gyP+X@xmid*So6X$UrJwS#>@z68lLDS)^Dt}_zU6P@1AhEN%?%v&-@jj^9m@H zO0Hh1=f;hz&zG=^p;f?{vXe;s9GDvHO-PUzZ%CY|lwDHGogWcGWO#79xv)?_u3o9v zU$ttWQ9w&eGYj5*i+?+8fRq{j}afB9Up^ICjGlq)}l=qrzyYujS^=ChFwX)YsLt^IN`h<8xhw3w2|$ z?o)+b|Fdm#2Es@9Ii*lm6{yiqqW~+h4ULU;ZR4?HCld7L4CL}EZr{Ge{=MHIT^Oda zCfrAO)2mk>zR%C@lz_(yLy9V<6X5bq+nmRsY?@p9(a@y+)TUK{kFSJ7nS0xghGYFF zF*$e!efwGgFh6P;S=pyKn5DXCm&U~M*{ACf3Ol!_$~zaqILBnV8$19Yz$KBqvyobT zGzxHW9m&vP&Mb(WO3BINTsVJ*t((^&lU>Bh>NTxF9i7~H&1L}Q<)xhxP|+}&o2^!i zvd_fSxCxhmM>&4sZLL09-^ANKPvOfQTZsQ;H3ETvk)FO}9x74WE+01Bm7YCK+Qv(l z$I^1U86%?}of2{M+#LL!chlSC8b8!bp!u%$*1T2$J$e`uy<|PnOV;a5yfh}Z-FS%o zaFWt;J5X|a6r6vDnPWC$YTU%WqP05tuiR#?xwSv#a)0{wl2cYaQ72#UDts&9`1)}k zD~!0@`1CYpYk3iK(KXK2N&v7nmocDkImMTs>3XZ2$bN13{bP?;0RIDT+Mecve)Mbr O0000 - + @@ -29,7 +29,6 @@ - @@ -54,7 +53,6 @@ - @@ -65,6 +63,11 @@ + + + + + diff --git a/components/lazmapviewer/lazmapviewerpkg.pas b/components/lazmapviewer/lazmapviewerpkg.pas index f82c60b07..31bb1d40c 100644 --- a/components/lazmapviewer/lazmapviewerpkg.pas +++ b/components/lazmapviewer/lazmapviewerpkg.pas @@ -10,14 +10,13 @@ interface uses mvCache, mvDownloadEngine, mvdragobj, mvEngine, mvGeoNames, mvgpsobj, mvJobQueue, mvJobs, mvMapProvider, mvtypes, mvmapviewer, mvextradata, - mvDLEFpc, LazarusPackageIntf; + mvDLEFpc, mvMapViewerReg, LazarusPackageIntf; implementation procedure Register; begin - RegisterUnit('mvGeoNames', @mvGeoNames.Register); - RegisterUnit('mvmapviewer', @mvmapviewer.Register); + RegisterUnit('mvMapViewerReg', @mvMapViewerReg.Register); end; initialization diff --git a/components/lazmapviewer/source/mvgeonames.pas b/components/lazmapviewer/source/mvgeonames.pas index 0e30a501d..a39634c84 100644 --- a/components/lazmapviewer/source/mvgeonames.pas +++ b/components/lazmapviewer/source/mvgeonames.pas @@ -45,8 +45,6 @@ type property OnNameFound : TNameFoundEvent read FOnNameFound write FOnNameFound; end; -procedure Register; - implementation @@ -68,16 +66,11 @@ end; Type TResRec = record - Name : String; - Descr : String; - Loc : TRealPoint; + Name: String; + Descr: String; + Loc: TRealPoint; End; -procedure Register; -begin - RegisterComponents('Maps',[TMVGeoNames]); -end; - function TMVGeoNames.RemoveTag(Const str : String) : TStringArray; var iStart,iEnd,i : Integer; tmp : String; diff --git a/components/lazmapviewer/source/mvmapviewer.pas b/components/lazmapviewer/source/mvmapviewer.pas index 6c42a015e..50fc85907 100644 --- a/components/lazmapviewer/source/mvmapviewer.pas +++ b/components/lazmapviewer/source/mvmapviewer.pas @@ -138,22 +138,14 @@ Type property OnMouseUp; end; - procedure Register; - implementation uses {$IFDEF USE_LAZINTFIMAGE} Math, FPImgCanv, FPImage, LCLVersion, {$ENDIF} - LResources, GraphType, mvJobQueue, mvExtraData, mvDLEFpc; -procedure Register; -begin - {$I mvmapviewer_icon.lrs} - RegisterComponents('Maps',[TMapView]); -end; {$IFDEF USE_LAZINTFIMAGE} // Workaround for http://mantis.freepascal.org/view.php?id=27144 diff --git a/components/lazmapviewer/source/mvmapviewer_icon.lrs b/components/lazmapviewer/source/mvmapviewer_icon.lrs deleted file mode 100644 index 0a19bbd24..000000000 --- a/components/lazmapviewer/source/mvmapviewer_icon.lrs +++ /dev/null @@ -1,54 +0,0 @@ -LazarusResources.Add('TMapViewer','PNG',[ - #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#24#0#0#0#24#8#6#0#0#0#224'w='#248#0 - +#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167#147#0#0#0#9'pHYs'#0#0#11#19#0#0#11 - +#19#1#0#154#156#24#0#0#4#127'IDATH'#199#165#150#217'n'#20'W'#16#134#191':' - +#231#244'63'#158#5#143#205'"c'#2'Al'#10#216'(w'#201#3'D'#17#202#211'"'#30'!' - +#185#9#138#29#161#128#162#160#16#2'x'#155#177#199#179#245#222#231#228'b'#198 - +'c'#6'B'#20'%u'#211']'#173#174#255'T'#213#255'Wu'#203#147#221']'#231#128'@k' - +#186#181#144#184'(8I2.D!'#183#186'-'#146#188#228#217#209#9#255#213#12'@d4_^Y' - +'C'#128#131'I'#194#141'N'#11#17#8#148'b'#130#163#29#250#12#179#28#231#254#30 - +#196#211#138#210':'#220#252#5#1#206'^U'#206#193#221#181#14'''IF'#229#28'F'#9 - +'u_'#19#25#141#3'V'#195#128#245'z'#180#0#215'"l4'#235#212'<'#131#3#26#190'G' - +#168'5'#206'9D'#160'r'#142#235#157'&v'#30#160'.'#173#212'8'#156'$'#212'='#195 - +'o'#199'C'#154#129#191#148#169#18#225#221'x'#186#240'WB'#15#173#20'qQ"'#192 - +'8/'#24#229#197','#198#205#18'8'#156'&'#172'F!'#14'PqQ'#2'0'#201#11#250'q' - +#202'(/'#22#167'3/'#213'('#189#240'Gi'#193#171#193'h'#225#203#156#191#11#181 - +'`'#6'('#130#167#132'['#221#22#129'V'#168#202'Z'#140#18#6'i'#142#18#225'Eo' - +#192#193'4Y'#0#148#214#145#149#229#194#183#206#161'E'#150'8'#168'y'#134'A' - +#146#1'p'#183#219#230#254#250#5#4#161#29#5#168'n=$'#173'*.7"'#30'\\E'#139'0L' - +'s'#206'0Jk'#153#230#179'v'#156'U'#20'z'#134#134#167#169#220#140#216#180',Y' - +#171'G<'#188#212#165#19#5#243#170#133';'#171'mLd'#12#235#181#136#131'I'#140 - +#136#176'^'#143#24'e9'#130#144#219#138#231#189#1#145#167#201'+;S'#140#18#238 - +#172'D'#248#190#225'('#171#168#156#165#27#133'h'#165'(m'#181'T'#153'u'#14#181 - +'V'#11#17#129#180#172'(l'#133'u'#142#172#156']'#159#190#235'1'#201#11#174'4' - +#235#139#128#205'f'#157#17#130'C'#209#9#3'6'#155#13'j'#158'!'#208#138#186#231 - +'}$a'#5#240#250't'#194#222'8'#230#179'V'#147#154'g'#200'+'#203#211#189#30#213 - +#156#236'W'#131'1F)'#2#163#169'{'#30#135#211#148#10#136#188's'#242#229#3'^' - +#150#6#237#222'Z'#135'v'#24#160#4#174#183'W8I2FY'#190#164#148#150'o'#176#14 - +#178#170#226'j='#164'H'#19'"'#223#195'ZK^'#20'h'#165'p'#206#225#251'>UU!"h' - +#173'QY'#158'3'#156'N'#241'e'#150#237'/'#189#1'Z'#132#15#135#246'8'#201#216 - +'l5 '#137'I'#135'C'#252'0b'#146#164#140#227#152' '#8#240'<'#15#223#247#24#156 - +#158'.'#218'y|2'#192#4#190'O'#0#164'E'#193'8+8'#142'S*'#231'x'#191'`'#7'l' - +#214'B'#142#147#140#161#21'"'#17#252#188'@'#128#195#211'1'#27#8'e'#158'S'#139 - +'B:'#237'6'#206'9'#242#162#160#211'n'#161#242'|'#222#10#165'x'#222#31','#250 - +#254#161#137'o'#184#216#136'X'#247'=\'#16'r'#146#21#216'$'#230#218'j'#135#192 - +'h'#162'0$'#207#11'D'#4#17'!'#240'}'#140'R'#24#223#247#249#225#205#1'F'#169 - +'On'#196'P'#11'+'#206#18#26'M'''#10#184#28#248'T'#214'2'#173','#206'A?I'#209 - +#2'W'#218'-'#246#143#250'xF'#211'\Y!'#1#204#143'{='#174#214'Cz'#147#148'J'#9 - +'JdiU `'#16'|'#223''''#142#19#130#192#167#172','#198'h'#166#195'1Q'#24#240'v' - +#18'SX'#199#197'f'#131'WY'#201#26#138#184#223#231'u'#238'PYY'#241#199'8%'#21 - +#184#223#237#240#237#214#22#29'-'#139'V='#218#218'&'#174','#189'i'#194#149 - +#171'7X]'#223' '#201'RF'#163'1wn'#222#225#218#198'u'#190'y'#176#133#0'?'#237 - +#247#177#206'1*J'#250'N'#211'4z&S'#165#4'_+TY'#0#240#213#253'-^'#190'}'#197 - +#205#141#235#11#146#183'n'#223#227#241#206#14#235#129#199#198#213#207'y'#251 - +#231'K'#0#30#239#236#160'Dx'#180#189#205#147#221']'#0#10#231#232#134#1#158 - +#146#217#1#206'9'#226#162#196#206''''#241#244'x'#159#246#234'e'#190#255#245#5 - +'_'#223#190#187#180#186#147#185#190#178't'#182#220#190'{'#248#16'`'#1#14'PT' - +#150#189'I|>hg'#193#207#142#6#179#224','#227#224#232#29';'#251#253'%'#178#31 - +'mo/'#238#27#245#8#128#159#127#127#201#155#209#228'c'#213#1#155#173#198#249#1 - +#239'[YYv'#143'z'#31'=?'#203#242#209#246'6'#251#201'L'#222'o'#134#227'O'#174 - +#137#192'h'#228#201#238#238'B2'#13#223#227#139#245#14'/z'#167#12#223'['#21#31 - +'Ze'#29'J'#132'O'#224#158#15#168's'#231#21#184#249#242'z'#209';'#229'4'#203 - +#249#167'X'#173#228'_'#253'Q'#136#8'K'#211'U'#148#21'qQ.'#190'X"'#194#255#181 - +#191#0#1#137#23#12'Mu'#148#1#0#0#0#0'IEND'#174'B`'#130 -]); diff --git a/components/lazmapviewer/source/mvmapviewer_icons.res b/components/lazmapviewer/source/mvmapviewer_icons.res new file mode 100644 index 0000000000000000000000000000000000000000..326f436e7e0d2c4431e142177d08ff719301b515 GIT binary patch literal 11096 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 R<+PH!AMAf?|9`WE{{zw|Wa