TRxDBGridExportSpreadSheet - fix OpenAfterExport flag

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

components/rx/trunk/docs/exsortzeos.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fpdoc-descriptions><package name="rx_sort_zeos"><module name="exsortzeos"><short>Модуль содержит класс для сортировки данных, предоставляемых библиотекой ZEOS в RxDBGrid</short><element name="TZeosDataSetSortEngine"><short>Класс сортировки данных</short>
+      </element><element name="TZeosDataSetSortEngine.Sort"><short>Сортировка по одному полю</short>
+      </element><element name="TZeosDataSetSortEngine.SortList"><short>Сортировка по нескольким полям</short>
+      </element>
+    </module>
+  </package>
+</fpdoc-descriptions>

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 
 
 
@@ -49,3 +50,7 @@ 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
+  
+fpdoc --package=rx_sort_zeos --format=html --index-colcount=4 --hide-protected \
+  --input=..exsortzeos.pas --descr=exsortzeos.xml \
+  --input=../rxsortzeos.pas --descr=rxsortzeos.xml

components/rx/trunk/docs/rxdbgrid.xml

@@ -150,6 +150,13 @@
       </element><element name="TRxColumn.OnDrawColumnCell"><short>Событие возникает при отрисовке значения колонки</short>
       </element><element name="TRxDBGrid.InvertSelection"><short>Инвертировать текущее выделение строки</short>
       </element>
+    <element name="TRxDBGridAbstractTools.RxDBGrid"><short>Ссылка на RxDBGrid, которому подключается данная функциональность</short>
+      </element><element name="TRxDBGridAbstractTools.ShowSetupForm"><short>Отображать форму параметров интрумента</short>
+      </element><element name="TRxDBGridAbstractTools.OnBeforeExecute"><short>Событие вызывается перед запуском инструмента</short>
+      </element><element name="TRxDBGridAbstractTools.OnAfterExecute"><short>Событие вызывается после запуска инструмента</short>
+      </element><element name="TRxDBGridAbstractTools.Execute"><short>Запуск инструмента</short>
+      </element><element name="RegisterRxDBGridSortEngine"><short>Процдера регистрирует вспомогательный класс для сортировки данных внутри RxDBGrid</short>
+      </element>
     </module>
   </package>
 </fpdoc-descriptions>

components/rx/trunk/docs/rxdbgridexportspreadsheet.xml

@@ -12,6 +12,11 @@ ressOverwriteExisting - при экспорте перезаписывать с
       </element><element name="TRxDBGridExportSpreadSheet.FileName"><short>Имя файла для экспорта</short>
       </element><element name="TRxDBGridExportSpreadSheet.PageName"><short>Имя страницы с данными</short>
       </element><element name="TRxDBGridExportSpreadSheet.Options"><short>Параметры экспорта</short>
+      <descr><p>Параметры экспорта данных</p>
+ressExportTitle - экспорт заголовков колонок
+ressExportColors - экспорт цвета ячеек
+ressExportFooter - экспорт строки итогов
+ressOverwriteExisting - при экспорте перезаписывать существующий файл</descr>
       </element><element name="TRxDBGridExportSpreadSheet.OpenAfterExport"><short>Открывать файл после экспорта</short>
       </element>
     </module>

components/rx/trunk/docs/rxsortzeos.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fpdoc-descriptions><package name="rx_sort_zeos"><module name="RxSortZeos"><short>Модуль содержит визуальный компонент для подключения модуля сортировки ZEOS</short><descr>Модуль содержит визуальный компонент для подключения модуля сортировки данных, предоставляемых библиотекой ZEOS в RxDBGrid</descr><element name="TRxSortZeos"><short>Визуальный компонент для подключения модуля сортировки данных, предоставляемых библиотекой ZEOS в RxDBGrid</short>
+      </element>
+    </module>
+  </package>
+</fpdoc-descriptions>

components/rx/trunk/docs/vclutils.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fpdoc-descriptions><package name="rxnew"><module name="vclutils"><short>Модуль содержит вспомогательные процедуры и функции</short><element name="TTextOrientation"><short>Напраление отображения текста</short><descr>toHorizontal
+toVertical90
+toHorizontal180
+toVertical270
+toHorizontal360</descr>
+      </element><element name="TTextOrientation.toHorizontal360"/>
+    </module>
+  </package>
+</fpdoc-descriptions>

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+}

components/rx/trunk/rx_sort_zeos.lpk

@@ -1,18 +1,14 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <Package Version="4">
     <Name Value="rx_sort_zeos"/>
+    <Type Value="RunAndDesignTime"/>
+    <Author Value="Lagunov A.A."/>
     <CompilerOptions>
       <Version Value="11"/>
       <SearchPaths>
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
-      <Other>
-        <CompilerMessages>
-          <MsgFileName Value=""/>
-        </CompilerMessages>
-        <CompilerPath Value="$(CompPath)"/>
-      </Other>
     </CompilerOptions>
     <Version Major="1"/>
     <Files Count="2">
@@ -26,7 +22,7 @@
         <UnitName Value="exsortzeos"/>
       </Item2>
     </Files>
-    <Type Value="RunAndDesignTime"/>
+    <LazDoc Paths="docs"/>
     <RequiredPkgs Count="3">
       <Item1>
         <PackageName Value="zcomponent"/>

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

components/rx/trunk/rxdbgridexportspreadsheet.pas

@@ -413,7 +413,7 @@ begin
     FDataSet.EnableControls;
   end;
 
-  if Result then
+  if Result and FOpenAfterExport then
     OpenDocument(FileName);
 end;
 

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;

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+}