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

@@ -0,0 +1,6 @@
+tmapview.png
+tmapview_150.png
+tmapview_200.png
+tmvgeonames.png
+tmvgeonames_150.png
+tmvgeonames_200.png

components/lazmapviewer/images/make_res.bat

@@ -0,0 +1 @@
+lazres ../source/mvmapviewer_icons.res @imagelist.txt

components/lazmapviewer/lazmapviewerpkg.lpk

@@ -10,7 +10,7 @@
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
-    <Files Count="13">
+    <Files Count="14">
       <Item1>
         <Filename Value="source/mvcache.pas"/>
         <UnitName Value="mvCache"/>
@@ -29,7 +29,6 @@
       </Item4>
       <Item5>
         <Filename Value="source/mvgeonames.pas"/>
-        <HasRegisterProc Value="True"/>
         <UnitName Value="mvGeoNames"/>
       </Item5>
       <Item6>
@@ -54,7 +53,6 @@
       </Item10>
       <Item11>
         <Filename Value="source/mvmapviewer.pas"/>
-        <HasRegisterProc Value="True"/>
         <UnitName Value="mvmapviewer"/>
       </Item11>
       <Item12>
@@ -65,6 +63,11 @@
         <Filename Value="source/mvdlefpc.pas"/>
         <UnitName Value="mvDLEFpc"/>
       </Item13>
+      <Item14>
+        <Filename Value="source/mvmapviewerreg.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="mvMapViewerReg"/>
+      </Item14>
     </Files>
     <RequiredPkgs Count="2">
       <Item1>

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

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;

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

components/lazmapviewer/source/mvmapviewer_icon.lrs

@@ -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
-]);

components/lazmapviewer/source/mvmapviewerreg.pas

@@ -0,0 +1,28 @@
+unit mvMapViewerReg;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils;
+
+procedure Register;
+
+implementation
+
+{$R mvmapviewer_icons.res}
+
+uses
+  mvGeoNames, mvMapViewer;
+
+procedure Register;
+const
+  PALETTE = 'Misc';
+begin
+  RegisterComponents(PALETTE, [TMapView]);
+  RegisterComponents(PALETTE, [TMvGeoNames]);
+end;
+
+end.
+