From 478f0092907f77b1d295e4cea50899d3c16e26b3 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 13 Jan 2021 05:39:51 +0000
Subject: [PATCH] RxFPC:after add item in RxTextHolderEditor set focus to text
 editor

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7963 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/dcl_rxtools.lpk           |   5 +-
 .../trunk/dcl_rxtools/rxtextholder_editor.lfm |  86 +++++++++---------
 .../trunk/dcl_rxtools/rxtextholder_editor.pas |   3 +
 .../rx/trunk/demos/RxLookup/project1.lpi      |  13 ++-
 components/rx/trunk/demos/RxMDI/project1.res  | Bin 139092 -> 139100 bytes
 components/rx/trunk/demos/RxMDI/unit1.lfm     |  20 ++--
 .../rx/trunk/languages/rxdconst.pt_BR.po      |  29 ++++--
 components/rx/trunk/rxnew.lpk                 |   2 +-
 8 files changed, 89 insertions(+), 69 deletions(-)

diff --git a/components/rx/trunk/dcl_rxtools.lpk b/components/rx/trunk/dcl_rxtools.lpk
index cb7d1f657..4963a795f 100644
--- a/components/rx/trunk/dcl_rxtools.lpk
+++ b/components/rx/trunk/dcl_rxtools.lpk
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <Name Value="dcl_rxtools"/>
     <Type Value="DesignTime"/>
     <Author Value="Lagunov Aleksey"/>
@@ -12,7 +12,7 @@
       </SearchPaths>
     </CompilerOptions>
     <License Value="LGPL 2"/>
-    <Version Release="1" Build="2"/>
+    <Version Major="1" Release="2" Build="5"/>
     <Files Count="2">
       <Item1>
         <Filename Value="dcl_rxtools/register_rxtools.pas"/>
@@ -25,6 +25,7 @@
         <UnitName Value="RxTextHolder_Editor"/>
       </Item2>
     </Files>
+    <CompatibilityMode Value="True"/>
     <i18n>
       <EnableI18N Value="True"/>
       <OutDir Value="languages"/>
diff --git a/components/rx/trunk/dcl_rxtools/rxtextholder_editor.lfm b/components/rx/trunk/dcl_rxtools/rxtextholder_editor.lfm
index e6ebff84f..dfe919aeb 100644
--- a/components/rx/trunk/dcl_rxtools/rxtextholder_editor.lfm
+++ b/components/rx/trunk/dcl_rxtools/rxtextholder_editor.lfm
@@ -14,8 +14,8 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
   LCLVersion = '2.1.0.0'
   object ButtonPanel1: TButtonPanel
     Left = 6
-    Height = 42
-    Top = 570
+    Height = 46
+    Top = 566
     Width = 730
     OKButton.Name = 'OKButton'
     OKButton.DefaultCaption = True
@@ -30,11 +30,11 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
   end
   object Panel1: TPanel
     Left = 0
-    Height = 564
+    Height = 560
     Top = 0
     Width = 267
     Align = alLeft
-    ClientHeight = 564
+    ClientHeight = 560
     ClientWidth = 267
     Constraints.MinWidth = 215
     TabOrder = 1
@@ -45,7 +45,7 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = BitBtn1
       Left = 1
-      Height = 531
+      Height = 525
       Top = 1
       Width = 265
       Anchors = [akTop, akLeft, akRight, akBottom]
@@ -62,9 +62,9 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
       AnchorSideBottom.Control = Panel1
       AnchorSideBottom.Side = asrBottom
       Left = 1
-      Height = 31
-      Top = 532
-      Width = 38
+      Height = 33
+      Top = 526
+      Width = 40
       Action = itemAdd
       Anchors = [akLeft, akBottom]
       AutoSize = True
@@ -77,10 +77,10 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = Panel1
       AnchorSideBottom.Side = asrBottom
-      Left = 39
-      Height = 31
-      Top = 532
-      Width = 65
+      Left = 41
+      Height = 33
+      Top = 526
+      Width = 64
       Action = itemRemove
       Anchors = [akLeft, akBottom]
       AutoSize = True
@@ -92,10 +92,10 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = Panel1
       AnchorSideBottom.Side = asrBottom
-      Left = 116
-      Height = 31
-      Top = 532
-      Width = 30
+      Left = 117
+      Height = 33
+      Top = 526
+      Width = 33
       Action = itemUp
       Anchors = [akLeft, akBottom]
       AutoSize = True
@@ -108,9 +108,9 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = Panel1
       AnchorSideBottom.Side = asrBottom
-      Left = 146
-      Height = 31
-      Top = 532
+      Left = 150
+      Height = 33
+      Top = 526
       Width = 51
       Action = itemDown
       Anchors = [akLeft, akBottom]
@@ -120,28 +120,28 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
   end
   object Splitter1: TSplitter
     Left = 267
-    Height = 564
+    Height = 560
     Top = 0
     Width = 5
   end
   object Panel2: TPanel
     Left = 272
-    Height = 564
+    Height = 560
     Top = 0
     Width = 470
     Align = alClient
-    ClientHeight = 564
+    ClientHeight = 560
     ClientWidth = 470
     TabOrder = 3
     object Panel3: TPanel
       Left = 1
-      Height = 43
-      Top = 520
+      Height = 44
+      Top = 515
       Width = 468
       Align = alBottom
       AutoSize = True
       BevelOuter = bvNone
-      ClientHeight = 43
+      ClientHeight = 44
       ClientWidth = 468
       TabOrder = 0
       object Label2: TLabel
@@ -149,9 +149,9 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
         AnchorSideBottom.Control = ComboBox1
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 19
-        Top = 18
-        Width = 74
+        Height = 17
+        Top = 21
+        Width = 69
         Anchors = [akLeft, akBottom]
         BorderSpacing.Left = 6
         Caption = 'Highlighter'
@@ -163,10 +163,10 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
         AnchorSideTop.Control = Panel3
         AnchorSideRight.Control = Panel3
         AnchorSideRight.Side = asrBottom
-        Left = 86
-        Height = 31
+        Left = 81
+        Height = 32
         Top = 6
-        Width = 376
+        Width = 381
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Around = 6
         ItemHeight = 0
@@ -177,8 +177,8 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
     end
     inline SynEdit1: TSynEdit
       Left = 1
-      Height = 476
-      Top = 44
+      Height = 469
+      Top = 46
       Width = 468
       Align = alClient
       Anchors = [akTop, akLeft, akRight]
@@ -629,6 +629,10 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
       SelectedColor.ItalicPriority = 50
       SelectedColor.UnderlinePriority = 50
       SelectedColor.StrikeOutPriority = 50
+      ScrollOnEditLeftOptions.ScrollExtraPercent = 20
+      ScrollOnEditLeftOptions.ScrollExtraMax = 10
+      ScrollOnEditRightOptions.ScrollExtraPercent = 30
+      ScrollOnEditRightOptions.ScrollExtraMax = 25
       BracketHighlightStyle = sbhsBoth
       BracketMatchColor.Background = clNone
       BracketMatchColor.Foreground = clNone
@@ -678,13 +682,13 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
     end
     object Panel4: TPanel
       Left = 1
-      Height = 43
+      Height = 45
       Top = 1
       Width = 468
       Align = alTop
       AutoSize = True
       BevelOuter = bvNone
-      ClientHeight = 43
+      ClientHeight = 45
       ClientWidth = 468
       TabOrder = 2
       object Edit1: TEdit
@@ -693,10 +697,10 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
         AnchorSideTop.Control = Panel4
         AnchorSideRight.Control = Panel4
         AnchorSideRight.Side = asrBottom
-        Left = 63
-        Height = 31
+        Left = 60
+        Height = 33
         Top = 6
-        Width = 399
+        Width = 402
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Around = 6
         OnExit = Edit1Exit
@@ -707,9 +711,9 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
         AnchorSideBottom.Control = Edit1
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 19
-        Top = 18
-        Width = 51
+        Height = 17
+        Top = 22
+        Width = 48
         Anchors = [akLeft, akBottom]
         BorderSpacing.Left = 6
         Caption = 'Caption'
diff --git a/components/rx/trunk/dcl_rxtools/rxtextholder_editor.pas b/components/rx/trunk/dcl_rxtools/rxtextholder_editor.pas
index 588f6e440..da6364cc0 100644
--- a/components/rx/trunk/dcl_rxtools/rxtextholder_editor.pas
+++ b/components/rx/trunk/dcl_rxtools/rxtextholder_editor.pas
@@ -140,6 +140,9 @@ begin
   ListBox1.Items.Add(FCurrentItem.Caption);
   ListBox1.ItemIndex:=ListBox1.Items.Count-1;
   ListBox1Click(nil);
+
+  if SynEdit1.Enabled then
+    SynEdit1.SetFocus;
 end;
 
 procedure TRxTextHolder_EditorForm.itemUpExecute(Sender: TObject);
diff --git a/components/rx/trunk/demos/RxLookup/project1.lpi b/components/rx/trunk/demos/RxLookup/project1.lpi
index ba28cb90b..6d6f901e1 100644
--- a/components/rx/trunk/demos/RxLookup/project1.lpi
+++ b/components/rx/trunk/demos/RxLookup/project1.lpi
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="11"/>
+    <Version Value="12"/>
     <General>
-      <MainUnit Value="0"/>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
       <Icon Value="0"/>
@@ -17,9 +19,6 @@
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <FormatVersion Value="2"/>
@@ -55,7 +54,8 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <TopLine Value="16"/>
+        <IsVisibleTab Value="True"/>
+        <TopLine Value="43"/>
         <CursorPos X="23" Y="74"/>
         <UsageCount Value="24"/>
         <Loaded Value="True"/>
@@ -125,7 +125,6 @@
       </Unit9>
       <Unit10>
         <Filename Value="../../rxdb/rxlookup.pas"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <TopLine Value="1466"/>
         <CursorPos X="2" Y="1471"/>
diff --git a/components/rx/trunk/demos/RxMDI/project1.res b/components/rx/trunk/demos/RxMDI/project1.res
index 4133fe048bfc96eac220bd2dbc2c6057417f565b..55653795630f092e02e316c1398baeab0ab25dbd 100644
GIT binary patch
delta 37
tcmcbzkK@ihjtL5k4>v0AXJb^De22|}nSp_!S%$q`hMjS{3_FvB1ONg93cLUS

delta 31
ncmcb!kK@WdjtL5kcQz{SXPf+#&8As}y<LT!ak~mTlZ6BT(u4}I

diff --git a/components/rx/trunk/demos/RxMDI/unit1.lfm b/components/rx/trunk/demos/RxMDI/unit1.lfm
index a900c98a5..c3085cc74 100644
--- a/components/rx/trunk/demos/RxMDI/unit1.lfm
+++ b/components/rx/trunk/demos/RxMDI/unit1.lfm
@@ -1,7 +1,7 @@
 object Form1: TForm1
-  Left = 527
+  Left = 686
   Height = 435
-  Top = 222
+  Top = 176
   Width = 613
   Caption = 'MainForm'
   ClientHeight = 410
@@ -13,7 +13,7 @@ object Form1: TForm1
   WindowState = wsMaximized
   object ToolPanel1: TToolPanel
     Left = 0
-    Height = 36
+    Height = 34
     Top = 0
     Width = 613
     Items = <    
@@ -37,7 +37,7 @@ object Form1: TForm1
     CustomizeShortCut = False
     Align = alTop
     BorderWidth = 4
-    ClientHeight = 36
+    ClientHeight = 34
     ClientWidth = 613
     TabOrder = 0
     object RxMDICloseButton1: TRxMDICloseButton
@@ -47,7 +47,7 @@ object Form1: TForm1
       AnchorSideRight.Side = asrBottom
       Left = 585
       Height = 22
-      Top = 7
+      Top = 6
       Width = 23
       Anchors = [akTop, akRight]
       Glyph.Data = {
@@ -75,7 +75,7 @@ object Form1: TForm1
   object RxMDITasks1: TRxMDITasks
     Left = 0
     Height = 25
-    Top = 364
+    Top = 367
     Width = 613
     Align = alBottom
     FlatButton = True
@@ -83,8 +83,8 @@ object Form1: TForm1
   end
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 21
-    Top = 389
+    Height = 18
+    Top = 392
     Width = 613
     Panels = <    
       item
@@ -97,8 +97,8 @@ object Form1: TForm1
   end
   object RxMDIPanel1: TRxMDIPanel
     Left = 0
-    Height = 328
-    Top = 36
+    Height = 333
+    Top = 34
     Width = 613
     CloseButton = RxMDICloseButton1
     TaskPanel = RxMDITasks1
diff --git a/components/rx/trunk/languages/rxdconst.pt_BR.po b/components/rx/trunk/languages/rxdconst.pt_BR.po
index d469d0076..d31261c7d 100644
--- a/components/rx/trunk/languages/rxdconst.pt_BR.po
+++ b/components/rx/trunk/languages/rxdconst.pt_BR.po
@@ -6,6 +6,7 @@ msgid "All values"
 msgstr "Todos os valores"
 
 #: rxdconst.sapptitlelabel
+#, object-pascal-format
 msgid "Application \"%s\""
 msgstr "Aplicação \"%s\""
 
@@ -74,7 +75,7 @@ msgid "Data changed. Save?"
 msgstr "Dados alterados. Salvar?"
 
 #: rxdconst.sdatabasename
-#, fuzzy
+#, object-pascal-format, fuzzy
 #| msgid "Database loocked: %s"
 msgid "Database locked: %s"
 msgstr "Banco de dados bloqueado: %s"
@@ -84,6 +85,7 @@ msgid "Database"
 msgstr "Banco de Dados"
 
 #: rxdconst.sdbcomboboxfieldnotassigned
+#, object-pascal-format
 msgid "%s:TDBComboBox - DataField not assigned"
 msgstr "%s:TDBComboBox - DataField não configurado"
 
@@ -165,6 +167,7 @@ msgid "Compare opertion needs field and const"
 msgstr "Operação de comparação precisa de campo e constante"
 
 #: rxdconst.sexprbadfield
+#, object-pascal-format
 msgid "Field '%s' not used in filter expression"
 msgstr "Campo '%s' não usado na expressão de filtro"
 
@@ -175,6 +178,7 @@ msgid "NULL-values enabled in '=' and '<>'"
 msgstr "Valor nulo habilitado em '=' e '<>'"
 
 #: rxdconst.sexprexpected
+#, object-pascal-format
 msgid "Error %s"
 msgstr "Erro %s"
 
@@ -183,6 +187,7 @@ msgid "Error in filter expression"
 msgstr "Erro na expressão do filtro"
 
 #: rxdconst.sexprinvalidchar
+#, object-pascal-format
 msgid "Error symbol in expression: '%s'"
 msgstr "Erro símbolo na expresión: '%s'"
 
@@ -193,10 +198,12 @@ msgid "Error in filed name"
 msgstr "Erro no nome"
 
 #: rxdconst.sexprnorparen
+#, object-pascal-format
 msgid "Error ')', error: %s"
 msgstr "Erro ')', error: %s"
 
 #: rxdconst.sexprnotboolean
+#, object-pascal-format
 msgid "Field '%s' is not boolean"
 msgstr "Campo '%s' não é booleano (verdadeiro/falso)"
 
@@ -209,14 +216,17 @@ msgid "Error in filter end"
 msgstr "Erro na terminação do filtro"
 
 #: rxdconst.sfieldreadonly
+#, object-pascal-format
 msgid "SFieldReadOnly %s"
 msgstr "SCampoApenasLeitura %s"
 
 #: rxdconst.sfieldrequired
+#, object-pascal-format
 msgid "Field '%s' must have a value"
 msgstr "O campo '%s' deve ter um valor"
 
 #: rxdconst.sfieldtypemismatch
+#, object-pascal-format
 msgid "Type mismatch for field '%s', expecting: %s actual: %s"
 msgstr "Tipo não corresponde para o campo '%s', esperado: %s atual: %s"
 
@@ -512,6 +522,10 @@ msgstr "Diferenciar maiúsculas de minúsculas"
 msgid "Direction"
 msgstr "Direção"
 
+#: rxdconst.srxdbgridfindinallfileds
+msgid "Find in all fields"
+msgstr ""
+
 #: rxdconst.srxdbgridfindonfield
 msgid "Find on field"
 msgstr "Buscar no campo"
@@ -609,10 +623,6 @@ msgctxt "rxdconst.srxfilterformapply"
 msgid "Apply"
 msgstr "Aplicar"
 
-#: rxdconst.srxfilterformcancel
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: rxdconst.srxfilterformcaption
 msgid "Filter conditions"
 msgstr "Condicionais de filtro"
@@ -728,6 +738,10 @@ msgstr "Mostrar cor do rodapé"
 msgid "Show grid color"
 msgstr "Mostrar cor da grade"
 
+#: rxdconst.sshowpreview
+msgid "Show preview"
+msgstr ""
+
 #: rxdconst.sshowreporttitle
 msgid "Show report title"
 msgstr "Mostrar título do relatório"
@@ -761,6 +775,7 @@ msgid "Top"
 msgstr "Início"
 
 #: rxdconst.sunknownfieldtype
+#, object-pascal-format
 msgid "SUnknownFieldType %s"
 msgstr "Tipo de campo desconhecido %s"
 
@@ -775,10 +790,8 @@ msgid "Unlock"
 msgstr "Desbloquear"
 
 #: rxdconst.sunlockhint
-#, fuzzy
-#| msgid "Enter you password"
 msgid "Enter your password"
-msgstr Digite sua senha"
+msgstr ""
 
 #: rxdconst.suserawjpeg
 msgid "Use raw JPEG"
diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk
index e4c8c704f..1ba17ce51 100644
--- a/components/rx/trunk/rxnew.lpk
+++ b/components/rx/trunk/rxnew.lpk
@@ -25,7 +25,7 @@
 Copyright (c) 1998 Master-Bank
 translate to Lazarus by alexs in 2005 - 2020"/>
     <License Value="LGPL"/>
-    <Version Major="3" Minor="3" Release="4" Build="227"/>
+    <Version Major="3" Minor="3" Release="4" Build="228"/>
     <Files Count="70">
       <Item1>
         <Filename Value="registerrx.pas"/>