pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

RxFPC:fix demo for RxDBGrid

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6089 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2017-12-06 07:17:42 +00:00
parent 68903f7027
commit d4e1105bb9
9 changed files with 107 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
components/rx/trunk/demos/rxdbgrid/RxDBGrid/RxDBGridDemo.lpi
View File

@ -55,7 +55,7 @@
<MinVersion Major="1" Release="18" Build="56" Valid="True"/> <MinVersion Major="1" Release="18" Build="56" Valid="True"/>
</Item5> </Item5>
</RequiredPackages> </RequiredPackages>
<Units Count="61"> <Units Count="65">
<Unit0> <Unit0>
<Filename Value="RxDBGridDemo.lpr"/> <Filename Value="RxDBGridDemo.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
@ -71,8 +71,8 @@
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="RxDBGridMainUnit"/> <UnitName Value="RxDBGridMainUnit"/>
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<TopLine Value="138"/> <TopLine Value="126"/>
<CursorPos X="43" Y="138"/> <CursorPos X="51" Y="152"/>
<UsageCount Value="127"/> <UsageCount Value="127"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -446,11 +446,10 @@
</Unit52> </Unit52>
<Unit53> <Unit53>
<Filename Value="/home/install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/> <Filename Value="/home/install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/>
<EditorIndex Value="4"/> <EditorIndex Value="-1"/>
<TopLine Value="1652"/> <TopLine Value="1652"/>
<CursorPos X="14" Y="1665"/> <CursorPos X="14" Y="1665"/>
<UsageCount Value="11"/> <UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit53> </Unit53>
<Unit54> <Unit54>
<Filename Value="../../rxdb/rxdbgrid_findunit.pas"/> <Filename Value="../../rxdb/rxdbgrid_findunit.pas"/>
@ -475,155 +474,76 @@
</Unit56> </Unit56>
<Unit57> <Unit57>
<Filename Value="../../../rxdb/rxdbgrid.pas"/> <Filename Value="../../../rxdb/rxdbgrid.pas"/>
<EditorIndex Value="1"/> <EditorIndex Value="-1"/>
<TopLine Value="5929"/> <TopLine Value="404"/>
<CursorPos X="42" Y="5953"/> <CursorPos X="14" Y="422"/>
<UsageCount Value="11"/> <UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit57> </Unit57>
<Unit58> <Unit58>
<Filename Value="../../../rxdb/rxmemds.pas"/> <Filename Value="../../../rxdb/rxmemds.pas"/>
<EditorIndex Value="2"/> <EditorIndex Value="-1"/>
<TopLine Value="1077"/> <TopLine Value="1077"/>
<CursorPos X="51" Y="1090"/> <CursorPos X="51" Y="1090"/>
<UsageCount Value="11"/> <UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit58> </Unit58>
<Unit59> <Unit59>
<Filename Value="/home/install/source/fpcsrc/packages/fcl-db/src/base/bufdataset_parser.pp"/> <Filename Value="/home/install/source/fpcsrc/packages/fcl-db/src/base/bufdataset_parser.pp"/>
<EditorIndex Value="3"/> <EditorIndex Value="-1"/>
<TopLine Value="38"/> <TopLine Value="38"/>
<CursorPos Y="39"/> <CursorPos Y="39"/>
<UsageCount Value="11"/> <UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit59> </Unit59>
<Unit60> <Unit60>
<Filename Value="/home/install/source/fpcsrc/packages/fcl-db/src/base/dataset.inc"/> <Filename Value="/home/install/source/fpcsrc/packages/fcl-db/src/base/dataset.inc"/>
<EditorIndex Value="5"/> <EditorIndex Value="-1"/>
<TopLine Value="1452"/> <TopLine Value="1452"/>
<CursorPos X="3" Y="1457"/> <CursorPos X="3" Y="1457"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit60> </Unit60>
<Unit61>
<Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
<ComponentName Value="RxDBGrid_PopUpFilterForm"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="RxDBGrid_PopUpFilterUnit"/>
<EditorIndex Value="-1"/>
<TopLine Value="154"/>
<CursorPos X="14" Y="180"/>
<UsageCount Value="10"/>
</Unit61>
<Unit62>
<Filename Value="../../../rxtools/rxfileutils.pas"/>
<UnitName Value="rxFileUtils"/>
<EditorIndex Value="-1"/>
<TopLine Value="183"/>
<CursorPos Y="206"/>
<UsageCount Value="10"/>
</Unit62>
<Unit63>
<Filename Value="../../../../lazutils/translations.pas"/>
<UnitName Value="Translations"/>
<EditorIndex Value="-1"/>
<TopLine Value="604"/>
<CursorPos Y="635"/>
<UsageCount Value="10"/>
</Unit63>
<Unit64>
<Filename Value="../../../rxtools/rxdconst.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="98"/>
<CursorPos X="26" Y="119"/>
<UsageCount Value="10"/>
</Unit64>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="27"> <JumpHistory Count="2" HistoryIndex="1">
<Position1> <Position1>
<Filename Value="../../../rxdb/rxdbgrid.pas"/> <Filename Value="rxdbgridmainunit.pas"/>
<Caret Line="925" Column="15" TopLine="909"/> <Caret Line="117" TopLine="86"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="../../../rxdb/rxdbgrid.pas"/> <Filename Value="rxdbgridmainunit.pas"/>
<Caret Line="6123" Column="22" TopLine="6103"/> <Caret Line="117" Column="70" TopLine="86"/>
</Position2> </Position2>
<Position3>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="961" Column="15" TopLine="957"/>
</Position3>
<Position4>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="6888" Column="3" TopLine="6884"/>
</Position4>
<Position5>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="913" Column="15" TopLine="908"/>
</Position5>
<Position6>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5487" Column="3" TopLine="5483"/>
</Position6>
<Position7>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5490" Column="12" TopLine="5482"/>
</Position7>
<Position8>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
</Position8>
<Position9>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="387" Column="65" TopLine="355"/>
</Position9>
<Position10>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5435" Column="24" TopLine="5403"/>
</Position10>
<Position11>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5498" Column="22" TopLine="5461"/>
</Position11>
<Position12>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
</Position12>
<Position13>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="386" Column="65" TopLine="355"/>
</Position13>
<Position14>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5434" Column="24" TopLine="5403"/>
</Position14>
<Position15>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5489" Column="5" TopLine="5459"/>
</Position15>
<Position16>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
</Position16>
<Position17>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="4336" Column="24" TopLine="4305"/>
</Position17>
<Position18>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="4338" Column="26" TopLine="4320"/>
</Position18>
<Position19>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="4941" Column="39" TopLine="4917"/>
</Position19>
<Position20>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="4960" Column="39" TopLine="4936"/>
</Position20>
<Position21>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5421" Column="21" TopLine="5399"/>
</Position21>
<Position22>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5427" Column="21" TopLine="5399"/>
</Position22>
<Position23>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5432" Column="21" TopLine="5401"/>
</Position23>
<Position24>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5433" Column="21" TopLine="5402"/>
</Position24>
<Position25>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5489" Column="19" TopLine="5470"/>
</Position25>
<Position26>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5953" Column="27" TopLine="5924"/>
</Position26>
<Position27>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5954" Column="66" TopLine="5924"/>
</Position27>
<Position28>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="5953" Column="28" TopLine="5937"/>
</Position28>
<Position29>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="387" Column="62" TopLine="368"/>
</Position29>
<Position30>
<Filename Value="../../../rxdb/rxdbgrid.pas"/>
<Caret Line="4961" Column="46" TopLine="4931"/>
</Position30>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
@ -655,13 +575,16 @@
<WatchScope Value="wpsLocal"/> <WatchScope Value="wpsLocal"/>
<WatchKind Value="wpkWrite"/> <WatchKind Value="wpkWrite"/>
<Source Value="../../../rxdb/rxdbgrid.pas"/> <Source Value="../../../rxdb/rxdbgrid.pas"/>
<Line Value="6063"/> <Line Value="6068"/>
</Item1> </Item1>
</BreakPoints> </BreakPoints>
<Exceptions Count="1"> <Exceptions Count="2">
<Item1> <Item1>
<Name Value="RunError(216)"/> <Name Value="RunError(216)"/>
</Item1> </Item1>
<Item2>
<Name Value="EConvertError"/>
</Item2>
</Exceptions> </Exceptions>
</Debugging> </Debugging>
</CONFIG> </CONFIG>

4
components/rx/trunk/demos/rxdbgrid/RxDBGrid/rxdbgridmainunit.lfm
View File

@ -82,8 +82,8 @@ object RxDBGridMainForm: TRxDBGridMainForm
Filter.Font.Style = [fsItalic] Filter.Font.Style = [fsItalic]
Filter.DropDownRows = 0 Filter.DropDownRows = 0
Filter.Color = clLime Filter.Color = clLime
Filter.EmptyValue = '(Нет)' Filter.EmptyValue = '(Пустые значения)'
Filter.AllValue = '(All values)' Filter.AllValue = '(Все значения)'
Filter.EmptyFont.Style = [fsItalic] Filter.EmptyFont.Style = [fsItalic]
Filter.ItemIndex = -1 Filter.ItemIndex = -1
Filter.Style = rxfstDialog Filter.Style = rxfstDialog

5
components/rx/trunk/demos/rxdbgrid/RxDBGrid/rxdbgridmainunit.pas
View File

@ -113,8 +113,8 @@ var
Lang, FallbackLang: String; Lang, FallbackLang: String;
begin begin
GetLanguageIDs(Lang{%H-},FallbackLang{%H-}); // in unit gettext GetLanguageIDs(Lang{%H-},FallbackLang{%H-}); // in unit gettext
TranslateUnitResourceStrings('rxconst',NormalizeDirectoryName('../../languages/rxconst.%s.po'), Lang, FallbackLang); TranslateUnitResourceStrings('rxconst',NormalizeDirectoryName('../../../languages/rxconst.%s.po'), Lang, FallbackLang);
TranslateUnitResourceStrings('rxdconst',NormalizeDirectoryName('../../languages/rxdconst.%s.po'), Lang, FallbackLang); TranslateUnitResourceStrings('rxdconst',NormalizeDirectoryName('../../../languages/rxdconst.%s.po'), Lang, FallbackLang);
end; end;
{$R *.lfm} {$R *.lfm}
@ -149,6 +149,7 @@ begin
RxMemoryData1.AppendRecord([16, 'Гарант', 480, 'Гарант', EncodeDate(2007, 2, 1), 3]); RxMemoryData1.AppendRecord([16, 'Гарант', 480, 'Гарант', EncodeDate(2007, 2, 1), 3]);
RxMemoryData1.AppendRecord([17, 'Fedora Linux', 0, 'Open source', EncodeDate(2007, 2, 1), 3]); RxMemoryData1.AppendRecord([17, 'Fedora Linux', 0, 'Open source', EncodeDate(2007, 2, 1), 3]);
RxMemoryData1.AppendRecord([17, 'Ubuntu Linux', 0, 'Open source', EncodeDate(2007, 2, 1), 3]); RxMemoryData1.AppendRecord([17, 'Ubuntu Linux', 0, 'Open source', EncodeDate(2007, 2, 1), 3]);
RxMemoryData1.AppendRecord([17, 'Linux', 0, null, EncodeDate(2007, 2, 1), 3]);
RxMemoryData1.First; RxMemoryData1.First;

8
components/rx/trunk/languages/rxdconst.es.po
View File

@ -471,7 +471,9 @@ msgstr "(Todos los valores)"
msgid "Copy cell value" msgid "Copy cell value"
msgstr "Copiar valor de la celda" msgstr "Copiar valor de la celda"
#: rxdconst.srxdbgridemptifilter #: rxdconst.srxdbgridemptyfilter
#, fuzzy
msgctxt "rxdconst.srxdbgridemptyfilter"
msgid "(Empty)" msgid "(Empty)"
msgstr "(Vacíos)" msgstr "(Vacíos)"
@ -530,6 +532,10 @@ msgstr "Hacia Delante"
msgid "Text to find" msgid "Text to find"
msgstr "Texto a Buscar" msgstr "Texto a Buscar"
#: rxdconst.srxdbgridnotemptyfilter
msgid "(Not empty)"
msgstr ""
#: rxdconst.srxdbgridoptimizecolwidth #: rxdconst.srxdbgridoptimizecolwidth
msgid "Optimize column width" msgid "Optimize column width"
msgstr "Optimizar ancho de columnas" msgstr "Optimizar ancho de columnas"

12
components/rx/trunk/languages/rxdconst.po
View File

@ -93,7 +93,7 @@ msgstr ""
#: rxdconst.sdescending #: rxdconst.sdescending
msgctxt "rxdconst.sdescending" msgctxt "rxdconst.sdescending"
msgid "Descending" msgid "Descending"
msgstr "" msgstr "По убыванию"
#: rxdconst.seditdata #: rxdconst.seditdata
msgid "editing" msgid "editing"
@ -453,7 +453,8 @@ msgstr ""
msgid "Copy cell value" msgid "Copy cell value"
msgstr "" msgstr ""
#: rxdconst.srxdbgridemptifilter #: rxdconst.srxdbgridemptyfilter
msgctxt "rxdconst.srxdbgridemptyfilter"
msgid "(Empty)" msgid "(Empty)"
msgstr "" msgstr ""
@ -512,6 +513,10 @@ msgstr ""
msgid "Text to find" msgid "Text to find"
msgstr "" msgstr ""
#: rxdconst.srxdbgridnotemptyfilter
msgid "(Not empty)"
msgstr ""
#: rxdconst.srxdbgridoptimizecolwidth #: rxdconst.srxdbgridoptimizecolwidth
msgid "Optimize column width" msgid "Optimize column width"
msgstr "" msgstr ""
@ -554,9 +559,10 @@ msgid "Totals row"
msgstr "" msgstr ""
#: rxdconst.srxdescending #: rxdconst.srxdescending
#, fuzzy
msgctxt "rxdconst.srxdescending" msgctxt "rxdconst.srxdescending"
msgid "Descending" msgid "Descending"
msgstr "" msgstr "По убыванию"
#: rxdconst.srxfieldslookupdisplay #: rxdconst.srxfieldslookupdisplay
msgid "Fields as LookupDisplay" msgid "Fields as LookupDisplay"

8
components/rx/trunk/languages/rxdconst.ru.po
View File

@ -111,7 +111,7 @@ msgstr "редактирование"
#: rxdconst.semptyvalues #: rxdconst.semptyvalues
msgid "Empty values" msgid "Empty values"
msgstr "По убыванию" msgstr "Пустые значения"
#: rxdconst.serrormsglabel #: rxdconst.serrormsglabel
msgid "Error message" msgid "Error message"
@ -463,7 +463,7 @@ msgstr "(Все значения)"
msgid "Copy cell value" msgid "Copy cell value"
msgstr "Копировать значение ячейки" msgstr "Копировать значение ячейки"
#: rxdconst.srxdbgridemptifilter #: rxdconst.srxdbgridemptyfilter
msgid "(Empty)" msgid "(Empty)"
msgstr "(Пусто)" msgstr "(Пусто)"
@ -522,6 +522,10 @@ msgstr "Вперёд"
msgid "Text to find" msgid "Text to find"
msgstr "Текст для поиска" msgstr "Текст для поиска"
#: rxdconst.srxdbgridnotemptyfilter
msgid "(Not empty)"
msgstr "(Не пусто)"
#: rxdconst.srxdbgridoptimizecolwidth #: rxdconst.srxdbgridoptimizecolwidth
msgid "Optimize column width" msgid "Optimize column width"
msgstr "Подобрать ширину колонки" msgstr "Подобрать ширину колонки"

8
components/rx/trunk/languages/rxdconst.uk.po
View File

@ -466,7 +466,9 @@ msgstr "(Усі значення)"
msgid "Copy cell value" msgid "Copy cell value"
msgstr "Копіювати значення комірки" msgstr "Копіювати значення комірки"
#: rxdconst.srxdbgridemptifilter #: rxdconst.srxdbgridemptyfilter
#, fuzzy
msgctxt "rxdconst.srxdbgridemptyfilter"
msgid "(Empty)" msgid "(Empty)"
msgstr "(Немає)" msgstr "(Немає)"
@ -525,6 +527,10 @@ msgstr "Вперед"
msgid "Text to find" msgid "Text to find"
msgstr "Текст для пошуку" msgstr "Текст для пошуку"
#: rxdconst.srxdbgridnotemptyfilter
msgid "(Not empty)"
msgstr ""
#: rxdconst.srxdbgridoptimizecolwidth #: rxdconst.srxdbgridoptimizecolwidth
msgid "Optimize column width" msgid "Optimize column width"
msgstr "Оптимізувати ширину колонок" msgstr "Оптимізувати ширину колонок"

8
components/rx/trunk/rxdb/rxdbgrid.pas
View File

@ -391,6 +391,7 @@ type
FAllValue: string; FAllValue: string;
FCurrentValues: TStringList; FCurrentValues: TStringList;
FEnabled: boolean; FEnabled: boolean;
FNotEmptyValue: string;
FOwner: TRxColumn; FOwner: TRxColumn;
FState: TRxFilterState; FState: TRxFilterState;
FStyle: TRxFilterStyle; FStyle: TRxFilterStyle;
@ -418,6 +419,7 @@ type
property Color: TColor read FColor write SetColor default clWhite; property Color: TColor read FColor write SetColor default clWhite;
property ValueList: TStringList read FValueList; property ValueList: TStringList read FValueList;
property EmptyValue: string read FEmptyValue write FEmptyValue; property EmptyValue: string read FEmptyValue write FEmptyValue;
property NotEmptyValue: string read FNotEmptyValue write FNotEmptyValue;
property AllValue: string read FAllValue write FAllValue; property AllValue: string read FAllValue write FAllValue;
property EmptyFont: TFont read FEmptyFont write FEmptyFont; property EmptyFont: TFont read FEmptyFont write FEmptyFont;
property ItemIndex: integer read GetItemIndex write SetItemIndex; property ItemIndex: integer read GetItemIndex write SetItemIndex;
@ -4350,6 +4352,9 @@ begin
if State = rxfsEmpty then if State = rxfsEmpty then
S:=TRxColumn(Columns[MyCol]).Filter.EmptyValue S:=TRxColumn(Columns[MyCol]).Filter.EmptyValue
else else
if State = rxfsNonEmpty then
S:=TRxColumn(Columns[MyCol]).Filter.NotEmptyValue
else
if State = rxfsAll then if State = rxfsAll then
S:=TRxColumn(Columns[MyCol]).Filter.AllValue S:=TRxColumn(Columns[MyCol]).Filter.AllValue
else else
@ -7298,8 +7303,9 @@ begin
Style:=rxfstSimple; Style:=rxfstSimple;
FEmptyFont.Style := [fsItalic]; FEmptyFont.Style := [fsItalic];
FEmptyValue := sRxDBGridEmptiFilter; FEmptyValue := sRxDBGridEmptyFilter;
FAllValue := sRxDBGridAllFilter; FAllValue := sRxDBGridAllFilter;
FNotEmptyValue:=sRxDBGridNotEmptyFilter;
FEnabled:=true; FEnabled:=true;
end; end;

3
components/rx/trunk/rxtools/rxdconst.pas
View File

@ -114,8 +114,9 @@ resourcestring
sRxDBGridFilterClear = 'Clear filter'; sRxDBGridFilterClear = 'Clear filter';
sRxDBGridSortByColumns = 'Sort data for columns'; sRxDBGridSortByColumns = 'Sort data for columns';
sRxDBGridSelectColumns = 'Select visible columns'; sRxDBGridSelectColumns = 'Select visible columns';
sRxDBGridEmptiFilter = '(Empty)'; sRxDBGridEmptyFilter = '(Empty)';
sRxDBGridAllFilter = '(All values)'; sRxDBGridAllFilter = '(All values)';
sRxDBGridNotEmptyFilter = '(Not empty)';
sRxDBGridSelectAllRows = 'Select all rows'; sRxDBGridSelectAllRows = 'Select all rows';
sRxDBGridCopyCellValue = 'Copy cell value'; sRxDBGridCopyCellValue = 'Copy cell value';
sRxDBGridOptimizeColWidth = 'Optimize column width'; sRxDBGridOptimizeColWidth = 'Optimize column width';