diff --git a/HGM.Controls.PanelCollapsed.pas b/HGM.Controls.PanelCollapsed.pas index 2f6399c..48ad740 100644 --- a/HGM.Controls.PanelCollapsed.pas +++ b/HGM.Controls.PanelCollapsed.pas @@ -61,7 +61,7 @@ procedure Register; implementation -{$R CollPanel.res} +{$R hCollPanel.res} procedure Register; begin diff --git a/HGM.Controls.SpinEdit.pas b/HGM.Controls.SpinEdit.pas index ed85232..2b48441 100644 --- a/HGM.Controls.SpinEdit.pas +++ b/HGM.Controls.SpinEdit.pas @@ -208,7 +208,7 @@ procedure Register; implementation -{$R lkspin.res} +{$R hSpin.res} uses Vcl.Themes, Vcl.GraphUtil; diff --git a/HGMComponents.dpk b/HGMComponents.dpk index dfc4071..c203faf 100644 --- a/HGMComponents.dpk +++ b/HGMComponents.dpk @@ -1,6 +1,8 @@ package HGMComponents; {$R *.res} +{$R *.otares} +{$R 'hIcons.dcr'} {$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} {$ALIGN 8} {$ASSERTIONS ON} @@ -31,15 +33,10 @@ package HGMComponents; requires rtl, vcl, - vclactnband, - vclx, xmlrtl, vclimg, - IndySystem, IndyProtocols, - IndyCore, - VclSmp, - PngComponents; + VclSmp; contains HGM.Autorun in 'HGM.Autorun.pas', diff --git a/HGMComponents.dproj b/HGMComponents.dproj index 1ee9398..49968aa 100644 --- a/HGMComponents.dproj +++ b/HGMComponents.dproj @@ -1,139 +1,139 @@  - {A89CCA8C-E08D-4464-A7F0-A21FA96D5DF8} + {E76584A0-E3B3-4F75-9D37-51B6AB96BCD6} HGMComponents.dpk - 18.2 - VCL True Debug - Win32 - 3 + 1025 Package + VCL + 18.2 + Win32 true - - true + + true Base true - - true + + true Base true - - true + + true Base true - - true - Cfg_1 - true + + true + Base + true + + + true + Base true - - true - Cfg_1 + + true + Base + true + + true + Base true - + true Base true - - true + + true Cfg_2 true true - - true + + true Cfg_2 true true - 1049 - CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) - HGMComponents - D:\Projects\Components;$(DCC_UnitSearchPath) - rtl;xmlrtl;$(DCC_UsePackage) - System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) - All + Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;System.Win;Winapi;$(DCC_Namespace) true - bpl + HGM Components + false + 1049 + 00400000 + false + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName= + false true - .\$(Platform)\$(Config) - .\$(Platform)\$(Config) + HGMComponents + false + false - - true - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) - 1033 - vcl;vclactnband;vclx;acntDelphiXE7_R;vclimg;IndySystem;IndyProtocols;IndyCore;VclSmp;PngComponents;$(DCC_UsePackage) + + xmlrtl;rtl;IndySystem;IndyProtocols;IndyCore;$(DCC_UsePackage) + android-support-v4.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + Debug - - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) - 1033 - true - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - vcl;vclactnband;vclx;acntDelphiXE7_R;vclimg;IndySystem;IndyProtocols;IndyCore;VclSmp;PngComponents;$(DCC_UsePackage) + + xmlrtl;rtl;IndySystem;IndyProtocols;IndyCore;$(DCC_UsePackage) - - 1049 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - DEBUG;$(DCC_Define) - false - true - true - true + + xmlrtl;rtl;IndySystem;IndyProtocols;IndyCore;$(DCC_UsePackage) - + + xmlrtl;rtl;IndySystem;IndyProtocols;IndyCore;$(DCC_UsePackage) + + + xmlrtl;rtl;vclactnband;vclx;vcl;vclimg;IndySystem;IndyProtocols;IndyCore;VclSmp;$(DCC_UsePackage) + Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) 1033 true - HGM Components - 58 - CompanyName=;FileVersion=1.0.0.58;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) + Debug + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName) - - true + + xmlrtl;rtl;vclactnband;vclx;vcl;vclimg;IndySystem;IndyProtocols;IndyCore;VclSmp;$(DCC_UsePackage) - - 1049 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + false - RELEASE;$(DCC_Define) - 0 0 + 0 + RELEASE;$(DCC_Define) - - true - CompanyName=;FileVersion=1.0.0.88;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) - 88 + + true + DEBUG;$(DCC_Define) + false - - true + + Debug + + + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName) MainSource + - - - - - @@ -158,14 +158,14 @@ - + Cfg_2 Base Base - + Cfg_1 Base @@ -175,421 +175,21 @@ Package - - True - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1049 - 1251 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - Devart Data Access Components - Devart Data Access GUI VCL related Components - Devart Oracle Data Access GUI VCL related Components - Devart Data Access GUI FireMonkey related Components - Devart Controls - Devart Oracle Data Access Components - Devart Oracle Data Access FMX Components - Devart Oracle Data Access GUI FMX related Components - Devart OraProvider package - Devart DataSet Manager - AlphaControls DB-aware pack - AlphaControls - Microsoft Office 2000 Sample Automation Server Wrapper Components - Microsoft Office XP Sample Automation Server Wrapper Components - HGMComponents.dpk - - - - HGMComponents.bpl - true - - - - - HGMComponents.bpl - true - - -<<<<<<< HEAD - - - res\drawable-normal - 1 - - - - - 1 - .dylib - - - 0 - .dll;.bpl - - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - -======= - - - - Contents\Resources ->>>>>>> cc8176b9276f27ab405bc8c217ffcdf841b021f0 - 1 - - - 1 - - - - - library\lib\mips - 1 - - - - - library\lib\x86 - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - - 1 - - - 1 - - - - - 1 - - - 1 - - - - - 1 - .dylib - - - 0 - .bpl - - - 1 - .dylib - - - 1 - .dylib - - - - - res\drawable-xhdpi - 1 - - - - - res\drawable-xxhdpi - 1 - - - - - 1 - - - 1 - - - - - Assets - 1 - - - Assets - 1 - - - - - Assets - 1 - - - Assets - 1 - - - - - res\drawable - 1 - - - - - res\drawable-xlarge - 1 - - - - - 1 - .framework - - - 0 - - - - - 1 - - - 1 - - - 0 - - - - - res\drawable-small - 1 - - - - - - 1 - - - Contents\MacOS - 0 - - - - - classes - 1 - - - - - - 1 - - - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - res\drawable - 1 - - - - - Contents\Resources - 1 - - - - - - 1 - - - 1 - - - - - 1 - - - library\lib\armeabi-v7a - 1 - - - 0 - - - 1 - - - 1 - - - - - library\lib\armeabi - 1 - - - - - res\drawable-large - 1 - - - - - 1 - - - 1 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - res\values - 1 - - - - - res\drawable-ldpi - 1 - - - - - 1 - - - 1 - - - - - res\drawable-hdpi - 1 - - - - - res\drawable-mdpi - 1 - - - - - 1 - - - - - 1 - - - 1 - - -<<<<<<< HEAD -======= - - - 0 - .dll;.bpl - - - 1 - .dylib - - - - ->>>>>>> cc8176b9276f27ab405bc8c217ffcdf841b021f0 - - - - - - - - - - + False + False + True + False True - True + False - False 12 - - - + + diff --git a/HGMComponents.otares b/HGMComponents.otares new file mode 100644 index 0000000..93e7e94 Binary files /dev/null and b/HGMComponents.otares differ diff --git a/HGMComponents.res b/HGMComponents.res index f88cca3..3077d0f 100644 Binary files a/HGMComponents.res and b/HGMComponents.res differ diff --git a/Icons.psd b/Icons.psd new file mode 100644 index 0000000..965ecfa Binary files /dev/null and b/Icons.psd differ diff --git a/Pictures/1.bmp b/Pictures/1.bmp new file mode 100644 index 0000000..ff2d619 Binary files /dev/null and b/Pictures/1.bmp differ diff --git a/Pictures/1.psd b/Pictures/1.psd new file mode 100644 index 0000000..0d91502 Binary files /dev/null and b/Pictures/1.psd differ diff --git a/Pictures/10.bmp b/Pictures/10.bmp new file mode 100644 index 0000000..74d5edb Binary files /dev/null and b/Pictures/10.bmp differ diff --git a/Pictures/11.bmp b/Pictures/11.bmp new file mode 100644 index 0000000..9c459aa Binary files /dev/null and b/Pictures/11.bmp differ diff --git a/Pictures/12.bmp b/Pictures/12.bmp new file mode 100644 index 0000000..20d2cbe Binary files /dev/null and b/Pictures/12.bmp differ diff --git a/Pictures/13.bmp b/Pictures/13.bmp new file mode 100644 index 0000000..8d9fe4e Binary files /dev/null and b/Pictures/13.bmp differ diff --git a/Pictures/14.bmp b/Pictures/14.bmp new file mode 100644 index 0000000..6a64399 Binary files /dev/null and b/Pictures/14.bmp differ diff --git a/Pictures/15.bmp b/Pictures/15.bmp new file mode 100644 index 0000000..8225908 Binary files /dev/null and b/Pictures/15.bmp differ diff --git a/Pictures/16.bmp b/Pictures/16.bmp new file mode 100644 index 0000000..1fba570 Binary files /dev/null and b/Pictures/16.bmp differ diff --git a/Pictures/17.bmp b/Pictures/17.bmp new file mode 100644 index 0000000..9c3a3e5 Binary files /dev/null and b/Pictures/17.bmp differ diff --git a/Pictures/2.bmp b/Pictures/2.bmp new file mode 100644 index 0000000..57a554a Binary files /dev/null and b/Pictures/2.bmp differ diff --git a/Pictures/3.bmp b/Pictures/3.bmp new file mode 100644 index 0000000..9f6f3b9 Binary files /dev/null and b/Pictures/3.bmp differ diff --git a/Pictures/4.bmp b/Pictures/4.bmp new file mode 100644 index 0000000..5f48a51 Binary files /dev/null and b/Pictures/4.bmp differ diff --git a/Pictures/5.bmp b/Pictures/5.bmp new file mode 100644 index 0000000..97018ee Binary files /dev/null and b/Pictures/5.bmp differ diff --git a/Pictures/6.bmp b/Pictures/6.bmp new file mode 100644 index 0000000..b012176 Binary files /dev/null and b/Pictures/6.bmp differ diff --git a/Pictures/7.bmp b/Pictures/7.bmp new file mode 100644 index 0000000..bc8a1c7 Binary files /dev/null and b/Pictures/7.bmp differ diff --git a/Pictures/8.bmp b/Pictures/8.bmp new file mode 100644 index 0000000..b904d71 Binary files /dev/null and b/Pictures/8.bmp differ diff --git a/Pictures/9.bmp b/Pictures/9.bmp new file mode 100644 index 0000000..84e04a2 Binary files /dev/null and b/Pictures/9.bmp differ diff --git a/CollPanel.res b/hCollPanel.res similarity index 100% rename from CollPanel.res rename to hCollPanel.res diff --git a/hIcons.dcr b/hIcons.dcr new file mode 100644 index 0000000..c55fdd7 Binary files /dev/null and b/hIcons.dcr differ diff --git a/lkspin.res b/hSpin.res similarity index 100% rename from lkspin.res rename to hSpin.res