From 8df360f4228e899094654a73f69d49540e0de8b1 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sat, 11 Jan 2025 11:06:39 +0000 Subject: [PATCH] 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 --- .../examples/fulldemo/configframe.lfm | 1 + .../examples/fulldemo/configframe.pas | 6 +++--- .../plugin_demos/dragmarker_demo/main.pas | 2 +- .../examples/plugin_demos/grid_demo/main.pas | 2 +- .../plugin_demos/legalnotice_demo/unit1.pas | 2 +- .../plugin_demos/linkedmaps_demo/main.pas | 2 +- .../udragcoloreditemplugin.pas | 2 +- .../mousepaintorder_demo/unit1.pas | 4 ++-- .../reorderplugins_demo/unit1.lfm | 10 +++++----- .../reorderplugins_demo/unit1.pas | 5 +++-- .../examples/plugin_demos/scale_demo/main.lfm | 1 - .../examples/plugin_demos/scale_demo/main.pas | 2 +- .../plugin_demos/scale_demo/mapscale_demo.lpi | 5 +++++ .../plugin_demos/scale_demo/mapscale_demo.lpr | 4 ++-- .../plugin_demos/spreadmarker_demo/unit1.pas | 6 +++--- .../userdefined_demo/project1.lpi | 5 ----- .../plugin_demos/userdefined_demo/unit1.pas | 5 +++-- .../point_of_interest_markers/unit1.pas | 2 +- components/lazmapviewer/lazmapviewer_all.lpg | 19 +++++++++++++++++-- components/lazmapviewer/lazmapviewerpkg.lpk | 4 ++-- components/lazmapviewer/lazmapviewerpkg.pas | 2 +- .../addons/plugins/grids/mvmapgridplugin.pas | 2 +- .../source/addons/plugins/mvplugins.pas | 2 +- .../addons/plugins/scale/mvmapscaleplugin.pas | 2 +- .../spreadmarkers/mvspreadmarker_plugin.pas | 2 +- .../source/mvmapviewerpropedits.pas | 2 +- .../lazmapviewer/source/mvmapviewerreg.pas | 2 +- .../{mvplugincore.pas => mvplugincommon.pas} | 2 +- .../lazmapviewer/source/mvplugineditors.pas | 2 +- 29 files changed, 62 insertions(+), 45 deletions(-) rename components/lazmapviewer/source/{mvplugincore.pas => mvplugincommon.pas} (99%) diff --git a/components/lazmapviewer/examples/fulldemo/configframe.lfm b/components/lazmapviewer/examples/fulldemo/configframe.lfm index fdac23229..e2a7301b3 100644 --- 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 diff --git a/components/lazmapviewer/examples/fulldemo/configframe.pas b/components/lazmapviewer/examples/fulldemo/configframe.pas index 2b24680a7..b5522c94d 100644 --- 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 diff --git a/components/lazmapviewer/examples/plugin_demos/dragmarker_demo/main.pas b/components/lazmapviewer/examples/plugin_demos/dragmarker_demo/main.pas index 61f764c1c..114b5272a 100644 --- 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 diff --git a/components/lazmapviewer/examples/plugin_demos/grid_demo/main.pas b/components/lazmapviewer/examples/plugin_demos/grid_demo/main.pas index eb0a04817..f88915861 100644 --- 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) diff --git a/components/lazmapviewer/examples/plugin_demos/legalnotice_demo/unit1.pas b/components/lazmapviewer/examples/plugin_demos/legalnotice_demo/unit1.pas index 1309ebdd3..1e15ecc1a 100644 --- 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) diff --git a/components/lazmapviewer/examples/plugin_demos/linkedmaps_demo/main.pas b/components/lazmapviewer/examples/plugin_demos/linkedmaps_demo/main.pas index 90f124db0..a293ecb1c 100644 --- 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 diff --git a/components/lazmapviewer/examples/plugin_demos/mousepaintorder_demo/udragcoloreditemplugin.pas b/components/lazmapviewer/examples/plugin_demos/mousepaintorder_demo/udragcoloreditemplugin.pas index 0f8f6b506..41553edf1 100644 --- 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 diff --git a/components/lazmapviewer/examples/plugin_demos/mousepaintorder_demo/unit1.pas b/components/lazmapviewer/examples/plugin_demos/mousepaintorder_demo/unit1.pas index a984d41fe..b3ccea899 100644 --- 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 diff --git a/components/lazmapviewer/examples/plugin_demos/reorderplugins_demo/unit1.lfm b/components/lazmapviewer/examples/plugin_demos/reorderplugins_demo/unit1.lfm index a7e4abf45..110a2eeb1 100644 --- 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 diff --git a/components/lazmapviewer/examples/plugin_demos/reorderplugins_demo/unit1.pas b/components/lazmapviewer/examples/plugin_demos/reorderplugins_demo/unit1.pas index 245f76739..7701ae908 100644 --- 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) diff --git a/components/lazmapviewer/examples/plugin_demos/scale_demo/main.lfm b/components/lazmapviewer/examples/plugin_demos/scale_demo/main.lfm index 40e2ffe98..a5744173d 100644 --- 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 diff --git a/components/lazmapviewer/examples/plugin_demos/scale_demo/main.pas b/components/lazmapviewer/examples/plugin_demos/scale_demo/main.pas index 28db893b3..58d9a3fd2 100644 --- 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 diff --git a/components/lazmapviewer/examples/plugin_demos/scale_demo/mapscale_demo.lpi b/components/lazmapviewer/examples/plugin_demos/scale_demo/mapscale_demo.lpi index d7f4effd9..2be5d296f 100644 --- 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 @@ + + + + + diff --git a/components/lazmapviewer/examples/plugin_demos/scale_demo/mapscale_demo.lpr b/components/lazmapviewer/examples/plugin_demos/scale_demo/mapscale_demo.lpr index 19397281f..fe2b58001 100644 --- 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} diff --git a/components/lazmapviewer/examples/plugin_demos/spreadmarker_demo/unit1.pas b/components/lazmapviewer/examples/plugin_demos/spreadmarker_demo/unit1.pas index f7fed8bef..9fdd94cd3 100644 --- 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 diff --git a/components/lazmapviewer/examples/plugin_demos/userdefined_demo/project1.lpi b/components/lazmapviewer/examples/plugin_demos/userdefined_demo/project1.lpi index a23703b38..8ae214717 100644 --- a/components/lazmapviewer/examples/plugin_demos/userdefined_demo/project1.lpi +++ b/components/lazmapviewer/examples/plugin_demos/userdefined_demo/project1.lpi @@ -44,11 +44,6 @@ - - - - - diff --git a/components/lazmapviewer/examples/plugin_demos/userdefined_demo/unit1.pas b/components/lazmapviewer/examples/plugin_demos/userdefined_demo/unit1.pas index e47e09e93..bfa5754e4 100644 --- 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 diff --git a/components/lazmapviewer/examples/point_of_interest_markers/unit1.pas b/components/lazmapviewer/examples/point_of_interest_markers/unit1.pas index eb3364523..ee37777ee 100644 --- 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 diff --git a/components/lazmapviewer/lazmapviewer_all.lpg b/components/lazmapviewer/lazmapviewer_all.lpg index 8b3635eb5..0bdf0653b 100644 --- a/components/lazmapviewer/lazmapviewer_all.lpg +++ b/components/lazmapviewer/lazmapviewer_all.lpg @@ -21,12 +21,27 @@ - + + + + + + + + + + + - + + + + + + diff --git a/components/lazmapviewer/lazmapviewerpkg.lpk b/components/lazmapviewer/lazmapviewerpkg.lpk index 2952b602a..562971e5d 100644 --- a/components/lazmapviewer/lazmapviewerpkg.lpk +++ b/components/lazmapviewer/lazmapviewerpkg.lpk @@ -129,8 +129,8 @@ FPC 3.2.0 or newer required."/> - - + + diff --git a/components/lazmapviewer/lazmapviewerpkg.pas b/components/lazmapviewer/lazmapviewerpkg.pas index 2aa0ef87a..1b3229b22 100644 --- 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; diff --git a/components/lazmapviewer/source/addons/plugins/grids/mvmapgridplugin.pas b/components/lazmapviewer/source/addons/plugins/grids/mvmapgridplugin.pas index 3a16cf384..78c720451 100644 --- 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; diff --git a/components/lazmapviewer/source/addons/plugins/mvplugins.pas b/components/lazmapviewer/source/addons/plugins/mvplugins.pas index bc9081d8f..aa7d94a2b 100644 --- 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 } diff --git a/components/lazmapviewer/source/addons/plugins/scale/mvmapscaleplugin.pas b/components/lazmapviewer/source/addons/plugins/scale/mvmapscaleplugin.pas index 1c5074b5a..c700735a3 100644 --- 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 } diff --git a/components/lazmapviewer/source/addons/plugins/spreadmarkers/mvspreadmarker_plugin.pas b/components/lazmapviewer/source/addons/plugins/spreadmarkers/mvspreadmarker_plugin.pas index 7d35bcfe8..557b102e2 100644 --- 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 diff --git a/components/lazmapviewer/source/mvmapviewerpropedits.pas b/components/lazmapviewer/source/mvmapviewerpropedits.pas index fa81c130e..ee55cacea 100644 --- 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)'; diff --git a/components/lazmapviewer/source/mvmapviewerreg.pas b/components/lazmapviewer/source/mvmapviewerreg.pas index 1f07d9ef4..c4450417d 100644 --- 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; diff --git a/components/lazmapviewer/source/mvplugincore.pas b/components/lazmapviewer/source/mvplugincommon.pas similarity index 99% rename from components/lazmapviewer/source/mvplugincore.pas rename to components/lazmapviewer/source/mvplugincommon.pas index 42a21eee5..67fe3e89c 100644 --- a/components/lazmapviewer/source/mvplugincore.pas +++ b/components/lazmapviewer/source/mvplugincommon.pas @@ -1,4 +1,4 @@ -unit mvPluginCore; +unit mvPluginCommon; {$mode objfpc}{$H+} diff --git a/components/lazmapviewer/source/mvplugineditors.pas b/components/lazmapviewer/source/mvplugineditors.pas index ee4ed4d42..30f4f1b6f 100644 --- a/components/lazmapviewer/source/mvplugineditors.pas +++ b/components/lazmapviewer/source/mvplugineditors.pas @@ -121,7 +121,7 @@ implementation {$R *.lfm} uses - mvPluginCore; + mvPluginCommon; { TMvComponentListPropertyEditor }