LazMapViewer: Rename unit mvPluginCore to mvPluginCommon. Adapt all sample projects.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9581 8e941d3f-bd1b-0410-a28a-d453659cc2b4
2025-01-11 11:06:39 +00:00 · 2025-01-11 11:06:39 +00:00 · 8df360f422
commit 8df360f422
parent 4bf90d369f
29 changed files with 62 additions and 45 deletions
--- a/components/lazmapviewer/examples/fulldemo/configframe.lfm
+++ b/components/lazmapviewer/examples/fulldemo/configframe.lfm
@ -579,6 +579,7 @@ object CfgFrame: TCfgFrame
    end
    object MapScalePlugin: TMapScalePlugin
      ZoomMin = 5
+      BackgroundOpacity = 0.550000011920929
    end
  end
 end
--- a/components/lazmapviewer/examples/fulldemo/configframe.pas
+++ b/components/lazmapviewer/examples/fulldemo/configframe.pas
@ -6,9 +6,9 @@ interface

 uses
  Classes, SysUtils, IniFiles,
-  Graphics,
-  Forms, Controls, StdCtrls, Buttons, Dialogs, ExtCtrls, ColorBox, ExtDlgs, Spin,
-  mvMapViewer, mvEngine, mvPluginCore, mvMapGridPlugin, mvMapScalePlugin,
+  Graphics, Forms, Controls, StdCtrls, Buttons, Dialogs, ExtCtrls,
+  ColorBox, ExtDlgs, Spin,
+  mvMapViewer, mvEngine, mvPluginCommon, mvMapGridPlugin, mvMapScalePlugin,
  globals;

 type
--- a/components/lazmapviewer/examples/plugin_demos/dragmarker_demo/main.pas
+++ b/components/lazmapviewer/examples/plugin_demos/dragmarker_demo/main.pas
@ -7,7 +7,7 @@ interface
 uses
  SysUtils, Classes, Math,
  Graphics, Forms, Controls, StdCtrls, ExtCtrls,
-  mvDLEFpc, mvMapViewer, mvPluginCore, mvPlugins, mvGPSObj;
+  mvDLEFpc, mvMapViewer, mvPluginCommon, mvPlugins, mvGPSObj;

 type

--- a/components/lazmapviewer/examples/plugin_demos/grid_demo/main.pas
+++ b/components/lazmapviewer/examples/plugin_demos/grid_demo/main.pas
@ -7,7 +7,7 @@ interface
 uses
  Classes, ComCtrls, DividerBevel, ExtCtrls, Spin, StdCtrls, SysUtils,
  Forms, Controls, Graphics, Dialogs, //LazLogger,
-  mvMapViewer, mvTypes, mvEngine, mvPluginCore, mvMapGridPlugin;
+  mvMapViewer, mvTypes, mvEngine, mvPluginCommon, mvMapGridPlugin;

 type
  TMainForm = class(TForm)
--- a/components/lazmapviewer/examples/plugin_demos/legalnotice_demo/unit1.pas
+++ b/components/lazmapviewer/examples/plugin_demos/legalnotice_demo/unit1.pas
@ -7,7 +7,7 @@ interface
 uses
  Classes, SysUtils,
  LCLIntf, Forms, Controls, Graphics, ExtCtrls, StdCtrls, Dialogs, Spin,
-  mvMapViewer, mvPluginCore, mvPlugins;
+  mvMapViewer, mvPluginCommon, mvPlugins;

 type
  TMainForm = class(TForm)
--- a/components/lazmapviewer/examples/plugin_demos/linkedmaps_demo/main.pas
+++ b/components/lazmapviewer/examples/plugin_demos/linkedmaps_demo/main.pas
@ -7,7 +7,7 @@ interface
 uses
  Buttons, Classes, SysUtils, Math,
  Graphics, Controls, StdCtrls, ExtCtrls, Forms,
-  mvMapViewer, mvPluginCore, mvPlugins;
+  mvMapViewer, mvPluginCommon, mvPlugins;

 type

--- a/components/lazmapviewer/examples/plugin_demos/mousepaintorder_demo/udragcoloreditemplugin.pas
+++ b/components/lazmapviewer/examples/plugin_demos/mousepaintorder_demo/udragcoloreditemplugin.pas
@ -6,7 +6,7 @@ interface

 uses
  Classes, SysUtils, Controls, Graphics,
-  mvPluginCore, mvPlugins, mvMapViewer, mvTypes, mvGPSObj, mvGeoMath;
+  mvPluginCommon, mvPlugins, mvMapViewer, mvTypes, mvGPSObj, mvGeoMath;

 type

--- a/components/lazmapviewer/examples/plugin_demos/mousepaintorder_demo/unit1.pas
+++ b/components/lazmapviewer/examples/plugin_demos/mousepaintorder_demo/unit1.pas
@ -5,8 +5,8 @@ unit Unit1;
 interface

 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, mvMapViewer,
-  mvPluginCore, uDragColoredItemPlugin;
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls,
+  mvMapViewer, mvPluginCommon, uDragColoredItemPlugin;

 type

--- a/components/lazmapviewer/examples/plugin_demos/reorderplugins_demo/unit1.lfm
+++ b/components/lazmapviewer/examples/plugin_demos/reorderplugins_demo/unit1.lfm
@ -76,24 +76,24 @@ object Form1: TForm1
    object MvPluginManager1LegalNoticePlugin1: TLegalNoticePlugin
      BackgroundColor = clWhite
      BackgroundOpacity = 1
-      Font.Height = -19
      LegalNotice = 'Test 1'
+      Font.Height = -19
    end
    object MvPluginManager1LegalNoticePlugin2: TLegalNoticePlugin
      BackgroundColor = clYellow
      BackgroundOpacity = 1
-      Font.Color = clRed
-      Font.Height = -19
      LegalNotice = 'Test 2'
      Spacing = 14
+      Font.Color = clRed
+      Font.Height = -19
    end
    object MvPluginManager1LegalNoticePlugin3: TLegalNoticePlugin
      BackgroundColor = clBlue
      BackgroundOpacity = 1
-      Font.Color = clWhite
-      Font.Height = -19
      LegalNotice = 'Test 3'
      Spacing = 24
+      Font.Color = clWhite
+      Font.Height = -19
    end
  end
 end
--- a/components/lazmapviewer/examples/plugin_demos/reorderplugins_demo/unit1.pas
+++ b/components/lazmapviewer/examples/plugin_demos/reorderplugins_demo/unit1.pas
@ -5,8 +5,9 @@ unit Unit1;
 interface

 uses
-  Classes, ExtCtrls, mvMapViewer, mvPluginCore, mvPlugins, StdCtrls, SysUtils,
-  Forms, Controls, Graphics, Dialogs, ValEdit;
+  SysUtils, Classes,
+  Forms, Controls, Graphics, StdCtrls, ExtCtrls, Dialogs, ValEdit,
+  mvMapViewer, mvPluginCommon, mvPlugins;

 type
  TForm1 = class(TForm)
--- a/components/lazmapviewer/examples/plugin_demos/scale_demo/main.lfm
+++ b/components/lazmapviewer/examples/plugin_demos/scale_demo/main.lfm
@ -27,7 +27,6 @@ object MainForm: TMainForm
    MapCenter.Longitude = 10
    MapCenter.Latitude = 50
    PluginManager = PluginManager
-    UseThreads = True
    Zoom = 8
    OnZoomChange = MapViewZoomChange
  end
--- a/components/lazmapviewer/examples/plugin_demos/scale_demo/main.pas
+++ b/components/lazmapviewer/examples/plugin_demos/scale_demo/main.pas
@ -7,7 +7,7 @@ interface
 uses
  Classes, SysUtils,
  Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, Spin,
-  mvMapViewer, mvMapProvider, mvPluginCore, mvMapScalePlugin;
+  mvMapViewer, mvMapProvider, mvPluginCommon, mvMapScalePlugin;

 type

--- a/components/lazmapviewer/examples/plugin_demos/scale_demo/mapscale_demo.lpi
+++ b/components/lazmapviewer/examples/plugin_demos/scale_demo/mapscale_demo.lpi
@ -59,6 +59,11 @@
      <Debugging>
        <DebugInfoType Value="dsDwarf3"/>
      </Debugging>
+      <Options>
+        <Win32>
+          <GraphicApplication Value="True"/>
+        </Win32>
+      </Options>
    </Linking>
  </CompilerOptions>
  <Debugging>
--- a/components/lazmapviewer/examples/plugin_demos/scale_demo/mapscale_demo.lpr
+++ b/components/lazmapviewer/examples/plugin_demos/scale_demo/mapscale_demo.lpr
@ -17,8 +17,8 @@ uses

 begin
  RequireDerivedFormResource := True;
-  Application.Title := 'MapScale_Demo';
-  Application.Scaled := True;
+  Application.Title:='MapScale_Demo';
+  Application.Scaled:=True;
  {$PUSH}{$WARN 5044 OFF}
  Application.MainFormOnTaskbar := True;
  {$POP}
--- a/components/lazmapviewer/examples/plugin_demos/spreadmarker_demo/unit1.pas
+++ b/components/lazmapviewer/examples/plugin_demos/spreadmarker_demo/unit1.pas
@ -5,9 +5,9 @@ unit Unit1;
 interface

 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs,
-  mvMapViewer, mvPluginCore, mvPlugins,
-  mvGPSObj, mvspreadmarker_plugin;
+  Classes, SysUtils,
+  Forms, Controls, Graphics, Dialogs,
+  mvMapViewer, mvPluginCommon, mvPlugins, mvGPSObj, mvspreadmarker_plugin;

 type

--- a/components/lazmapviewer/examples/plugin_demos/userdefined_demo/project1.lpi
+++ b/components/lazmapviewer/examples/plugin_demos/userdefined_demo/project1.lpi
@ -44,11 +44,6 @@
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Unit1"/>
      </Unit>
-      <Unit>
-        <Filename Value="..\..\..\source\addons\plugins\mvnullplugin.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="mvNullPlugin"/>
-      </Unit>
    </Units>
  </ProjectOptions>
  <CompilerOptions>
--- a/components/lazmapviewer/examples/plugin_demos/userdefined_demo/unit1.pas
+++ b/components/lazmapviewer/examples/plugin_demos/userdefined_demo/unit1.pas
@ -5,8 +5,9 @@ unit Unit1;
 interface

 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls,
-  mvMapViewer, mvPluginCore, mvPlugins;
+  Classes, SysUtils,
+  Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls,
+  mvMapViewer, mvPluginCommon, mvPlugins;

 type

--- a/components/lazmapviewer/examples/point_of_interest_markers/unit1.pas
+++ b/components/lazmapviewer/examples/point_of_interest_markers/unit1.pas
@ -5,7 +5,7 @@ unit Unit1;
 interface

 uses
-  Classes, mvMapViewer, mvPluginCore, mvPlugins, StdCtrls, SysUtils, Forms,
+  Classes, mvMapViewer, mvPluginCommon, mvPlugins, StdCtrls, SysUtils, Forms,
  Controls, Graphics, Dialogs, mvTypes;

 type
--- a/components/lazmapviewer/lazmapviewer_all.lpg
+++ b/components/lazmapviewer/lazmapviewer_all.lpg
@ -21,12 +21,27 @@
          <Mode Name="default"/>
        </BuildModes>
      </Target>
-      <Target FileName="examples\fulldemo_with_addons\mapviewer_demo_with_addons.lpi">
+      <Target FileName="unittests\mapviewer_tests.lpi">
+        <BuildModes>
+          <Mode Name="Default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="examples\elevations\Elevations_Demo.lpi">
+        <BuildModes>
+          <Mode Name="Default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="examples\flights\flights.lpi">
        <BuildModes>
          <Mode Name="default"/>
        </BuildModes>
      </Target>
-      <Target FileName="unittests\mapviewer_tests.lpi">
+      <Target FileName="examples\gpstilelayer_demo\GPSTileLayer_Demo.lpi">
+        <BuildModes>
+          <Mode Name="Default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="examples\restricted_zoom_pan\RestrictedZoomPan_Demo.lpi">
        <BuildModes>
          <Mode Name="Default"/>
        </BuildModes>
--- a/components/lazmapviewer/lazmapviewerpkg.lpk
+++ b/components/lazmapviewer/lazmapviewerpkg.lpk
@ -129,8 +129,8 @@ FPC 3.2.0 or newer required."/>
        <UnitName Value="mvClassRegistration"/>
      </Item26>
      <Item27>
-        <Filename Value="source/mvplugincore.pas"/>
-        <UnitName Value="mvPluginCore"/>
+        <Filename Value="source/mvplugincommon.pas"/>
+        <UnitName Value="mvPluginCommon"/>
      </Item27>
      <Item28>
        <Filename Value="source/addons/plugins/mvplugins.pas"/>
--- a/components/lazmapviewer/lazmapviewerpkg.pas
+++ b/components/lazmapviewer/lazmapviewerpkg.pas
@ -13,7 +13,7 @@ uses
  mvDLEFpc, mvMapViewerReg, mvGPX, mvDrawingEngine, mvDE_IntfGraphics, 
  mvDLEWin, mvMapViewerPropEdits, mvLayersPropEditForm, mvGeoMath, 
  mvMapViewerPathEditForm, mvMapViewerPathEditDsgForm, mvDLECache, 
-  mvPluginEditors, mvClassRegistration, mvPluginCore, mvPlugins, 
+  mvPluginEditors, mvClassRegistration, mvPluginCommon, mvPlugins, 
  mvspreadmarker_plugin, uInactivityAlarmTimer, mvMapGridPlugin, 
  mvMapScalePlugin, LazarusPackageIntf;

--- a/components/lazmapviewer/source/addons/plugins/grids/mvmapgridplugin.pas
+++ b/components/lazmapviewer/source/addons/plugins/grids/mvmapgridplugin.pas
@ -9,7 +9,7 @@ interface
 uses
  Classes, SysUtils, Math,
  Graphics, Controls, LCLIntf, //LazLoggerBase,
-  mvMapViewer, mvDrawingEngine, mvPluginCore,  mvGeoMath, mvTypes;
+  mvMapViewer, mvDrawingEngine, mvPluginCommon,  mvGeoMath, mvTypes;

 type
  TMapGridPlugin = class;
--- a/components/lazmapviewer/source/addons/plugins/mvplugins.pas
+++ b/components/lazmapviewer/source/addons/plugins/mvplugins.pas
@ -7,7 +7,7 @@ interface
 uses
  Classes, SysUtils, Contnrs,
  Graphics, Controls, LCLIntf, //LazLoggerBase,
-  mvMapViewer, mvDrawingEngine, mvPluginCore, mvGPSObj, mvTypes;
+  mvMapViewer, mvDrawingEngine, mvPluginCommon, mvGPSObj, mvTypes;

 type
  { TCenterMarkerPlugin - draws a cross in the map center }
--- a/components/lazmapviewer/source/addons/plugins/scale/mvmapscaleplugin.pas
+++ b/components/lazmapviewer/source/addons/plugins/scale/mvmapscaleplugin.pas
@ -9,7 +9,7 @@ interface
 uses
  Classes, SysUtils, Math,
  Graphics, Controls, Types,
-  mvMapViewer, mvGeoMath, mvPluginCore;
+  mvMapViewer, mvGeoMath, mvPluginCommon;

 type
  { TMapScalePlugin }
--- a/components/lazmapviewer/source/addons/plugins/spreadmarkers/mvspreadmarker_plugin.pas
+++ b/components/lazmapviewer/source/addons/plugins/spreadmarkers/mvspreadmarker_plugin.pas
@ -18,7 +18,7 @@ interface

 uses
  Classes, SysUtils, Controls, Graphics,
-  mvMapViewer, mvTypes, mvGpsObj,mvPluginCore,mvDrawingEngine,mvGeoMath,
+  mvMapViewer, mvTypes, mvGpsObj, mvPluginCommon, mvDrawingEngine, mvGeoMath,
  uInactivityAlarmTimer;

 type
--- a/components/lazmapviewer/source/mvmapviewerpropedits.pas
+++ b/components/lazmapviewer/source/mvmapviewerpropedits.pas
@ -105,7 +105,7 @@ implementation
 uses
  System.UITypes, Dialogs, IDEWindowIntf, LazIDEIntf, StrUtils, mvMapViewer,
  mvGpsObj, mvLayersPropEditForm, mvEngine, mvGeoMath,
-  mvMapViewerPathEditDsgForm, mvPluginCore;
+  mvMapViewerPathEditDsgForm, mvPluginCommon;

 const
  sNONE = '(none)';
--- a/components/lazmapviewer/source/mvmapviewerreg.pas
+++ b/components/lazmapviewer/source/mvmapviewerreg.pas
@ -15,7 +15,7 @@ implementation

 uses
  Controls, ImgList,
-  mvTypes, mvGeoNames, mvMapViewer, mvDLEFpc, mvDLECache, mvPluginCore,
+  mvTypes, mvGeoNames, mvMapViewer, mvDLEFpc, mvDLECache, mvPluginCommon,
  mvMapViewerPropEdits, mvPlugins, mvPluginEditors;

 procedure Register;
--- a/components/lazmapviewer/source/mvplugincommon.pas
+++ b/components/lazmapviewer/source/mvplugincommon.pas
@ -1,4 +1,4 @@
-unit mvPluginCore;
+unit mvPluginCommon;

 {$mode objfpc}{$H+}

--- a/components/lazmapviewer/source/mvplugineditors.pas
+++ b/components/lazmapviewer/source/mvplugineditors.pas
@ -121,7 +121,7 @@ implementation
 {$R *.lfm}

 uses
-  mvPluginCore;
+  mvPluginCommon;

 { TMvComponentListPropertyEditor }