Merge pull request #203 from jimmckeeth/master

Renamed the Delphi module to DelphiVCL

Author: pyscripter

Modules/Delphi/Delphi.dpr

@@ -0,0 +1,25 @@
+library DelphiVCL;
+
+uses
+  SysUtils,
+  Classes,
+  uMain in 'uMain.pas';
+
+{$I Definition.Inc}
+
+exports
+  // This must match the pattern "PyInit_[ProjectName]"
+  // So if the project is named DelphiVCL then
+  //   the export must be PyInit_DelphiVCL
+  PyInit_DelphiVCL;
+{$IFDEF MSWINDOWS}
+{$E pyd}
+{$ENDIF}
+{$IFDEF LINUX}
+{$SONAME 'DelphiVCL'}
+
+{$ENDIF}
+
+begin
+end.
+

Modules/Delphi/Delphi.dproj

@@ -0,0 +1,45 @@
+from DelphiVCL import *
+
+class MainForm(Form):
+
+    def __init__(self, Owner):
+        self.Caption = "A VCL Form..."
+        self.SetBounds(10, 10, 500, 400)
+        
+        self.lblHello = Label(self)
+        self.lblHello.SetProps(Parent=self, Caption="Hello Python")
+        self.lblHello.SetBounds(10, 10, 300, 24)
+
+        self.edit1 = Edit(self)
+        self.edit1.SetProps(Parent=self)
+        self.edit1.SetBounds(10, 30, 250, 24)
+
+        self.button1 = Button(self)
+        self.button1.Parent = self
+        self.button1.SetBounds(270,24,100,30)
+        self.button1.Caption = "Add"
+        self.button1.OnClick = self.Button1Click
+
+        self.lb1 = ListBox(self)
+        self.lb1.Parent = self
+        self.lb1.SetBounds(10,60,300,300)
+
+        self.OnClose = self.MainFormClose
+
+    def MainFormClose(self, Sender, Action):
+        Action.Value = caFree
+
+    def Button1Click(self, Sender):
+        self.lb1.Items.Add(self.edit1.Text)
+        self.edit1.Text = ""
+
+def main():
+    Application.Initialize()
+    Application.Title = "MyDelphiApp"
+    f = MainForm(Application)
+    f.Show()
+    FreeConsole()
+    Application.Run()
+
+main()
+

Modules/Delphi/TestApp.py

@@ -1,49 +1,56 @@
-unit uMain;
-
-interface
-
-uses PythonEngine;
-
-function PyInit_Delphi: PPyObject; cdecl;
-
-implementation
-
-uses WrapDelphi, WrapDelphiVCL;
-
-var
-  gEngine : TPythonEngine;
-  gModule : TPythonModule;
-  gDelphiWrapper : TPyDelphiWrapper;
-
-function PyInit_Delphi: PPyObject;
-begin
-  try
-    gEngine := TPythonEngine.Create(nil);
-    gEngine.AutoFinalize := False;
-    gEngine.UseLastKnownVersion := False;
-    // Adapt to the desired python version
-    gEngine.RegVersion := '3.8';
-    gEngine.DllName := 'python38.dll';
-
-    gModule := TPythonModule.Create(nil);
-    gModule.Engine := gEngine;
-    gModule.ModuleName := 'Delphi';
-
-    gDelphiWrapper := TPyDelphiWrapper.Create(nil);
-    gDelphiWrapper.Engine := gEngine;
-    gDelphiWrapper.Module := gModule;
-
-    gEngine.LoadDll;
-  except
-  end;
-  Result := gModule.Module;
-end;
-
-initialization
-finalization
-  gEngine.Free;
-  gModule.Free;
-  gDelphiWrapper.Free;
-end.
-
-
+unit uMain;
+
+interface
+
+uses PythonEngine;
+
+function PyInit_DelphiVCL: PPyObject; cdecl;
+
+implementation
+
+uses WrapDelphi, WrapDelphiVCL;
+
+var
+  gEngine : TPythonEngine;
+  gModule : TPythonModule;
+  gDelphiWrapper : TPyDelphiWrapper;
+
+// This must match the pattern "PyInit_[ProjectName]"
+// So if the project is named DelphiVCL then
+//   the function must be PyInit_DelphiVCL
+function PyInit_DelphiVCL: PPyObject;
+begin
+  try
+    gEngine := TPythonEngine.Create(nil);
+    gEngine.AutoFinalize := False;
+    gEngine.UseLastKnownVersion := False;
+    // Adapt to the desired python version - Will only work with this version
+    gEngine.RegVersion := '3.9';
+    gEngine.DllName := 'python39.dll';
+
+    gModule := TPythonModule.Create(nil);
+    gModule.Engine := gEngine;
+    // This must match the ProjectName and the function name pattern
+    gModule.ModuleName := 'DelphiVCL';
+
+    gDelphiWrapper := TPyDelphiWrapper.Create(nil);
+    gDelphiWrapper.Engine := gEngine;
+    gDelphiWrapper.Module := gModule;
+
+    gEngine.LoadDll;
+  except
+  end;
+  Result := gModule.Module;
+end;
+
+initialization
+  gEngine := nil;
+  gModule := nil;
+  gDelphiWrapper := nil;
+finalization
+  gEngine.Free;
+  gModule.Free;
+  gDelphiWrapper.Free;
+end.
+
+

Modules/DelphiVCL/DelphiVCL.dpr

@@ -3,16 +3,16 @@
 
 ![P4D Logo](https://github.com/pyscripter/python4delphi/wiki/Images/Python4Delphi-Libraries.png)
 
-- [Webinar Info]()
+- [Webinar Info](https://blogs.embarcadero.com/python-for-delphi-developers-webinar/)
 
-- [Video replay]()
+- [Video replay](https://blogs.embarcadero.com/combining-the-strengths-of-delphi-and-python/)
 
 - [Slides]()
 
-- Source code is included in this folder.  Demo33 is in the Demos directory and the python extension module demos are in the Modules directory.
+- Source code is included in this folder.  [Demo33](https://github.com/pyscripter/python4delphi/tree/master/Demos/Demo33) is in the Demos directory and the python extension [module demos](https://github.com/pyscripter/python4delphi/tree/master/Modules/DemoModule) are in the Modules directory.
 
 Please note that to compile the source code you need to install the [SVGIconLibrary](https://github.com/EtheaDev/SVGIconImageList).  
-PyChartHTML uses the TEdgeBrowser control.  So you need to use Delphi 10.4 or later and install the [WebView2 Runtime](https://developer.microsoft.com/en-us/microsoft-edge/webview2/).  The required WebView2Loader.dll is already in the output folder.  Finally the visualization and analytics demos make use of a range of python modules that need to be installed in python using the python package installer pip. These needed modules are listed below:
+PyChartHTML uses the [TEdgeBrowser](http://docwiki.embarcadero.com/RADStudio/Sydney/en/Using_TEdgeBrowser_Component_and_Changes_to_the_TWebBrowser_Component) control.  So you need to use Delphi 10.4 or later and install the [WebView2 Runtime](https://developer.microsoft.com/en-us/microsoft-edge/webview2/).  The required WebView2Loader.dll is already in the output folder.  Finally the visualization and analytics demos make use of a range of python modules that need to be installed in python using the python package installer pip. These needed modules are listed below:
 
 - numpy
 - pandas