pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

RxFPC:TRxLoginDialog - support for i18n. patch from Michal Gawrycki with small corrections

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6751 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2018-12-12 06:37:09 +00:00
parent e224f3a826
commit a0367219ee
23 changed files with 220 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
components/rx/trunk/demos/RxLogin/unit1.lfm
View File

@ -4,8 +4,25 @@ object Form1: TForm1
Top = 285 Top = 285
Width = 455 Width = 455
Caption = 'RxLogin demo' Caption = 'RxLogin demo'
ClientHeight = 335
ClientWidth = 455
Position = poScreenCenter 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 object RxLoginDialog1: TRxLoginDialog
DetailItems.Strings = ( DetailItems.Strings = (
'Line 1' 'Line 1'

3
components/rx/trunk/demos/RxLogin/unit1.pas
View File

@ -5,13 +5,14 @@ unit Unit1;
interface interface
uses uses
Classes, SysUtils, Forms, Controls, Graphics, Dialogs, rxlogin; Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ButtonPanel, rxlogin;
type type
{ TForm1 } { TForm1 }
TForm1 = class(TForm) TForm1 = class(TForm)
ButtonPanel1: TButtonPanel;
RxLoginDialog1: TRxLoginDialog; RxLoginDialog1: TRxLoginDialog;
procedure RxLoginDialog1AfterLogin(Sender: TObject); procedure RxLoginDialog1AfterLogin(Sender: TObject);
procedure RxLoginDialog1BeforeLogin(Sender: TObject); procedure RxLoginDialog1BeforeLogin(Sender: TObject);

11
components/rx/trunk/languages/register_rxctrl.po
View File

@ -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 ""

8
components/rx/trunk/languages/rxconst.es.po
View File

@ -180,6 +180,14 @@ msgstr "Anterior A?o|"
msgid "Error. Expected value for field %s." msgid "Error. Expected value for field %s."
msgstr "" msgstr ""
#: rxconst.srxlogindlgbtnmore
msgid "More >>"
msgstr ""
#: rxconst.srxlogindlgdatabase
msgid "Database"
msgstr ""
#: rxconst.srxstrholdertexteditor #: rxconst.srxstrholdertexteditor
msgid "Rx string holder editor" msgid "Rx string holder editor"
msgstr "" msgstr ""

8
components/rx/trunk/languages/rxconst.po
View File

@ -178,6 +178,14 @@ msgstr ""
msgid "Error. Expected value for field %s." msgid "Error. Expected value for field %s."
msgstr "" msgstr ""
#: rxconst.srxlogindlgbtnmore
msgid "More >>"
msgstr ""
#: rxconst.srxlogindlgdatabase
msgid "Database"
msgstr ""
#: rxconst.srxstrholdertexteditor #: rxconst.srxstrholdertexteditor
msgid "Rx string holder editor" msgid "Rx string holder editor"
msgstr "" msgstr ""

9
components/rx/trunk/languages/rxconst.ru.po
View File

@ -188,6 +188,14 @@ msgstr "Превыдущий год|"
msgid "Error. Expected value for field %s." msgid "Error. Expected value for field %s."
msgstr "Поле %s. Требуется значение" msgstr "Поле %s. Требуется значение"
#: rxconst.srxlogindlgbtnmore
msgid "More >>"
msgstr "Больше >>"
#: rxconst.srxlogindlgdatabase
msgid "Database"
msgstr "База данных"
#: rxconst.srxstrholdertexteditor #: rxconst.srxstrholdertexteditor
msgid "Rx string holder editor" msgid "Rx string holder editor"
msgstr "Редактор RxStrHolder" msgstr "Редактор RxStrHolder"
@ -332,4 +340,3 @@ msgstr "Интерфейс : "
#: rxconst.swindowsicofiles #: rxconst.swindowsicofiles
msgid "Windows Ico files (*.ico)|*.ico|All files (*.*)|*.*" msgid "Windows Ico files (*.ico)|*.ico|All files (*.*)|*.*"
msgstr "Файлы иконок Windows (*.ico)|*.ico|Все файлы (*.*)|*.*" msgstr "Файлы иконок Windows (*.ico)|*.ico|Все файлы (*.*)|*.*"

8
components/rx/trunk/languages/rxconst.uk.po
View File

@ -193,6 +193,14 @@ msgstr "Попередній місяць|"
msgid "Error. Expected value for field %s." msgid "Error. Expected value for field %s."
msgstr "Поле %s. Вимагається значення" msgstr "Поле %s. Вимагається значення"
#: rxconst.srxlogindlgbtnmore
msgid "More >>"
msgstr ""
#: rxconst.srxlogindlgdatabase
msgid "Database"
msgstr ""
#: rxconst.srxstrholdertexteditor #: rxconst.srxstrholdertexteditor
msgid "Rx string holder editor" msgid "Rx string holder editor"
msgstr "" msgstr ""

4
components/rx/trunk/languages/rxdconst.es.po
View File

@ -609,10 +609,6 @@ msgctxt "rxdconst.srxfilterformapply"
msgid "Apply" msgid "Apply"
msgstr "Aplicar" msgstr "Aplicar"
#: rxdconst.srxfilterformcancel
msgid "Cancel"
msgstr "Cancelar"
#: rxdconst.srxfilterformcaption #: rxdconst.srxfilterformcaption
msgid "Filter conditions" msgid "Filter conditions"
msgstr "Condiciones de Filtro" msgstr "Condiciones de Filtro"

4
components/rx/trunk/languages/rxdconst.po
View File

@ -585,10 +585,6 @@ msgctxt "rxdconst.srxfilterformapply"
msgid "Apply" msgid "Apply"
msgstr "" msgstr ""
#: rxdconst.srxfilterformcancel
msgid "Cancel"
msgstr ""
#: rxdconst.srxfilterformcaption #: rxdconst.srxfilterformcaption
msgid "Filter conditions" msgid "Filter conditions"
msgstr "" msgstr ""

4
components/rx/trunk/languages/rxdconst.ru.po
View File

@ -593,10 +593,6 @@ msgctxt "rxdconst.srxfilterformapply"
msgid "Apply" msgid "Apply"
msgstr "Применить" msgstr "Применить"
#: rxdconst.srxfilterformcancel
msgid "Cancel"
msgstr "Отмена"
#: rxdconst.srxfilterformcaption #: rxdconst.srxfilterformcaption
msgid "Filter conditions" msgid "Filter conditions"
msgstr "Выражение фильтра" msgstr "Выражение фильтра"

4
components/rx/trunk/languages/rxdconst.uk.po
View File

@ -599,10 +599,6 @@ msgctxt "rxdconst.srxfilterformapply"
msgid "Apply" msgid "Apply"
msgstr "Застосувати" msgstr "Застосувати"
#: rxdconst.srxfilterformcancel
msgid "Cancel"
msgstr "Скасувати"
#: rxdconst.srxfilterformcaption #: rxdconst.srxfilterformcaption
msgid "Filter conditions" msgid "Filter conditions"
msgstr "Вираз фільтра" msgstr "Вираз фільтра"

11
components/rx/trunk/languages/rxmemds.po
View File

@ -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 ""

14
components/rx/trunk/rxcontrols/rxduallist.pas
View File

@ -88,7 +88,7 @@ type
implementation implementation
uses SysUtils, Forms, rxfduallst, LCLStrConsts, rxconst; uses SysUtils, Forms, rxfduallst, Buttons, LCLType, rxconst;
{ TDualListDialog } { TDualListDialog }
@ -101,9 +101,9 @@ begin
FList2 := TStringList.Create; FList2 := TStringList.Create;
FLabel1Caption := SDualListSrcCaption; FLabel1Caption := SDualListSrcCaption;
FLabel2Caption := SDualListDestCaption; FLabel2Caption := SDualListDestCaption;
OkBtnCaption := rsmbOK; OkBtnCaption := GetButtonCaption(idButtonOk);
CancelBtnCaption := rsmbCancel; CancelBtnCaption := GetButtonCaption(idButtonCancel);
HelpBtnCaption := rsmbHelp; HelpBtnCaption := GetButtonCaption(idButtonHelp);
Title:=SDualListCaption; Title:=SDualListCaption;
end; end;
@ -136,17 +136,17 @@ end;
function TDualListDialog.IsOkBtnCustom: Boolean; function TDualListDialog.IsOkBtnCustom: Boolean;
begin begin
Result := CompareStr(OkBtnCaption, rsmbOK) <> 0; Result := CompareStr(OkBtnCaption, GetButtonCaption(idButtonOk)) <> 0;
end; end;
function TDualListDialog.IsCancelBtnCustom: Boolean; function TDualListDialog.IsCancelBtnCustom: Boolean;
begin begin
Result := CompareStr(CancelBtnCaption, rsmbCancel) <> 0; Result := CompareStr(CancelBtnCaption, GetButtonCaption(idButtonCancel)) <> 0;
end; end;
function TDualListDialog.IsHelpBtnCustom: Boolean; function TDualListDialog.IsHelpBtnCustom: Boolean;
begin begin
Result := CompareStr(HelpBtnCaption, rsmbHelp) <> 0; Result := CompareStr(HelpBtnCaption, GetButtonCaption(idButtonHelp)) <> 0;
end; end;
function TDualListDialog.Execute: Boolean; function TDualListDialog.Execute: Boolean;

4
components/rx/trunk/rxcontrols/rxlogin.lfm
View File

@ -333,7 +333,7 @@ object RxLoginForm: TRxLoginForm
BorderSpacing.Around = 6 BorderSpacing.Around = 6
BorderSpacing.InnerBorder = 2 BorderSpacing.InnerBorder = 2
Cancel = True Cancel = True
Caption = 'Отмена' Caption = 'Cancel'
Kind = bkCancel Kind = bkCancel
ModalResult = 2 ModalResult = 2
TabOrder = 4 TabOrder = 4
@ -352,7 +352,7 @@ object RxLoginForm: TRxLoginForm
AutoSize = True AutoSize = True
BorderSpacing.Right = 6 BorderSpacing.Right = 6
BorderSpacing.Bottom = 6 BorderSpacing.Bottom = 6
Caption = '&Справка' Caption = '&Help'
Kind = bkHelp Kind = bkHelp
TabOrder = 5 TabOrder = 5
end end

9
components/rx/trunk/rxcontrols/rxlogin.pas
View File

@ -676,11 +676,18 @@ end;
procedure TRxLoginForm.FormCreate(Sender: TObject); procedure TRxLoginForm.FormCreate(Sender: TObject);
begin begin
Icon.Assign(Application.Icon); Icon.Assign(Application.Icon);
// if Icon.Empty then Icon.Handle := LoadIcon(0, IDI_APPLICATION);
AppIcon.Picture.Assign(Icon); AppIcon.Picture.Assign(Icon);
AppTitleLabel.Caption := Format(SAppTitleLabel, [Application.Title]); AppTitleLabel.Caption := Format(SAppTitleLabel, [Application.Title]);
PasswordLabel.Caption := SPasswordLabel; PasswordLabel.Caption := SPasswordLabel;
UserNameLabel.Caption := SUserNameLabel; UserNameLabel.Caption := SUserNameLabel;
btnOK.Caption := GetButtonCaption(idButtonOk);
btnCancel.Caption := GetButtonCaption(idButtonCancel);
btnHelp.Caption := GetButtonCaption(idButtonHelp);
btnMore.Caption := sRxLoginDlgBtnMore;
DataBaseLabel.Caption := sRxLoginDlgDatabase;
end; end;
procedure TRxLoginForm.btnMoreClick(Sender: TObject); procedure TRxLoginForm.btnMoreClick(Sender: TObject);

6
components/rx/trunk/rxcontrols/rxpickdate.pas
View File

@ -264,7 +264,7 @@ const
implementation implementation
uses Messages, RXCtrls, rxconst, rxtooledit, rxlclutils, math, LCLStrConsts, LResources; uses Messages, RXCtrls, rxconst, rxtooledit, rxlclutils, math, LResources;
{$R pickdate.res} {$R pickdate.res}
@ -1348,7 +1348,7 @@ begin
begin begin
Parent := Control; Parent := Control;
SetBounds(0, 0, 112, 21); SetBounds(0, 0, 112, 21);
Caption := rsmbOK; Caption := GetButtonCaption(idButtonOk);
ModalResult := mrOk; ModalResult := mrOk;
end; end;
@ -1356,7 +1356,7 @@ begin
begin begin
Parent := Control; Parent := Control;
SetBounds(111, 0, 111, 21); SetBounds(111, 0, 111, 21);
Caption := rsmbCancel; Caption := GetButtonCaption(idButtonCancel);
ModalResult := mrCancel; ModalResult := mrCancel;
Cancel := True; Cancel := True;
end; end;

60
components/rx/trunk/rxdb/rxdbgrid_findunit.lfm
View File

@ -10,16 +10,16 @@ object rxDBGridFindForm: TrxDBGridFindForm
OnCreate = FormCreate OnCreate = FormCreate
OnShow = FormShow OnShow = FormShow
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.5' LCLVersion = '2.1.0.0'
object Label1: TLabel object Label1: TLabel
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner AnchorSideTop.Control = Owner
AnchorSideBottom.Control = Edit1 AnchorSideBottom.Control = Edit1
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 6 Left = 6
Height = 21 Height = 19
Top = 6 Top = 6
Width = 75 Width = 73
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Text to find' Caption = 'Text to find'
FocusControl = Edit1 FocusControl = Edit1
@ -32,9 +32,9 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideBottom.Control = ComboBox1 AnchorSideBottom.Control = ComboBox1
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 6 Left = 6
Height = 21 Height = 19
Top = 70 Top = 68
Width = 75 Width = 77
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Find at filed' Caption = 'Find at filed'
ParentColor = False ParentColor = False
@ -43,10 +43,10 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideRight.Control = Button2 AnchorSideRight.Control = Button2
AnchorSideBottom.Control = Owner AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 340 Left = 337
Height = 41 Height = 39
Top = 213 Top = 215
Width = 84 Width = 87
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -64,8 +64,8 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideBottom.Control = Owner AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 430 Left = 430
Height = 41 Height = 39
Top = 213 Top = 215
Width = 57 Width = 57
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
AutoSize = True AutoSize = True
@ -85,7 +85,7 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 18 Left = 18
Height = 31 Height = 31
Top = 33 Top = 31
Width = 469 Width = 469
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -98,8 +98,8 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 12 Left = 12
Height = 35 Height = 31
Top = 97 Top = 93
Width = 475 Width = 475
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -116,10 +116,10 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = Panel1 AnchorSideBottom.Control = Panel1
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 148 Left = 150
Height = 70 Height = 66
Top = 138 Top = 130
Width = 339 Width = 337
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
AutoFill = True AutoFill = True
AutoSize = True AutoSize = True
@ -135,7 +135,7 @@ object rxDBGridFindForm: TrxDBGridFindForm
ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.ShrinkVertical = crsScaleChilds
ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 3 ChildSizing.ControlsPerLine = 3
ClientHeight = 47 ClientHeight = 46
ClientWidth = 335 ClientWidth = 335
Columns = 3 Columns = 3
Items.Strings = ( Items.Strings = (
@ -150,22 +150,22 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideTop.Control = ComboBox1 AnchorSideTop.Control = ComboBox1
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 70 Height = 66
Top = 138 Top = 130
Width = 136 Width = 138
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
ClientHeight = 70 ClientHeight = 66
ClientWidth = 136 ClientWidth = 138
TabOrder = 5 TabOrder = 5
object CheckBox2: TCheckBox object CheckBox2: TCheckBox
AnchorSideLeft.Control = Panel1 AnchorSideLeft.Control = Panel1
AnchorSideTop.Control = CheckBox1 AnchorSideTop.Control = CheckBox1
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 7 Left = 7
Height = 25 Height = 23
Top = 38 Top = 36
Width = 92 Width = 95
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Partial key' Caption = 'Partial key'
TabOrder = 0 TabOrder = 0
@ -174,9 +174,9 @@ object rxDBGridFindForm: TrxDBGridFindForm
AnchorSideLeft.Control = Panel1 AnchorSideLeft.Control = Panel1
AnchorSideTop.Control = Panel1 AnchorSideTop.Control = Panel1
Left = 7 Left = 7
Height = 25 Height = 23
Top = 7 Top = 7
Width = 122 Width = 124
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Case sensetive' Caption = 'Case sensetive'
TabOrder = 1 TabOrder = 1

6
components/rx/trunk/rxdb/rxdbgrid_findunit.pas
View File

@ -37,7 +37,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons,
StdCtrls, ExtCtrls, rxdbgrid, DB; StdCtrls, ExtCtrls, rxdbgrid, DB, LCLType;
type type
@ -69,7 +69,7 @@ type
procedure ShowRxDBGridFindForm(Grid:TRxDBGrid); procedure ShowRxDBGridFindForm(Grid:TRxDBGrid);
implementation implementation
uses rxdbutils, DBGrids, rxdconst, LCLStrConsts; uses rxdbutils, DBGrids, rxdconst;
{$R *.lfm} {$R *.lfm}
@ -103,7 +103,7 @@ begin
RadioGroup1.Items.Add(sRxDbGridFindRangeForw); RadioGroup1.Items.Add(sRxDbGridFindRangeForw);
RadioGroup1.Items.Add(sRxDbGridFindRangeBack); RadioGroup1.Items.Add(sRxDbGridFindRangeBack);
BtnFind.Caption:=sRxFindMore; BtnFind.Caption:=sRxFindMore;
Button2.Caption:=rsMbClose; Button2.Caption:=GetButtonCaption(idButtonCancel);
RadioGroup1.ItemIndex:=0; RadioGroup1.ItemIndex:=0;
end; end;

36
components/rx/trunk/rxdb/rxdbgridfootertools_setup.lfm
View File

@ -9,7 +9,7 @@ object RxDBGridFooterTools_SetupForm: TRxDBGridFooterTools_SetupForm
OnCreate = FormCreate OnCreate = FormCreate
Position = poScreenCenter Position = poScreenCenter
ShowHint = True ShowHint = True
LCLVersion = '1.7' LCLVersion = '2.1.0.0'
object ButtonPanel1: TButtonPanel object ButtonPanel1: TButtonPanel
Left = 6 Left = 6
Height = 42 Height = 42
@ -31,19 +31,19 @@ object RxDBGridFooterTools_SetupForm: TRxDBGridFooterTools_SetupForm
Height = 236 Height = 236
Top = 0 Top = 0
Width = 341 Width = 341
ActivePage = TabSheet2 ActivePage = TabSheet1
Align = alClient Align = alClient
TabIndex = 1 TabIndex = 0
TabOrder = 1 TabOrder = 1
object TabSheet1: TTabSheet object TabSheet1: TTabSheet
Caption = 'Functions' Caption = 'Functions'
ClientHeight = 198 ClientHeight = 203
ClientWidth = 335 ClientWidth = 331
object StringGrid1: TStringGrid object StringGrid1: TStringGrid
Left = 0 Left = 0
Height = 198 Height = 203
Top = 0 Top = 0
Width = 335 Width = 331
Align = alClient Align = alClient
AutoFillColumns = True AutoFillColumns = True
ColCount = 2 ColCount = 2
@ -52,7 +52,7 @@ object RxDBGridFooterTools_SetupForm: TRxDBGridFooterTools_SetupForm
ReadOnly = True ReadOnly = True
Title.Alignment = taCenter Title.Alignment = taCenter
Title.Caption = 'Collumn name' Title.Caption = 'Collumn name'
Width = 166 Width = 164
end end
item item
PickList.Strings = ( PickList.Strings = (
@ -68,29 +68,29 @@ object RxDBGridFooterTools_SetupForm: TRxDBGridFooterTools_SetupForm
) )
Title.Alignment = taCenter Title.Alignment = taCenter
Title.Caption = 'Function' Title.Caption = 'Function'
Width = 167 Width = 165
end> end>
FixedCols = 0 FixedCols = 0
Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goSmoothScroll] Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goSmoothScroll]
TabOrder = 0 TabOrder = 0
TitleStyle = tsNative TitleStyle = tsNative
ColWidths = ( ColWidths = (
166 164
167 165
) )
end end
end end
object TabSheet2: TTabSheet object TabSheet2: TTabSheet
Caption = 'Other options' Caption = 'Other options'
ClientHeight = 198 ClientHeight = 203
ClientWidth = 335 ClientWidth = 331
object Label1: TLabel object Label1: TLabel
AnchorSideLeft.Control = TabSheet2 AnchorSideLeft.Control = TabSheet2
AnchorSideTop.Control = TabSheet2 AnchorSideTop.Control = TabSheet2
Left = 6 Left = 6
Height = 20 Height = 19
Top = 6 Top = 6
Width = 108 Width = 109
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Footer row color' Caption = 'Footer row color'
ParentColor = False ParentColor = False
@ -102,9 +102,9 @@ object RxDBGridFooterTools_SetupForm: TRxDBGridFooterTools_SetupForm
AnchorSideRight.Control = TabSheet2 AnchorSideRight.Control = TabSheet2
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 12 Left = 12
Height = 34 Height = 31
Top = 32 Top = 31
Width = 317 Width = 313
Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbCustomColor, cbPrettyNames, cbCustomColors] Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbCustomColor, cbPrettyNames, cbCustomColors]
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6 BorderSpacing.Around = 6

4
components/rx/trunk/rxdb/rxfilterby.pas
View File

@ -113,7 +113,7 @@ var
rxFilterByForm: TrxFilterByForm; rxFilterByForm: TrxFilterByForm;
implementation implementation
uses rxdconst, rxstrutils, DBGrids; uses rxdconst, rxstrutils, DBGrids, Buttons, LCLType;
{$R *.lfm} {$R *.lfm}
@ -170,7 +170,7 @@ begin
Label5.Caption:=sRxFilterFormOperand; Label5.Caption:=sRxFilterFormOperand;
Label6.Caption:=sRxFilterFormEnd; Label6.Caption:=sRxFilterFormEnd;
Button3.Caption:=sRxFilterFormClear; Button3.Caption:=sRxFilterFormClear;
Button2.Caption:=sRxFilterFormCancel; Button2.Caption:=GetButtonCaption(idButtonCancel);
Button1.Caption:=sRxFilterFormApply; Button1.Caption:=sRxFilterFormApply;
end; end;

197
components/rx/trunk/rxnew.lpk
View File

@ -25,8 +25,8 @@
Copyright (c) 1998 Master-Bank Copyright (c) 1998 Master-Bank
translate to Lazarus by alexs in 2005 - 2018"/> translate to Lazarus by alexs in 2005 - 2018"/>
<License Value="LGPL"/> <License Value="LGPL"/>
<Version Major="3" Minor="2" Release="1" Build="210"/> <Version Major="3" Minor="2" Release="2" Build="215"/>
<Files Count="74"> <Files Count="71">
<Item1> <Item1>
<Filename Value="registerrx.pas"/> <Filename Value="registerrx.pas"/>
<HasRegisterProc Value="True"/> <HasRegisterProc Value="True"/>
@ -68,7 +68,7 @@ translate to Lazarus by alexs in 2005 - 2018"/>
</Item9> </Item9>
<Item10> <Item10>
<Filename Value="rxcontrols\rxapputils.pas"/> <Filename Value="rxcontrols\rxapputils.pas"/>
<UnitName Value="rxapputils"/> <UnitName Value="rxAppUtils"/>
</Item10> </Item10>
<Item11> <Item11>
<Filename Value="rxcontrols\rxautopanel.pas"/> <Filename Value="rxcontrols\rxautopanel.pas"/>
@ -139,193 +139,181 @@ translate to Lazarus by alexs in 2005 - 2018"/>
<Type Value="Binary"/> <Type Value="Binary"/>
</Item27> </Item27>
<Item28> <Item28>
<Filename Value="rxdb\rxdbgrid_columsunit.lfm"/>
<Type Value="LFM"/>
</Item28>
<Item29>
<Filename Value="rxdb\rxdbgrid_columsunit.lrt"/>
<Type Value="Text"/>
</Item29>
<Item30>
<Filename Value="rxdb\rxdbgrid_columsunit.pas"/> <Filename Value="rxdb\rxdbgrid_columsunit.pas"/>
<UnitName Value="rxdbgrid_columsunit"/> <UnitName Value="rxdbgrid_columsunit"/>
</Item30> </Item28>
<Item31> <Item29>
<Filename Value="rxdb\rxdbgrid_findunit.lfm"/>
<Type Value="LFM"/>
</Item31>
<Item32>
<Filename Value="rxdb\rxdbgrid_findunit.pas"/> <Filename Value="rxdb\rxdbgrid_findunit.pas"/>
<UnitName Value="rxdbgrid_findunit"/> <UnitName Value="rxdbgrid_findunit"/>
</Item32> </Item29>
<Item33> <Item30>
<Filename Value="rxdb\exsortmds.pas"/> <Filename Value="rxdb\exsortmds.pas"/>
<UnitName Value="exsortmds"/> <UnitName Value="exsortmds"/>
</Item33> </Item30>
<Item34> <Item31>
<Filename Value="rxdb\rxdbgridexportpdf.pas"/> <Filename Value="rxdb\rxdbgridexportpdf.pas"/>
<UnitName Value="RxDBGridExportPdf"/> <UnitName Value="RxDBGridExportPdf"/>
</Item34> </Item31>
<Item35> <Item32>
<Filename Value="rxdb\rxdbgridexportpdfsetupunit.pas"/> <Filename Value="rxdb\rxdbgridexportpdfsetupunit.pas"/>
<UnitName Value="RxDBGridExportPdfSetupUnit"/> <UnitName Value="RxDBGridExportPdfSetupUnit"/>
</Item35> </Item32>
<Item36> <Item33>
<Filename Value="rxdb\rxdbgridfootertools.pas"/> <Filename Value="rxdb\rxdbgridfootertools.pas"/>
<UnitName Value="RxDBGridFooterTools"/> <UnitName Value="RxDBGridFooterTools"/>
</Item36> </Item33>
<Item37> <Item34>
<Filename Value="rxdb\rxdbgridfootertools_setup.pas"/> <Filename Value="rxdb\rxdbgridfootertools_setup.pas"/>
<UnitName Value="rxdbgridfootertools_setup"/> <UnitName Value="rxdbgridfootertools_setup"/>
</Item37> </Item34>
<Item38> <Item35>
<Filename Value="rxdb\rxdbspinedit.pas"/> <Filename Value="rxdb\rxdbspinedit.pas"/>
<UnitName Value="RxDBSpinEdit"/> <UnitName Value="RxDBSpinEdit"/>
</Item38> </Item35>
<Item39> <Item36>
<Filename Value="rxdb\rxdbtimeedit.pas"/> <Filename Value="rxdb\rxdbtimeedit.pas"/>
<UnitName Value="RxDBTimeEdit"/> <UnitName Value="RxDBTimeEdit"/>
</Item39> </Item36>
<Item40> <Item37>
<Filename Value="rxdb\rxdbutils.pas"/> <Filename Value="rxdb\rxdbutils.pas"/>
<UnitName Value="rxdbutils"/> <UnitName Value="rxdbutils"/>
</Item40> </Item37>
<Item41> <Item38>
<Filename Value="rxdb\rxfilterby.pas"/> <Filename Value="rxdb\rxfilterby.pas"/>
<UnitName Value="rxfilterby"/> <UnitName Value="rxfilterby"/>
</Item41> </Item38>
<Item42> <Item39>
<Filename Value="rxdb\rxlookup.pas"/> <Filename Value="rxdb\rxlookup.pas"/>
<UnitName Value="rxlookup"/> <UnitName Value="rxlookup"/>
</Item42> </Item39>
<Item43> <Item40>
<Filename Value="rxdb\rxmemds.pas"/> <Filename Value="rxdb\rxmemds.pas"/>
<UnitName Value="rxmemds"/> <UnitName Value="rxmemds"/>
</Item43> </Item40>
<Item44> <Item41>
<Filename Value="rxdb\rxpopupunit.pas"/> <Filename Value="rxdb\rxpopupunit.pas"/>
<UnitName Value="rxpopupunit"/> <UnitName Value="rxpopupunit"/>
</Item44> </Item41>
<Item45> <Item42>
<Filename Value="rxdb\rxseldsfrm.pas"/> <Filename Value="rxdb\rxseldsfrm.pas"/>
<UnitName Value="rxseldsfrm"/> <UnitName Value="rxseldsfrm"/>
</Item45> </Item42>
<Item46> <Item43>
<Filename Value="rxdb\rxsortby.pas"/> <Filename Value="rxdb\rxsortby.pas"/>
<UnitName Value="rxsortby"/> <UnitName Value="rxsortby"/>
</Item46> </Item43>
<Item47> <Item44>
<Filename Value="rxdb\rxsortmemds.pas"/> <Filename Value="rxdb\rxsortmemds.pas"/>
<UnitName Value="rxsortmemds"/> <UnitName Value="rxsortmemds"/>
</Item47> </Item44>
<Item48> <Item45>
<Filename Value="rxcontrols\rxdice.inc"/> <Filename Value="rxcontrols\rxdice.inc"/>
<Type Value="Include"/> <Type Value="Include"/>
</Item48> </Item45>
<Item49> <Item46>
<Filename Value="rxcontrols\rxdice.pas"/> <Filename Value="rxcontrols\rxdice.pas"/>
<UnitName Value="rxdice"/> <UnitName Value="rxDice"/>
</Item49> </Item46>
<Item50> <Item47>
<Filename Value="rxcontrols\rxduallist.pas"/> <Filename Value="rxcontrols\rxduallist.pas"/>
<UnitName Value="rxduallist"/> <UnitName Value="rxduallist"/>
</Item50> </Item47>
<Item51> <Item48>
<Filename Value="rxcontrols\rxfduallst.pas"/> <Filename Value="rxcontrols\rxfduallst.pas"/>
<UnitName Value="rxfduallst"/> <UnitName Value="rxfduallst"/>
</Item51> </Item48>
<Item52> <Item49>
<Filename Value="rxcontrols\rxfolderlister.pas"/> <Filename Value="rxcontrols\rxfolderlister.pas"/>
<UnitName Value="rxfolderlister"/> <UnitName Value="rxfolderlister"/>
</Item52> </Item49>
<Item53> <Item50>
<Filename Value="rxcontrols\rxhistory.pas"/> <Filename Value="rxcontrols\rxhistory.pas"/>
<UnitName Value="RXHistory"/> <UnitName Value="RXHistory"/>
</Item53> </Item50>
<Item54> <Item51>
<Filename Value="rxcontrols\rxinipropstorage.pas"/> <Filename Value="rxcontrols\rxinipropstorage.pas"/>
<UnitName Value="RxIniPropStorage"/> <UnitName Value="RxIniPropStorage"/>
</Item54> </Item51>
<Item55> <Item52>
<Filename Value="rxcontrols\rxlclconst.pas"/> <Filename Value="rxcontrols\rxlclconst.pas"/>
<UnitName Value="rxlclconst"/> <UnitName Value="rxlclconst"/>
</Item55> </Item52>
<Item56> <Item53>
<Filename Value="rxcontrols\rxlogin.pas"/> <Filename Value="rxcontrols\rxlogin.pas"/>
<UnitName Value="rxlogin"/> <UnitName Value="rxlogin"/>
</Item56> </Item53>
<Item57> <Item54>
<Filename Value="rxcontrols\rxmdi.pas"/> <Filename Value="rxcontrols\rxmdi.pas"/>
<UnitName Value="RxMDI"/> <UnitName Value="RxMDI"/>
</Item57> </Item54>
<Item58> <Item55>
<Filename Value="rxcontrols\rxpagemngr.pas"/> <Filename Value="rxcontrols\rxpagemngr.pas"/>
<UnitName Value="rxpagemngr"/> <UnitName Value="rxpagemngr"/>
</Item58> </Item55>
<Item59> <Item56>
<Filename Value="rxcontrols\rxpickdate.pas"/> <Filename Value="rxcontrols\rxpickdate.pas"/>
<UnitName Value="rxpickdate"/> <UnitName Value="rxpickdate"/>
</Item59> </Item56>
<Item60> <Item57>
<Filename Value="rxcontrols\rxshortcutunit.pas"/> <Filename Value="rxcontrols\rxshortcutunit.pas"/>
<UnitName Value="rxShortCutUnit"/> <UnitName Value="rxShortCutUnit"/>
</Item60> </Item57>
<Item61> <Item58>
<Filename Value="rxcontrols\rxspin.pas"/> <Filename Value="rxcontrols\rxspin.pas"/>
<UnitName Value="rxspin"/> <UnitName Value="rxspin"/>
</Item61> </Item58>
<Item62> <Item59>
<Filename Value="rxcontrols\rxswitch.pas"/> <Filename Value="rxcontrols\rxswitch.pas"/>
<UnitName Value="rxswitch"/> <UnitName Value="rxswitch"/>
</Item62> </Item59>
<Item63> <Item60>
<Filename Value="rxcontrols\rxsystemservices.pas"/> <Filename Value="rxcontrols\rxsystemservices.pas"/>
<UnitName Value="RxSystemServices"/> <UnitName Value="RxSystemServices"/>
</Item63> </Item60>
<Item64> <Item61>
<Filename Value="rxcontrols\rxtbrsetup.pas"/> <Filename Value="rxcontrols\rxtbrsetup.pas"/>
<UnitName Value="rxtbrsetup"/> <UnitName Value="rxtbrsetup"/>
</Item64> </Item61>
<Item65> <Item62>
<Filename Value="rxcontrols\rxtimeedit.pas"/> <Filename Value="rxcontrols\rxtimeedit.pas"/>
<UnitName Value="RxTimeEdit"/> <UnitName Value="RxTimeEdit"/>
</Item65> </Item62>
<Item66> <Item63>
<Filename Value="rxcontrols\rxtoolbar.pas"/> <Filename Value="rxcontrols\rxtoolbar.pas"/>
<UnitName Value="rxtoolbar"/> <UnitName Value="rxtoolbar"/>
</Item66> </Item63>
<Item67> <Item64>
<Filename Value="rxcontrols\rxtooledit.pas"/> <Filename Value="rxcontrols\rxtooledit.pas"/>
<UnitName Value="rxtooledit"/> <UnitName Value="rxtooledit"/>
</Item67> </Item64>
<Item68> <Item65>
<Filename Value="rxdb\rxdbgrid_popupfilterunit.pas"/> <Filename Value="rxdb\rxdbgrid_popupfilterunit.pas"/>
<UnitName Value="RxDBGrid_PopUpFilterUnit"/> <UnitName Value="RxDBGrid_PopUpFilterUnit"/>
</Item68> </Item65>
<Item69> <Item66>
<Filename Value="rxdb\rxdbverticalgrid.pas"/> <Filename Value="rxdb\rxdbverticalgrid.pas"/>
<UnitName Value="rxdbverticalgrid"/> <UnitName Value="rxdbverticalgrid"/>
</Item69> </Item66>
<Item70> <Item67>
<Filename Value="rxcontrols\rxlclutils.pas"/> <Filename Value="rxcontrols\rxlclutils.pas"/>
<UnitName Value="rxlclutils"/> <UnitName Value="rxlclutils"/>
</Item70> </Item67>
<Item71> <Item68>
<Filename Value="rxcontrols\rxrangesel.pas"/> <Filename Value="rxcontrols\rxrangesel.pas"/>
<UnitName Value="RxRangeSel"/> <UnitName Value="RxRangeSel"/>
</Item71> </Item68>
<Item72> <Item69>
<Filename Value="rxcontrols\rxxmlpropstorage.pas"/> <Filename Value="rxcontrols\rxxmlpropstorage.pas"/>
<UnitName Value="RxXMLPropStorage"/> <UnitName Value="RxXMLPropStorage"/>
</Item72> </Item69>
<Item73> <Item70>
<Filename Value="rxcontrols\rxswitch.res"/> <Filename Value="rxcontrols\rxswitch.res"/>
<Type Value="Binary"/> <Type Value="Binary"/>
</Item73> </Item70>
<Item74> <Item71>
<Filename Value="rxcontrols\rxpopupnotifier.pas"/> <Filename Value="rxcontrols\rxpopupnotifier.pas"/>
<UnitName Value="rxPopupNotifier"/> <UnitName Value="RxPopupNotifier"/>
</Item74> </Item71>
</Files> </Files>
<LazDoc Paths="docs;\usr\local\share\lazarus\components\rxnew\docs"/> <LazDoc Paths="docs;\usr\local\share\lazarus\components\rxnew\docs"/>
<i18n> <i18n>
@ -352,7 +340,6 @@ translate to Lazarus by alexs in 2005 - 2018"/>
</UsageOptions> </UsageOptions>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
<IgnoreBinaries Value="False"/>
</PublishOptions> </PublishOptions>
</Package> </Package>
</CONFIG> </CONFIG>

11
components/rx/trunk/rxtools/rxconst.pas
View File

@ -77,14 +77,6 @@ resourcestring
sButtonAlign1 = 'None'; sButtonAlign1 = 'None';
sButtonAlign2 = 'Left'; sButtonAlign2 = 'Left';
sButtonAlign3 = 'Right'; 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 : '; sWidget = 'Widget : ';
sAppVersion = 'Version : '; sAppVersion = 'Version : ';
sLCLVersion = 'LCL Version: '; sLCLVersion = 'LCL Version: ';
@ -150,6 +142,9 @@ resourcestring
sRxTextFolderSynHTML = 'HTML'; sRxTextFolderSynHTML = 'HTML';
sRxTextFolderSynSQL = 'SQL'; sRxTextFolderSynSQL = 'SQL';
{ TRxLoginDialog }
sRxLoginDlgBtnMore = 'More >>';
sRxLoginDlgDatabase = 'Database';
implementation implementation

3
components/rx/trunk/rxtools/rxdconst.pas
View File

@ -88,8 +88,6 @@ resourcestring
SDBComboBoxFieldNotAssigned = '%s:TDBComboBox - DataField not assigned'; SDBComboBoxFieldNotAssigned = '%s:TDBComboBox - DataField not assigned';
//SPropDefByLookup = 'PropDefByLookup';
//SDataSourceFixed = 'SDataSourceFixed';
SCircularDataLink = 'Circular data link'; SCircularDataLink = 'Circular data link';
sRxAscendign = 'Ascendign'; sRxAscendign = 'Ascendign';
sRxDescending = 'Descending'; sRxDescending = 'Descending';
@ -130,7 +128,6 @@ resourcestring
sRxFilterFormOperand = 'Operand :'; sRxFilterFormOperand = 'Operand :';
sRxFilterFormEnd = 'end.'; sRxFilterFormEnd = 'end.';
sRxFilterFormClear = 'Clear filter'; sRxFilterFormClear = 'Clear filter';
sRxFilterFormCancel = 'Cancel';
sRxFilterFormApply = 'Apply'; sRxFilterFormApply = 'Apply';
sRxFilterFormCaption = 'Filter conditions'; sRxFilterFormCaption = 'Filter conditions';