1
0
mirror of https://bitbucket.org/Dennis07/lina-components.git synced 2025-08-24 21:49:04 +02:00

Version 1.0 DEV 1.17b

Signed-off-by: dennis07 <den.goehlert@t-online.de>
This commit is contained in:
dennis07
2017-11-08 01:15:07 +01:00
parent 531d96e914
commit dd526cecee
12 changed files with 296 additions and 230 deletions

View File

@@ -39,18 +39,31 @@
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
<Cfg_1_Win64>true</Cfg_1_Win64>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
<Cfg_2>true</Cfg_2>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
<Cfg_2>true</Cfg_2>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<DCC_MapFile>3</DCC_MapFile>
<VerInfo_Keys>CompanyName=Dennis Göhlert a.o.;FileDescription=Lina Components;FileVersion=1.0.0.0;InternalName=;LegalCopyright=2014;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
<VerInfo_Locale>1031</VerInfo_Locale>
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
<GenDll>true</GenDll>
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)</DCC_Namespace>
<GenPackage>true</GenPackage>
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
<DCC_DcuOutput>..\..\Source\Compiled\Delphi_XE5</DCC_DcuOutput>
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
<DCC_E>false</DCC_E>
<DCC_N>false</DCC_N>
@@ -85,13 +98,16 @@
<DCC_RemoteDebug>true</DCC_RemoteDebug>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
<DCC_AdditionalSwitches>-LUDesignIDE</DCC_AdditionalSwitches>
<DCC_DcuOutput>..\..\Source\Compiled\Delphi_XE5</DCC_DcuOutput>
<VerInfo_Keys>CompanyName=Dennis Göhlert a.o.;FileDescription=Lina Components;FileVersion=1.0.0.0;InternalName=;LegalCopyright=2014;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
<VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<DCC_Description>Lina Components</DCC_Description>
<DCC_RemoteDebug>false</DCC_RemoteDebug>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -99,6 +115,11 @@
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
<DCC_DebugInformation>0</DCC_DebugInformation>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
</PropertyGroup>
<ItemGroup>
<DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>

View File

@@ -1,47 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<BorlandProject>
<Transactions>
<Transaction>1899.12.30 00:00:00.000.508,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uBase.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.592,=C:\Users\Dennis\Documents\RAD Studio\Projekte\LinaComponents\uFileTools.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.576,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uSysTools.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.592,=C:\Users\Dennis\Documents\RAD Studio\Projekte\LinaComponents\uFileTools.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.508,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uBase.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.518,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uBattery.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.650,C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uBattery.pas=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uSysCtrls.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.204,C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\uFileCtrls.pas=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uFileCtrls.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.411,C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Unit1.pas=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uAdvCtrls.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.791,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Unit1.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.681,C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Resource\Lina.rc=</Transaction>
<Transaction>1899.12.30 00:00:00.000.325,=dbrtl.dcp</Transaction>
<Transaction>1899.12.30 00:00:00.000.674,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Unit1.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.809,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Resource\Lina.rc</Transaction>
<Transaction>1899.12.30 00:00:00.000.938,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\Config.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.621,=C:\Users\Dennis\Documents\RAD Studio\Projekte\LinaComponents\uLinaTest.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.325,=dbrtl.dcp</Transaction>
<Transaction>1899.12.30 00:00:00.000.681,C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Resource\Lina.rc=</Transaction>
<Transaction>1899.12.30 00:00:00.000.934,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\Config.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.414,C:\Users\Dennis\Documents\RAD Studio\Projekte\LinaComponents\uLinaTest.pas=</Transaction>
<Transaction>1899.12.30 00:00:00.000.621,=C:\Users\Dennis\Documents\RAD Studio\Projekte\LinaComponents\uLinaTest.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.556,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uLocalMgr.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.577,=C:\Users\Dennis\Documents\RAD Studio\Projekte\LinaComponents\uBattery.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.861,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Settings.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.318,=vcl.dcp</Transaction>
<Transaction>1899.12.30 00:00:00.000.648,=C:\Users\Dennis\Documents\RAD Studio\Projekte\LinaComponents\uScriptMgr.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.934,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\Config.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.938,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\Config.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.537,C:\Users\Dennis G\Documents\CodeQuality.htm=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Untitled1.htm</Transaction>
<Transaction>1899.12.30 00:00:00.000.143,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Untitled1.htm</Transaction>
<Transaction>1899.12.30 00:00:00.000.896,C:\Users\Dennis G\Documents\CodeQuality.htm=</Transaction>
<Transaction>1899.12.30 00:00:00.000.674,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Unit1.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.555,=C:\Users\Dennis\Documents\RAD Studio\Projekte\LinaComponents\uBase.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.837,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Unit1.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.971,=IndySystem.dcp</Transaction>
<Transaction>1899.12.30 00:00:00.000.555,=C:\Users\Dennis\Documents\RAD Studio\Projekte\LinaComponents\uBase.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.584,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uVirtObj.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.525,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uCrypt.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.075,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uCalc.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.686,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\uSysTools.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.196,=rtl.dcp</Transaction>
<Transaction>1899.12.30 00:00:00.000.075,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uCalc.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.118,=IndyCore.dcp</Transaction>
<Transaction>1899.12.30 00:00:00.000.535,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uFileTools.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.633,=C:\Users\Dennis\Documents\RAD Studio\Projekte\LinaComponents\uLocalMgr.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.686,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\uSysTools.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.525,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uCrypt.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.672,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\uFrmCtrls.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.633,C:\Users\Dennis\Documents\RAD Studio\Projekte\Package1.dproj=C:\Users\Dennis\Documents\RAD Studio\Projekte\LinaComponents\LINA_D_XE5.dproj</Transaction>
<Transaction>1899.12.30 00:00:00.000.582,C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Unit1.pas=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uWebCtrls.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.932,C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Unit1.pas=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\uFileCtrls.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.412,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Unit1.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.837,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Unit1.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.791,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Unit1.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.675,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Unit1.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.412,=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Unit1.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.173,C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Package\Delphi_XE5\Unit1.pas=C:\Users\Dennis G\Documents\RAD Studio\Projekte\LinaComponents\Source\uInit.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.857,=PascalScript_Core_D19.dcp</Transaction>
<Transaction>1899.12.30 00:00:00.000.045,=IndyProtocols.dcp</Transaction>

View File

@@ -435,7 +435,7 @@ end;
procedure TCommandButton.SetReplaceCaption(Value: Boolean);
begin
FReplaceCaption := Value;
if Value = True then
if Value then
begin
SetWindowLong(Handle,GWL_STYLE,GetWindowLong(Handle,GWL_STYLE) or BS_ICON);
end else
@@ -466,7 +466,7 @@ end;
procedure TCommandButton.CreateParams(var Params: TCreateParams);
begin
inherited;
if CommandLink = True then
if CommandLink then
begin
Params.Style := Params.Style or BS_COMMANDLINK;
end;
@@ -480,7 +480,7 @@ end;
procedure TCommandButton.UpdateShield;
begin
if (Icon.Empty = True) and (Shield = True) then
if Icon.Empty and Shield then
begin
SendMessage(Handle,BCM_SETSHIELD,0,LParam(Shield));
end;
@@ -488,7 +488,7 @@ end;
procedure TCommandButton.UpdateIcon;
begin
if (Icon.Empty = False) or (Shield = False) then
if (not Icon.Empty) or (not Shield) then
begin
SendMessage(Handle,BM_SETIMAGE,1,LParam(Icon.Handle));
end;
@@ -524,7 +524,7 @@ end;
procedure TScrollListBox.SetHorizontalScrollBar(Value: Boolean);
begin
if Value = True then
if Value then
begin
UpdateHorizontalScrollBar;
end else
@@ -536,7 +536,7 @@ end;
procedure TScrollListBox.SetWordWrap(Value: Boolean);
begin
if Value = True then
if Value then
begin
Style := lbOwnerDrawVariable;
end;
@@ -553,7 +553,7 @@ procedure TScrollListBox.DrawItem(Index: Integer; Rect: TRect; State: TOwnerDraw
var
CountIndex: Integer;
begin
if WordWrap = True then
if WordWrap then
begin
Canvas.FillRect(Rect);
if (Index < Count) and (Index >= TopIndex) then
@@ -564,7 +564,7 @@ begin
begin
Rect.Top := Rect.Top + FItemHeights[CountIndex];
end;
if UseRightToLeftAlignment = True then
if UseRightToLeftAlignment then
begin
Rect.Right := Rect.Right - 2;
end else
@@ -584,7 +584,7 @@ end;
procedure TScrollListBox.WndProc(var Message: TMessage);
begin
inherited;
if (HorizontalScrollBar = True) and (Message.Msg = LB_ADDSTRING) or (Message.Msg = LB_DELETESTRING) or (Message.Msg = LB_INSERTSTRING) then
if HorizontalScrollBar and (Message.Msg = LB_ADDSTRING) or (Message.Msg = LB_DELETESTRING) or (Message.Msg = LB_INSERTSTRING) then
begin
UpdateHorizontalScrollBar;
end;
@@ -681,9 +681,9 @@ var
begin
inherited;
FCaptionVisible := False;
if (FShowCaption = True) and (not (csDestroying in ComponentState)) then
if FShowCaption and (not (csDestroying in ComponentState)) then
begin
if ((Focused = False) or (CaptionMode = mcmAnyState)) and (Length(Text) < 1) then
if ((not Focused) or (CaptionMode = mcmAnyState)) and (Length(Text) < 1) then
begin
CCanvas := TControlCanvas.Create;
try
@@ -700,7 +700,7 @@ begin
FCaptionVisible := True;
end;
end;
if Assigned(OnPaint) = True then
if Assigned(OnPaint) then
begin
OnPaint(Self);
end;
@@ -742,7 +742,7 @@ begin
slsHovered: (FLabel as TLabel).Font.Assign(Hovered);
slsPressed: (FLabel as TLabel).Font.Assign(Pressed);
end;
if (FLabel.HighlightVisited = True) and (TargetVisited(FLabel.Target) = True) then
if FLabel.HighlightVisited and TargetVisited(FLabel.Target) then
begin
(FLabel as TLabel).Font.Color := Visited;
end;
@@ -808,17 +808,17 @@ var
CanOpen: Boolean;
begin
inherited;
if (AutoOpenTarget = True) and (Length(Target) <> 0) then
if AutoOpenTarget and (Length(Target) <> 0) then
begin
CanOpen := True;
if Assigned(OnOpenTargetQuery) = True then
if Assigned(OnOpenTargetQuery) then
begin
OnOpenTargetQuery(Self,CanOpen);
end;
if CanOpen = True then
if CanOpen then
begin
ExecuteFile(Target);
if StoreVisited = True then
if StoreVisited then
begin
VisitedTargets.Add(Target);
for Index := 0 to ShortcutLabels.Count - 1 do
@@ -826,7 +826,7 @@ begin
(ShortcutLabels.Items[Index] as TShortcutLabel).Font.Update;
end;
end;
if Assigned(OnOpenTarget) = True then
if Assigned(OnOpenTarget) then
begin
OnOpenTarget(Self);
end;
@@ -978,7 +978,7 @@ begin
end;
end;
end;
if (Message.Result = HTCLIENT) and (PtInRect(MoveArea,ScreenPos) = True) and (spaMove in Allow) then
if (Message.Result = HTCLIENT) and PtInRect(MoveArea,ScreenPos) and (spaMove in Allow) then
begin
Message.Result := HTCAPTION;
end;
@@ -1038,14 +1038,14 @@ const
var
AutoCompleteOptions: DWORD;
begin
if AutoSuggest = True then
if AutoSuggest then
begin
AutoCompleteOptions := SHACF_AUTOSUGGEST_FORCE_ON;
end else
begin
AutoCompleteOptions := SHACF_AUTOSUGGEST_FORCE_OFF;
end;
if AutoAppend = True then
if AutoAppend then
begin
AutoCompleteOptions := AutoCompleteOptions or SHACF_AUTOAPPEND_FORCE_ON;
end else

View File

@@ -363,7 +363,7 @@ begin
begin
if Current^ in Numbers + Letters then
begin
if WantNumber = True then
if WantNumber then
begin
SetLength(Block,Length(Block) + 1);
Block[Length(Block)] := Current^;
@@ -375,7 +375,7 @@ begin
begin
if Current^ in CalcOperators then
begin
if WantOperator = True then
if WantOperator then
begin
Terms[Length(Terms)].Operation := GetOperation(Current^);
WantOperator := False;
@@ -388,7 +388,7 @@ begin
end;
Inc(Current);
end;
if (WantNumber = True) or (WantOperator = True) then
if WantNumber or WantOperator then
begin
RaiseError('Incomplete expression',Current);
end;

View File

@@ -154,7 +154,7 @@ end;
procedure TContextMenuItem.SetIcon(Value: TFileName);
begin
if (FileExists(Value) = True) or (Length(Value) = 0) then
if FileExists(Value) or (Length(Value) = 0) then
begin
FIcon := Value;
end else
@@ -226,7 +226,7 @@ begin
begin
FExt := '*';
end;
if FAutoLoad = True then
if FAutoLoad then
begin
LoadFromRegistry;
end;
@@ -235,7 +235,7 @@ end;
procedure TContextMenu.SetAutoLoad(Value: Boolean);
begin
FAutoLoad := Value;
if Value = True then
if Value then
begin
LoadFromRegistry;
end;
@@ -260,7 +260,7 @@ begin
end;
end;
FAlias := Value;
if FAutoLoad = True then
if FAutoLoad then
begin
LoadFromRegistry;
end;
@@ -269,7 +269,7 @@ end;
procedure TContextMenu.SetAliasRedirect(Value: Boolean);
begin
FAliasRedirect := Value;
if FAutoLoad = True then
if FAutoLoad then
begin
LoadFromRegistry;
end;
@@ -331,36 +331,36 @@ begin
try
Reg.RootKey := HKEY_CLASSES_ROOT;
Reg.Access := KEY_READ;
if Reg.KeyExists(RegKey) = True then
if Reg.KeyExists(RegKey) then
begin
Reg.OpenKeyReadOnly(RegKey);
if Reg.ValueExists('') = True then
if Reg.ValueExists('') then
begin
FAlias := Reg.ReadString('');
end;
Reg.CloseKey;
end;
Key := RegKey + ContextRegPathShell;
if Reg.KeyExists(Key) = True then
if Reg.KeyExists(Key) then
begin
Reg.OpenKeyReadOnly(Key);
if Reg.HasSubKeys = True then
if Reg.HasSubKeys then
begin
Reg.GetKeyNames(SubKeys);
for Index := 0 to SubKeys.Count - 1 do
begin
if Reg.KeyExists(SubKeys.Strings[Index] + ContextRegPathCommand) = True then
if Reg.KeyExists(SubKeys.Strings[Index] + ContextRegPathCommand) then
begin
Reg.CloseKey;
Reg.OpenKeyReadOnly(Key + PathDelim + SubKeys.Strings[Index]);
if Reg.ValueExists('') = True then
if Reg.ValueExists('') then
begin
Cptn := Reg.ReadString('');
end else
begin
Cptn := '';
end;
if Reg.ValueExists('icon') = True then
if Reg.ValueExists('icon') then
begin
Icn := Reg.ReadString('icon');
end else
@@ -369,7 +369,7 @@ begin
end;
Reg.CloseKey;
Reg.OpenKeyReadOnly(Key + PathDelim + SubKeys.Strings[Index] + ContextRegPathCommand);
if Reg.ValueExists('') = True then
if Reg.ValueExists('') then
begin
Cmd := Reg.ReadString('');
end else

View File

@@ -129,10 +129,6 @@ type
TWinFileArray = array of TWinFile;
{$IFNDEF NOGENERIC}
TWinFileList = TList<TWinFile>;
{$ENDIF}
procedure InitializeInvalidNames;
function ValidFileName(const FileName: TInvalidFileName; const InvalidFileNames: TInvalidFileNames): Boolean;
function ValidFileNameStr(const FileName: String; const InvalidFileNames: TInvalidFileNames): Boolean;
@@ -142,7 +138,7 @@ type
function ExecuteFile(FileName: String; ExecMode: TFileExecuteMode = feOpen;
InDir: Boolean = False): Boolean;
function ExtractFileFolder(FileName: String): String;
procedure ListFiles(Dir: String; var OutList: TStrings; FileExts: array of String;
procedure ListFiles(Dir: String; out OutList: TStrings; FileExts: array of String;
NameStyles: TFileNameStyles = []; RecMode: Boolean = False);
procedure ListFolders(Dir: String; var OutList: TStrings;
NameStyles: TFileNameStyles = []; RecMode: Boolean = False);
@@ -305,7 +301,7 @@ begin
FileName := S[Index] + FileName;
end;
end;
if ValidFileNameStr(FileName,InvalidFileNames) = False then
if not ValidFileNameStr(FileName,InvalidFileNames) then
begin
Result := False;
Exit;
@@ -316,7 +312,7 @@ begin
for Index := 1 to SLength do
begin
{ -> Doppel-Slash verhindern }
if NoPathDelim = True then
if NoPathDelim then
begin
if S[Index] in PathDelims then
begin
@@ -331,7 +327,7 @@ begin
NoPathDelim := (S[Index] in PathDelims);
end;
{ -> Drive-Char validieren }
if (NeedPathDelim = True) then
if NeedPathDelim then
begin
if S[Index] in PathDelims then
begin
@@ -398,7 +394,7 @@ begin
end;
end;
procedure ListFiles(Dir: String; var OutList: TStrings; FileExts: array of String;
procedure ListFiles(Dir: String; out OutList: TStrings; FileExts: array of String;
NameStyles: TFileNameStyles = []; RecMode: Boolean = False);
var
SRec: TSearchRec;
@@ -409,6 +405,13 @@ begin
begin
raise EMissingExts.Create('Missing file extensions');
end;
if Assigned(OutList) then
begin
OutList.Clear;
end else
begin
OutList := TStringList.Create;
end;
for ExtIndex := Low(FileExts) to High(FileExts) do
begin
if FindFirst(Dir + '*.*',faAnyFile,SRec) = 0 then
@@ -418,7 +421,7 @@ begin
begin
if ((SRec.Attr and faDirectory) = faDirectory) then
begin
if RecMode = True then
if RecMode then
begin
ListFiles(Dir + SRec.Name,OutList,FileExts,NameStyles,RecMode);
end;
@@ -463,7 +466,7 @@ begin
end else
begin
OutList.Add(SRec.Name);
if RecMode = True then
if RecMode then
begin
ListFolders(Dir + SRec.Name,OutList,NameStyles,RecMode);
end;
@@ -483,7 +486,7 @@ function ExecuteFile(FileName: String; ExecMode: TFileExecuteMode = feOpen;
begin
Result := True;
try
if InDir = True then
if InDir then
begin
ShellExecute(Application.Handle,FEModeToPChar(ExecMode),PChar(FileName),nil,PChar(ExtractFileDir(FileName)),SW_NORMAL);
end else
@@ -698,13 +701,13 @@ begin
GetMem(OwnerName,1024);
GetMem(DomainName,1024);
try
if GetFileSecurity(PChar(FileName),OWNER_SECURITY_INFORMATION,SecDescr,1024,SizeNeeded) = True then
if GetFileSecurity(PChar(FileName),OWNER_SECURITY_INFORMATION,SecDescr,1024,SizeNeeded) then
begin
if GetSecurityDescriptorOwner(SecDescr,OwnerSID,OwnerDefault) = True then
if GetSecurityDescriptorOwner(SecDescr,OwnerSID,OwnerDefault) then
begin
SizeNeeded := 1024;
SizeNeeded2 := 1024;
if LookupAccountSID(nil,OwnerSID,OwnerName,SizeNeeded,DomainName,SizeNeeded2,OwnerType) = True then
if LookupAccountSID(nil,OwnerSID,OwnerName,SizeNeeded,DomainName,SizeNeeded2,OwnerType) then
begin
Result := OwnerName + '@' + DomainName;
end else
@@ -887,7 +890,7 @@ end;
constructor TWinFileInfo.Create(AFileName: String);
begin
FFileName := AFileName;
if FileExists(FFileName) = False then
if not FileExists(FFileName) then
begin
raise EFileNoExist.Create('File not found: "' + FFileName + '"');
end;
@@ -906,7 +909,7 @@ end;
constructor TWinDrive.Create(ADriveChar: Char);
begin
FDriveChar := ADriveChar;
if DirectoryExists(DriveCharToFileDir(FDriveChar)) = False then
if not DirectoryExists(DriveCharToFileDir(FDriveChar)) then
begin
raise EDriveNoExist.Create('Drive not found: "' + FDriveChar + '"');
end;
@@ -974,7 +977,7 @@ begin
FFileName := AFileName;
FDrive := TWinDrive.Create(ExtractDriveChar(FFileName));
FInfo := TWinFileInfo.Create(FFileName);
if FileExists(FFileName) = False then
if not FileExists(FFileName) then
begin
raise EFileNoExist.Create('File not found: "' + FFileName + '"');
end;
@@ -989,7 +992,7 @@ end;
function TWinFile.GetExtension(WithDot: Boolean = True): String;
begin
if WithDot = True then
if WithDot then
begin
Result := ExtractFileExt(FFileName);
end else
@@ -1000,7 +1003,7 @@ end;
function TWinFile.GetFileName(WithExt: Boolean = True): String;
begin
if WithExt = True then
if WithExt then
begin
Result := ExtractFileName(FFileName); //Name + Erweiterung
end else

View File

@@ -1481,7 +1481,7 @@ end;
procedure TSplashTimer.SetEnabled(Value: Boolean);
begin
FEnabled := Value;
if SplashScreenVisible = True then
if SplashScreenVisible then
begin
TimerObject.Enabled := Value;
end;
@@ -1538,7 +1538,7 @@ begin
OnCreate(Self);
end;
{ Erst NACHDEM fertig erstellt wurde und OnCreate-Event ausgef�hrt wurde... }
if AutoShow = True then
if AutoShow then
begin
Show;
end;
@@ -1739,15 +1739,15 @@ end;
procedure TSplashScreen.SetVisible(Value: Boolean);
begin
if Value = True then
if Value then
begin
if SplashForm.FormObject.Visible = False then
if not SplashForm.FormObject.Visible then
begin
Show;
end;
end else
begin
if SplashForm.FormObject.Visible = True then
if SplashForm.FormObject.Visible then
begin
Hide;
end;
@@ -1878,14 +1878,14 @@ end;
procedure TProgressBarManager.Update;
begin
if Assigned(Target) = False then
if not Assigned(Target) then
begin
Exit;
end;
if Mode <> pmmNone then
begin
if (Mode = pmmBattery) and (Assigned(SourceBattery) = False)
or (Mode = pmmDownload) and (Assigned(SourceDownload) = False) then
if (Mode = pmmBattery) and (not Assigned(SourceBattery))
or (Mode = pmmDownload) and (not Assigned(SourceDownload)) then
begin
Exit;
end;
@@ -1954,14 +1954,14 @@ end;
procedure TListBoxManager.Update;
begin
if Assigned(Target) = False then
if not Assigned(Target) then
begin
Exit;
end;
if Mode <> lmmNone then
begin
if (Mode = lmmEdit) and (Assigned(SourceEdit) = False)
or (Mode = lmmComboBox) and (Assigned(SourceComboBox) = False) then
if (Mode = lmmEdit) and (not Assigned(SourceEdit))
or (Mode = lmmComboBox) and (not Assigned(SourceComboBox)) then
begin
Exit;
end;
@@ -2162,7 +2162,7 @@ begin
while CharIndex <= Length(ParamItem) do
begin
//[X----]
if InPrefix = True then
if InPrefix then
begin
if Length(Format.Prefix) = 0 then
begin
@@ -2182,7 +2182,7 @@ begin
end else
begin
//[----X]
if InSuffix = True then
if InSuffix then
begin
if (ParamItem[CharIndex] = Format.Suffix[CharIndex - Length(Format.Prefix + Identifier + Format.Separator + Value)]) then
begin
@@ -2200,7 +2200,7 @@ begin
//Identifier [ InIdent := not (InPrefix or InSuffix) ]
begin
//[--X--]
if InSep = True then
if InSep then
begin
if Length(Format.Separator) = 0 then
begin
@@ -2222,7 +2222,7 @@ begin
end else
begin
//[---X-]
if InDef = True then
if InDef then
begin
Value := Value + ParamItem[CharIndex];
if CharIndex = Length(ParamItem) - Length(Format.Suffix) then
@@ -2300,7 +2300,7 @@ begin
(References.Items[Index] as TParamReference).Update;
end;
finally
if Assigned(OnUpdate) = True then
if Assigned(OnUpdate) then
begin
OnUpdate(Self);
end;
@@ -2608,7 +2608,8 @@ end;
function TDiagramValues.AddData(Data: TDiagramValueData): TDiagramValue;
begin
(Add as TDiagramValue).Data := Data;
Result := (Add as TDiagramValue);
Result.Data := Data;
end;
function TDiagramValues.FindItem(const Name: String): TDiagramValue;
@@ -3616,7 +3617,6 @@ end;
procedure TDiagram.DrawCursorArtLines;
var
Index: Integer;
CursorPos: TPoint;
begin
if not (csDesigning in ComponentState) then

View File

@@ -25,7 +25,7 @@ type
{ Hilfsklassen }
TLanguageTag = String[3];
TCommentAllow = type TLinePosition;
TLocalizationApplyMode = (laCustom,laAll,laMainForm,laNone);
TLocalizationApplyMode = (laCustom,laAll,laMainForm,laOwnerForm,laNone);
{ Ereignisse }
TLocalizationManagerChangeQueryEvent = procedure(Sender: TObject; OldIndex, NewIndex: Integer; var CanChange: Boolean) of object;
@@ -179,6 +179,7 @@ type
FExporter: TLocalizationExporter;
protected
{ Protected-Deklarationen }
procedure Clear;
procedure AddSection(Section: String);
procedure AddIndent(const Section: String; Indent: String);
public
@@ -222,9 +223,11 @@ type
FReference: PString;
FField: String;
{ Methoden }
function GetDisplayName: String; override;
procedure SetIndent(Value: String);
procedure Apply;
protected
{ Protected-Deklarationen }
function GetDisplayName: String; override;
public
{ Public-Deklarationen }
constructor Create(Collection: TCollection); override;
@@ -485,7 +488,7 @@ end;
procedure TLocalizationImporter.PrepareImport;
begin
if ClearBeforeImport = True then
if ClearBeforeImport then
begin
Localization.Lines.Clear;
end;
@@ -709,6 +712,7 @@ var
label
EoL;
begin
(Collection as TLocalizations).FManager.Data.Clear;
Result := False;
Section := '';
Indent := '';
@@ -732,14 +736,14 @@ begin
InComment := @Format.Comment[1];
InCharacter := @Format.Character[1];
//Parsen
while Complete = False do
while not Complete do
begin
if ((Address = False) or (Current^ <> #0)) and (not (Current^ in Spaces)) or ((((Address = False) and (Position = posValue)) or (Header = True)) and (Length(Block) <> 0)) then
if ((not Address) or (Current^ <> #0)) and (not (Current^ in Spaces)) or ((((not Address) and (Position = posValue)) or Header) and (Length(Block) <> 0)) then
begin
//Zeichen zu Block hinzuf�gen
if Current^ <> #0 then
begin
if Character = False then
if not Character then
begin
Block := Block + Current^;
end else
@@ -747,7 +751,7 @@ begin
Ordinal := Ordinal + Current^;
end;
end;
if (Current^ = #0{@Lines.Strings[Line][Length(Lines.Strings[Line])]}) or ((Character = True) and (Current^ in Spaces)) then
if (Current^ = #0{@Lines.Strings[Line][Length(Lines.Strings[Line])]}) or (Character and (Current^ in Spaces)) then
begin
goto EoL;
end else
@@ -811,33 +815,33 @@ begin
Continue;
end;
end;
if (Length(Block) <> 0) or ((Position = posValue) and (Address = False)) or ((Position = posIndent) and (Header = True)) then
if (Length(Block) <> 0) or ((Position = posValue) and (not Address)) or ((Position = posIndent) and Header) then
begin
if //Kommentaranfang
((Block = Format.Comment) and ((Format.AllowComment = lpAnyPosition) or ((Format.AllowComment = lpBeginning) and (Current = @Lines.Strings[Line][1]))) or (Current^ = #0{@Lines.Strings[Line][Length(Lines.Strings[Line])]}) or (InComment^ = #0)) or
//Zeilenende
((Current^ = #0{@Lines.Strings[Line][Length(Lines.Strings[Line])]}) and (not (Current^ in Spaces))) or
//Adressenende
(Address = True) then
Address then
begin
//Block fertig
if ((Position = posSeparator) and (Block = Format.Separator)) or ((Block = Format.Comment) and ((Position = posPrefix) or (Finished = True))) or ((Header = True) and (Position = posIndent) and (Length(Block) <> 0)) or (((Position = PosValue) or ((Current^ = #0) and (Special = True))) and ((Address = False) or ((Length(Block) <> 0) or (Special = True)))) then
if ((Position = posSeparator) and (Block = Format.Separator)) or ((Block = Format.Comment) and ((Position = posPrefix) or Finished)) or (Header and (Position = posIndent) and (Length(Block) <> 0)) or (((Position = PosValue) or ((Current^ = #0) and Special)) and ((not Address) or ((Length(Block) <> 0) or Special))) then
begin
if Position = posSeparator then
begin
Block := '';
end;
if Header = True then
if Header then
begin
//Ende von Header
Section := TrimRight(Block);
end else
begin
//Ende von Value
if (Finished = False) and (Block <> Format.Comment) then
if (not Finished) and (Block <> Format.Comment) then
begin
//Ende von Special
if Special = True then
if Special then
begin
if Length(Indent) = 0 then
begin
@@ -916,7 +920,7 @@ begin
end else
begin
//Ende von Indent
if Address = False then
if not Address then
begin
//Wert
(Collection as TLocalizations).FManager.Data.WriteString(Section,Indent,TrimRight(Block));
@@ -924,7 +928,7 @@ begin
begin
//Adressierung
Complete := (Current^ = #0{@Lines.Strings[Line][Length(Lines.Strings[Line])]});
if (Collection as TLocalizations).FManager.Data.IndentExists(Section,Block) = True then
if (Collection as TLocalizations).FManager.Data.IndentExists(Section,Block) then
begin
(Collection as TLocalizations).FManager.Data.Address(Section,Indent,Block);
Finished := True;
@@ -970,10 +974,10 @@ begin
end;
posIndent: begin
Indent := LowerCase(TrimRight(Block));
if Header = False then
if not Header then
begin
Inc(Position);
if Special = True then
if Special then
begin
if ArrayPos(Indent,Specials) <> -1 then
begin
@@ -992,7 +996,7 @@ begin
end;
posSeparator: begin
Address := (Block = Format.Address);
if (Block <> Format.Separator) and (Address = False) then
if (Block <> Format.Separator) and (not Address) then
begin
RaiseParseErrorUnexpected('Separator or address mark','"' + Block + '"',Line,Current,Length(Block));
Exit;
@@ -1000,7 +1004,7 @@ begin
Inc(Position);
end;
posValue: begin
if (Finished = True) and ((InComment^ <> #0) or (not (Current^ in Spaces))) then
if Finished and ((InComment^ <> #0) or (not (Current^ in Spaces))) then
begin
RaiseParseErrorUnexpected('End of line','"' + Block + '"',Line,Current,Length(Block));
Exit;
@@ -1131,7 +1135,7 @@ begin
begin
Exit;
end;
if ClearBeforeExport = True then
if ClearBeforeExport then
begin
Sections := TStringList.Create;
INI.ReadSections(Sections);
@@ -1186,6 +1190,13 @@ begin
inherited;
end;
procedure TLocalizationData.Clear;
begin
SetLength(Sections,0);
SetLength(Indents,0);
SetLength(Values,0);
end;
procedure TLocalizationData.AddSection(Section: String);
begin
SetLength(Sections,Length(Sections) + 1);
@@ -1212,8 +1223,17 @@ begin
end;
function TLocalizationData.IndexOfIndent(const Section,Indent: String): Integer;
var
SectionIndex: Integer;
begin
Result := ArrayPosRef(Indent,Sections[IndexOfSection(Section)].Reference^,FManager.IgnoreCase);
SectionIndex := IndexOfSection(Section);
if SectionIndex <> -1 then
begin
Result := ArrayPosRef(Indent,Sections[SectionIndex].Reference^,FManager.IgnoreCase);
end else
begin
Result := SectionIndex;
end;
end;
function TLocalizationData.SectionExists(const Section: String): Boolean;
@@ -1223,13 +1243,7 @@ end;
function TLocalizationData.IndentExists(const Section,Indent: String): Boolean;
begin
if SectionExists(Section) = True then
begin
Result := (IndexOfIndent(Section,Indent) >= 0);
end else
begin
Result := False;
end;
Result := (IndexOfIndent(Section,Indent) >= 0);
end;
procedure TLocalizationData.ReadSections(var ASections: TStrings);
@@ -1245,12 +1259,17 @@ end;
procedure TLocalizationData.ReadIndents(const Section: String; var AIndents: TStrings);
var
SectionIndex: Integer;
Index: Integer;
begin
AIndents.Clear;
for Index := Low(Sections[IndexOfSection(Section)].Reference^) to High(Sections[IndexOfSection(Section)].Reference^) do
SectionIndex := IndexOfSection(Section);
if SectionIndex <> -1 then
begin
AIndents.Add(Sections[IndexOfSection(Section)].Reference^[Index].Value);
for Index := Low(Sections[SectionIndex].Reference^) to High(Sections[SectionIndex].Reference^) do
begin
AIndents.Add(Sections[IndexOfSection(Section)].Reference^[Index].Value);
end;
end;
end;
@@ -1267,7 +1286,7 @@ end;
function TLocalizationData.ReadString(const Section,Indent: String; Default: String): String;
begin
if (SectionExists(Section) = True) and (IndentExists(Section,Indent) = True) then
if IndentExists(Section,Indent) then
begin
Result := Sections[IndexOfSection(Section)].Reference^[IndexOfIndent(Section,Indent)].Reference^;
end else
@@ -1288,11 +1307,11 @@ end;
procedure TLocalizationData.WriteString(const Section,Indent: String; Value: String);
begin
if SectionExists(Section) = False then
if not SectionExists(Section) then
begin
AddSection(Section);
end;
if IndentExists(Section,Indent) = False then
if not IndentExists(Section,Indent) then
begin
AddIndent(Section,Indent);
end;
@@ -1314,11 +1333,11 @@ end;
procedure TLocalizationData.Address(const Section,Indent,Target: String);
begin
if SectionExists(Section) = False then
if not SectionExists(Section) then
begin
AddSection(Section);
end;
if IndentExists(Section,Indent) = False then
if not IndentExists(Section,Indent) then
begin
AddIndent(Section,Indent);
end;
@@ -1440,12 +1459,13 @@ begin
laCustom: FManager.References.Apply;
laAll: ApplyToAll;
laMainForm: ApplyToFormEx(Application.MainForm);
laOwnerForm: ApplyToFormEx(GetOwnerForm(FManager));
end;
end;
procedure TLocalizationApplier.ApplyToComponent(Component: TComponent; Field,Section,Indent: String);
begin
if Assigned(Component) = True then
if Assigned(Component) and IsPublishedSubProp(Component,Field) then
begin
SetStrSubProp(Component,Field,FManager.Data.ReadString(Section,Indent,GetStrSubProp(Component,Field)));
end;
@@ -1465,7 +1485,7 @@ var
Index: Integer;
Indents: TStrings;
begin
if Assigned(Form) = True then
if Assigned(Form) then
begin
Indents := TStringList.Create;
try
@@ -1494,7 +1514,7 @@ var
Index_Indent: Integer;
Indents: TStrings;
begin
if Assigned(Form) = True then
if Assigned(Form) then
begin
Indents := TStringList.Create;
try
@@ -1559,33 +1579,33 @@ procedure TLocalizationManager.SetCurrent(Value: Integer);
var
AllowChange: Boolean;
begin
if Assigned(OnChangeQuery) = True then
if Assigned(OnChangeQuery) then
begin
AllowChange := True;
OnChangeQuery(Self,FCurrent,Value,AllowChange);
if AllowChange = False then
if not AllowChange then
begin
Exit;
end;
end;
if Value > -1 then
begin
if (Localizations.Items[Value] as TLocalization).Apply = True then
if (Localizations.Items[Value] as TLocalization).Apply then
begin
if Assigned(OnChangeSuccess) = True then
if Assigned(OnChangeSuccess) then
begin
OnChangeSuccess(Self,FCurrent,Value);
end;
end else
begin
if Assigned(OnChangeFail) = True then
if Assigned(OnChangeFail) then
begin
OnChangeFail(Self,FCurrent,Value);
end;
Exit;
end;
end;
if Assigned(OnChange) = True then
if Assigned(OnChange) then
begin
OnChange(Self,FCurrent,Value);
end;

View File

@@ -219,7 +219,7 @@ begin
Index := Index + 1;
PluginFound := (Index >= PluginList.Count - 1);
end;
until (PluginFound = True);
until PluginFound;
end;
end;
@@ -515,7 +515,7 @@ begin
begin
AddLog('Compiling script...');
end;
if ScriptEngine.Compile = True then
if ScriptEngine.Compile then
begin
if ReturnMode = srAll then
begin
@@ -525,7 +525,7 @@ begin
begin
AddLog('Executing script...');
end;
if ScriptEngine.Execute = False then
if not ScriptEngine.Execute then
begin
if (ReturnMode = srAll) or (ReturnMode = srErrors) then
begin
@@ -564,11 +564,11 @@ begin
{ VARIABLEN }
if slForms in Libraries then
begin
if Assigned(VarSelf) = True then
if Assigned(VarSelf) then
begin
AddRegisteredVariable('Self','TForm');
end;
if Assigned(VarApplication) = True then
if Assigned(VarApplication) then
begin
AddRegisteredVariable('Application','TApplication');
end;
@@ -585,7 +585,7 @@ begin
AddMethod(Self,@TScriptManager.PS_Randomize,'procedure Randomize');
AddMethod(Self,@TScriptManager.PS_Sleep,'procedure Sleep(Milliseconds: Cardinal)');
AddMethod(Self,@TScriptManager.PS_About,'procedure About');
if SecureMode = False then
if not SecureMode then
begin
AddMethod(Self,@TScriptManager.CompileAndExecute,'function CompileAndExecute: Boolean');
end;
@@ -600,11 +600,11 @@ procedure TScriptManager.ScriptEngineExecute(Sender: TPSScript);
begin
with (Sender as TPSScript) do
begin
if Assigned(VarSelf) = True then
if Assigned(VarSelf) then
begin
SetVarToInstance('Self',VarSelf);
end;
if Assigned(VarApplication) = True then
if Assigned(VarApplication) then
begin
SetVarToInstance('Application',VarApplication);
end;

View File

@@ -563,7 +563,7 @@ begin
if Length(Key) <> 0 then
begin
case Mode of
cmXor: Result := ((StrIsInt(Key) = True) and (StrToInt(Key) in [0..31]));
cmXor: Result := (StrIsInt(Key) and (StrToInt(Key) in [0..31]));
cmCaesar: Result := ((Length(Key) = 1) and (Key[1] in Letters));
cmVigenere: Result := ConsistsOf(Key,Letters);
cmCustom: Result := True;
@@ -770,11 +770,11 @@ begin
Snapshot := CreateToolHelp32Snapshot(TH32CS_SNAPPROCESS,0);
try
ProcEntry.dwSize := SizeOf(ProcEntry);
if Process32First(Snapshot,ProcEntry) = True then
if Process32First(Snapshot,ProcEntry) then
begin
repeat
FNames.Add(ProcEntry.szExeFile);
until (Process32Next(Snapshot,ProcEntry) = False)
until not Process32Next(Snapshot,ProcEntry)
end else
begin
RaiseLastOSError;
@@ -860,7 +860,7 @@ begin
Result := ProcEntry.th32ProcessID;
Break;
end;
until (Process32Next(Snapshot,ProcEntry) = False)
until not Process32Next(Snapshot,ProcEntry)
end else
begin
RaiseLastOSError;
@@ -887,7 +887,7 @@ begin
Result := ProcEntry.szExeFile;
Break;
end;
until (Process32Next(Snapshot,ProcEntry) = False)
until not Process32Next(Snapshot,ProcEntry)
end else
begin
RaiseLastOSError;
@@ -940,7 +940,7 @@ begin
Result := ProcEntry.cntThreads;
Break;
end;
until (Process32Next(Snapshot,ProcEntry) = False)
until not Process32Next(Snapshot,ProcEntry)
end else
begin
RaiseLastOSError;
@@ -967,7 +967,7 @@ begin
Result := ProcEntry.th32ParentProcessID;
Break;
end;
until (Process32Next(Snapshot,ProcEntry) = False)
until not Process32Next(Snapshot,ProcEntry)
end else
begin
RaiseLastOSError;
@@ -994,7 +994,7 @@ begin
Result := ProcEntry.pcPriClassBase;
Break;
end;
until (Process32Next(Snapshot,ProcEntry) = False)
until not Process32Next(Snapshot,ProcEntry);
end else
begin
RaiseLastOSError;
@@ -1010,7 +1010,7 @@ var
begin
Result := 0;
ProcMem.cb := SizeOf(ProcMem);
if GetProcessMemoryInfo(OpenProcess(PROCESS_QUERY_INFORMATION,False,ProcID),@ProcMem,SizeOf(ProcMem)) = True then
if GetProcessMemoryInfo(OpenProcess(PROCESS_QUERY_INFORMATION,False,ProcID),@ProcMem,SizeOf(ProcMem)) then
begin
Result := ProcMem.WorkingSetSize;
end else
@@ -1043,13 +1043,13 @@ begin
begin
Success := GetTokenInformation(Token,TokenUser,nil,0,Buffer);
User := nil;
while (Success = False) and (GetLastError = ERROR_INSUFFICIENT_BUFFER) do
while (not Success) and (GetLastError = ERROR_INSUFFICIENT_BUFFER) do
begin
ReallocMem(User,Buffer);
Success := GetTokenInformation(Token,TokenUser,User,Buffer,Buffer);
end;
CloseHandle(Token);
if Success = False then
if not Success then
begin
RaiseLastOSError;
end;
@@ -1096,13 +1096,13 @@ begin
begin
Success := GetTokenInformation(Token,TokenUser,nil,0,Buffer);
User := nil;
while (Success = False) and (GetLastError = ERROR_INSUFFICIENT_BUFFER) do
while (not Success) and (GetLastError = ERROR_INSUFFICIENT_BUFFER) do
begin
ReallocMem(User,Buffer);
Success := GetTokenInformation(Token,TokenUser,User,Buffer,Buffer);
end;
CloseHandle(Token);
if Success = False then
if not Success then
begin
RaiseLastOSError;
end;
@@ -1716,7 +1716,7 @@ begin
end;
try
Reg.OpenKeyReadOnly(RegistryPath + PathDelim + RegSubKey);
if Reg.ValueExists(Variable) = True then
if Reg.ValueExists(Variable) then
begin
Result := Reg.ReadString(Variable);
end else
@@ -1851,7 +1851,7 @@ begin
if Length(Value) <> 0 then
begin
case Mode of
cmXor: if not ((StrIsInt(Value) = True) and (StrToInt(Value) in [0..31])) then
cmXor: if not (StrIsInt(Value) and (StrToInt(Value) in [0..31])) then
begin
raise EInvalidKey.Create('Invalid Xor crypt key value');
end;
@@ -1864,7 +1864,7 @@ begin
end;
cmVigenere: begin
Value := UpperCase(Value);
if ConsistsOf(Value,UpperCaseLetters) = False then
if not ConsistsOf(Value,UpperCaseLetters) then
begin
raise EInvalidKey.Create('Invalid Vigenere crypt key value');
end;
@@ -1876,7 +1876,7 @@ begin
begin
OnKeyChangeQuery(Self,Value,CanChange);
end;
if CanChange = True then
if CanChange then
begin
FKey := Value;
if Assigned(OnKeyChange) then
@@ -1894,7 +1894,7 @@ end;
procedure TCryptManager.SetDecrypted(Value: TStrings);
begin
(FDecrypted as TStringList).Assign(Value);
if AutoCrypt = True then
if AutoCrypt then
begin
Encrypt;
end;
@@ -1908,7 +1908,7 @@ end;
procedure TCryptManager.SetEncrypted(Value: TStrings);
begin
(FEncrypted as TStringList).Assign(Value);
if AutoCrypt = True then
if AutoCrypt then
begin
Decrypt;
end;
@@ -1916,7 +1916,7 @@ end;
procedure TCryptManager.DecryptedChange(Sender: TObject);
begin
if AutoCrypt = True then
if AutoCrypt then
begin
Encrypt;
end;
@@ -1924,7 +1924,7 @@ end;
procedure TCryptManager.EncryptedChange(Sender: TObject);
begin
if AutoCrypt = True then
if AutoCrypt then
begin
Decrypt;
end;
@@ -2079,7 +2079,7 @@ procedure TCryptManager.Decrypt;
var
OldAutoCrypt: Boolean;
begin
if AutoCrypt = True then
if AutoCrypt then
begin
OldAutoCrypt := True;
AutoCrypt := False;
@@ -2095,11 +2095,11 @@ begin
cmVigenere: VigenereDecrypt;
end;
end;
if Assigned(OnWork) = True then
if Assigned(OnWork) then
begin
OnWork(Self);
end;
if OldAutoCrypt = True then
if OldAutoCrypt then
begin
AutoCrypt := True;
end;
@@ -2109,7 +2109,7 @@ procedure TCryptManager.Encrypt;
var
OldAutoCrypt: Boolean;
begin
if AutoCrypt = True then
if AutoCrypt then
begin
OldAutoCrypt := True;
AutoCrypt := False;
@@ -2125,11 +2125,11 @@ begin
cmVigenere: VigenereEncrypt;
end;
end;
if Assigned(OnWork) = True then
if Assigned(OnWork) then
begin
OnWork(Self);
end;
if OldAutoCrypt = True then
if OldAutoCrypt then
begin
AutoCrypt := True;
end;

View File

@@ -13,11 +13,8 @@ interface
uses
{ Standard-Units }
SysUtils, Classes, Math, Windows, Graphics, Printers, TypInfo, Controls
{$IFNDEF NO_GENERIC}
,Generics.Collections
{$ENDIF}
;
SysUtils, Classes, Math, Windows, Graphics, Printers, TypInfo, Controls,
Forms;
type
{ Fehlermeldungen }
@@ -37,14 +34,6 @@ type
TBit = 0..1;
{$IFNDEF NO_GENERIC}
TVariantList = TList<Variant>;
TIntegerList = TList<Integer>;
TBooleanList = TList<Boolean>;
TFloatList = TList<Extended>;
TPointList = TList<TPoint>;
{$ENDIF}
{ Typisierte Arrays }
TPointerArray = array of Pointer;
TPCharArray = array of PChar;
@@ -516,7 +505,8 @@ type
function GetMethodSubProp(Instance: TObject; const PropName: String): TMethod;
procedure SetMethodSubProp(Instance: TObject; const PropName: String; Value: TMethod);
function SubPropIsType(Instance: TObject; const PropName: String; TypeKind: TTypeKind): Boolean;
function SubPropType(Instance: TObject; const PropName: String): TTypeKind; overload;
function SubPropType(Instance: TObject; const PropName: String): TTypeKind;
function IsPublishedSubProp(Instance: TObject; const PropName: String): Boolean;
{ Datum/Uhrzeit }
function SystemTime: TSystemTime;
function Year: Word;
@@ -571,6 +561,7 @@ type
function ControlIndex(Control: TControl): Integer;
function IntToStrMinLength(Value: Integer; MinLength: SmallInt): String;
function BmpRect(Bitmap: TBitmap): TRect;
function GetOwnerForm(Component: TComponent): TCustomForm;
function MultiPos(const SubStr, Str: ShortString; Offset: Integer = 1): TIntegerArray; overload;
function MultiPos(const SubStr, Str: String; Offset: Integer = 1): TIntegerArray; overload;
function CharLine(Current: PAnsiChar; Text: AnsiString): Integer; {$IFNDEF NO_UNICODE} overload;
@@ -1183,7 +1174,7 @@ var
Buffer: String;
begin
Changed := True;
while Changed = True do
while Changed do
begin
Changed := False;
for Index := Low(Elements) to High(Elements) - 1 do
@@ -1193,7 +1184,7 @@ begin
Buffer := Elements[Index];
Elements[Index] := Elements[Index + 1];
Elements[Index + 1] := Buffer;
if Changed = False then
if not Changed then
begin
Changed := True;
end;
@@ -1209,7 +1200,7 @@ var
Buffer: ShortInt;
begin
Changed := True;
while Changed = True do
while Changed do
begin
Changed := False;
for Index := Low(Elements) to High(Elements) - 1 do
@@ -1219,7 +1210,7 @@ begin
Buffer := Elements[Index];
Elements[Index] := Elements[Index + 1];
Elements[Index + 1] := Buffer;
if Changed = False then
if not Changed then
begin
Changed := True;
end;
@@ -1235,7 +1226,7 @@ var
Buffer: SmallInt;
begin
Changed := True;
while Changed = True do
while Changed do
begin
Changed := False;
for Index := Low(Elements) to High(Elements) - 1 do
@@ -1245,7 +1236,7 @@ begin
Buffer := Elements[Index];
Elements[Index] := Elements[Index + 1];
Elements[Index + 1] := Buffer;
if Changed = False then
if not Changed then
begin
Changed := True;
end;
@@ -1261,7 +1252,7 @@ var
Buffer: Integer;
begin
Changed := True;
while Changed = True do
while Changed do
begin
Changed := False;
for Index := Low(Elements) to High(Elements) - 1 do
@@ -1271,7 +1262,7 @@ begin
Buffer := Elements[Index];
Elements[Index] := Elements[Index + 1];
Elements[Index + 1] := Buffer;
if Changed = False then
if not Changed then
begin
Changed := True;
end;
@@ -1287,7 +1278,7 @@ var
Buffer: Int64;
begin
Changed := True;
while Changed = True do
while Changed do
begin
Changed := False;
for Index := Low(Elements) to High(Elements) - 1 do
@@ -1297,7 +1288,7 @@ begin
Buffer := Elements[Index];
Elements[Index] := Elements[Index + 1];
Elements[Index + 1] := Buffer;
if Changed = False then
if not Changed then
begin
Changed := True;
end;
@@ -1313,7 +1304,7 @@ var
Buffer: Byte;
begin
Changed := True;
while Changed = True do
while Changed do
begin
Changed := False;
for Index := Low(Elements) to High(Elements) - 1 do
@@ -1323,7 +1314,7 @@ begin
Buffer := Elements[Index];
Elements[Index] := Elements[Index + 1];
Elements[Index + 1] := Buffer;
if Changed = False then
if not Changed then
begin
Changed := True;
end;
@@ -1339,7 +1330,7 @@ var
Buffer: Word;
begin
Changed := True;
while Changed = True do
while Changed do
begin
Changed := False;
for Index := Low(Elements) to High(Elements) - 1 do
@@ -1349,7 +1340,7 @@ begin
Buffer := Elements[Index];
Elements[Index] := Elements[Index + 1];
Elements[Index + 1] := Buffer;
if Changed = False then
if not Changed then
begin
Changed := True;
end;
@@ -1365,7 +1356,7 @@ var
Buffer: Cardinal;
begin
Changed := True;
while Changed = True do
while Changed do
begin
Changed := False;
for Index := Low(Elements) to High(Elements) - 1 do
@@ -1375,7 +1366,7 @@ begin
Buffer := Elements[Index];
Elements[Index] := Elements[Index + 1];
Elements[Index + 1] := Buffer;
if Changed = False then
if not Changed then
begin
Changed := True;
end;
@@ -1391,7 +1382,7 @@ var
Buffer: Single;
begin
Changed := True;
while Changed = True do
while Changed do
begin
Changed := False;
for Index := Low(Elements) to High(Elements) - 1 do
@@ -1401,7 +1392,7 @@ begin
Buffer := Elements[Index];
Elements[Index] := Elements[Index + 1];
Elements[Index + 1] := Buffer;
if Changed = False then
if not Changed then
begin
Changed := True;
end;
@@ -1417,7 +1408,7 @@ var
Buffer: Double;
begin
Changed := True;
while Changed = True do
while Changed do
begin
Changed := False;
for Index := Low(Elements) to High(Elements) - 1 do
@@ -1427,7 +1418,7 @@ begin
Buffer := Elements[Index];
Elements[Index] := Elements[Index + 1];
Elements[Index + 1] := Buffer;
if Changed = False then
if not Changed then
begin
Changed := True;
end;
@@ -1443,7 +1434,7 @@ var
Buffer: Extended;
begin
Changed := True;
while Changed = True do
while Changed do
begin
Changed := False;
for Index := Low(Elements) to High(Elements) - 1 do
@@ -1453,7 +1444,7 @@ begin
Buffer := Elements[Index];
Elements[Index] := Elements[Index + 1];
Elements[Index + 1] := Buffer;
if Changed = False then
if not Changed then
begin
Changed := True;
end;
@@ -1842,6 +1833,20 @@ begin
end;
end;
function IsPublishedSubProp(Instance: TObject; const PropName: String): Boolean;
var
DotPos: Integer;
begin
DotPos := Pos(DotSep,PropName);
if DotPos = 0 then
begin
Result := IsPublishedProp(Instance,Trim(PropName));
end else
begin
Result := IsPublishedSubProp(GetObjectProp(Instance,Trim(Copy(PropName,1,DotPos - 1))),Copy(PropName,DotPos + 1,Length(PropName) - 2));
end;
end;
function SystemTime: TSystemTime;
begin
GetLocalTime(Result);
@@ -2123,7 +2128,7 @@ begin
finally
Temp.Free;
end;
if Result = True then
if Result then
begin
Range.Offset := Temp.Offset;
Range.Target := Temp.Target;
@@ -2181,7 +2186,7 @@ end;
function ExtractClassName(FullClassName: String; CaseSensitive: Boolean = False): String;
begin
if (Length(FullClassName) <> 0) and ((FullClassName[1] = 'T') or ((CaseSensitive = False) and (FullClassName[1] = 't'))) and ((FullClassName[2] in UppercaseLetters) or (CaseSensitive = False)) then
if (Length(FullClassName) <> 0) and ((FullClassName[1] = 'T') or ((not CaseSensitive) and (FullClassName[1] = 't'))) and ((FullClassName[2] in UppercaseLetters) or (not CaseSensitive)) then
begin
Result := Copy(FullClassName,2,Length(FullClassName) - 1);
end else
@@ -2359,7 +2364,7 @@ var
Tick_Finish: Cardinal;
begin
Result := 0;
if (Assigned(Command) = False) or (Amount = 0) or (Attempts = 0) then
if (not Assigned(Command)) or (Amount = 0) or (Attempts = 0) then
begin
Exit;
end;
@@ -2775,7 +2780,7 @@ begin
Result := Low(AArray) - 1;
for Index := Low(AArray) to High(AArray) do
begin
if (AArray[Index].Value = AValue) or ((IgnoreCase = True) and (LowerCase(AArray[Index].Value) = LowerCase(AValue))) then
if (AArray[Index].Value = AValue) or (IgnoreCase and (LowerCase(AArray[Index].Value) = LowerCase(AValue))) then
begin
Result := Index;
Exit;
@@ -2835,7 +2840,7 @@ begin
Result := Low(AArray) - 1;
for Index := Low(AArray) to High(AArray) do
begin
if (AArray[Index].Value = AValue) or ((IgnoreCase = True) and (LowerCase(AArray[Index].Value) = LowerCase(AValue))) then
if (AArray[Index].Value = AValue) or (IgnoreCase and (LowerCase(AArray[Index].Value) = LowerCase(AValue))) then
begin
Result := Index;
Exit;
@@ -3132,6 +3137,23 @@ begin
Result := Rect(0,0,Bitmap.Width,Bitmap.Height);
end;
function GetOwnerForm(Component: TComponent): TCustomForm;
begin
if not (Assigned(Component) and Assigned(Component.Owner)) then
begin
Result := nil;
end else
begin
if Component is TCustomForm then
begin
Result := Component as TCustomForm;
end else
begin
Result := GetOwnerForm(Component.Owner);
end;
end;
end;
function MultiPos(const SubStr, Str: ShortString; Offset: Integer = 1): TIntegerArray;
begin
@@ -3544,7 +3566,7 @@ begin
begin
Privileges.PrivilegeCount := 1;
LookupPrivilegeValue(nil,Name,Privileges.Privileges[0].Luid);
if Value = True then
if Value then
begin
Privileges.Privileges[0].Attributes := SE_PRIVILEGE_ENABLED;
end else
@@ -4159,7 +4181,7 @@ end;
function TFilteredStringList.GetFilteredStrings: TStrings;
begin
if Filtered = True then
if Filtered then
begin
FilterUpdate;
Result := FFilteredStrings;

View File

@@ -354,18 +354,18 @@ begin
Exit;
end;
if (S[Index] in Spaces) or
((S[Index] = ':') and (ProtocolValid = True)) then
((S[Index] = ':') and ProtocolValid) then
begin
Result := False;
Exit;
end;
if ProtocolValid = False then
if not ProtocolValid then
begin
Protocol := Protocol + S[Index];
if S[Index] = ':' then
begin
ProtocolValid := True;
if ValidProtocol(Protocol,WebProtocolsSimple) = False then
if not ValidProtocol(Protocol,WebProtocolsSimple) then
begin
DoubleSlashRequired := True;
Continue;
@@ -380,7 +380,7 @@ begin
begin
if S[Index] = '/' then
begin
if DoubleSlashRequired = True then
if DoubleSlashRequired then
begin
Protocol := Protocol + S[Index];
DoubleSlashRequired := False;
@@ -388,7 +388,7 @@ begin
begin
if S[Index - 1] = '/' then
begin
if ValidProtocol(Protocol + S[Index],WebProtocolsSpecial) = False then
if not ValidProtocol(Protocol + S[Index],WebProtocolsSpecial) then
begin
Result := False;
Exit;
@@ -400,7 +400,7 @@ begin
end;
end else
begin
if (DoubleSlashRequired = True) or ((S[Index - 1] = '/') and (S[Index - 2] <> '/') and (DomainLength = 0)) then
if (DoubleSlashRequired) or ((S[Index - 1] = '/') and (S[Index - 2] <> '/') and (DomainLength = 0)) then
begin
Result := False;
Exit;
@@ -440,14 +440,14 @@ begin
Current := @S[1];
while True do
begin
if InTag = True then
if InTag then
begin
if InValue = True then
if InValue then
begin
if Current^ = '"' then
begin
InValue := False;
if Ignore = False then
if not Ignore then
begin
Result := Block;
Exit;
@@ -462,7 +462,7 @@ begin
Inc(Current);
Continue;
end;
if Equal = True then
if Equal then
begin
if Current^ in Spaces then
begin
@@ -473,7 +473,7 @@ begin
if Current^ = '"' then
begin
InValue := True;
Ignore := not ((Ignore = True) and (Block = Param));
Ignore := not (Ignore and (Block = Param));
Block := '';
//-->
Inc(Current);
@@ -604,7 +604,7 @@ end;
procedure TDownload.SetAddress(Value: String);
begin
if (StrIsURL(Value) = True) or (Length(Value) = 0) then
if StrIsURL(Value) or (Length(Value) = 0) then
begin
FAddress := Value;
end else
@@ -690,7 +690,7 @@ end;
procedure TDownload.Prepare;
begin
if SSL = True then
if SSL then
begin
idHTTPObject.IOHandler := SSLHandler;
end else