RxFPC: revert 4650, fix button icons in RxDBGrid, move resourses for pickdate to res file

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

components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi

@@ -55,7 +55,7 @@
         <MinVersion Major="1" Release="18" Build="56" Valid="True"/>
       </Item5>
     </RequiredPackages>
-    <Units Count="128">
+    <Units Count="129">
       <Unit0>
         <Filename Value="RxDBGridDemo.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -70,9 +70,8 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="RxDBGridMainUnit"/>
-        <IsVisibleTab Value="True"/>
+        <TopLine Value="70"/>
-        <TopLine Value="68"/>
+        <CursorPos X="133" Y="87"/>
-        <CursorPos X="133" Y="85"/>
         <UsageCount Value="107"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -470,10 +469,11 @@
       </Unit62>
       <Unit63>
         <Filename Value="../../vclutils.pas"/>
-        <EditorIndex Value="-1"/>
+        <EditorIndex Value="2"/>
-        <TopLine Value="621"/>
+        <TopLine Value="618"/>
-        <CursorPos X="25" Y="629"/>
+        <CursorPos X="10" Y="629"/>
         <UsageCount Value="12"/>
+        <Loaded Value="True"/>
       </Unit63>
       <Unit64>
         <Filename Value="../../../../lcl/include/canvas.inc"/>
@@ -827,10 +827,12 @@
       </Unit118>
       <Unit119>
         <Filename Value="../../pickdate.pas"/>
-        <EditorIndex Value="-1"/>
+        <IsVisibleTab Value="True"/>
-        <TopLine Value="991"/>
+        <EditorIndex Value="1"/>
-        <CursorPos X="3" Y="940"/>
+        <TopLine Value="990"/>
+        <CursorPos X="36" Y="1017"/>
         <UsageCount Value="10"/>
+        <Loaded Value="True"/>
       </Unit119>
       <Unit120>
         <Filename Value="../../rxdbctrls.pas"/>
@@ -889,8 +891,30 @@
         <CursorPos X="64" Y="119"/>
         <UsageCount Value="10"/>
       </Unit127>
+      <Unit128>
+        <Filename Value="../../pickdate.lrs"/>
+        <EditorIndex Value="-1"/>
+        <UsageCount Value="10"/>
+      </Unit128>
     </Units>
-    <JumpHistory HistoryIndex="-1"/>
+    <JumpHistory Count="4" HistoryIndex="3">
+      <Position1>
+        <Filename Value="../../pickdate.pas"/>
+        <Caret Line="940" Column="3" TopLine="1560"/>
+      </Position1>
+      <Position2>
+        <Filename Value="../../pickdate.pas"/>
+        <Caret Line="353" Column="10" TopLine="319"/>
+      </Position2>
+      <Position3>
+        <Filename Value="rxdbgridmainunit.pas"/>
+        <Caret Line="85" Column="133" TopLine="68"/>
+      </Position3>
+      <Position4>
+        <Filename Value="rxdbgridmainunit.pas"/>
+        <Caret Line="86" Column="133" TopLine="69"/>
+      </Position4>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>

components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm

@@ -554,6 +554,35 @@ object RxDBGridMainForm: TRxDBGridMainForm
       OnChange = CheckBox5Change
       TabOrder = 7
     end
+    object Label2: TLabel
+      AnchorSideLeft.Control = CheckBox5
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = Panel1
+      Left = 865
+      Height = 20
+      Top = 7
+      Width = 32
+      BorderSpacing.Around = 6
+      Caption = 'Дата'
+      ParentColor = False
+    end
+    object RxDateEdit1: TRxDateEdit
+      AnchorSideLeft.Control = Label2
+      AnchorSideTop.Control = Label2
+      AnchorSideTop.Side = asrBottom
+      Left = 871
+      Height = 30
+      Top = 33
+      Width = 129
+      BorderSpacing.Around = 6
+      ButtonWidth = 23
+      MaxLength = 10
+      NumGlyphs = 2
+      PasswordChar = #0
+      PopupColor = clWindow
+      TabOrder = 8
+      Text = '  .  .    '
+    end
   end
   object SpeedButton1: TSpeedButton
     Left = 596

components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas

@@ -7,8 +7,8 @@ interface
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, rxmemds,
   DB, rxdbgrid, RxAboutDialog, RxIniPropStorage, RxDBGridPrintGrid,
-  RxDBGridExportSpreadSheet, RxDBGridFooterTools, ExtCtrls, Buttons, Menus,
+  RxDBGridExportSpreadSheet, RxDBGridFooterTools, tooledit, ExtCtrls, Buttons,
-  ActnList, StdCtrls, DBGrids, types;
+  Menus, ActnList, StdCtrls, DBGrids, types;
 
 type
 
@@ -17,11 +17,13 @@ type
   TRxDBGridMainForm = class(TForm)
     actCalcTotal: TAction;
     CheckBox5: TCheckBox;
+    Label2: TLabel;
     MenuItem10: TMenuItem;
     MenuItem11: TMenuItem;
     MenuItem8: TMenuItem;
     MenuItem9: TMenuItem;
     RxAboutDialog1: TRxAboutDialog;
+    RxDateEdit1: TRxDateEdit;
     RxDBGridExportSpreadSheet1: TRxDBGridExportSpreadSheet;
     RxDBGridFooterTools1: TRxDBGridFooterTools;
     RxDBGridPrint1: TRxDBGridPrint;

components/rx/trunk/images/componet_img/all_component_res.sh

@@ -2,9 +2,11 @@ rm tooledit.lrs
 rm rxdbgrid.lrs
 rm tooledit.res
 rm rxdbgrid.res
+rm pickdate.rex
 
 /usr/local/share/lazarus/tools/lazres rxdbgrid.res rx_markerdown.png rx_markerup.png rx_DropDown.png  rx_Ellipsis.png  rx_Glyph.png  rx_minus.png  rx_plus.png  rx_UpDown.png rx_menu_grid.png
 /usr/local/share/lazarus/tools/lazres rx_lcl.res picDateEdit.png rxbtn_downarrow.png
+/usr/local/share/lazarus/tools/lazres pickdate.res rx_next1.png rx_next2.png rx_prev1.png rx_prev2.png
 
 #../../../../tools\lazres.exe tooledit.lrs picDateEdit.bmp
 #../../../../tools\lazres.exe rxdbgrid.lrs rx_markerdown.xpm rx_markerup.xpm

components/rx/trunk/images/next1.xpm

@@ -1,11 +0,0 @@
-/* XPM */
-static char *next1[]={
-"8 6 2 1",
-". c None",
-"# c #000000",
-"...#....",
-"...##...",
-"...###..",
-"...###..",
-"...##...",
-"...#...."};

components/rx/trunk/images/next2.xpm

@@ -1,11 +0,0 @@
-/* XPM */
-static char *next2[]={
-"8 6 2 1",
-". c None",
-"# c #000000",
-".#...#..",
-".##..##.",
-".###.###",
-".###.###",
-".##..##.",
-".#...#.."};

components/rx/trunk/images/prev1.xpm

@@ -1,11 +0,0 @@
-/* XPM */
-static char *prev1[]={
-"8 6 2 1",
-". c None",
-"# c #000000",
-"....#...",
-"...##...",
-"..###...",
-"..###...",
-"...##...",
-"....#..."};

components/rx/trunk/images/prev2.xpm

@@ -1,11 +0,0 @@
-/* XPM */
-static char *prev2[]={
-"8 6 2 1",
-". c None",
-"# c #000000",
-"..#...#.",
-".##..##.",
-"###.###.",
-"###.###.",
-".##..##.",
-"..#...#."};

components/rx/trunk/pickdate.lrs

@@ -1,20 +0,0 @@
-LazarusResources.Add('next1','XPM',[
-  '/* XPM */'#10'static char *next1[]={'#10'"8 6 2 1",'#10'". c None",'#10'"# c'
-  +' #000000",'#10'"...#....",'#10'"...##...",'#10'"...###..",'#10'"...###..",'
-  +#10'"...##...",'#10'"...#...."};'#10
-]);
-LazarusResources.Add('next2','XPM',[
-  '/* XPM */'#10'static char *next2[]={'#10'"8 6 2 1",'#10'". c None",'#10'"# c'
-  +' #000000",'#10'".#...#..",'#10'".##..##.",'#10'".###.###",'#10'".###.###",'
-  +#10'".##..##.",'#10'".#...#.."};'#10
-]);
-LazarusResources.Add('prev1','XPM',[
-  '/* XPM */'#10'static char *prev1[]={'#10'"8 6 2 1",'#10'". c None",'#10'"# c'
-  +' #000000",'#10'"....#...",'#10'"...##...",'#10'"..###...",'#10'"..###...",'
-  +#10'"...##...",'#10'"....#..."};'#10
-]);
-LazarusResources.Add('prev2','XPM',[
-  '/* XPM */'#10'static char *prev2[]={'#10'"8 6 2 1",'#10'". c None",'#10'"# c'
-  +' #000000",'#10'"..#...#.",'#10'".##..##.",'#10'"###.###.",'#10'"###.###.",'
-  +#10'".##..##.",'#10'"..#...#."};'#10
-]);

components/rx/trunk/pickdate.pas

@@ -264,8 +264,9 @@ const
 
 implementation
 
-uses Messages, RXCtrls, rxconst, ToolEdit, vclutils, math, LCLStrConsts,
+uses Messages, RXCtrls, rxconst, ToolEdit, vclutils, math, LCLStrConsts, LResources;
-  {rxstrutils,} LResources;
+
+{$R pickdate.res}
 
 const
   SBtnGlyphs: array[0..3] of PChar = ('PREV2', 'PREV1', 'NEXT1', 'NEXT2');
@@ -795,7 +796,7 @@ begin
     if FMonthOffset = 2 then FMonthOffset := -5;
 
     FillDaysArray;
-    MoveExtend(false, (ADay - FMonthOffset) mod 7, (ADay - FMonthOffset) div 7 + 1, true);
+    MoveExtend(false, (ADay - FMonthOffset) mod 7, (ADay - FMonthOffset) div 7 + 1);
     TopRow:=1; //Правим ошибку для автоскрола календаря после 15 числа...
     VisualChange;
 
@@ -1012,7 +1013,8 @@ begin
     Parent := FControlPanel;
     SetBounds(-1, -1, BtnSide, BtnSide);
     //loaded bitmap should be freed as Glyph just takes a copy of it
-    TmpBitmap:=LoadBitmapFromLazarusResource('prev2');
+    //TmpBitmap:=LoadBitmapFromLazarusResource('prev2');
+    TmpBitmap:=CreateResBitmap('rx_prev2');
     Glyph := TmpBitmap;
     FreeAndNil(TmpBitmap);
 
@@ -1027,7 +1029,8 @@ begin
     Parent := FControlPanel;
     SetBounds(BtnSide - 2, -1, BtnSide, BtnSide);
 
-    TmpBitmap:=LoadBitmapFromLazarusResource('prev1');
+    //TmpBitmap:=LoadBitmapFromLazarusResource('prev1');
+    TmpBitmap:=CreateResBitmap('rx_prev1');
     Glyph := TmpBitmap;
     FreeAndNil(TmpBitmap);
 
@@ -1041,7 +1044,8 @@ begin
   begin
     Parent := FControlPanel;
     SetBounds(FControlPanel.Width - 2 * BtnSide + 2, -1, BtnSide, BtnSide);
-    TmpBitmap:=LoadBitmapFromLazarusResource('next1');
+    //TmpBitmap:=LoadBitmapFromLazarusResource('next1');
+    TmpBitmap:=CreateResBitmap('rx_next1');
     Glyph := TmpBitmap;
     FreeAndNil(TmpBitmap);
     OnClick := @NextMonthBtnClick;
@@ -1054,7 +1058,8 @@ begin
   begin
     Parent := FControlPanel;
     SetBounds(FControlPanel.Width - BtnSide + 1, -1, BtnSide, BtnSide);
-    TmpBitmap:=LoadBitmapFromLazarusResource('next2');
+    //TmpBitmap:=LoadBitmapFromLazarusResource('next2');
+    TmpBitmap:=CreateResBitmap('rx_next2');
     Glyph := TmpBitmap;
     FreeAndNil(TmpBitmap);
     OnClick := @NextYearBtnClick;
@@ -1589,6 +1594,4 @@ begin
   DefaultRowHeight := (aHeight - GridLinesH) div 7;
 end;
 
-initialization
-  {$I pickdate.lrs}
 end.

components/rx/trunk/rxnew.lpk

@@ -25,7 +25,7 @@ translate to Lazarus by alexs in 2005 - 2016
 "/>
     <License Value="LGPL"/>
     <Version Major="2" Minor="9" Release="2" Build="190"/>
-    <Files Count="68">
+    <Files Count="67">
       <Item1>
         <Filename Value="autopanel.pas"/>
         <UnitName Value="AutoPanel"/>
@@ -71,236 +71,232 @@ translate to Lazarus by alexs in 2005 - 2016
         <UnitName Value="pickdate"/>
       </Item11>
       <Item12>
-        <Filename Value="pickdate.lrs"/>
-        <Type Value="LRS"/>
-      </Item12>
-      <Item13>
         <Filename Value="registerrx.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="registerrx"/>
-      </Item13>
+      </Item12>
-      <Item14>
+      <Item13>
         <Filename Value="registerrxdb.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="RegisterRxDB"/>
-      </Item14>
+      </Item13>
-      <Item15>
+      <Item14>
         <Filename Value="registerrxtools.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="RegisterRxTools"/>
-      </Item15>
+      </Item14>
-      <Item16>
+      <Item15>
         <Filename Value="rx.inc"/>
         <Type Value="Include"/>
-      </Item16>
+      </Item15>
-      <Item17>
+      <Item16>
         <Filename Value="rxaboutdialog.pas"/>
         <UnitName Value="RxAboutDialog"/>
-      </Item17>
+      </Item16>
-      <Item18>
+      <Item17>
         <Filename Value="rxaboutformunit.pas"/>
         <UnitName Value="rxAboutFormUnit"/>
-      </Item18>
+      </Item17>
-      <Item19>
+      <Item18>
         <Filename Value="rxappicon.pas"/>
         <UnitName Value="rxappicon"/>
-      </Item19>
+      </Item18>
-      <Item20>
+      <Item19>
         <Filename Value="rxapputils.pas"/>
         <UnitName Value="rxapputils"/>
-      </Item20>
+      </Item19>
-      <Item21>
+      <Item20>
         <Filename Value="rxclock.pas"/>
         <UnitName Value="rxclock"/>
-      </Item21>
+      </Item20>
-      <Item22>
+      <Item21>
         <Filename Value="rxconst.pas"/>
         <UnitName Value="rxconst"/>
-      </Item22>
+      </Item21>
-      <Item23>
+      <Item22>
         <Filename Value="rxctrls.pas"/>
         <UnitName Value="rxctrls"/>
-      </Item23>
+      </Item22>
-      <Item24>
+      <Item23>
         <Filename Value="rxdbcolorbox.pas"/>
         <UnitName Value="RxDBColorBox"/>
-      </Item24>
+      </Item23>
-      <Item25>
+      <Item24>
         <Filename Value="rxdbcomb.pas"/>
         <UnitName Value="rxdbcomb"/>
-      </Item25>
+      </Item24>
-      <Item26>
+      <Item25>
         <Filename Value="rxdbctrls.pas"/>
         <UnitName Value="RxDBCtrls"/>
-      </Item26>
+      </Item25>
-      <Item27>
+      <Item26>
         <Filename Value="rxdbgrid.pas"/>
         <UnitName Value="rxdbgrid"/>
-      </Item27>
+      </Item26>
-      <Item28>
+      <Item27>
         <Filename Value="rxdbgrid_columsunit.pas"/>
         <UnitName Value="rxdbgrid_columsunit"/>
-      </Item28>
+      </Item27>
-      <Item29>
+      <Item28>
         <Filename Value="rxdbgrid_findunit.pas"/>
         <UnitName Value="rxdbgrid_findunit"/>
-      </Item29>
+      </Item28>
-      <Item30>
+      <Item29>
         <Filename Value="rxdbspinedit.pas"/>
         <UnitName Value="RxDBSpinEdit"/>
-      </Item30>
+      </Item29>
-      <Item31>
+      <Item30>
         <Filename Value="rxdbtimeedit.pas"/>
         <UnitName Value="RxDBTimeEdit"/>
-      </Item31>
+      </Item30>
-      <Item32>
+      <Item31>
         <Filename Value="rxdconst.pas"/>
         <UnitName Value="rxdconst"/>
-      </Item32>
+      </Item31>
-      <Item33>
+      <Item32>
         <Filename Value="rxdice.pas"/>
         <UnitName Value="rxdice"/>
-      </Item33>
+      </Item32>
-      <Item34>
+      <Item33>
         <Filename Value="rxfilterby.pas"/>
         <UnitName Value="rxfilterby"/>
-      </Item34>
+      </Item33>
-      <Item35>
+      <Item34>
         <Filename Value="rxiconv.pas"/>
         <UnitName Value="rxiconv"/>
-      </Item35>
+      </Item34>
-      <Item36>
+      <Item35>
         <Filename Value="rxlogin.pas"/>
         <UnitName Value="rxlogin"/>
-      </Item36>
+      </Item35>
-      <Item37>
+      <Item36>
         <Filename Value="rxlookup.pas"/>
         <UnitName Value="rxlookup"/>
-      </Item37>
+      </Item36>
-      <Item38>
+      <Item37>
         <Filename Value="rxmemds.pas"/>
         <UnitName Value="rxmemds"/>
-      </Item38>
+      </Item37>
-      <Item39>
+      <Item38>
         <Filename Value="rxpopupunit.pas"/>
         <UnitName Value="rxpopupunit"/>
-      </Item39>
+      </Item38>
-      <Item40>
+      <Item39>
         <Filename Value="rxsortmemds.pas"/>
         <UnitName Value="rxsortmemds"/>
-      </Item40>
+      </Item39>
-      <Item41>
+      <Item40>
         <Filename Value="rxspin.pas"/>
         <UnitName Value="rxspin"/>
-      </Item41>
+      </Item40>
-      <Item42>
+      <Item41>
         <Filename Value="rxswitch.pas"/>
         <UnitName Value="rxswitch"/>
-      </Item42>
+      </Item41>
-      <Item43>
+      <Item42>
         <Filename Value="rxsystemservices.pas"/>
         <UnitName Value="RxSystemServices"/>
-      </Item43>
+      </Item42>
-      <Item44>
+      <Item43>
         <Filename Value="rxtbrsetup.pas"/>
         <UnitName Value="rxtbrsetup"/>
-      </Item44>
+      </Item43>
-      <Item45>
+      <Item44>
         <Filename Value="rxtimeedit.pas"/>
         <UnitName Value="RxTimeEdit"/>
-      </Item45>
+      </Item44>
-      <Item46>
+      <Item45>
         <Filename Value="rxtoolbar.pas"/>
         <UnitName Value="rxtoolbar"/>
-      </Item46>
+      </Item45>
-      <Item47>
+      <Item46>
         <Filename Value="rxversinfo.pas"/>
         <UnitName Value="RxVersInfo"/>
-      </Item47>
+      </Item46>
-      <Item48>
+      <Item47>
         <Filename Value="rxviewspanel.pas"/>
         <UnitName Value="RxViewsPanel"/>
-      </Item48>
+      </Item47>
-      <Item49>
+      <Item48>
         <Filename Value="rxxpman.pas"/>
         <UnitName Value="rxxpman"/>
-      </Item49>
+      </Item48>
-      <Item50>
+      <Item49>
         <Filename Value="seldsfrm.pas"/>
         <UnitName Value="seldsfrm"/>
-      </Item50>
+      </Item49>
-      <Item51>
+      <Item50>
         <Filename Value="tooledit.pas"/>
         <UnitName Value="tooledit"/>
-      </Item51>
+      </Item50>
-      <Item52>
+      <Item51>
         <Filename Value="vclutils.pas"/>
         <UnitName Value="vclutils"/>
-      </Item52>
+      </Item51>
-      <Item53>
+      <Item52>
         <Filename Value="rxcloseformvalidator.pas"/>
         <UnitName Value="RxCloseFormValidator"/>
-      </Item53>
+      </Item52>
-      <Item54>
+      <Item53>
         <Filename Value="rxhistorynavigator.pas"/>
         <UnitName Value="RxHistoryNavigator"/>
-      </Item54>
+      </Item53>
-      <Item55>
+      <Item54>
         <Filename Value="ex_rx_bin_datapacket.pas"/>
         <UnitName Value="ex_rx_bin_datapacket"/>
-      </Item55>
+      </Item54>
-      <Item56>
+      <Item55>
         <Filename Value="ex_rx_datapacket.pas"/>
         <UnitName Value="ex_rx_datapacket"/>
-      </Item56>
+      </Item55>
-      <Item57>
+      <Item56>
         <Filename Value="ex_rx_xml_datapacket.pas"/>
         <UnitName Value="ex_rx_xml_datapacket"/>
-      </Item57>
+      </Item56>
-      <Item58>
+      <Item57>
         <Filename Value="rxsortby.lfm"/>
         <Type Value="LFM"/>
-      </Item58>
+      </Item57>
-      <Item59>
+      <Item58>
         <Filename Value="rxsortby.pas"/>
         <UnitName Value="rxsortby"/>
-      </Item59>
+      </Item58>
-      <Item60>
+      <Item59>
         <Filename Value="rxmdi.pas"/>
         <UnitName Value="RxMDI"/>
-      </Item60>
+      </Item59>
-      <Item61>
+      <Item60>
         <Filename Value="rxinipropstorage.pas"/>
         <UnitName Value="RxIniPropStorage"/>
-      </Item61>
+      </Item60>
-      <Item62>
+      <Item61>
         <Filename Value="rx_lcl.res"/>
         <Type Value="Binary"/>
-      </Item62>
+      </Item61>
-      <Item63>
+      <Item62>
         <Filename Value="rxdaterangeeditunit.pas"/>
         <UnitName Value="rxDateRangeEditUnit"/>
-      </Item63>
+      </Item62>
-      <Item64>
+      <Item63>
         <Filename Value="rxdbgridfootertools.pas"/>
         <UnitName Value="RxDBGridFooterTools"/>
-      </Item64>
+      </Item63>
-      <Item65>
+      <Item64>
         <Filename Value="rxdbgridfootertools_setup.lfm"/>
         <Type Value="LFM"/>
-      </Item65>
+      </Item64>
-      <Item66>
+      <Item65>
         <Filename Value="rxdbgridfootertools_setup.pas"/>
         <UnitName Value="rxdbgridfootertools_setup"/>
-      </Item66>
+      </Item65>
-      <Item67>
+      <Item66>
         <Filename Value="rxshortcutunit.lfm"/>
         <Type Value="LFM"/>
-      </Item67>
+      </Item66>
-      <Item68>
+      <Item67>
         <Filename Value="rxshortcutunit.pas"/>
         <UnitName Value="rxShortCutUnit"/>
-      </Item68>
+      </Item67>
     </Files>
     <LazDoc Paths="docs;\usr\local\share\lazarus\components\rxnew\docs"/>
     <i18n>