diff --git a/components/rx/trunk/docs/exsortzeos.xml b/components/rx/trunk/docs/exsortzeos.xml new file mode 100644 index 000000000..250b31121 --- /dev/null +++ b/components/rx/trunk/docs/exsortzeos.xml @@ -0,0 +1,8 @@ + +Модуль содержит класс для сортировки данных, предоставляемых библиотекой ZEOS в RxDBGridКласс сортировки данных + Сортировка по одному полю + Сортировка по нескольким полям + + + + diff --git a/components/rx/trunk/docs/makehtml.sh b/components/rx/trunk/docs/makehtml.sh index bf2de3c8b..9e0726df4 100755 --- a/components/rx/trunk/docs/makehtml.sh +++ b/components/rx/trunk/docs/makehtml.sh @@ -40,6 +40,7 @@ cp ../rx.inc rx.inc --input=../autopanel.pas --descr=autopanel.xml \ --input=../boxprocs.pas --descr=boxprocs.xml \ --input=../rxspin.pas --descr=rxspin \ + --input=../vclutils.pas --descr=vclutils.xml \ --input=../rxinipropstorage.pas --descr=rxinipropstorage.xml @@ -48,4 +49,8 @@ fpdoc --package=rxdbgrid_print --format=html --index-colcount=4 --hide-protected fpdoc --package=rxdbgrid_export_spreadsheet --format=html --index-colcount=4 --hide-protected \ --input=../rxdbgridexportspreadsheet.pas --descr=rxdbgridexportspreadsheet.xml \ - --input=../rxdbgridexportspreadsheet_paramsunit.pas rxdbgridexportspreadsheet_paramsunit.xml \ No newline at end of file + --input=../rxdbgridexportspreadsheet_paramsunit.pas rxdbgridexportspreadsheet_paramsunit.xml + +fpdoc --package=rx_sort_zeos --format=html --index-colcount=4 --hide-protected \ + --input=..exsortzeos.pas --descr=exsortzeos.xml \ + --input=../rxsortzeos.pas --descr=rxsortzeos.xml \ No newline at end of file diff --git a/components/rx/trunk/docs/rxdbgrid.xml b/components/rx/trunk/docs/rxdbgrid.xml index b4051df30..6c8009815 100644 --- a/components/rx/trunk/docs/rxdbgrid.xml +++ b/components/rx/trunk/docs/rxdbgrid.xml @@ -150,6 +150,13 @@ Событие возникает при отрисовке значения колонки Инвертировать текущее выделение строки + Ссылка на RxDBGrid, которому подключается данная функциональность + Отображать форму параметров интрумента + Событие вызывается перед запуском инструмента + Событие вызывается после запуска инструмента + Запуск инструмента + Процдера регистрирует вспомогательный класс для сортировки данных внутри RxDBGrid + diff --git a/components/rx/trunk/docs/rxdbgridexportspreadsheet.xml b/components/rx/trunk/docs/rxdbgridexportspreadsheet.xml index ee417e305..63328965c 100644 --- a/components/rx/trunk/docs/rxdbgridexportspreadsheet.xml +++ b/components/rx/trunk/docs/rxdbgridexportspreadsheet.xml @@ -12,6 +12,11 @@ ressOverwriteExisting - при экспорте перезаписывать с Имя файла для экспорта Имя страницы с данными Параметры экспорта +

Параметры экспорта данных

+ressExportTitle - экспорт заголовков колонок +ressExportColors - экспорт цвета ячеек +ressExportFooter - экспорт строки итогов +ressOverwriteExisting - при экспорте перезаписывать существующий файл Открывать файл после экспорта diff --git a/components/rx/trunk/docs/rxsortzeos.xml b/components/rx/trunk/docs/rxsortzeos.xml new file mode 100644 index 000000000..95ab7af7a --- /dev/null +++ b/components/rx/trunk/docs/rxsortzeos.xml @@ -0,0 +1,6 @@ + +Модуль содержит визуальный компонент для подключения модуля сортировки ZEOSМодуль содержит визуальный компонент для подключения модуля сортировки данных, предоставляемых библиотекой ZEOS в RxDBGridВизуальный компонент для подключения модуля сортировки данных, предоставляемых библиотекой ZEOS в RxDBGrid + + + + diff --git a/components/rx/trunk/docs/vclutils.xml b/components/rx/trunk/docs/vclutils.xml new file mode 100644 index 000000000..750c9c5de --- /dev/null +++ b/components/rx/trunk/docs/vclutils.xml @@ -0,0 +1,10 @@ + +Модуль содержит вспомогательные процедуры и функцииНапраление отображения текстаtoHorizontal +toVertical90 +toHorizontal180 +toVertical270 +toHorizontal360 + + + + diff --git a/components/rx/trunk/exsortzeos.pas b/components/rx/trunk/exsortzeos.pas index c27d95d30..f68a7e6fd 100644 --- a/components/rx/trunk/exsortzeos.pas +++ b/components/rx/trunk/exsortzeos.pas @@ -1,3 +1,34 @@ +{ exsortzeos unit + + Copyright (C) 2005-2015 Lagunov Aleksey alexs@yandex.ru and Lazarus team + original conception from rx library for Delphi (c) + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version with the following modification: + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules,and + to copy and distribute the resulting executable under terms of your choice, + provided that you also meet, for each linked independent module, the terms + and conditions of the license of that module. An independent module is a + module which is not derived from or based on this library. If you modify + this library, you may extend this exception to your version of the library, + but you are not obligated to do so. If you do not wish to do so, delete this + exception statement from your version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License + for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +} + unit exsortzeos; {$mode objfpc}{$H+} diff --git a/components/rx/trunk/rx_sort_zeos.lpk b/components/rx/trunk/rx_sort_zeos.lpk index 6fe9abb36..4d12a118c 100644 --- a/components/rx/trunk/rx_sort_zeos.lpk +++ b/components/rx/trunk/rx_sort_zeos.lpk @@ -1,18 +1,14 @@ - + + + - - - - - - @@ -26,7 +22,7 @@ - + diff --git a/components/rx/trunk/rxdbgrid.pas b/components/rx/trunk/rxdbgrid.pas index 4569fc366..48d63d6c8 100644 --- a/components/rx/trunk/rxdbgrid.pas +++ b/components/rx/trunk/rxdbgrid.pas @@ -1,6 +1,6 @@ { rxdbgrid unit - Copyright (C) 2005-2014 Lagunov Aleksey alexs@yandex.ru and Lazarus team + Copyright (C) 2005-2015 Lagunov Aleksey alexs@yandex.ru and Lazarus team original conception from rx library for Delphi (c) This library is free software; you can redistribute it and/or modify it diff --git a/components/rx/trunk/rxdbgridexportspreadsheet.pas b/components/rx/trunk/rxdbgridexportspreadsheet.pas index 3c7d53bd4..d61a67577 100644 --- a/components/rx/trunk/rxdbgridexportspreadsheet.pas +++ b/components/rx/trunk/rxdbgridexportspreadsheet.pas @@ -413,7 +413,7 @@ begin FDataSet.EnableControls; end; - if Result then + if Result and FOpenAfterExport then OpenDocument(FileName); end; diff --git a/components/rx/trunk/rxmdi.pas b/components/rx/trunk/rxmdi.pas index 22f33566e..017425e5d 100644 --- a/components/rx/trunk/rxmdi.pas +++ b/components/rx/trunk/rxmdi.pas @@ -222,7 +222,7 @@ constructor TRxMDICloseButton.Create(AOwner: TComponent); begin inherited Create(AOwner); // FLabelPosition := lpAbove; - FLabelSpacing := 3; + FLabelSpacing := 6; CreateInternalLabel; Glyph:=LoadLazResBitmapImage('RxMDICloseIcon'); end; diff --git a/components/rx/trunk/rxsortzeos.pas b/components/rx/trunk/rxsortzeos.pas index f34038ee9..6c8990fcb 100644 --- a/components/rx/trunk/rxsortzeos.pas +++ b/components/rx/trunk/rxsortzeos.pas @@ -1,3 +1,35 @@ +{ RxSortZeos unit + + Copyright (C) 2005-2015 Lagunov Aleksey alexs@yandex.ru and Lazarus team + original conception from rx library for Delphi (c) + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version with the following modification: + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules,and + to copy and distribute the resulting executable under terms of your choice, + provided that you also meet, for each linked independent module, the terms + and conditions of the license of that module. An independent module is a + module which is not derived from or based on this library. If you modify + this library, you may extend this exception to your version of the library, + but you are not obligated to do so. If you do not wish to do so, delete this + exception statement from your version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License + for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +} + + unit RxSortZeos; {$mode objfpc}{$H+}