From a0367219eea63eeae5a6adfbf90717ecd6c701ec Mon Sep 17 00:00:00 2001 From: alexs75 Date: Wed, 12 Dec 2018 06:37:09 +0000 Subject: [PATCH] RxFPC:TRxLoginDialog - support for i18n. patch from Michal Gawrycki with small corrections git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6751 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/rx/trunk/demos/RxLogin/unit1.lfm | 19 +- components/rx/trunk/demos/RxLogin/unit1.pas | 3 +- .../rx/trunk/languages/register_rxctrl.po | 11 - components/rx/trunk/languages/rxconst.es.po | 8 + components/rx/trunk/languages/rxconst.po | 8 + components/rx/trunk/languages/rxconst.ru.po | 9 +- components/rx/trunk/languages/rxconst.uk.po | 8 + components/rx/trunk/languages/rxdconst.es.po | 4 - components/rx/trunk/languages/rxdconst.po | 4 - components/rx/trunk/languages/rxdconst.ru.po | 4 - components/rx/trunk/languages/rxdconst.uk.po | 4 - components/rx/trunk/languages/rxmemds.po | 11 - components/rx/trunk/rxcontrols/rxduallist.pas | 14 +- components/rx/trunk/rxcontrols/rxlogin.lfm | 4 +- components/rx/trunk/rxcontrols/rxlogin.pas | 9 +- components/rx/trunk/rxcontrols/rxpickdate.pas | 6 +- .../rx/trunk/rxdb/rxdbgrid_findunit.lfm | 60 +++--- .../rx/trunk/rxdb/rxdbgrid_findunit.pas | 6 +- .../trunk/rxdb/rxdbgridfootertools_setup.lfm | 36 ++-- components/rx/trunk/rxdb/rxfilterby.pas | 4 +- components/rx/trunk/rxnew.lpk | 197 ++++++++---------- components/rx/trunk/rxtools/rxconst.pas | 11 +- components/rx/trunk/rxtools/rxdconst.pas | 3 - 23 files changed, 220 insertions(+), 223 deletions(-) delete mode 100644 components/rx/trunk/languages/register_rxctrl.po delete mode 100644 components/rx/trunk/languages/rxmemds.po diff --git a/components/rx/trunk/demos/RxLogin/unit1.lfm b/components/rx/trunk/demos/RxLogin/unit1.lfm index a807ed28d..2d63a78dd 100644 --- a/components/rx/trunk/demos/RxLogin/unit1.lfm +++ b/components/rx/trunk/demos/RxLogin/unit1.lfm @@ -4,8 +4,25 @@ object Form1: TForm1 Top = 285 Width = 455 Caption = 'RxLogin demo' + ClientHeight = 335 + ClientWidth = 455 Position = poScreenCenter - LCLVersion = '1.9.0.0' + LCLVersion = '2.1.0.0' + object ButtonPanel1: TButtonPanel + Left = 6 + Height = 42 + Top = 287 + Width = 443 + OKButton.Name = 'OKButton' + OKButton.DefaultCaption = True + HelpButton.Name = 'HelpButton' + HelpButton.DefaultCaption = True + CloseButton.Name = 'CloseButton' + CloseButton.DefaultCaption = True + CancelButton.Name = 'CancelButton' + CancelButton.DefaultCaption = True + TabOrder = 0 + end object RxLoginDialog1: TRxLoginDialog DetailItems.Strings = ( 'Line 1' diff --git a/components/rx/trunk/demos/RxLogin/unit1.pas b/components/rx/trunk/demos/RxLogin/unit1.pas index bd13ba546..9d55f998e 100644 --- a/components/rx/trunk/demos/RxLogin/unit1.pas +++ b/components/rx/trunk/demos/RxLogin/unit1.pas @@ -5,13 +5,14 @@ unit Unit1; interface uses - Classes, SysUtils, Forms, Controls, Graphics, Dialogs, rxlogin; + Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ButtonPanel, rxlogin; type { TForm1 } TForm1 = class(TForm) + ButtonPanel1: TButtonPanel; RxLoginDialog1: TRxLoginDialog; procedure RxLoginDialog1AfterLogin(Sender: TObject); procedure RxLoginDialog1BeforeLogin(Sender: TObject); diff --git a/components/rx/trunk/languages/register_rxctrl.po b/components/rx/trunk/languages/register_rxctrl.po deleted file mode 100644 index 1e423145e..000000000 --- a/components/rx/trunk/languages/register_rxctrl.po +++ /dev/null @@ -1,11 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -#: register_rxctrl.sloadicon -msgid "Load icon" -msgstr "" - -#: register_rxctrl.stesttrxlogindialog -msgid "Test TRxLoginDialog" -msgstr "" - diff --git a/components/rx/trunk/languages/rxconst.es.po b/components/rx/trunk/languages/rxconst.es.po index e2fbfb920..e55a47ce5 100644 --- a/components/rx/trunk/languages/rxconst.es.po +++ b/components/rx/trunk/languages/rxconst.es.po @@ -180,6 +180,14 @@ msgstr "Anterior A?o|" msgid "Error. Expected value for field %s." msgstr "" +#: rxconst.srxlogindlgbtnmore +msgid "More >>" +msgstr "" + +#: rxconst.srxlogindlgdatabase +msgid "Database" +msgstr "" + #: rxconst.srxstrholdertexteditor msgid "Rx string holder editor" msgstr "" diff --git a/components/rx/trunk/languages/rxconst.po b/components/rx/trunk/languages/rxconst.po index b23f459b5..429fdb85c 100644 --- a/components/rx/trunk/languages/rxconst.po +++ b/components/rx/trunk/languages/rxconst.po @@ -178,6 +178,14 @@ msgstr "" msgid "Error. Expected value for field %s." msgstr "" +#: rxconst.srxlogindlgbtnmore +msgid "More >>" +msgstr "" + +#: rxconst.srxlogindlgdatabase +msgid "Database" +msgstr "" + #: rxconst.srxstrholdertexteditor msgid "Rx string holder editor" msgstr "" diff --git a/components/rx/trunk/languages/rxconst.ru.po b/components/rx/trunk/languages/rxconst.ru.po index f886a7f05..f6dba027d 100644 --- a/components/rx/trunk/languages/rxconst.ru.po +++ b/components/rx/trunk/languages/rxconst.ru.po @@ -188,6 +188,14 @@ msgstr "Превыдущий год|" msgid "Error. Expected value for field %s." msgstr "Поле %s. Требуется значение" +#: rxconst.srxlogindlgbtnmore +msgid "More >>" +msgstr "Больше >>" + +#: rxconst.srxlogindlgdatabase +msgid "Database" +msgstr "База данных" + #: rxconst.srxstrholdertexteditor msgid "Rx string holder editor" msgstr "Редактор RxStrHolder" @@ -332,4 +340,3 @@ msgstr "Интерфейс : " #: rxconst.swindowsicofiles msgid "Windows Ico files (*.ico)|*.ico|All files (*.*)|*.*" msgstr "Файлы иконок Windows (*.ico)|*.ico|Все файлы (*.*)|*.*" - diff --git a/components/rx/trunk/languages/rxconst.uk.po b/components/rx/trunk/languages/rxconst.uk.po index 688c9347f..c2a2c9f37 100644 --- a/components/rx/trunk/languages/rxconst.uk.po +++ b/components/rx/trunk/languages/rxconst.uk.po @@ -193,6 +193,14 @@ msgstr "Попередній місяць|" msgid "Error. Expected value for field %s." msgstr "Поле %s. Вимагається значення" +#: rxconst.srxlogindlgbtnmore +msgid "More >>" +msgstr "" + +#: rxconst.srxlogindlgdatabase +msgid "Database" +msgstr "" + #: rxconst.srxstrholdertexteditor msgid "Rx string holder editor" msgstr "" diff --git a/components/rx/trunk/languages/rxdconst.es.po b/components/rx/trunk/languages/rxdconst.es.po index 23bb7d327..34fc268c9 100644 --- a/components/rx/trunk/languages/rxdconst.es.po +++ b/components/rx/trunk/languages/rxdconst.es.po @@ -609,10 +609,6 @@ msgctxt "rxdconst.srxfilterformapply" msgid "Apply" msgstr "Aplicar" -#: rxdconst.srxfilterformcancel -msgid "Cancel" -msgstr "Cancelar" - #: rxdconst.srxfilterformcaption msgid "Filter conditions" msgstr "Condiciones de Filtro" diff --git a/components/rx/trunk/languages/rxdconst.po b/components/rx/trunk/languages/rxdconst.po index bf7802334..867759872 100644 --- a/components/rx/trunk/languages/rxdconst.po +++ b/components/rx/trunk/languages/rxdconst.po @@ -585,10 +585,6 @@ msgctxt "rxdconst.srxfilterformapply" msgid "Apply" msgstr "" -#: rxdconst.srxfilterformcancel -msgid "Cancel" -msgstr "" - #: rxdconst.srxfilterformcaption msgid "Filter conditions" msgstr "" diff --git a/components/rx/trunk/languages/rxdconst.ru.po b/components/rx/trunk/languages/rxdconst.ru.po index b369d1357..ead5cdb3d 100644 --- a/components/rx/trunk/languages/rxdconst.ru.po +++ b/components/rx/trunk/languages/rxdconst.ru.po @@ -593,10 +593,6 @@ msgctxt "rxdconst.srxfilterformapply" msgid "Apply" msgstr "Применить" -#: rxdconst.srxfilterformcancel -msgid "Cancel" -msgstr "Отмена" - #: rxdconst.srxfilterformcaption msgid "Filter conditions" msgstr "Выражение фильтра" diff --git a/components/rx/trunk/languages/rxdconst.uk.po b/components/rx/trunk/languages/rxdconst.uk.po index 5afc4f6d5..4729e7398 100644 --- a/components/rx/trunk/languages/rxdconst.uk.po +++ b/components/rx/trunk/languages/rxdconst.uk.po @@ -599,10 +599,6 @@ msgctxt "rxdconst.srxfilterformapply" msgid "Apply" msgstr "Застосувати" -#: rxdconst.srxfilterformcancel -msgid "Cancel" -msgstr "Скасувати" - #: rxdconst.srxfilterformcaption msgid "Filter conditions" msgstr "Вираз фільтра" diff --git a/components/rx/trunk/languages/rxmemds.po b/components/rx/trunk/languages/rxmemds.po deleted file mode 100644 index 16582d7f9..000000000 --- a/components/rx/trunk/languages/rxmemds.po +++ /dev/null @@ -1,11 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -#: rxmemds.sinvalidfields -msgid "No fields defined" -msgstr "" - -#: rxmemds.smemnorecords -msgid "No data found" -msgstr "" - diff --git a/components/rx/trunk/rxcontrols/rxduallist.pas b/components/rx/trunk/rxcontrols/rxduallist.pas index 076a37256..a2d5cd02b 100644 --- a/components/rx/trunk/rxcontrols/rxduallist.pas +++ b/components/rx/trunk/rxcontrols/rxduallist.pas @@ -88,7 +88,7 @@ type implementation -uses SysUtils, Forms, rxfduallst, LCLStrConsts, rxconst; +uses SysUtils, Forms, rxfduallst, Buttons, LCLType, rxconst; { TDualListDialog } @@ -101,9 +101,9 @@ begin FList2 := TStringList.Create; FLabel1Caption := SDualListSrcCaption; FLabel2Caption := SDualListDestCaption; - OkBtnCaption := rsmbOK; - CancelBtnCaption := rsmbCancel; - HelpBtnCaption := rsmbHelp; + OkBtnCaption := GetButtonCaption(idButtonOk); + CancelBtnCaption := GetButtonCaption(idButtonCancel); + HelpBtnCaption := GetButtonCaption(idButtonHelp); Title:=SDualListCaption; end; @@ -136,17 +136,17 @@ end; function TDualListDialog.IsOkBtnCustom: Boolean; begin - Result := CompareStr(OkBtnCaption, rsmbOK) <> 0; + Result := CompareStr(OkBtnCaption, GetButtonCaption(idButtonOk)) <> 0; end; function TDualListDialog.IsCancelBtnCustom: Boolean; begin - Result := CompareStr(CancelBtnCaption, rsmbCancel) <> 0; + Result := CompareStr(CancelBtnCaption, GetButtonCaption(idButtonCancel)) <> 0; end; function TDualListDialog.IsHelpBtnCustom: Boolean; begin - Result := CompareStr(HelpBtnCaption, rsmbHelp) <> 0; + Result := CompareStr(HelpBtnCaption, GetButtonCaption(idButtonHelp)) <> 0; end; function TDualListDialog.Execute: Boolean; diff --git a/components/rx/trunk/rxcontrols/rxlogin.lfm b/components/rx/trunk/rxcontrols/rxlogin.lfm index fdb6eb30f..977fdeef1 100644 --- a/components/rx/trunk/rxcontrols/rxlogin.lfm +++ b/components/rx/trunk/rxcontrols/rxlogin.lfm @@ -333,7 +333,7 @@ object RxLoginForm: TRxLoginForm BorderSpacing.Around = 6 BorderSpacing.InnerBorder = 2 Cancel = True - Caption = 'Отмена' + Caption = 'Cancel' Kind = bkCancel ModalResult = 2 TabOrder = 4 @@ -352,7 +352,7 @@ object RxLoginForm: TRxLoginForm AutoSize = True BorderSpacing.Right = 6 BorderSpacing.Bottom = 6 - Caption = '&Справка' + Caption = '&Help' Kind = bkHelp TabOrder = 5 end diff --git a/components/rx/trunk/rxcontrols/rxlogin.pas b/components/rx/trunk/rxcontrols/rxlogin.pas index 2d2aa412e..5c25f5c4b 100644 --- a/components/rx/trunk/rxcontrols/rxlogin.pas +++ b/components/rx/trunk/rxcontrols/rxlogin.pas @@ -676,11 +676,18 @@ end; procedure TRxLoginForm.FormCreate(Sender: TObject); begin Icon.Assign(Application.Icon); -// if Icon.Empty then Icon.Handle := LoadIcon(0, IDI_APPLICATION); + AppIcon.Picture.Assign(Icon); AppTitleLabel.Caption := Format(SAppTitleLabel, [Application.Title]); PasswordLabel.Caption := SPasswordLabel; UserNameLabel.Caption := SUserNameLabel; + + btnOK.Caption := GetButtonCaption(idButtonOk); + btnCancel.Caption := GetButtonCaption(idButtonCancel); + btnHelp.Caption := GetButtonCaption(idButtonHelp); + btnMore.Caption := sRxLoginDlgBtnMore; + + DataBaseLabel.Caption := sRxLoginDlgDatabase; end; procedure TRxLoginForm.btnMoreClick(Sender: TObject); diff --git a/components/rx/trunk/rxcontrols/rxpickdate.pas b/components/rx/trunk/rxcontrols/rxpickdate.pas index 37cab4459..ea03be1f6 100644 --- a/components/rx/trunk/rxcontrols/rxpickdate.pas +++ b/components/rx/trunk/rxcontrols/rxpickdate.pas @@ -264,7 +264,7 @@ const implementation -uses Messages, RXCtrls, rxconst, rxtooledit, rxlclutils, math, LCLStrConsts, LResources; +uses Messages, RXCtrls, rxconst, rxtooledit, rxlclutils, math, LResources; {$R pickdate.res} @@ -1348,7 +1348,7 @@ begin begin Parent := Control; SetBounds(0, 0, 112, 21); - Caption := rsmbOK; + Caption := GetButtonCaption(idButtonOk); ModalResult := mrOk; end; @@ -1356,7 +1356,7 @@ begin begin Parent := Control; SetBounds(111, 0, 111, 21); - Caption := rsmbCancel; + Caption := GetButtonCaption(idButtonCancel); ModalResult := mrCancel; Cancel := True; end; diff --git a/components/rx/trunk/rxdb/rxdbgrid_findunit.lfm b/components/rx/trunk/rxdb/rxdbgrid_findunit.lfm index bbff8673f..23f3adec4 100644 --- a/components/rx/trunk/rxdb/rxdbgrid_findunit.lfm +++ b/components/rx/trunk/rxdb/rxdbgrid_findunit.lfm @@ -10,16 +10,16 @@ object rxDBGridFindForm: TrxDBGridFindForm OnCreate = FormCreate OnShow = FormShow Position = poScreenCenter - LCLVersion = '1.5' + LCLVersion = '2.1.0.0' object Label1: TLabel AnchorSideLeft.Control = Owner AnchorSideTop.Control = Owner AnchorSideBottom.Control = Edit1 AnchorSideBottom.Side = asrBottom Left = 6 - Height = 21 + Height = 19 Top = 6 - Width = 75 + Width = 73 BorderSpacing.Around = 6 Caption = 'Text to find' FocusControl = Edit1 @@ -32,9 +32,9 @@ object rxDBGridFindForm: TrxDBGridFindForm AnchorSideBottom.Control = ComboBox1 AnchorSideBottom.Side = asrBottom Left = 6 - Height = 21 - Top = 70 - Width = 75 + Height = 19 + Top = 68 + Width = 77 BorderSpacing.Around = 6 Caption = 'Find at filed' ParentColor = False @@ -43,10 +43,10 @@ object rxDBGridFindForm: TrxDBGridFindForm AnchorSideRight.Control = Button2 AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom - Left = 340 - Height = 41 - Top = 213 - Width = 84 + Left = 337 + Height = 39 + Top = 215 + Width = 87 Anchors = [akRight, akBottom] AutoSize = True BorderSpacing.Around = 6 @@ -64,8 +64,8 @@ object rxDBGridFindForm: TrxDBGridFindForm AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom Left = 430 - Height = 41 - Top = 213 + Height = 39 + Top = 215 Width = 57 Anchors = [akRight, akBottom] AutoSize = True @@ -85,7 +85,7 @@ object rxDBGridFindForm: TrxDBGridFindForm AnchorSideRight.Side = asrBottom Left = 18 Height = 31 - Top = 33 + Top = 31 Width = 469 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 @@ -98,8 +98,8 @@ object rxDBGridFindForm: TrxDBGridFindForm AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 12 - Height = 35 - Top = 97 + Height = 31 + Top = 93 Width = 475 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 @@ -116,10 +116,10 @@ object rxDBGridFindForm: TrxDBGridFindForm AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = Panel1 AnchorSideBottom.Side = asrBottom - Left = 148 - Height = 70 - Top = 138 - Width = 339 + Left = 150 + Height = 66 + Top = 130 + Width = 337 Anchors = [akTop, akLeft, akRight, akBottom] AutoFill = True AutoSize = True @@ -135,7 +135,7 @@ object rxDBGridFindForm: TrxDBGridFindForm ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 3 - ClientHeight = 47 + ClientHeight = 46 ClientWidth = 335 Columns = 3 Items.Strings = ( @@ -150,22 +150,22 @@ object rxDBGridFindForm: TrxDBGridFindForm AnchorSideTop.Control = ComboBox1 AnchorSideTop.Side = asrBottom Left = 6 - Height = 70 - Top = 138 - Width = 136 + Height = 66 + Top = 130 + Width = 138 AutoSize = True BorderSpacing.Around = 6 - ClientHeight = 70 - ClientWidth = 136 + ClientHeight = 66 + ClientWidth = 138 TabOrder = 5 object CheckBox2: TCheckBox AnchorSideLeft.Control = Panel1 AnchorSideTop.Control = CheckBox1 AnchorSideTop.Side = asrBottom Left = 7 - Height = 25 - Top = 38 - Width = 92 + Height = 23 + Top = 36 + Width = 95 BorderSpacing.Around = 6 Caption = 'Partial key' TabOrder = 0 @@ -174,9 +174,9 @@ object rxDBGridFindForm: TrxDBGridFindForm AnchorSideLeft.Control = Panel1 AnchorSideTop.Control = Panel1 Left = 7 - Height = 25 + Height = 23 Top = 7 - Width = 122 + Width = 124 BorderSpacing.Around = 6 Caption = 'Case sensetive' TabOrder = 1 diff --git a/components/rx/trunk/rxdb/rxdbgrid_findunit.pas b/components/rx/trunk/rxdb/rxdbgrid_findunit.pas index 07ab2dce8..699be4af0 100644 --- a/components/rx/trunk/rxdb/rxdbgrid_findunit.pas +++ b/components/rx/trunk/rxdb/rxdbgrid_findunit.pas @@ -37,7 +37,7 @@ interface uses Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons, - StdCtrls, ExtCtrls, rxdbgrid, DB; + StdCtrls, ExtCtrls, rxdbgrid, DB, LCLType; type @@ -69,7 +69,7 @@ type procedure ShowRxDBGridFindForm(Grid:TRxDBGrid); implementation -uses rxdbutils, DBGrids, rxdconst, LCLStrConsts; +uses rxdbutils, DBGrids, rxdconst; {$R *.lfm} @@ -103,7 +103,7 @@ begin RadioGroup1.Items.Add(sRxDbGridFindRangeForw); RadioGroup1.Items.Add(sRxDbGridFindRangeBack); BtnFind.Caption:=sRxFindMore; - Button2.Caption:=rsMbClose; + Button2.Caption:=GetButtonCaption(idButtonCancel); RadioGroup1.ItemIndex:=0; end; diff --git a/components/rx/trunk/rxdb/rxdbgridfootertools_setup.lfm b/components/rx/trunk/rxdb/rxdbgridfootertools_setup.lfm index dd9808d05..beb28031c 100644 --- a/components/rx/trunk/rxdb/rxdbgridfootertools_setup.lfm +++ b/components/rx/trunk/rxdb/rxdbgridfootertools_setup.lfm @@ -9,7 +9,7 @@ object RxDBGridFooterTools_SetupForm: TRxDBGridFooterTools_SetupForm OnCreate = FormCreate Position = poScreenCenter ShowHint = True - LCLVersion = '1.7' + LCLVersion = '2.1.0.0' object ButtonPanel1: TButtonPanel Left = 6 Height = 42 @@ -31,19 +31,19 @@ object RxDBGridFooterTools_SetupForm: TRxDBGridFooterTools_SetupForm Height = 236 Top = 0 Width = 341 - ActivePage = TabSheet2 + ActivePage = TabSheet1 Align = alClient - TabIndex = 1 + TabIndex = 0 TabOrder = 1 object TabSheet1: TTabSheet Caption = 'Functions' - ClientHeight = 198 - ClientWidth = 335 + ClientHeight = 203 + ClientWidth = 331 object StringGrid1: TStringGrid Left = 0 - Height = 198 + Height = 203 Top = 0 - Width = 335 + Width = 331 Align = alClient AutoFillColumns = True ColCount = 2 @@ -52,7 +52,7 @@ object RxDBGridFooterTools_SetupForm: TRxDBGridFooterTools_SetupForm ReadOnly = True Title.Alignment = taCenter Title.Caption = 'Collumn name' - Width = 166 + Width = 164 end item PickList.Strings = ( @@ -68,29 +68,29 @@ object RxDBGridFooterTools_SetupForm: TRxDBGridFooterTools_SetupForm ) Title.Alignment = taCenter Title.Caption = 'Function' - Width = 167 + Width = 165 end> FixedCols = 0 Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goSmoothScroll] TabOrder = 0 TitleStyle = tsNative ColWidths = ( - 166 - 167 + 164 + 165 ) end end object TabSheet2: TTabSheet Caption = 'Other options' - ClientHeight = 198 - ClientWidth = 335 + ClientHeight = 203 + ClientWidth = 331 object Label1: TLabel AnchorSideLeft.Control = TabSheet2 AnchorSideTop.Control = TabSheet2 Left = 6 - Height = 20 + Height = 19 Top = 6 - Width = 108 + Width = 109 BorderSpacing.Around = 6 Caption = 'Footer row color' ParentColor = False @@ -102,9 +102,9 @@ object RxDBGridFooterTools_SetupForm: TRxDBGridFooterTools_SetupForm AnchorSideRight.Control = TabSheet2 AnchorSideRight.Side = asrBottom Left = 12 - Height = 34 - Top = 32 - Width = 317 + Height = 31 + Top = 31 + Width = 313 Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbCustomColor, cbPrettyNames, cbCustomColors] Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 diff --git a/components/rx/trunk/rxdb/rxfilterby.pas b/components/rx/trunk/rxdb/rxfilterby.pas index f614bfee7..01f158f96 100644 --- a/components/rx/trunk/rxdb/rxfilterby.pas +++ b/components/rx/trunk/rxdb/rxfilterby.pas @@ -113,7 +113,7 @@ var rxFilterByForm: TrxFilterByForm; implementation -uses rxdconst, rxstrutils, DBGrids; +uses rxdconst, rxstrutils, DBGrids, Buttons, LCLType; {$R *.lfm} @@ -170,7 +170,7 @@ begin Label5.Caption:=sRxFilterFormOperand; Label6.Caption:=sRxFilterFormEnd; Button3.Caption:=sRxFilterFormClear; - Button2.Caption:=sRxFilterFormCancel; + Button2.Caption:=GetButtonCaption(idButtonCancel); Button1.Caption:=sRxFilterFormApply; end; diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk index 870fb1838..c2a70ef81 100644 --- a/components/rx/trunk/rxnew.lpk +++ b/components/rx/trunk/rxnew.lpk @@ -25,8 +25,8 @@ Copyright (c) 1998 Master-Bank translate to Lazarus by alexs in 2005 - 2018"/> - - + + @@ -68,7 +68,7 @@ translate to Lazarus by alexs in 2005 - 2018"/> - + @@ -139,193 +139,181 @@ translate to Lazarus by alexs in 2005 - 2018"/> - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -352,7 +340,6 @@ translate to Lazarus by alexs in 2005 - 2018"/> - diff --git a/components/rx/trunk/rxtools/rxconst.pas b/components/rx/trunk/rxtools/rxconst.pas index f4f866c04..9032f7dde 100644 --- a/components/rx/trunk/rxtools/rxconst.pas +++ b/components/rx/trunk/rxtools/rxconst.pas @@ -77,14 +77,6 @@ resourcestring sButtonAlign1 = 'None'; sButtonAlign2 = 'Left'; sButtonAlign3 = 'Right'; -// sGTKWidgetSet = 'GTK widget set'; -// sGTK2WidgetSet = 'GTK 2 widget set'; -// sWin32_64WidgetSet = 'Win32/Win64 widget set'; -// sWinCEWidgetSet = 'WinCE widget set'; -// sCarbonWidgetSet = 'Carbon widget set'; -// sQTWidgetSet = 'QT widget set'; -// sFpGUIWidgetSet = 'FpGUI widget set'; -// sOtherGUIWidgetSet = 'Other gui'; sWidget = 'Widget : '; sAppVersion = 'Version : '; sLCLVersion = 'LCL Version: '; @@ -150,6 +142,9 @@ resourcestring sRxTextFolderSynHTML = 'HTML'; sRxTextFolderSynSQL = 'SQL'; + { TRxLoginDialog } + sRxLoginDlgBtnMore = 'More >>'; + sRxLoginDlgDatabase = 'Database'; implementation diff --git a/components/rx/trunk/rxtools/rxdconst.pas b/components/rx/trunk/rxtools/rxdconst.pas index 6ff42ffd5..1fd02d323 100644 --- a/components/rx/trunk/rxtools/rxdconst.pas +++ b/components/rx/trunk/rxtools/rxdconst.pas @@ -88,8 +88,6 @@ resourcestring SDBComboBoxFieldNotAssigned = '%s:TDBComboBox - DataField not assigned'; - //SPropDefByLookup = 'PropDefByLookup'; - //SDataSourceFixed = 'SDataSourceFixed'; SCircularDataLink = 'Circular data link'; sRxAscendign = 'Ascendign'; sRxDescending = 'Descending'; @@ -130,7 +128,6 @@ resourcestring sRxFilterFormOperand = 'Operand :'; sRxFilterFormEnd = 'end.'; sRxFilterFormClear = 'Clear filter'; - sRxFilterFormCancel = 'Cancel'; sRxFilterFormApply = 'Apply'; sRxFilterFormCaption = 'Filter conditions';