move image state in subfolder

lazpaint/lazpaint.lpi

@@ -36,7 +36,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <OtherUnitFiles Value="buttons;tablet;dialog;dialog\color;dialog\filter;tools"/>
+            <OtherUnitFiles Value="buttons;tablet;dialog;dialog\color;dialog\filter;tools;image"/>
             <UnitOutputDirectory Value="release\lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -384,7 +384,7 @@
         <UnitName Value="UToolbox"/>
       </Unit6>
       <Unit7>
-        <Filename Value="uimage.pas"/>
+        <Filename Value="image\uimage.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UImage"/>
       </Unit7>
@@ -572,12 +572,12 @@
         <UnitName Value="UToolText"/>
       </Unit36>
       <Unit37>
-        <Filename Value="uimagestate.pas"/>
+        <Filename Value="image\uimagestate.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UImageState"/>
       </Unit37>
       <Unit38>
-        <Filename Value="ustatetype.pas"/>
+        <Filename Value="image\ustatetype.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UStateType"/>
       </Unit38>
@@ -611,7 +611,7 @@
         <UnitName Value="UBlendOp"/>
       </Unit42>
       <Unit43>
-        <Filename Value="uimageobservation.pas"/>
+        <Filename Value="image\uimageobservation.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UImageObservation"/>
       </Unit43>
@@ -639,7 +639,7 @@
         <UnitName Value="UFilters"/>
       </Unit47>
       <Unit48>
-        <Filename Value="uimageaction.pas"/>
+        <Filename Value="image\uimageaction.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UImageAction"/>
       </Unit48>
@@ -649,7 +649,7 @@
         <UnitName Value="ULoadImage"/>
       </Unit49>
       <Unit50>
-        <Filename Value="uimagediff.pas"/>
+        <Filename Value="image\uimagediff.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UImageDiff"/>
       </Unit50>
@@ -724,12 +724,12 @@
         <UnitName Value="UScriptType"/>
       </Unit62>
       <Unit63>
-        <Filename Value="ulayeraction.pas"/>
+        <Filename Value="image\ulayeraction.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ULayerAction"/>
       </Unit63>
       <Unit64>
-        <Filename Value="uimagetype.pas"/>
+        <Filename Value="image\uimagetype.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UImageType"/>
       </Unit64>

lazpaint/lazpaintembeddedpack.lpk

@@ -10,7 +10,7 @@
       <PathDelim Value="\"/>
       <SearchPaths>
         <IncludeFiles Value="dialog\filter;dialog\color"/>
-        <OtherUnitFiles Value="tablet;dialog\filter;dialog\color;dialog;tools"/>
+        <OtherUnitFiles Value="tablet;dialog\filter;dialog\color;dialog;tools;image"/>
         <UnitOutputDirectory Value="debug\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <CodeGeneration>
@@ -27,7 +27,7 @@
       </Linking>
     </CompilerOptions>
     <Version Major="7" Release="2"/>
-    <Files Count="91">
+    <Files Count="94">
       <Item1>
         <Filename Value="lazpaintinstance.pas"/>
         <UnitName Value="LazpaintInstance"/>
@@ -121,7 +121,7 @@
         <UnitName Value="UGraph"/>
       </Item23>
       <Item24>
-        <Filename Value="uimage.pas"/>
+        <Filename Value="image\uimage.pas"/>
         <UnitName Value="UImage"/>
       </Item24>
       <Item25>
@@ -201,7 +201,7 @@
         <UnitName Value="UTwirl"/>
       </Item43>
       <Item44>
-        <Filename Value="uimagestate.pas"/>
+        <Filename Value="image\uimagestate.pas"/>
         <UnitName Value="UImageState"/>
       </Item44>
       <Item45>
@@ -249,15 +249,15 @@
         <UnitName Value="UBlendOp"/>
       </Item55>
       <Item56>
-        <Filename Value="uimageaction.pas"/>
+        <Filename Value="image\uimageaction.pas"/>
         <UnitName Value="UImageAction"/>
       </Item56>
       <Item57>
-        <Filename Value="uimagediff.pas"/>
+        <Filename Value="image\uimagediff.pas"/>
         <UnitName Value="UImageDiff"/>
       </Item57>
       <Item58>
-        <Filename Value="uimageobservation.pas"/>
+        <Filename Value="image\uimageobservation.pas"/>
         <UnitName Value="UImageObservation"/>
       </Item58>
       <Item59>
@@ -392,6 +392,18 @@
         <Filename Value="tools\utoollayer.pas"/>
         <UnitName Value="UToolLayer"/>
       </Item91>
+      <Item92>
+        <Filename Value="image\uimagetype.pas"/>
+        <UnitName Value="UImageType"/>
+      </Item92>
+      <Item93>
+        <Filename Value="image\ulayeraction.pas"/>
+        <UnitName Value="ULayerAction"/>
+      </Item93>
+      <Item94>
+        <Filename Value="image\ustatetype.pas"/>
+        <UnitName Value="UStateType"/>
+      </Item94>
     </Files>
     <RequiredPkgs Count="6">
       <Item1>

lazpaint/lazpaintembeddedpack.pas

@@ -18,7 +18,8 @@ uses
   ULoadImage, ULoading, UMenu, UObject3D, UPhongFilter, UScripting, USharpen, 
   UToolPhong, UTranslation, UVolatileScrollBar, UZoom, laztablet, 
   ugeometricbrush, UFilterFunction, UFormRain, unoisefilter, uposterize, 
-  uadjustcurves, UToolBrush, UToolIcon, UToolLayer, LazarusPackageIntf;
+  uadjustcurves, UToolBrush, UToolIcon, UToolLayer, UImageType, ULayerAction, 
+  UStateType, LazarusPackageIntf;
 
 implementation