Merge pull request #188 from ReinierNL/update_demo33

Updates for demo 33

Author: pyscripter

Demos/Demo33/ThSort.dfm

@@ -12,7 +12,7 @@ interface
 
 type
   TThreadSortForm = class(TForm)
-    StartBtn: TButton;
+    Start3Btn: TButton;
     BubbleSortBox: TPaintBox;
     SelectionSortBox: TPaintBox;
     QuickSortBox: TPaintBox;
@@ -25,23 +25,23 @@   TThreadSortForm = class(TForm)
     PythonMemo: TMemo;
     PythonEngine1: TPythonEngine;
     SortModule: TPythonModule;
-    Start2Btn: TButton;
+    Start1Btn: TButton;
     LoadBtn: TButton;
     PythonDialog: TOpenDialog;
     SaveDialog: TSaveDialog;
     SaveBtn: TButton;
-    Button1: TButton;
+    StopBtn: TButton;
     procedure BubbleSortBoxPaint(Sender: TObject);
     procedure SelectionSortBoxPaint(Sender: TObject);
     procedure QuickSortBoxPaint(Sender: TObject);
     procedure FormCreate(Sender: TObject);
-    procedure StartBtnClick(Sender: TObject);
-    procedure Start2BtnClick(Sender: TObject);
+    procedure Start3BtnClick(Sender: TObject);
+    procedure Start1BtnClick(Sender: TObject);
     procedure LoadBtnClick(Sender: TObject);
     procedure SaveBtnClick(Sender: TObject);
     procedure SortModuleInitialization(Sender: TObject);
     procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
-    procedure Button1Click(Sender: TObject);
+    procedure StopBtnClick(Sender: TObject);
   private
     OwnThreadState: PPyThreadState;
     ThreadsRunning: Integer;
@@ -129,22 +129,22 @@ procedure TThreadSortForm.InitThreads(ThreadExecMode: TThreadExecMode; script: T
 
   end;
 
-  StartBtn.Enabled := False;
-  Start2Btn.Enabled := False;
+  Start1Btn.Enabled := False;
+  Start3Btn.Enabled := False;
 end;
 
-procedure TThreadSortForm.Start2BtnClick(Sender: TObject);
+procedure TThreadSortForm.Start1BtnClick(Sender: TObject);
 begin
   with GetPythonEngine do
   begin
     ExecStrings(PythonMemo.Lines);
-    self.InitThreads(emNewState,nil);
+    self.InitThreads(emNewState, nil);
   end;
 end;
 
-procedure TThreadSortForm.StartBtnClick(Sender: TObject);
+procedure TThreadSortForm.Start3BtnClick(Sender: TObject);
 begin
-  InitThreads(emNewInterpreter,PythonMemo.Lines);
+  InitThreads(emNewInterpreter, PythonMemo.Lines);
 //PythonEngine1.ExecStrings(PythonMemo.Lines);
 end;
 
@@ -182,8 +182,8 @@ procedure TThreadSortForm.ThreadDone(Sender: TObject);
   if ThreadsRunning = 0 then
   begin
     GetPythonEngine.PyEval_RestoreThread(OwnThreadState);
-    StartBtn.Enabled := True;
-    Start2Btn.Enabled := True;
+    Start1Btn.Enabled := True;
+    Start3Btn.Enabled := True;
     ArraysRandom := False;
     Thread1 := nil;
     Thread2 := nil;
@@ -196,7 +196,8 @@ procedure TThreadSortForm.ThreadDone(Sender: TObject);
 }
 
 function TThreadSortForm.SortModule_GetValue( pself, args : PPyObject ) : PPyObject; cdecl;
-var psort,index: integer;
+var
+  psort, index: Integer;
 begin
   with GetPythonEngine do
   begin
@@ -208,12 +209,10 @@ function TThreadSortForm.SortModule_GetValue( pself, args : PPyObject ) : PPyObj
   end;
 end;
 
-
-
 function TThreadSortForm.SortModule_Swap( pself, args : PPyObject ) : PPyObject; cdecl;
-var psort,i,j: integer;
+var
+  psort, i, j: Integer;
 begin
-
   with GetPythonEngine do
   begin
     if (PyErr_Occurred() = nil) and (PyArg_ParseTuple( args, 'iii',@psort, @i, @j) <> 0) then
@@ -225,8 +224,6 @@ function TThreadSortForm.SortModule_Swap( pself, args : PPyObject ) : PPyObject;
   end;
 end;
 
-
-
 procedure TThreadSortForm.SortModuleInitialization(Sender: TObject);
 begin
   with Sender as TPythonModule do
@@ -240,7 +237,7 @@ procedure TThreadSortForm.SortModuleInitialization(Sender: TObject);
     end;
 end;
 
-procedure TThreadSortForm.Button1Click(Sender: TObject);
+procedure TThreadSortForm.StopBtnClick(Sender: TObject);
 begin
   if Assigned(Thread1) and not Thread1.Finished then Thread1.Stop();
   if Assigned(Thread2) and not Thread2.Finished then Thread2.Stop();

Demos/Demo33/ThSort.pas

@@ -78,6 +78,7 @@
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
         <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
+        <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
@@ -90,6 +91,7 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
+        <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
         <Version>7.0</Version>