RxFPC:start reorder source folder structure

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5704 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/rx/trunk/rx_sort_fbdataset.lpk

@@ -7,6 +7,7 @@
     <CompilerOptions>
       <Version Value="11"/>
       <SearchPaths>
+        <OtherUnitFiles Value="rx_sort_fbdataset"/>
         <UnitOutputDirectory Value="lib/rx_sort_fbdataset/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
@@ -14,13 +15,13 @@
     <Version Major="1" Minor="1" Release="1" Build="2"/>
     <Files Count="2">
       <Item1>
-        <Filename Value="rxsortfbdataset.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="RxSortFBDataSet"/>
+        <Filename Value="rx_sort_fbdataset/exsortfb.pas"/>
+        <UnitName Value="exsortfb"/>
       </Item1>
       <Item2>
-        <Filename Value="exsortfb.pas"/>
-        <UnitName Value="exsortfb"/>
+        <Filename Value="rx_sort_fbdataset/rxsortfbdataset.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="RxSortFBDataSet"/>
       </Item2>
     </Files>
     <RequiredPkgs Count="3">

components/rx/trunk/rx_sort_fbdataset.pas

@@ -8,7 +8,7 @@ unit rx_sort_fbdataset;
 interface
 
 uses
-  RxSortFBDataSet, exsortfb, LazarusPackageIntf;
+  exsortfb, RxSortFBDataSet, LazarusPackageIntf;
 
 implementation
 

components/rx/trunk/rx_sort_sqldb.lpk

@@ -6,16 +6,21 @@
     <CompilerOptions>
       <Version Value="11"/>
       <SearchPaths>
+        <OtherUnitFiles Value="rx_sort_sqldb"/>
         <UnitOutputDirectory Value="lib/rx_sort_sqldb/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
     <Version Major="1" Minor="1" Release="1" Build="2"/>
-    <Files Count="1">
+    <Files Count="2">
       <Item1>
-        <Filename Value="rxsortsqldb.pas"/>
+        <Filename Value="rx_sort_sqldb/rxsortsqldb.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="RxSortSqlDB"/>
       </Item1>
+      <Item2>
+        <Filename Value="rx_sort_sqldb/exsortsql.pas"/>
+        <UnitName Value="exsortsql"/>
+      </Item2>
     </Files>
     <RequiredPkgs Count="2">
       <Item1>

components/rx/trunk/rx_sort_sqldb.pas

@@ -8,7 +8,7 @@ unit rx_sort_sqldb;
 interface
 
 uses
-  RxSortSqlDB, LazarusPackageIntf;
+  RxSortSqlDB, exsortsql, LazarusPackageIntf;
 
 implementation
 

components/rx/trunk/rx_sort_zeos.lpk

@@ -7,6 +7,7 @@
     <CompilerOptions>
       <Version Value="11"/>
       <SearchPaths>
+        <OtherUnitFiles Value="rx_sort_zeos"/>
         <UnitOutputDirectory Value="lib/rx_sort_zeos/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
@@ -14,13 +15,13 @@
     <Version Major="1" Minor="1" Release="1" Build="1"/>
     <Files Count="2">
       <Item1>
-        <Filename Value="rxsortzeos.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="RxSortZeos"/>
+        <Filename Value="rx_sort_zeos/exsortzeos.pas"/>
+        <UnitName Value="exsortzeos"/>
       </Item1>
       <Item2>
-        <Filename Value="exsortzeos.pas"/>
-        <UnitName Value="exsortzeos"/>
+        <Filename Value="rx_sort_zeos/rxsortzeos.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="RxSortZeos"/>
       </Item2>
     </Files>
     <LazDoc Paths="docs"/>

components/rx/trunk/rx_sort_zeos.pas

@@ -8,7 +8,7 @@ unit rx_sort_zeos;
 interface
 
 uses
-  RxSortZeos, exsortzeos, LazarusPackageIntf;
+  exsortzeos, RxSortZeos, LazarusPackageIntf;
 
 implementation
 

components/rx/trunk/rxdb/exsortmds.pas

@@ -8,9 +8,12 @@ uses
   Classes, SysUtils, DB, RxDBGrid;
 
 type
-  TMemDataSetSortEngine = class(TExDBGridSortEngine)
+
+  { TMemDataSetSortEngine }
+
+  TMemDataSetSortEngine = class(TRxDBGridSortEngine)
   public
-    procedure Sort(Field:TField; ADataSet:TDataSet; Asc:boolean);override;
+    procedure Sort(FieldName: string; ADataSet:TDataSet; Asc:boolean; SortOptions:TRxSortEngineOptions);override;
   end;
 
 implementation
@@ -20,7 +23,8 @@ type
   THackMDS = class(TMemDataSet)
   end;
   
-procedure TMemDataSetSortEngine.Sort(Field:TField; ADataSet:TDataSet; Asc:boolean);
+procedure TMemDataSetSortEngine.Sort(FieldName: string; ADataSet: TDataSet;
+  Asc: boolean; SortOptions: TRxSortEngineOptions);
 var
   MS:TMemoryStream;
   V, FRecSize, FRecCount, I, J:integer;
@@ -31,6 +35,7 @@ var
   I1:integer;
   B1:boolean;
   D1:TDateTime;
+  Field:TField;
 
 
 function DoExch:boolean;
@@ -103,6 +108,7 @@ end;
 begin
   if Assigned(ADataSet) then
   begin
+    Field:=ADataSet.FieldByName(FieldName);
     ADataSet.DisableControls;
     MS:=TMemoryStream.Create;
     BufOrign:=THackMDS(ADataSet).AllocRecordBuffer;
@@ -181,6 +187,6 @@ begin
 end;
 
 initialization
-  RegisterExDBGridSortEngine(TMemDataSetSortEngine, TMemDataset);
+  RegisterRxDBGridSortEngine(TMemDataSetSortEngine, 'TMemDataset');
 end.
 

components/rx/trunk/rxdbgrid_export_spreadsheet.lpk

@@ -7,25 +7,22 @@
     <CompilerOptions>
       <Version Value="11"/>
       <SearchPaths>
+        <OtherUnitFiles Value="rxdbgrid_export_spreadsheet"/>
         <UnitOutputDirectory Value="lib/rxdbgrid_export_spreadsheet/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
     <License Value="LGPL"/>
     <Version Major="1" Release="1" Build="6"/>
-    <Files Count="3">
+    <Files Count="2">
       <Item1>
-        <Filename Value="rxdbgridexportspreadsheet.pas"/>
+        <Filename Value="rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="RxDBGridExportSpreadSheet"/>
       </Item1>
       <Item2>
-        <Filename Value="rxdbgridexportspreadsheet_paramsunit.lfm"/>
-        <Type Value="LFM"/>
-      </Item2>
-      <Item3>
-        <Filename Value="rxdbgridexportspreadsheet_paramsunit.pas"/>
+        <Filename Value="rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet_paramsunit.pas"/>
         <UnitName Value="RxDBGridExportSpreadSheet_ParamsUnit"/>
-      </Item3>
+      </Item2>
     </Files>
     <LazDoc Paths="docs"/>
     <RequiredPkgs Count="3">