diff --git a/components/rx/trunk/languages/rxconst.es.po b/components/rx/trunk/languages/rxconst.es.po
index e72b22155..1513989f8 100644
--- a/components/rx/trunk/languages/rxconst.es.po
+++ b/components/rx/trunk/languages/rxconst.es.po
@@ -245,6 +245,10 @@ msgstr "Menu panel herramienta"
msgid "Transparent"
msgstr "Transparente"
+#: rxconst.svariableisnotstring
+msgid "Variable %s is not string"
+msgstr ""
+
#: rxconst.svisiblebuttons
msgid "Visible buttons"
msgstr "Botones visibles"
diff --git a/components/rx/trunk/languages/rxconst.po b/components/rx/trunk/languages/rxconst.po
index 0f1867153..7cc665299 100644
--- a/components/rx/trunk/languages/rxconst.po
+++ b/components/rx/trunk/languages/rxconst.po
@@ -241,6 +241,10 @@ msgstr ""
msgid "Transparent"
msgstr ""
+#: rxconst.svariableisnotstring
+msgid "Variable %s is not string"
+msgstr ""
+
#: rxconst.svisiblebuttons
msgid "Visible buttons"
msgstr ""
diff --git a/components/rx/trunk/languages/rxconst.ru.po b/components/rx/trunk/languages/rxconst.ru.po
index 95c97d378..80d1a089c 100644
--- a/components/rx/trunk/languages/rxconst.ru.po
+++ b/components/rx/trunk/languages/rxconst.ru.po
@@ -241,6 +241,10 @@ msgstr "Настройка панели инструментов"
msgid "Transparent"
msgstr "Прозрачно"
+#: rxconst.svariableisnotstring
+msgid "Variable %s is not string"
+msgstr ""
+
#: rxconst.svisiblebuttons
msgid "Visible buttons"
msgstr "Отображаемые кнопки"
diff --git a/components/rx/trunk/languages/rxconst.uk.po b/components/rx/trunk/languages/rxconst.uk.po
index 8cf7cf655..e9ffb2201 100644
--- a/components/rx/trunk/languages/rxconst.uk.po
+++ b/components/rx/trunk/languages/rxconst.uk.po
@@ -258,6 +258,10 @@ msgstr "Налаштування панелі інструментів"
msgid "Transparent"
msgstr "Прозоро"
+#: rxconst.svariableisnotstring
+msgid "Variable %s is not string"
+msgstr ""
+
#: rxconst.svisiblebuttons
msgid "Visible buttons"
msgstr "Видимі кнопки"
diff --git a/components/rx/trunk/rxconfigvalues.pas b/components/rx/trunk/rxconfigvalues.pas
index 8ea648a58..a002a9755 100644
--- a/components/rx/trunk/rxconfigvalues.pas
+++ b/components/rx/trunk/rxconfigvalues.pas
@@ -126,6 +126,7 @@ type
end;
implementation
+uses rxconst;
{ TConfigValuesEnumerator }
@@ -370,7 +371,7 @@ begin
if FDataType = cvtString then
Result:=FValue
else
- raise Exception.CreateFmt('Variable %s is not string', [FName]);
+ raise Exception.CreateFmt(sVariableIsNotString, [FName]);
end;
procedure TConfigValue.SetAsBoolean(const AValue: boolean);
@@ -440,7 +441,7 @@ begin
end
end
else
- raise Exception.CreateFmt('Variable %s is not string', [FName]);
+ raise Exception.CreateFmt(sVariableIsNotString, [FName]);
end;
constructor TConfigValue.Create;
diff --git a/components/rx/trunk/rxconst.pas b/components/rx/trunk/rxconst.pas
index 49f85eeb1..85aa33ddf 100644
--- a/components/rx/trunk/rxconst.pas
+++ b/components/rx/trunk/rxconst.pas
@@ -35,29 +35,10 @@ interface
{$I RX.INC}
-uses LMessages, Controls;
const
RX_VERSION = $0002004B; { 2.75 }
-const
-{ Command message for Speedbar editor }
- CM_SPEEDBARCHANGED = CM_BASE + 80;
-{ Command message for TRxSpeedButton }
- CM_RXBUTTONPRESSED = CM_BASE + 81;
-{ Command messages for TRxWindowHook }
- CM_RECREATEWINDOW = CM_BASE + 82;
- CM_DESTROYHOOK = CM_BASE + 83;
-{ Notify message for TRxTrayIcon }
- CM_TRAYICON = CM_BASE + 84;
-
-const
- crHand = TCursor(14000);
- crDragHand = TCursor(14001);
-
-//const
-//{ TBitmap.GetTransparentColor from GRAPHICS.PAS uses this value }
-// PaletteMask = $02000000;
resourcestring
sBrowse = 'Browse';
@@ -139,6 +120,9 @@ resourcestring
{ TFolderLister }
sFolderListerErr = '%s. Not assigned property MenuItem';
+ { TConfigValues }
+ sVariableIsNotString = 'Variable %s is not string';
+
implementation
end.
diff --git a/components/rx/trunk/rxlclconst.pas b/components/rx/trunk/rxlclconst.pas
new file mode 100644
index 000000000..78462b5b7
--- /dev/null
+++ b/components/rx/trunk/rxlclconst.pas
@@ -0,0 +1,61 @@
+{ rxlclconst unit
+
+Copyright (C) 2005-2016 Lagunov Aleksey alexs75@yandex.ru and Lazarus team
+original conception from rx library for Delphi (c)
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version with the following modification:
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent modules,and
+ to copy and distribute the resulting executable under terms of your choice,
+ provided that you also meet, for each linked independent module, the terms
+ and conditions of the license of that module. An independent module is a
+ module which is not derived from or based on this library. If you modify
+ this library, you may extend this exception to your version of the library,
+ but you are not obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
+ for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+}
+
+unit rxlclconst;
+
+interface
+
+{$I RX.INC}
+
+uses LMessages, Controls;
+
+const
+{ Command message for Speedbar editor }
+ CM_SPEEDBARCHANGED = CM_BASE + 80;
+{ Command message for TRxSpeedButton }
+ CM_RXBUTTONPRESSED = CM_BASE + 81;
+{ Command messages for TRxWindowHook }
+ CM_RECREATEWINDOW = CM_BASE + 82;
+ CM_DESTROYHOOK = CM_BASE + 83;
+{ Notify message for TRxTrayIcon }
+ CM_TRAYICON = CM_BASE + 84;
+{
+const
+ crHand = TCursor(14000);
+ crDragHand = TCursor(14001);
+}
+//const
+//{ TBitmap.GetTransparentColor from GRAPHICS.PAS uses this value }
+// PaletteMask = $02000000;
+
+implementation
+
+end.
diff --git a/components/rx/trunk/rxlogin.pas b/components/rx/trunk/rxlogin.pas
index 30fc4508f..037d54161 100644
--- a/components/rx/trunk/rxlogin.pas
+++ b/components/rx/trunk/rxlogin.pas
@@ -411,12 +411,12 @@ begin
with AppIcon do
begin
OnDblClick := @DoIconDblClick;
- Cursor := crHand;
+ Cursor := crHandPoint;
end;
with KeyImage do
begin
OnDblClick := @DoIconDblClick;
- Cursor := crHand;
+ Cursor := crHandPoint;
end;
end;
PasswordEdit.MaxLength := FMaxPasswordLen;
diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk
index defe5e6fb..7f6bd3366 100644
--- a/components/rx/trunk/rxnew.lpk
+++ b/components/rx/trunk/rxnew.lpk
@@ -107,200 +107,200 @@ translate to Lazarus by alexs in 2005 - 2016
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
diff --git a/components/rx/trunk/rxnew.pas b/components/rx/trunk/rxnew.pas
index 324fc349d..8131864f2 100644
--- a/components/rx/trunk/rxnew.pas
+++ b/components/rx/trunk/rxnew.pas
@@ -11,7 +11,7 @@ uses
RxAutoPanel, rxboxprocs, rxcurredit, rxdbcurredit, rxdbdateedit, rxdbutils,
rxduallist, rxfduallst, rxfolderlister, rxpagemngr, rxpickdate, registerrx,
RegisterRxDB, RegisterRxTools, RxAboutDialog, rxAboutFormUnit, rxapputils,
- rxclock, rxconst, rxctrls, RxDBColorBox, rxdbcomb, RxDBCtrls, rxdbgrid,
+ rxclock, rxctrls, RxDBColorBox, rxdbcomb, RxDBCtrls, rxdbgrid,
rxdbgrid_columsunit, rxdbgrid_findunit, RxDBSpinEdit, RxDBTimeEdit,
rxdconst, rxdice, rxfilterby, rxiconv, rxlogin, rxlookup, rxmemds,
rxpopupunit, rxsortmemds, rxspin, rxswitch, RxSystemServices, rxtbrsetup,
@@ -19,7 +19,7 @@ uses
rxvclutils, RxCloseFormValidator, RxHistoryNavigator, ex_rx_bin_datapacket,
ex_rx_datapacket, ex_rx_xml_datapacket, rxsortby, RxMDI, RxIniPropStorage,
rxDateRangeEditUnit, RxDBGridFooterTools, rxdbgridfootertools_setup,
- rxShortCutUnit, RxDBGridExportPdf, RxDBGridExportPdfSetupUnit,
+ rxShortCutUnit, RxDBGridExportPdf, RxDBGridExportPdfSetupUnit, rxlclconst,
LazarusPackageIntf;
implementation
diff --git a/components/rx/trunk/rxtools.lpk b/components/rx/trunk/rxtools.lpk
index 1c71e1846..fc80b55fe 100644
--- a/components/rx/trunk/rxtools.lpk
+++ b/components/rx/trunk/rxtools.lpk
@@ -15,7 +15,7 @@
"/>
-
+
@@ -32,6 +32,10 @@
+
+
+
+
diff --git a/components/rx/trunk/rxtools.pas b/components/rx/trunk/rxtools.pas
index 3e89ffce1..d58a177e4 100644
--- a/components/rx/trunk/rxtools.pas
+++ b/components/rx/trunk/rxtools.pas
@@ -8,7 +8,8 @@ unit rxtools;
interface
uses
- rxConfigValues, rxstrutils, rxdateutil, rxFileUtils, LazarusPackageIntf;
+ rxConfigValues, rxstrutils, rxdateutil, rxFileUtils, rxconst,
+ LazarusPackageIntf;
implementation