TRxDBGridExportSpreadSheet - export merged title cells

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

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

@@ -99,7 +99,6 @@
       <Unit5>
         <Filename Value="../../rxdbgrid.pas"/>
         <UnitName Value="rxdbgrid"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="2"/>
         <TopLine Value="843"/>
         <CursorPos X="23" Y="867"/>
@@ -713,9 +712,10 @@
       <Unit103>
         <Filename Value="../../rxdbgridexportspreadsheet.pas"/>
         <UnitName Value="RxDBGridExportSpreadSheet"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <TopLine Value="185"/>
-        <CursorPos X="2" Y="208"/>
+        <CursorPos Y="208"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit103>

components/rx/trunk/Demos/RxDBGrid_ExportSpreadsheet/unit1.lfm

@@ -10,8 +10,8 @@ object Form1: TForm1
   LCLVersion = '1.3'
   object RxDBGrid1: TRxDBGrid
     Left = 0
-    Height = 455
+    Height = 457
-    Top = 72
+    Top = 70
     Width = 746
     TitleButtons = False
     AutoSort = True
@@ -23,11 +23,11 @@ object Form1: TForm1
         Title.Orientation = toHorizontal
         Width = 90
         FieldName = 'CODE'
+        EditButtons = <>
         Filter.DropDownRows = 0
         Filter.EmptyValue = '(Нет)'
         Filter.EmptyFont.Style = [fsItalic]
         Filter.ItemIndex = -1
-        EditButtons = <>
       end    
       item
         Color = clAqua
@@ -36,11 +36,11 @@ object Form1: TForm1
         Title.Orientation = toHorizontal
         Width = 350
         FieldName = 'NAME'
+        EditButtons = <>
         Filter.DropDownRows = 0
         Filter.EmptyValue = '(Нет)'
         Filter.EmptyFont.Style = [fsItalic]
         Filter.ItemIndex = -1
-        EditButtons = <>
       end    
       item
         Title.Alignment = taCenter
@@ -48,11 +48,11 @@ object Form1: TForm1
         Title.Orientation = toHorizontal
         Width = 120
         FieldName = 'PRICE'
+        EditButtons = <>
         Filter.DropDownRows = 0
         Filter.EmptyValue = '(Нет)'
         Filter.EmptyFont.Style = [fsItalic]
         Filter.ItemIndex = -1
-        EditButtons = <>
       end>
     KeyStrokes = <    
       item
@@ -125,21 +125,21 @@ object Form1: TForm1
   end
   object Panel1: TPanel
     Left = 0
-    Height = 72
+    Height = 70
     Top = 0
     Width = 746
     Align = alTop
     AutoSize = True
-    ClientHeight = 72
+    ClientHeight = 70
     ClientWidth = 746
     TabOrder = 1
     object Label1: TLabel
       AnchorSideLeft.Control = Panel1
       AnchorSideTop.Control = Panel1
       Left = 7
-      Height = 21
+      Height = 19
       Top = 7
-      Width = 145
+      Width = 131
       BorderSpacing.Around = 6
       Caption = 'SpeadSheet file name '
       ParentColor = False
@@ -148,10 +148,10 @@ object Form1: TForm1
       AnchorSideTop.Control = Panel1
       AnchorSideRight.Control = Panel1
       AnchorSideRight.Side = asrBottom
-      Left = 599
+      Left = 606
       Height = 23
       Top = 7
-      Width = 140
+      Width = 133
       Anchors = [akTop, akRight]
       BorderSpacing.Around = 6
       Caption = 'Open after export'
@@ -165,7 +165,7 @@ object Form1: TForm1
       AnchorSideTop.Side = asrBottom
       Left = 13
       Height = 31
-      Top = 34
+      Top = 32
       Width = 275
       FilterIndex = 0
       HideDirectories = False
@@ -182,7 +182,7 @@ object Form1: TForm1
       AnchorSideTop.Side = asrCenter
       Left = 294
       Height = 33
-      Top = 33
+      Top = 31
       Width = 87
       Caption = 'Export data'
       OnClick = Button1Click
@@ -255,10 +255,10 @@ object Form1: TForm1
   object RxDBGridExportSpreadSheet1: TRxDBGridExportSpreadSheet
     RxDBGrid = RxDBGrid1
     Caption = 'Экспорт в электронную таблицу'
+    ShowSetupForm = True
     OnBeforeExecute = RxDBGridExportSpreadSheet1BeforeExecute
-    OnAfterExecute = RxDBGridExportSpreadSheet1AfterExecute
     PageName = 'Test page'
-    Options = []
+    Options = [ressExportTitle, ressExportColors, ressExportFooter, ressOverwriteExisting]
     left = 336
     top = 256
   end

components/rx/trunk/Demos/RxDBGrid_ExportSpreadsheet/unit1.pas

@@ -27,7 +27,6 @@ type
     RxMemoryData1PRICE: TCurrencyField;
     procedure Button1Click(Sender: TObject);
     procedure FormCreate(Sender: TObject);
-    procedure RxDBGridExportSpreadSheet1AfterExecute(Sender: TObject);
     procedure RxDBGridExportSpreadSheet1BeforeExecute(Sender: TObject);
   private
     { private declarations }
@@ -65,12 +64,6 @@ begin
   FileNameEdit1.Text:='test1.ods';
 end;
 
-procedure TForm1.RxDBGridExportSpreadSheet1AfterExecute(Sender: TObject);
-begin
-  if CheckBox1.Checked then
-    OpenDocument(FileNameEdit1.FileName);
-end;
-
 procedure TForm1.RxDBGridExportSpreadSheet1BeforeExecute(Sender: TObject);
 begin
   RxDBGridExportSpreadSheet1.FileName:=FileNameEdit1.Text;

components/rx/trunk/languages/rxconst.es.po

@@ -89,22 +89,10 @@ msgstr ""
 msgid "File specified is not an executable file, dynamic-link library, or icon file"
 msgstr "Fichero especificado no es un fichero ejecutable, vinculo dinamico, o fichero de icono"
 
-#: rxconst.sfirsthalfofyear
-msgid "First half of year"
-msgstr ""
-
-#: rxconst.sfirstquarter
-msgid "First quarter"
-msgstr ""
-
 #: rxconst.sflatbuttons
 msgid "Flat buttons"
 msgstr "Botones planos"
 
-#: rxconst.sfourthquarter
-msgid "Fourth quarter"
-msgstr ""
-
 #: rxconst.sfpcversion
 msgid "FPC version : "
 msgstr ""
@@ -181,14 +169,6 @@ msgstr ""
 msgid "Error. Expected value for filed %s."
 msgstr ""
 
-#: rxconst.ssecondhalfofyear
-msgid "Second half of year"
-msgstr ""
-
-#: rxconst.ssecondquarter
-msgid "Second quarter"
-msgstr ""
-
 #: rxconst.sshowcaption
 msgid "Show caption"
 msgstr "Mostrar titulo"
@@ -205,10 +185,6 @@ msgstr ""
 msgid "Target OS : "
 msgstr ""
 
-#: rxconst.sthirdquarter
-msgid "Third quarter"
-msgstr ""
-
 #: rxconst.stocurdate
 msgid "Set current date"
 msgstr "Poner fecha actual"

components/rx/trunk/languages/rxconst.po

@@ -89,22 +89,10 @@ msgstr ""
 msgid "File specified is not an executable file, dynamic-link library, or icon file"
 msgstr ""
 
-#: rxconst.sfirsthalfofyear
-msgid "First half of year"
-msgstr ""
-
-#: rxconst.sfirstquarter
-msgid "First quarter"
-msgstr ""
-
 #: rxconst.sflatbuttons
 msgid "Flat buttons"
 msgstr ""
 
-#: rxconst.sfourthquarter
-msgid "Fourth quarter"
-msgstr ""
-
 #: rxconst.sfpcversion
 msgid "FPC version : "
 msgstr ""
@@ -181,14 +169,6 @@ msgstr ""
 msgid "Error. Expected value for filed %s."
 msgstr ""
 
-#: rxconst.ssecondhalfofyear
-msgid "Second half of year"
-msgstr ""
-
-#: rxconst.ssecondquarter
-msgid "Second quarter"
-msgstr ""
-
 #: rxconst.sshowcaption
 msgid "Show caption"
 msgstr ""
@@ -205,10 +185,6 @@ msgstr ""
 msgid "Target OS : "
 msgstr ""
 
-#: rxconst.sthirdquarter
-msgid "Third quarter"
-msgstr ""
-
 #: rxconst.stocurdate
 msgid "Set current date"
 msgstr ""

components/rx/trunk/languages/rxconst.ru.po

@@ -89,22 +89,10 @@ msgstr "Элемент управления не найден в валидат
 msgid "File specified is not an executable file, dynamic-link library, or icon file"
 msgstr "Указанный файл не исполняемый, не библиотека и не иконка"
 
-#: rxconst.sfirsthalfofyear
-msgid "First half of year"
-msgstr "Первое полугодие"
-
-#: rxconst.sfirstquarter
-msgid "First quarter"
-msgstr "Первый квартал"
-
 #: rxconst.sflatbuttons
 msgid "Flat buttons"
 msgstr "Плавающие кнопки"
 
-#: rxconst.sfourthquarter
-msgid "Fourth quarter"
-msgstr "Четвёртый квартал"
-
 #: rxconst.sfpcversion
 msgid "FPC version : "
 msgstr "Версия FPC : "
@@ -181,14 +169,6 @@ msgstr "Графический интерфейс QT"
 msgid "Error. Expected value for filed %s."
 msgstr "Поле %s. Требуется значение"
 
-#: rxconst.ssecondhalfofyear
-msgid "Second half of year"
-msgstr "Второе полугодие"
-
-#: rxconst.ssecondquarter
-msgid "Second quarter"
-msgstr "Второй квартал"
-
 #: rxconst.sshowcaption
 msgid "Show caption"
 msgstr "Отображать заголовок"
@@ -205,10 +185,6 @@ msgstr "Целевой процессор : "
 msgid "Target OS : "
 msgstr "Целевая ОС : "
 
-#: rxconst.sthirdquarter
-msgid "Third quarter"
-msgstr "Третий квартал"
-
 #: rxconst.stocurdate
 msgid "Set current date"
 msgstr "Установть текущую дату"

components/rx/trunk/languages/rxconst.uk.po

@@ -98,22 +98,10 @@ msgstr "Елемент управління не знайдений в валі
 msgid "File specified is not an executable file, dynamic-link library, or icon file"
 msgstr "Вказаний файл не виконуваний, не бібліотека і не іконка"
 
-#: rxconst.sfirsthalfofyear
-msgid "First half of year"
-msgstr ""
-
-#: rxconst.sfirstquarter
-msgid "First quarter"
-msgstr ""
-
 #: rxconst.sflatbuttons
 msgid "Flat buttons"
 msgstr "Плаваючі кнопки"
 
-#: rxconst.sfourthquarter
-msgid "Fourth quarter"
-msgstr ""
-
 #: rxconst.sfpcversion
 msgid "FPC version : "
 msgstr "Версія FPC : "
@@ -190,14 +178,6 @@ msgstr "Набір віджетів QT"
 msgid "Error. Expected value for filed %s."
 msgstr "Поле %s. Вимагається значення"
 
-#: rxconst.ssecondhalfofyear
-msgid "Second half of year"
-msgstr ""
-
-#: rxconst.ssecondquarter
-msgid "Second quarter"
-msgstr ""
-
 #: rxconst.sshowcaption
 msgid "Show caption"
 msgstr "Показати заголовок"
@@ -214,10 +194,6 @@ msgstr "Цільовий CPU : "
 msgid "Target OS : "
 msgstr "Цільова OS : "
 
-#: rxconst.sthirdquarter
-msgid "Third quarter"
-msgstr ""
-
 #: rxconst.stocurdate
 msgid "Set current date"
 msgstr "Встановити поточну дату"

components/rx/trunk/languages/rxdconst.es.po

@@ -5,10 +5,6 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 msgid "Application \"%s\""
 msgstr "Aplicación \"%s\""
 
-#: rxdconst.sbottomcaption
-msgid "Bottom"
-msgstr ""
-
 #: rxdconst.sbrowsedata
 msgid "browse"
 msgstr "vista"
@@ -69,22 +65,6 @@ msgstr "editando"
 msgid "Error message"
 msgstr "Mensaje de error"
 
-#: rxdconst.sexportcellcolors
-msgid "Export cell colors"
-msgstr ""
-
-#: rxdconst.sexportcolumnfooter
-msgid "Export column footer"
-msgstr ""
-
-#: rxdconst.sexportcolumnheader
-msgid "Export column header"
-msgstr ""
-
-#: rxdconst.sexportfilename
-msgid "Export file name"
-msgstr ""
-
 #: rxdconst.sexprbadcompare
 msgid "Compare opertion need fielad and const"
 msgstr "Comparación operacion necesita fielad y const"
@@ -95,8 +75,8 @@ msgstr "Campo '%s' no usado en expresión de filtro"
 
 #: rxdconst.sexprbadnulltest
 #, fuzzy
-#| msgid "NULL-values enabled in '=' и '<>'"
+#| msgid "NULL-values enabled in '=' and '<>'"
-msgid "NULL-values enabled in '=' and '<>'"
+msgid "NULL-values enabled in '=' и '<>'"
 msgstr "Valor nulo habilitado en '=' y '<>'"
 
 #: rxdconst.sexprexpected
@@ -143,10 +123,6 @@ msgstr "Campo '%s' debe tener un valor"
 msgid "Type mismatch for field '%s', expecting: %s actual: %s"
 msgstr "Tipo no corresponde para el campo '%s', se esperaba: %s actual: %s"
 
-#: rxdconst.shidezerovalues
-msgid "Hide zero values"
-msgstr ""
-
 #: rxdconst.shintlabel
 msgid "Enter you user name and password"
 msgstr "Entre su nombre de usuario y clave"
@@ -171,14 +147,6 @@ msgstr "No hay campos definido"
 msgid "User name or password not valid"
 msgstr "Nombre de usuario o clave no es valido"
 
-#: rxdconst.slandscape
-msgid "Landscape"
-msgstr ""
-
-#: rxdconst.sleftcaption
-msgid "Left"
-msgstr ""
-
 #: rxdconst.slocaldatabase
 msgid "Unable complete this operation on local dataset"
 msgstr "No se puede completar esta operación en el conjunto de datos local"
@@ -215,26 +183,6 @@ msgstr "Conjunto de Datos no esta en modo de edición o inserción"
 msgid "&Old password:"
 msgstr "&Anterior clave:"
 
-#: rxdconst.sopenafterexport
-msgid "Open after export"
-msgstr ""
-
-#: rxdconst.sorientation
-msgid "Orientation"
-msgstr ""
-
-#: rxdconst.soverwriteexisting
-msgid "Overwrite existing"
-msgstr ""
-
-#: rxdconst.spagemargins
-msgid "Page margins"
-msgstr ""
-
-#: rxdconst.spagename
-msgid "Page name"
-msgstr ""
-
 #: rxdconst.spasswordchanged
 msgid "Password changed"
 msgstr "Clave cambiada"
@@ -251,22 +199,10 @@ msgstr "Clave no cambio"
 msgid "New password and confirmation not equal"
 msgstr "Nueva clave y confirmacion no son iguales"
 
-#: rxdconst.sportrait
-msgid "Portrait"
-msgstr ""
-
 #: rxdconst.sprevbutton
 msgid "&Prior"
 msgstr "&Anterior"
 
-#: rxdconst.sprintgrid
-msgid "Print grid"
-msgstr ""
-
-#: rxdconst.sprintoptions
-msgid "Print options"
-msgstr ""
-
 #: rxdconst.spropdefbylookup
 msgid "PropDefByLookup"
 msgstr "PropDefByLookup"
@@ -275,18 +211,10 @@ msgstr "PropDefByLookup"
 msgid "Register"
 msgstr "Registro"
 
-#: rxdconst.sreporttitle
-msgid "Report title"
-msgstr ""
-
 #: rxdconst.sretrylogin
 msgid "Retry to connect with database?"
 msgstr "Reintentar conectar con la base de dato?"
 
-#: rxdconst.srightcaption
-msgid "Right"
-msgstr ""
-
 #: rxdconst.srxallfields
 msgid "All fields"
 msgstr ""
@@ -366,15 +294,6 @@ msgstr "Hacia Delante"
 msgid "Text to find"
 msgstr "Texto a Buscar"
 
-#: rxdconst.srxdbgridselapplycaption
-msgctxt "rxdconst.srxdbgridselapplycaption"
-msgid "Apply"
-msgstr "Aceptar"
-
-#: rxdconst.srxdbgridselapplyhint
-msgid "Apply current columns setings"
-msgstr ""
-
 #: rxdconst.srxdbgridselcolcaption
 msgid "Grid columns"
 msgstr "Columnas de la Tabla"
@@ -416,6 +335,7 @@ msgid "Fill fields in SortField property"
 msgstr ""
 
 #: rxdconst.srxfilterformapply
+#, fuzzy
 msgctxt "rxdconst.srxfilterformapply"
 msgid "Apply"
 msgstr "Aceptar"
@@ -519,38 +439,6 @@ msgstr "Error del Servidor"
 msgid "find"
 msgstr "buscar"
 
-#: rxdconst.sshowcolumnheaderonallpage
-msgid "Show column header on all page"
-msgstr ""
-
-#: rxdconst.sshowfooter
-msgid "Show footer"
-msgstr ""
-
-#: rxdconst.sshowfootercolor
-msgid "Show footer color"
-msgstr ""
-
-#: rxdconst.sshowgridcolor
-msgid "Show grid color"
-msgstr ""
-
-#: rxdconst.sshowreporttitle
-msgid "Show report title"
-msgstr ""
-
-#: rxdconst.sshowtitle
-msgid "Show column title"
-msgstr ""
-
-#: rxdconst.stoolsexportspeadsheet
-msgid "Export to speadsheet"
-msgstr ""
-
-#: rxdconst.stopcaption
-msgid "Top"
-msgstr ""
-
 #: rxdconst.sunknownfieldtype
 msgid "SUnknownFieldType %s"
 msgstr "STipoCampoDesconocido %s"

components/rx/trunk/languages/rxdconst.po

@@ -5,10 +5,6 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 msgid "Application \"%s\""
 msgstr ""
 
-#: rxdconst.sbottomcaption
-msgid "Bottom"
-msgstr ""
-
 #: rxdconst.sbrowsedata
 msgid "browse"
 msgstr ""
@@ -69,22 +65,6 @@ msgstr ""
 msgid "Error message"
 msgstr ""
 
-#: rxdconst.sexportcellcolors
-msgid "Export cell colors"
-msgstr ""
-
-#: rxdconst.sexportcolumnfooter
-msgid "Export column footer"
-msgstr ""
-
-#: rxdconst.sexportcolumnheader
-msgid "Export column header"
-msgstr ""
-
-#: rxdconst.sexportfilename
-msgid "Export file name"
-msgstr ""
-
 #: rxdconst.sexprbadcompare
 msgid "Compare opertion need fielad and const"
 msgstr ""
@@ -94,7 +74,7 @@ msgid "Field '%s' not used in filter expression"
 msgstr ""
 
 #: rxdconst.sexprbadnulltest
-msgid "NULL-values enabled in '=' and '<>'"
+msgid "NULL-values enabled in '=' и '<>'"
 msgstr ""
 
 #: rxdconst.sexprexpected
@@ -141,10 +121,6 @@ msgstr ""
 msgid "Type mismatch for field '%s', expecting: %s actual: %s"
 msgstr ""
 
-#: rxdconst.shidezerovalues
-msgid "Hide zero values"
-msgstr ""
-
 #: rxdconst.shintlabel
 msgid "Enter you user name and password"
 msgstr ""
@@ -169,14 +145,6 @@ msgstr ""
 msgid "User name or password not valid"
 msgstr ""
 
-#: rxdconst.slandscape
-msgid "Landscape"
-msgstr ""
-
-#: rxdconst.sleftcaption
-msgid "Left"
-msgstr ""
-
 #: rxdconst.slocaldatabase
 msgid "Unable complete this operation on local dataset"
 msgstr ""
@@ -213,26 +181,6 @@ msgstr ""
 msgid "&Old password:"
 msgstr ""
 
-#: rxdconst.sopenafterexport
-msgid "Open after export"
-msgstr ""
-
-#: rxdconst.sorientation
-msgid "Orientation"
-msgstr ""
-
-#: rxdconst.soverwriteexisting
-msgid "Overwrite existing"
-msgstr ""
-
-#: rxdconst.spagemargins
-msgid "Page margins"
-msgstr ""
-
-#: rxdconst.spagename
-msgid "Page name"
-msgstr ""
-
 #: rxdconst.spasswordchanged
 msgid "Password changed"
 msgstr ""
@@ -249,22 +197,10 @@ msgstr ""
 msgid "New password and confirmation not equal"
 msgstr ""
 
-#: rxdconst.sportrait
-msgid "Portrait"
-msgstr ""
-
 #: rxdconst.sprevbutton
 msgid "&Prior"
 msgstr ""
 
-#: rxdconst.sprintgrid
-msgid "Print grid"
-msgstr ""
-
-#: rxdconst.sprintoptions
-msgid "Print options"
-msgstr ""
-
 #: rxdconst.spropdefbylookup
 msgid "PropDefByLookup"
 msgstr ""
@@ -273,18 +209,10 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: rxdconst.sreporttitle
-msgid "Report title"
-msgstr ""
-
 #: rxdconst.sretrylogin
 msgid "Retry to connect with database?"
 msgstr ""
 
-#: rxdconst.srightcaption
-msgid "Right"
-msgstr ""
-
 #: rxdconst.srxallfields
 msgid "All fields"
 msgstr ""
@@ -364,15 +292,6 @@ msgstr ""
 msgid "Text to find"
 msgstr ""
 
-#: rxdconst.srxdbgridselapplycaption
-msgctxt "rxdconst.srxdbgridselapplycaption"
-msgid "Apply"
-msgstr ""
-
-#: rxdconst.srxdbgridselapplyhint
-msgid "Apply current columns setings"
-msgstr ""
-
 #: rxdconst.srxdbgridselcolcaption
 msgid "Grid columns"
 msgstr ""
@@ -515,38 +434,6 @@ msgstr ""
 msgid "find"
 msgstr ""
 
-#: rxdconst.sshowcolumnheaderonallpage
-msgid "Show column header on all page"
-msgstr ""
-
-#: rxdconst.sshowfooter
-msgid "Show footer"
-msgstr ""
-
-#: rxdconst.sshowfootercolor
-msgid "Show footer color"
-msgstr ""
-
-#: rxdconst.sshowgridcolor
-msgid "Show grid color"
-msgstr ""
-
-#: rxdconst.sshowreporttitle
-msgid "Show report title"
-msgstr ""
-
-#: rxdconst.sshowtitle
-msgid "Show column title"
-msgstr ""
-
-#: rxdconst.stoolsexportspeadsheet
-msgid "Export to speadsheet"
-msgstr ""
-
-#: rxdconst.stopcaption
-msgid "Top"
-msgstr ""
-
 #: rxdconst.sunknownfieldtype
 msgid "SUnknownFieldType %s"
 msgstr ""

components/rx/trunk/languages/rxdconst.ru.po

@@ -5,10 +5,6 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 msgid "Application \"%s\""
 msgstr "Программа \"%s\""
 
-#: rxdconst.sbottomcaption
-msgid "Bottom"
-msgstr "Снизу"
-
 #: rxdconst.sbrowsedata
 msgid "browse"
 msgstr "просмотр"
@@ -69,22 +65,6 @@ msgstr "редактирование"
 msgid "Error message"
 msgstr "Сообщение об ошибке"
 
-#: rxdconst.sexportcellcolors
-msgid "Export cell colors"
-msgstr "Экспорт цвета ячеек"
-
-#: rxdconst.sexportcolumnfooter
-msgid "Export column footer"
-msgstr "Экспорт итогов по столбцам"
-
-#: rxdconst.sexportcolumnheader
-msgid "Export column header"
-msgstr "Экспорт заголовков столбцов"
-
-#: rxdconst.sexportfilename
-msgid "Export file name"
-msgstr "Имя файла для выгрузки"
-
 #: rxdconst.sexprbadcompare
 msgid "Compare opertion need fielad and const"
 msgstr "Операции сравнения требуют наличия поля и константы"
@@ -94,7 +74,9 @@ msgid "Field '%s' not used in filter expression"
 msgstr "Поле '%s' не может быть использовано в выражении фильтрации"
 
 #: rxdconst.sexprbadnulltest
-msgid "NULL-values enabled in '=' and '<>'"
+#, fuzzy
+#| msgid "NULL-values enabled in '=' and '<>'"
+msgid "NULL-values enabled in '=' и '<>'"
 msgstr "NULL-значения разрешены только в выражениях '=' и '<>'"
 
 #: rxdconst.sexprexpected
@@ -141,10 +123,6 @@ msgstr "Поле '%s' ожидает значение"
 msgid "Type mismatch for field '%s', expecting: %s actual: %s"
 msgstr "Несоответсвие типов для поля '%s', необходимо: %s введено: %s"
 
-#: rxdconst.shidezerovalues
-msgid "Hide zero values"
-msgstr "Скрывать нулевые значения"
-
 #: rxdconst.shintlabel
 msgid "Enter you user name and password"
 msgstr "Введите ваше имя и пароль"
@@ -169,14 +147,6 @@ msgstr "Нет объявления полей"
 msgid "User name or password not valid"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: rxdconst.slandscape
-msgid "Landscape"
-msgstr "Альбом"
-
-#: rxdconst.sleftcaption
-msgid "Left"
-msgstr "Слева"
-
 #: rxdconst.slocaldatabase
 msgid "Unable complete this operation on local dataset"
 msgstr "Невозможно произвести эту операцию с локальной базой данных"
@@ -213,26 +183,6 @@ msgstr "Набор данных не в режиме редактировани
 msgid "&Old password:"
 msgstr "&Старый пароль"
 
-#: rxdconst.sopenafterexport
-msgid "Open after export"
-msgstr "Открыть после экспорта"
-
-#: rxdconst.sorientation
-msgid "Orientation"
-msgstr "Ориентация"
-
-#: rxdconst.soverwriteexisting
-msgid "Overwrite existing"
-msgstr "Перезаписать существующее"
-
-#: rxdconst.spagemargins
-msgid "Page margins"
-msgstr "Отступы на странице"
-
-#: rxdconst.spagename
-msgid "Page name"
-msgstr "Название страницы"
-
 #: rxdconst.spasswordchanged
 msgid "Password changed"
 msgstr "Пароль изменён"
@@ -249,22 +199,10 @@ msgstr "Пароль не изменён"
 msgid "New password and confirmation not equal"
 msgstr "Новый пароль и подтверждение не совпадают"
 
-#: rxdconst.sportrait
-msgid "Portrait"
-msgstr "Портрет"
-
 #: rxdconst.sprevbutton
 msgid "&Prior"
 msgstr "&Превыдущие"
 
-#: rxdconst.sprintgrid
-msgid "Print grid"
-msgstr "Печать списка"
-
-#: rxdconst.sprintoptions
-msgid "Print options"
-msgstr "Параметры печати"
-
 #: rxdconst.spropdefbylookup
 msgid "PropDefByLookup"
 msgstr ""
@@ -273,18 +211,10 @@ msgstr ""
 msgid "Register"
 msgstr "Регистрация"
 
-#: rxdconst.sreporttitle
-msgid "Report title"
-msgstr "Заголовок отчёта"
-
 #: rxdconst.sretrylogin
 msgid "Retry to connect with database?"
 msgstr "Вы хотите повторить попытку соединения с базой данных?"
 
-#: rxdconst.srightcaption
-msgid "Right"
-msgstr "Справа"
-
 #: rxdconst.srxallfields
 msgid "All fields"
 msgstr "Все поля"
@@ -364,15 +294,6 @@ msgstr "Вперёд"
 msgid "Text to find"
 msgstr "Текст для поиска"
 
-#: rxdconst.srxdbgridselapplycaption
-msgctxt "rxdconst.srxdbgridselapplycaption"
-msgid "Apply"
-msgstr "Применить"
-
-#: rxdconst.srxdbgridselapplyhint
-msgid "Apply current columns setings"
-msgstr "Сохранить текущие настройки колонок"
-
 #: rxdconst.srxdbgridselcolcaption
 msgid "Grid columns"
 msgstr "Поля таблицы"
@@ -414,6 +335,7 @@ msgid "Fill fields in SortField property"
 msgstr "Заполните список для поля SortField"
 
 #: rxdconst.srxfilterformapply
+#, fuzzy
 msgctxt "rxdconst.srxfilterformapply"
 msgid "Apply"
 msgstr "Применить"
@@ -515,38 +437,6 @@ msgstr "Ошибка сервера"
 msgid "find"
 msgstr "поиск"
 
-#: rxdconst.sshowcolumnheaderonallpage
-msgid "Show column header on all page"
-msgstr "Отображать заголовки колонок на всех страницах"
-
-#: rxdconst.sshowfooter
-msgid "Show footer"
-msgstr "Отображать итоги"
-
-#: rxdconst.sshowfootercolor
-msgid "Show footer color"
-msgstr "Итоги в цвете"
-
-#: rxdconst.sshowgridcolor
-msgid "Show grid color"
-msgstr "Список в цвете"
-
-#: rxdconst.sshowreporttitle
-msgid "Show report title"
-msgstr "Отображать заголовок отчёта"
-
-#: rxdconst.sshowtitle
-msgid "Show column title"
-msgstr "Отображать заголовки колонок"
-
-#: rxdconst.stoolsexportspeadsheet
-msgid "Export to speadsheet"
-msgstr "Экспорт в электронную таблицу"
-
-#: rxdconst.stopcaption
-msgid "Top"
-msgstr "Сверху"
-
 #: rxdconst.sunknownfieldtype
 msgid "SUnknownFieldType %s"
 msgstr "Не определён тип данных для поля %s"

components/rx/trunk/languages/rxdconst.uk.po

@@ -14,10 +14,6 @@ msgstr ""
 msgid "Application \"%s\""
 msgstr "Програма \"%s\""
 
-#: rxdconst.sbottomcaption
-msgid "Bottom"
-msgstr ""
-
 #: rxdconst.sbrowsedata
 msgid "browse"
 msgstr "перегляд"
@@ -78,22 +74,6 @@ msgstr "Редагування"
 msgid "Error message"
 msgstr "Повідомлення про помилку"
 
-#: rxdconst.sexportcellcolors
-msgid "Export cell colors"
-msgstr ""
-
-#: rxdconst.sexportcolumnfooter
-msgid "Export column footer"
-msgstr ""
-
-#: rxdconst.sexportcolumnheader
-msgid "Export column header"
-msgstr ""
-
-#: rxdconst.sexportfilename
-msgid "Export file name"
-msgstr ""
-
 #: rxdconst.sexprbadcompare
 msgid "Compare opertion need fielad and const"
 msgstr "Операції порівняння вимагають наявності поля і константи"
@@ -104,8 +84,8 @@ msgstr "Поле '%s' не може бути використане в вира
 
 #: rxdconst.sexprbadnulltest
 #, fuzzy
-#| msgid "NULL-values enabled in '=' и '<>'"
+#| msgid "NULL-values enabled in '=' and '<>'"
-msgid "NULL-values enabled in '=' and '<>'"
+msgid "NULL-values enabled in '=' и '<>'"
 msgstr "NULL-значення дозволені тільки у виразах '=' і '<>'"
 
 #: rxdconst.sexprexpected
@@ -152,10 +132,6 @@ msgstr "Поле '%s' очікує значення"
 msgid "Type mismatch for field '%s', expecting: %s actual: %s"
 msgstr "Несоответсвие типов для поля '%s', необходимо: %s введено: %s"
 
-#: rxdconst.shidezerovalues
-msgid "Hide zero values"
-msgstr ""
-
 #: rxdconst.shintlabel
 msgid "Enter you user name and password"
 msgstr "Введіть ваші ім'я користувача та пароль"
@@ -180,14 +156,6 @@ msgstr "Немає оголошення полів"
 msgid "User name or password not valid"
 msgstr "Помилка в імені користувача або паролі"
 
-#: rxdconst.slandscape
-msgid "Landscape"
-msgstr ""
-
-#: rxdconst.sleftcaption
-msgid "Left"
-msgstr ""
-
 #: rxdconst.slocaldatabase
 msgid "Unable complete this operation on local dataset"
 msgstr "Неможливо провести цю операцію з локальною базою даних"
@@ -224,26 +192,6 @@ msgstr "Набір даних не в режимі редагування або
 msgid "&Old password:"
 msgstr "&Старий пароль"
 
-#: rxdconst.sopenafterexport
-msgid "Open after export"
-msgstr ""
-
-#: rxdconst.sorientation
-msgid "Orientation"
-msgstr ""
-
-#: rxdconst.soverwriteexisting
-msgid "Overwrite existing"
-msgstr ""
-
-#: rxdconst.spagemargins
-msgid "Page margins"
-msgstr ""
-
-#: rxdconst.spagename
-msgid "Page name"
-msgstr ""
-
 #: rxdconst.spasswordchanged
 msgid "Password changed"
 msgstr "Пароль змінено"
@@ -260,22 +208,10 @@ msgstr "Пароль не змінено"
 msgid "New password and confirmation not equal"
 msgstr "Новий пароль і підтвердження не співпадають"
 
-#: rxdconst.sportrait
-msgid "Portrait"
-msgstr ""
-
 #: rxdconst.sprevbutton
 msgid "&Prior"
 msgstr "&Попередній"
 
-#: rxdconst.sprintgrid
-msgid "Print grid"
-msgstr ""
-
-#: rxdconst.sprintoptions
-msgid "Print options"
-msgstr ""
-
 #: rxdconst.spropdefbylookup
 msgid "PropDefByLookup"
 msgstr ""
@@ -284,18 +220,10 @@ msgstr ""
 msgid "Register"
 msgstr "Реєстрація"
 
-#: rxdconst.sreporttitle
-msgid "Report title"
-msgstr ""
-
 #: rxdconst.sretrylogin
 msgid "Retry to connect with database?"
 msgstr "Ви хочете повторити спробу з'єднання з базою даних?"
 
-#: rxdconst.srightcaption
-msgid "Right"
-msgstr ""
-
 #: rxdconst.srxallfields
 msgid "All fields"
 msgstr ""
@@ -375,15 +303,6 @@ msgstr "Вперед"
 msgid "Text to find"
 msgstr "Текст для пошуку"
 
-#: rxdconst.srxdbgridselapplycaption
-msgctxt "rxdconst.srxdbgridselapplycaption"
-msgid "Apply"
-msgstr "Застосувати"
-
-#: rxdconst.srxdbgridselapplyhint
-msgid "Apply current columns setings"
-msgstr ""
-
 #: rxdconst.srxdbgridselcolcaption
 msgid "Grid columns"
 msgstr "Поля таблиці"
@@ -425,6 +344,7 @@ msgid "Fill fields in SortField property"
 msgstr ""
 
 #: rxdconst.srxfilterformapply
+#, fuzzy
 msgctxt "rxdconst.srxfilterformapply"
 msgid "Apply"
 msgstr "Застосувати"
@@ -526,38 +446,6 @@ msgstr "Помилка сервера"
 msgid "find"
 msgstr "Пошук"
 
-#: rxdconst.sshowcolumnheaderonallpage
-msgid "Show column header on all page"
-msgstr ""
-
-#: rxdconst.sshowfooter
-msgid "Show footer"
-msgstr ""
-
-#: rxdconst.sshowfootercolor
-msgid "Show footer color"
-msgstr ""
-
-#: rxdconst.sshowgridcolor
-msgid "Show grid color"
-msgstr ""
-
-#: rxdconst.sshowreporttitle
-msgid "Show report title"
-msgstr ""
-
-#: rxdconst.sshowtitle
-msgid "Show column title"
-msgstr ""
-
-#: rxdconst.stoolsexportspeadsheet
-msgid "Export to speadsheet"
-msgstr ""
-
-#: rxdconst.stopcaption
-msgid "Top"
-msgstr ""
-
 #: rxdconst.sunknownfieldtype
 msgid "SUnknownFieldType %s"
 msgstr "Не визначений тип даних для поля %s"

components/rx/trunk/rxdbgridexportspreadsheet.pas

@@ -192,7 +192,7 @@ begin
     end;
   end;
 
-{
+
   if FMaxTitleHeight > 1 then
   begin
     for i:=0 to FRxDBGrid.Columns.Count-1 do
@@ -205,7 +205,7 @@ begin
       end;
     end;
   end;
-}
+
   inc(FCurRow, FMaxTitleHeight);
 end;