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

RxFPC: RxDBGrid - new options rdgDisableWordWrapTitles - ID0030493 from regs

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5099 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2016-08-23 06:15:57 +00:00
parent e940ee5f96
commit bbd5da7cd5
3 changed files with 79 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
components/rx/trunk/Demos/RxDbGridExportToPDF/project1.lps
View File

@ -3,7 +3,7 @@
<ProjectSession> <ProjectSession>
<Version Value="9"/> <Version Value="9"/>
<BuildModes Active="Default"/> <BuildModes Active="Default"/>
<Units Count="84"> <Units Count="87">
<Unit0> <Unit0>
<Filename Value="project1.lpr"/> <Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
@ -33,9 +33,10 @@
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="../../rxdbgrid.pas"/> <Filename Value="../../rxdbgrid.pas"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="3"/> <EditorIndex Value="3"/>
<TopLine Value="635"/> <TopLine Value="2909"/>
<CursorPos X="50" Y="659"/> <CursorPos Y="2921"/>
<UsageCount Value="33"/> <UsageCount Value="33"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit3> </Unit3>
@ -86,7 +87,6 @@
<Unit10> <Unit10>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<UnitName Value="RxDBGridExportPdf"/> <UnitName Value="RxDBGridExportPdf"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<TopLine Value="572"/> <TopLine Value="572"/>
<CursorPos X="87" Y="593"/> <CursorPos X="87" Y="593"/>
@ -460,7 +460,7 @@
<UnitName Value="RxDBGridExportPdfSetupUnit"/> <UnitName Value="RxDBGridExportPdfSetupUnit"/>
<EditorIndex Value="2"/> <EditorIndex Value="2"/>
<TopLine Value="43"/> <TopLine Value="43"/>
<CursorPos X="11" Y="66"/> <CursorPos X="78" Y="60"/>
<UsageCount Value="22"/> <UsageCount Value="22"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -655,127 +655,148 @@
<CursorPos Y="946"/> <CursorPos Y="946"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit83> </Unit83>
<Unit84>
<Filename Value="../../../wst/type_lib_edtr/edit_helper.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="412"/>
<CursorPos X="19" Y="428"/>
<UsageCount Value="10"/>
</Unit84>
<Unit85>
<Filename Value="/home/install/source/fpcsrc/packages/fcl-passrc/src/pastree.pp"/>
<UnitName Value="PasTree"/>
<EditorIndex Value="-1"/>
<TopLine Value="572"/>
<CursorPos X="3" Y="575"/>
<UsageCount Value="10"/>
</Unit85>
<Unit86>
<Filename Value="../../../wst/type_lib_edtr/uinterfaceedit.pas"/>
<EditorIndex Value="-1"/>
<CursorPos X="11" Y="13"/>
<UsageCount Value="10"/>
</Unit86>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="551" TopLine="535"/> <Caret Line="599" TopLine="584"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="575" TopLine="561"/> <Caret Line="601" TopLine="584"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="595" TopLine="580"/> <Caret Line="570" TopLine="555"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="570" TopLine="555"/> <Caret Line="610" TopLine="595"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="572" TopLine="555"/> <Caret Line="553" TopLine="537"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="573" TopLine="555"/> <Caret Line="555" TopLine="537"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="599" TopLine="584"/> <Caret Line="556" TopLine="537"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="601" TopLine="584"/> <Caret Line="558" TopLine="537"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="570" TopLine="555"/> <Caret Line="566" TopLine="560"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="610" TopLine="595"/> <Caret Line="567" TopLine="560"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="553" TopLine="537"/> <Caret Line="569" TopLine="560"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="555" TopLine="537"/> <Caret Line="570" TopLine="560"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="556" TopLine="537"/> <Caret Line="572" TopLine="560"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="558" TopLine="537"/> <Caret Line="573" TopLine="560"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="566" TopLine="560"/> <Caret Line="575" TopLine="560"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="567" TopLine="560"/> <Caret Line="577" TopLine="560"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="569" TopLine="560"/> <Caret Line="578" TopLine="560"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="570" TopLine="560"/> <Caret Line="579" TopLine="560"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="572" TopLine="560"/> <Caret Line="580" TopLine="560"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="573" TopLine="560"/> <Caret Line="582" TopLine="560"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="575" TopLine="560"/> <Caret Line="583" TopLine="560"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="577" TopLine="560"/> <Caret Line="584" TopLine="560"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="578" TopLine="560"/> <Caret Line="580" TopLine="560"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="579" TopLine="560"/> <Caret Line="590" TopLine="566"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="580" TopLine="560"/> <Caret Line="593" Column="87" TopLine="572"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgrid.pas"/>
<Caret Line="582" TopLine="560"/> <Caret Line="659" Column="50" TopLine="635"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgrid.pas"/>
<Caret Line="583" TopLine="560"/> <Caret Line="101" Column="15" TopLine="79"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgrid.pas"/>
<Caret Line="584" TopLine="560"/> <Caret Line="2837" Column="8" TopLine="2822"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgrid.pas"/>
<Caret Line="580" TopLine="560"/> <Caret Line="101" Column="5" TopLine="76"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="../../rxdbgridexportpdf.pas"/> <Filename Value="../../rxdbgrid.pas"/>
<Caret Line="590" TopLine="566"/> <Caret Line="2838" TopLine="2822"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>

8
components/rx/trunk/docs/rxfpc.xml
View File

@ -533,6 +533,14 @@
<td>rdgCaseInsensitiveSort</td> <td>rdgCaseInsensitiveSort</td>
<td>Параметр включает режим сортировки без учёта регистра символов в столбце <link id="TRxDBGrid">RxDBGrid</link>-а</td> <td>Параметр включает режим сортировки без учёта регистра символов в столбце <link id="TRxDBGrid">RxDBGrid</link>-а</td>
</tr> </tr>
<tr>
<td>rdgWordWrap</td>
<td>Разрешить использование TRxColumn.WordWrap для переноса строк</td>
</tr>
<tr>
<td>rdgWordWrapTitles</td>
<td>Перенос строк в заголовках</td>
</tr>
</table> </table>
</descr> </descr>
</element> </element>

13
components/rx/trunk/rxdbgrid.pas
View File

@ -97,7 +97,8 @@ type
rdgAllowSortForm, rdgAllowSortForm,
rdgAllowToolMenu, rdgAllowToolMenu,
rdgCaseInsensitiveSort, rdgCaseInsensitiveSort,
rdgWordWrap rdgWordWrap,
rdgDisableWordWrapTitles
); );
TOptionsRx = set of TOptionRx; TOptionsRx = set of TOptionRx;
@ -2833,7 +2834,10 @@ begin
H := H1; H := H1;
end; end;
RowHeights[0] := DefaultRowHeight * H; if not (rdgDisableWordWrapTitles in OptionsRx) then
RowHeights[0] := DefaultRowHeight * H
else
RowHeights[0] := DefaultRowHeight;
if rdgFilter in OptionsRx then if rdgFilter in OptionsRx then
begin begin
@ -2916,7 +2920,10 @@ begin
Canvas.TextStyle:=T1; Canvas.TextStyle:=T1;
DrawCellText(aCol, aRow, aRect, aState, ACaption); DrawCellText(aCol, aRow, aRect, aState, ACaption);
Canvas.TextStyle:=T2; } Canvas.TextStyle:=T2; }
WriteTextHeader(Canvas, aRect, ACaption, GetColumnAlignment(aCol, True)); if not (rdgDisableWordWrapTitles in OptionsRx) then
WriteTextHeader(Canvas, aRect, ACaption, GetColumnAlignment(aCol, True))
else
DrawCellText(aCol, aRow, aRect, aState, ACaption);
end; end;
end; end;