diff --git a/components/rx/trunk/docs/rxdbgrid.xml b/components/rx/trunk/docs/rxdbgrid.xml
index f32a788cc..ad8c6c0cf 100644
--- a/components/rx/trunk/docs/rxdbgrid.xml
+++ b/components/rx/trunk/docs/rxdbgrid.xml
@@ -178,6 +178,14 @@
Рисовать линии сетки RxDBGrid полностью Рисовать линии сетки RxDBGrid полностью
В противнгом случае в область между данными и итогом не будут отображаться линии колонок
Set on owner form property ModalResult to mrOk on mouse doble click
EN
+
+Set on owner form property ModalResult to mrOk on mouse doble click</p>
+
RU
+
+Если грид находится на модальной форме, то при двойном нажатии мышкой свойство ModalResult формы будет установлено в mrOK
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/rx/trunk/images/imgsrc/rx_sort_fbdataset/TRxSortFBDataSet_150.svg b/components/rx/trunk/images/imgsrc/rx_sort_fbdataset/TRxSortFBDataSet_150.svg
new file mode 100644
index 000000000..a0bfd7065
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rx_sort_fbdataset/TRxSortFBDataSet_150.svg
@@ -0,0 +1,537 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/rx/trunk/images/imgsrc/rx_sort_fbdataset/TRxSortFBDataSet_200.svg b/components/rx/trunk/images/imgsrc/rx_sort_fbdataset/TRxSortFBDataSet_200.svg
new file mode 100644
index 000000000..41ac203fb
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rx_sort_fbdataset/TRxSortFBDataSet_200.svg
@@ -0,0 +1,505 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/rx/trunk/images/imgsrc/rx_sort_ibx/TRxSortIBX.svg b/components/rx/trunk/images/imgsrc/rx_sort_ibx/TRxSortIBX.svg
new file mode 100644
index 000000000..017243b42
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rx_sort_ibx/TRxSortIBX.svg
@@ -0,0 +1,499 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+ I
+
+ X
+
+ I
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/rx/trunk/images/imgsrc/rx_sort_ibx/TRxSortIBX_150.svg b/components/rx/trunk/images/imgsrc/rx_sort_ibx/TRxSortIBX_150.svg
new file mode 100644
index 000000000..58cc7f95b
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rx_sort_ibx/TRxSortIBX_150.svg
@@ -0,0 +1,546 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+ I
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/rx/trunk/images/imgsrc/rx_sort_ibx/TRxSortIBX_200.svg b/components/rx/trunk/images/imgsrc/rx_sort_ibx/TRxSortIBX_200.svg
new file mode 100644
index 000000000..fffedf075
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rx_sort_ibx/TRxSortIBX_200.svg
@@ -0,0 +1,524 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+ I X B
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/rx/trunk/images/imgsrc/rx_sort_sqldb/TRxSortSqlDB.svg b/components/rx/trunk/images/imgsrc/rx_sort_sqldb/TRxSortSqlDB.svg
new file mode 100644
index 000000000..9b684c901
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rx_sort_sqldb/TRxSortSqlDB.svg
@@ -0,0 +1,485 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+ S
+
+ l D B
+
+
+
+
+
+
+
+
+
diff --git a/components/rx/trunk/images/imgsrc/rx_sort_sqldb/TRxSortSqlDB_150.svg b/components/rx/trunk/images/imgsrc/rx_sort_sqldb/TRxSortSqlDB_150.svg
new file mode 100644
index 000000000..3d9a0978a
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rx_sort_sqldb/TRxSortSqlDB_150.svg
@@ -0,0 +1,565 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/rx/trunk/images/imgsrc/rx_sort_sqldb/TRxSortSqlDB_200.svg b/components/rx/trunk/images/imgsrc/rx_sort_sqldb/TRxSortSqlDB_200.svg
new file mode 100644
index 000000000..af469ec6e
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rx_sort_sqldb/TRxSortSqlDB_200.svg
@@ -0,0 +1,587 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+ S q l
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/rx/trunk/images/imgsrc/rx_sort_zeos/TRxSortZeos.svg b/components/rx/trunk/images/imgsrc/rx_sort_zeos/TRxSortZeos.svg
new file mode 100644
index 000000000..4a09892fc
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rx_sort_zeos/TRxSortZeos.svg
@@ -0,0 +1,481 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+ Z
+
+
+
+ s
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/rx/trunk/images/imgsrc/rx_sort_zeos/TRxSortZeos_150.svg b/components/rx/trunk/images/imgsrc/rx_sort_zeos/TRxSortZeos_150.svg
new file mode 100644
index 000000000..87ca9a35e
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rx_sort_zeos/TRxSortZeos_150.svg
@@ -0,0 +1,567 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ s
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/rx/trunk/images/imgsrc/rx_sort_zeos/TRxSortZeos_200.svg b/components/rx/trunk/images/imgsrc/rx_sort_zeos/TRxSortZeos_200.svg
new file mode 100644
index 000000000..221f8792c
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rx_sort_zeos/TRxSortZeos_200.svg
@@ -0,0 +1,533 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+ Z e
+
+ s
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/rx/trunk/images/mk_res.sh b/components/rx/trunk/images/mk_res.sh
index eec5df096..41e4bb2af 100755
--- a/components/rx/trunk/images/mk_res.sh
+++ b/components/rx/trunk/images/mk_res.sh
@@ -1,5 +1,18 @@
rm rx.lrs
rm rx.res
+
+rm RxSortFBDataSet.lrs
+rm RxSortFBDataSet.res
+
+rm RxSortIBX.lrs
+rm RxSortIBX.res
+
+rm RxSortSqlDB.lrs
+rm RxSortSqlDB.res
+
+rm RxSortZeos.lrs
+rm RxSortZeos.res
+
/usr/local/share/lazarus/tools/lazres rx.res TRxDateEdit_150.png TRxDateEdit_200.png TRxDateEdit.png \
TRxLookupEdit.png TRxLookupEdit_150.png TRxLookupEdit_200.png \
TRxDBGrid.png TRxDBGrid_150.png TRxDBGrid_200.png \
@@ -49,4 +62,16 @@ rm rx.res
TRxPopupNotifier.png TRxPopupNotifier_150.png TRxPopupNotifier_200.png \
TRxSystemServices.png TRxSystemServices_150.png TRxSystemServices_200.png \
TRxVersionInfo.png TRxVersionInfo_150.png TRxVersionInfo_200.png \
- TRxXMLPropStorage.png TRxXMLPropStorage_150.png TRxXMLPropStorage_200.png
\ No newline at end of file
+ TRxXMLPropStorage.png TRxXMLPropStorage_150.png TRxXMLPropStorage_200.png
+
+
+/usr/local/share/lazarus/tools/lazres RxSortFBDataSet.res TRxSortFBDataSet.png TRxSortFBDataSet_150.png TRxSortFBDataSet_200.png
+/usr/local/share/lazarus/tools/lazres RxSortIBX.res TRxSortIBX.png TRxSortIBX_150.png TRxSortIBX_200.png
+/usr/local/share/lazarus/tools/lazres RxSortSqlDB.res TRxSortSqlDB.png TRxSortSqlDB_150.png TRxSortSqlDB_200.png
+/usr/local/share/lazarus/tools/lazres RxSortZeos.res TRxSortZeos.png TRxSortZeos_150.png TRxSortZeos_200.png
+
+cp rx.res ..
+cp RxSortFBDataSet.res ../rx_sort_fbdataset
+cp RxSortIBX.res ../rx_sort_ibx
+cp RxSortSqlDB.res ../rx_sort_sqldb
+cp RxSortZeos.res ../rx_sort_zeos
diff --git a/components/rx/trunk/rx.res b/components/rx/trunk/rx.res
index f59a59218..e5ba56bdc 100644
Binary files a/components/rx/trunk/rx.res and b/components/rx/trunk/rx.res differ
diff --git a/components/rx/trunk/rx_sort_fbdataset/RxSortFBDataSet.res b/components/rx/trunk/rx_sort_fbdataset/RxSortFBDataSet.res
new file mode 100644
index 000000000..0396b797d
Binary files /dev/null and b/components/rx/trunk/rx_sort_fbdataset/RxSortFBDataSet.res differ
diff --git a/components/rx/trunk/rx_sort_fbdataset/rxsortfbdataset.pas b/components/rx/trunk/rx_sort_fbdataset/rxsortfbdataset.pas
index 6fad77c2c..181e1e505 100644
--- a/components/rx/trunk/rx_sort_fbdataset/rxsortfbdataset.pas
+++ b/components/rx/trunk/rx_sort_fbdataset/rxsortfbdataset.pas
@@ -54,6 +54,8 @@ procedure Register;
implementation
uses exsortfb;
+{$R RxSortFBDataSet.res}
+
procedure Register;
begin
RegisterComponents('RX DBAware',[TRxSortFBDataSet]);
diff --git a/components/rx/trunk/rx_sort_ibx/RxSortIBX.res b/components/rx/trunk/rx_sort_ibx/RxSortIBX.res
new file mode 100644
index 000000000..735f22216
Binary files /dev/null and b/components/rx/trunk/rx_sort_ibx/RxSortIBX.res differ
diff --git a/components/rx/trunk/rx_sort_ibx/rxsortibx.pas b/components/rx/trunk/rx_sort_ibx/rxsortibx.pas
index 4c574e4f1..4a6ed18b1 100644
--- a/components/rx/trunk/rx_sort_ibx/rxsortibx.pas
+++ b/components/rx/trunk/rx_sort_ibx/rxsortibx.pas
@@ -24,6 +24,8 @@ procedure Register;
implementation
uses exsortibx;
+{$R RxSortIBX.res}
+
procedure Register;
begin
RegisterComponents('RX DBAware',[TRxSortIBX]);
diff --git a/components/rx/trunk/rx_sort_sqldb/RxSortSqlDB.res b/components/rx/trunk/rx_sort_sqldb/RxSortSqlDB.res
new file mode 100644
index 000000000..d47c4995e
Binary files /dev/null and b/components/rx/trunk/rx_sort_sqldb/RxSortSqlDB.res differ
diff --git a/components/rx/trunk/rx_sort_sqldb/rxsortsqldb.pas b/components/rx/trunk/rx_sort_sqldb/rxsortsqldb.pas
index bee0b6b17..a3472800b 100644
--- a/components/rx/trunk/rx_sort_sqldb/rxsortsqldb.pas
+++ b/components/rx/trunk/rx_sort_sqldb/rxsortsqldb.pas
@@ -24,6 +24,8 @@ procedure Register;
implementation
uses exsortsql;
+{$R RxSortSqlDB.res}
+
procedure Register;
begin
RegisterComponents('RX DBAware',[TRxSortSqlDB]);
diff --git a/components/rx/trunk/rx_sort_zeos/RxSortZeos.res b/components/rx/trunk/rx_sort_zeos/RxSortZeos.res
new file mode 100644
index 000000000..68e85ba7c
Binary files /dev/null and b/components/rx/trunk/rx_sort_zeos/RxSortZeos.res differ
diff --git a/components/rx/trunk/rx_sort_zeos/rxsortzeos.pas b/components/rx/trunk/rx_sort_zeos/rxsortzeos.pas
index 4e8e784d7..14c0e70e2 100644
--- a/components/rx/trunk/rx_sort_zeos/rxsortzeos.pas
+++ b/components/rx/trunk/rx_sort_zeos/rxsortzeos.pas
@@ -56,6 +56,8 @@ procedure Register;
implementation
uses exsortzeos;
+{$R RxSortZeos.res}
+
procedure Register;
begin
RegisterComponents('RX DBAware',[TRxSortZeos]);
diff --git a/components/rx/trunk/rxcontrols/rxswitch.pas b/components/rx/trunk/rxcontrols/rxswitch.pas
index 18f552744..b9b2bcb99 100644
--- a/components/rx/trunk/rxcontrols/rxswitch.pas
+++ b/components/rx/trunk/rxcontrols/rxswitch.pas
@@ -44,6 +44,7 @@ type
TTextPos = (tpNone, tpLeft, tpRight, tpAbove, tpBelow);
TSwithState = (sw_off, sw_on);
+ TSwithStyle = (swsClassic, swsNewHorizontal, swsNewVertical, swsCustom);
TSwitchBitmaps = set of TSwithState;
TRxSwitch = class(TCustomControl)
@@ -54,6 +55,7 @@ type
FOnOn: TNotifyEvent;
FOnOff: TNotifyEvent;
FStateOn: TSwithState;
+ FStyle: TSwithStyle;
FTextPosition: TTextPos;
FBorderStyle: TBorderStyle;
FToggleKey: TShortCut;
@@ -63,6 +65,7 @@ type
function GetSwitchGlyphOn: TBitmap;
procedure GlyphChanged(Sender: TObject);
procedure SetStateOn(Value: TSwithState);
+ procedure SetStyle(AValue: TSwithStyle);
procedure SetSwitchGlyphOff(const AValue: TBitmap);
procedure SetSwitchGlyphOn(const AValue: TBitmap);
procedure SetTextPosition(Value: TTextPos);
@@ -105,27 +108,24 @@ type
property DragCursor;
property Enabled;
property Font;
- property GlyphOff: TBitmap read GetSwitchGlyphOff write SetSwitchGlyphOff
- stored StoreBitmapOff;
- property GlyphOn: TBitmap read GetSwitchGlyphOn write SetSwitchGlyphOn
- stored StoreBitmapOn;
+ property GlyphOff: TBitmap read GetSwitchGlyphOff write SetSwitchGlyphOff stored StoreBitmapOff;
+ property GlyphOn: TBitmap read GetSwitchGlyphOn write SetSwitchGlyphOn stored StoreBitmapOn;
property ParentColor;
property ParentFont;
property ParentShowHint;
property PopupMenu;
property ShowFocus: Boolean read FShowFocus write SetShowFocus default True;
- property ToggleKey: TShortCut read FToggleKey write FToggleKey
- default VK_SPACE;
+ property ToggleKey: TShortCut read FToggleKey write FToggleKey default VK_SPACE;
property ShowHint;
property StateOn: TSwithState read FStateOn write SetStateOn default sw_off;
property TabOrder;
property TabStop default True;
- property TextPosition: TTextPos read FTextPosition write SetTextPosition
- default tpNone;
+ property TextPosition: TTextPos read FTextPosition write SetTextPosition default tpNone;
property Anchors;
property Constraints;
property DragKind;
property Visible;
+ property Style:TSwithStyle read FStyle write SetStyle;
property OnClick;
property OnDblClick;
property OnEnter;
@@ -500,6 +500,12 @@ begin
end;
end;
+procedure TRxSwitch.SetStyle(AValue: TSwithStyle);
+begin
+ if FStyle=AValue then Exit;
+ FStyle:=AValue;
+end;
+
procedure TRxSwitch.SetSwitchGlyphOff(const AValue: TBitmap);
begin
SetSwitchGlyph(sw_off, AValue);