Menu
▾
▴
[JVCL-Checkins] CVS: rm/source JvDSADialogs.pas,1.4,1.5 JvOLBEditor.dfm,1.1,1.2 JvOLBEditor.pas,1.1,1.2 JvOLBar.pas,1.1,1.2 JvOLE2Auto.pas,1.1,1.2 JvObjPickerComp.pas,1.1,1.2 JvObjSel.pas,1.1,1.2 JvObjStr.pas,1.1,1.2 JvObserverLabel.pas,1.1,1.2 JvObserverMessages.pas,1.1,1.2 JvObservibleCheckBox.pas,1.1,1.2 JvOneSizeFitsAllButton.pas,1.1,1.2 JvOutEdit.pas,1.1,1.2 JvOutlookEdit.pas,1.1,1.2 JvPluginMan.pas,1.2,1.3 JvTrayIcon.pas,1.3,1.4
|
From: Robert M. <mar...@us...> - 2003-02-09 12:24:56
|
Update of /cvsroot/jvcl/rm/source
In directory sc8-pr-cvs1:/tmp/cvs-serv585/source
Modified Files:
JvDSADialogs.pas JvOLBEditor.dfm JvOLBEditor.pas JvOLBar.pas
JvOLE2Auto.pas JvObjPickerComp.pas JvObjSel.pas JvObjStr.pas
JvObserverLabel.pas JvObserverMessages.pas
JvObservibleCheckBox.pas JvOneSizeFitsAllButton.pas
JvOutEdit.pas JvOutlookEdit.pas JvPluginMan.pas JvTrayIcon.pas
Log Message:
cleaned
Index: JvDSADialogs.pas
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvDSADialogs.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JvDSADialogs.pas 19 Jan 2003 13:36:03 -0000 1.4
--- JvDSADialogs.pas 9 Feb 2003 12:24:52 -0000 1.5
***************
*** 15,21 ****
All Rights Reserved.
! Contributor(s):
! Last Modified: 2002-08-27
You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
--- 15,22 ----
All Rights Reserved.
! Contributor(s):
! Steve Magruder
! Last Modified: 2003-01-31
You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
***************
*** 76,79 ****
--- 77,81 ----
procedure EndWrite(const DSAInfo: TDSARegItem); virtual;
function IsKeyNameAllowed(const Key: string): Boolean;
+
function GetCheckMarkTextSuffix: string; virtual; abstract;
procedure SetCheckMarkTextSuffix(Value: string); virtual; abstract;
***************
*** 81,84 ****
--- 83,87 ----
constructor Create;
destructor Destroy; override;
+
function GetState(const DSAInfo: TDSARegItem; out LastResult: Integer;
const OnCustomData: TDSACustomData = nil): Boolean; virtual;
***************
*** 110,113 ****
--- 113,117 ----
procedure WriteString(const DSAInfo: TDSARegItem; const Key: string;
const Value: string); virtual; abstract;
+
property CheckMarkTextSuffix: string read GetCheckMarkTextSuffix;
end;
***************
*** 123,126 ****
--- 127,131 ----
public
constructor Create(const ARootKey: HKEY; const AKey: string);
+
function ReadBool(const DSAInfo: TDSARegItem; const Key: string): Boolean; override;
function ReadBoolDef(const DSAInfo: TDSARegItem; const Key: string;
***************
*** 148,151 ****
--- 153,157 ----
procedure WriteString(const DSAInfo: TDSARegItem; const Key: string;
const Value: string); override;
+
property RootKey: HKEY read FRootKey write FRootKey;
property Key: string read FKey write FKey;
***************
*** 196,199 ****
--- 202,206 ----
procedure WriteString(const DSAInfo: TDSARegItem; const Key: string;
const Value: string); override;
+
property CheckMarkTextSuffix: string read GetCheckMarkTextSuffix write SetCheckMarkTextSuffix;
end;
***************
*** 217,220 ****
--- 224,228 ----
procedure ShowMessageFmt(const Msg: string; const Params: array of const;
const Center: TDlgCenterKind = dckScreen);
+
function MessageDlg(const Msg: string; const DlgType: TMsgDlgType;
const Buttons: TMsgDlgButtons; const HelpCtx: Longint; const Center: TDlgCenterKind = dckScreen;
***************
*** 230,233 ****
--- 238,242 ----
const CancelButton: TMsgDlgBtn = mbDefault;
const HelpButton: TMsgDlgBtn = mbHelp): TModalResult; overload;
+
function MessageDlgEx(const Msg: string; const DlgType: TMsgDlgType;
const Buttons: array of string; const Results: array of Integer; const HelpCtx: Longint;
***************
*** 251,254 ****
--- 260,264 ----
procedure DSAShowMessageFmt(const DlgID: Integer; const Msg: string; const Params: array of const;
const Center: TDlgCenterKind = dckScreen);
+
function DSAMessageDlg(const DlgID: Integer; const Msg: string; const DlgType: TMsgDlgType;
const Buttons: TMsgDlgButtons; const HelpCtx: Longint; const Center: TDlgCenterKind = dckScreen;
***************
*** 264,267 ****
--- 274,278 ----
const DefaultButton: TMsgDlgBtn = mbDefault; const CancelButton: TMsgDlgBtn = mbDefault;
const HelpButton: TMsgDlgBtn = mbHelp): TModalResult; overload;
+
function DSAMessageDlgEx(const DlgID: Integer; const Msg: string; const DlgType: TMsgDlgType;
const Buttons: array of string; const Results: array of Integer;
***************
*** 355,358 ****
--- 366,370 ----
procedure SetOrgShowModalPtr(Value: Pointer);
procedure UpdateDSAState; virtual;
+
property OrgOwner: TComponent read GetOrgOwner write SetOrgOwner;
property OrgShowModalPtr: Pointer read GetOrgShowModalPtr write SetOrgShowModalPtr;
***************
*** 379,383 ****
{$IFNDEF DELPHI6_UP}
-
type
PBoolean = ^Boolean;
--- 391,394 ----
***************
*** 385,389 ****
const
sLineBreak = #13#10;
-
{$ENDIF DELPHI6_UP}
--- 396,399 ----
***************
*** 453,456 ****
--- 463,467 ----
protected
procedure CustomKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+ procedure CustomShow(Sender: TObject);
procedure HelpButtonClick(Sender: TObject);
procedure WriteToClipBoard(Text: String);
***************
*** 480,483 ****
--- 491,508 ----
end;
+ procedure TDSAMessageForm.CustomShow(Sender: TObject);
+ var
+ I: Integer;
+ begin
+ for I := 0 to ComponentCount - 1 do
+ begin
+ if (Components[I] is TButton) and (Components[I] as TButton).Default then
+ begin
+ (Components[I] as TButton).SetFocus;
+ Break;
+ end;
+ end;
+ end;
+
procedure TDSAMessageForm.HelpButtonClick(Sender: TObject);
begin
***************
*** 625,628 ****
--- 650,654 ----
KeyPreview := True;
OnKeyDown := CustomKeyDown;
+ OnShow := CustomShow;
DialogUnits := GetAveCharSize(Canvas);
HorzMargin := MulDiv(mcHorzMargin, DialogUnits.X, 4);
***************
*** 786,794 ****
for I := Index + 1 to High(FList) do
begin
! FList[I-1].ID := FList[I].ID;
! FList[I-1].Name := FList[I].Name;
! FList[I-1].Description := FList[I].Description;
! FList[I-1].ChkTextKind := FList[I].ChkTextKind;
! FList[I-1].Storage := FList[I].Storage;
end;
SetLength(FList, High(FList));
--- 812,820 ----
for I := Index + 1 to High(FList) do
begin
! FList[I - 1].ID := FList[I].ID;
! FList[I - 1].Name := FList[I].Name;
! FList[I - 1].Description := FList[I].Description;
! FList[I - 1].ChkTextKind := FList[I].ChkTextKind;
! FList[I - 1].Storage := FList[I].Storage;
end;
SetLength(FList, High(FList));
***************
*** 865,869 ****
function TDSARegister.Add(const ID: Integer; const Name, Description: string;
! const Storage: TDSAStorage; const CheckTextKind: TDSACheckTextKind): TAddResult;
var
TmpItem: TDSARegItem;
--- 891,895 ----
function TDSARegister.Add(const ID: Integer; const Name, Description: string;
! const Storage: TDSAStorage; const CheckTextKind: TDSACheckTextKind = ctkShow): TAddResult;
var
TmpItem: TDSARegItem;
***************
*** 1037,1041 ****
function TDSAStorage.GetState(const DSAInfo: TDSARegItem; out LastResult: Integer;
! const OnCustomData: TDSACustomData): Boolean;
begin
BeginRead(DSAInfo);
--- 1063,1067 ----
function TDSAStorage.GetState(const DSAInfo: TDSARegItem; out LastResult: Integer;
! const OnCustomData: TDSACustomData = nil): Boolean;
begin
BeginRead(DSAInfo);
***************
*** 1255,1259 ****
DSAString = 5;
! DSAKindTexts: array [DSABool .. DSAString] of string = (
sDSAAccessBool, sDSAAccessFloat, sDSAAccessInt64, sDSAAccessInt, sDSAAccessString);
--- 1281,1285 ----
DSAString = 5;
! DSAKindTexts: array [DSABool..DSAString] of string = (
sDSAAccessBool, sDSAAccessFloat, sDSAAccessInt64, sDSAAccessInt, sDSAAccessString);
***************
*** 1626,1630 ****
//--------------------------------------------------------------------------------------------------
! procedure ShowMessage(const Msg: string; const Center: TDlgCenterKind);
begin
MessageDlg(Msg, mtCustom, [mbOk], 0, Center);
--- 1652,1656 ----
//--------------------------------------------------------------------------------------------------
! procedure ShowMessage(const Msg: string; const Center: TDlgCenterKind = dckScreen);
begin
MessageDlg(Msg, mtCustom, [mbOk], 0, Center);
***************
*** 1642,1648 ****
function MessageDlg(const Msg: string; const DlgType: TMsgDlgType; const Buttons: TMsgDlgButtons;
! const HelpCtx: Longint; const Center: TDlgCenterKind;
! const DefaultButton: TMsgDlgBtn; const CancelButton: TMsgDlgBtn;
! const HelpButton: TMsgDlgBtn): TModalResult;
var
TmpPic: TGraphic;
--- 1668,1674 ----
function MessageDlg(const Msg: string; const DlgType: TMsgDlgType; const Buttons: TMsgDlgButtons;
! const HelpCtx: Longint; const Center: TDlgCenterKind = dckScreen;
! const DefaultButton: TMsgDlgBtn = mbDefault; const CancelButton: TMsgDlgBtn = mbDefault;
! const HelpButton: TMsgDlgBtn = mbHelp): TModalResult;
var
TmpPic: TGraphic;
***************
*** 1660,1666 ****
function MessageDlg(const Caption, Msg: string; const DlgType: TMsgDlgType;
! const Buttons: TMsgDlgButtons; const HelpCtx: Longint; const Center: TDlgCenterKind;
! const DefaultButton: TMsgDlgBtn;
! const CancelButton: TMsgDlgBtn; const HelpButton: TMsgDlgBtn): TModalResult;
var
TmpPic: TGraphic;
--- 1686,1692 ----
function MessageDlg(const Caption, Msg: string; const DlgType: TMsgDlgType;
! const Buttons: TMsgDlgButtons; const HelpCtx: Longint; const Center: TDlgCenterKind = dckScreen;
! const DefaultButton: TMsgDlgBtn = mbDefault;
! const CancelButton: TMsgDlgBtn = mbDefault; const HelpButton: TMsgDlgBtn = mbHelp): TModalResult;
var
TmpPic: TGraphic;
***************
*** 1678,1684 ****
function MessageDlg(const Caption, Msg: string; const Picture: TGraphic;
! const Buttons: TMsgDlgButtons; const HelpCtx: Longint; const Center: TDlgCenterKind;
! const DefaultButton: TMsgDlgBtn; const CancelButton: TMsgDlgBtn;
! const HelpButton: TMsgDlgBtn): TModalResult;
var
DefBtn: TMsgDlgBtn;
--- 1704,1710 ----
function MessageDlg(const Caption, Msg: string; const Picture: TGraphic;
! const Buttons: TMsgDlgButtons; const HelpCtx: Longint; const Center: TDlgCenterKind = dckScreen;
! const DefaultButton: TMsgDlgBtn = mbDefault; const CancelButton: TMsgDlgBtn = mbDefault;
! const HelpButton: TMsgDlgBtn = mbHelp): TModalResult;
var
DefBtn: TMsgDlgBtn;
***************
*** 1720,1725 ****
function MessageDlgEx(const Msg: string; const DlgType: TMsgDlgType;
const Buttons: array of string; const Results: array of Integer; const HelpCtx: Longint;
! const Center: TDlgCenterKind; const DefaultButton: Integer;
! const CancelButton: Integer; const HelpButton: Integer): TModalResult;
var
TmpPic: TGraphic;
--- 1746,1751 ----
function MessageDlgEx(const Msg: string; const DlgType: TMsgDlgType;
const Buttons: array of string; const Results: array of Integer; const HelpCtx: Longint;
! const Center: TDlgCenterKind = dckScreen; const DefaultButton: Integer = 0;
! const CancelButton: Integer = 1; const HelpButton: Integer = -1): TModalResult;
var
TmpPic: TGraphic;
***************
*** 1738,1743 ****
function MessageDlgEx(const Caption, Msg: string; const DlgType: TMsgDlgType;
const Buttons: array of string; const Results: array of Integer; const HelpCtx: Longint;
! const Center: TDlgCenterKind; const DefaultButton: Integer;
! const CancelButton: Integer; const HelpButton: Integer): TModalResult;
var
TmpPic: TGraphic;
--- 1764,1769 ----
function MessageDlgEx(const Caption, Msg: string; const DlgType: TMsgDlgType;
const Buttons: array of string; const Results: array of Integer; const HelpCtx: Longint;
! const Center: TDlgCenterKind = dckScreen; const DefaultButton: Integer = 0;
! const CancelButton: Integer = 1; const HelpButton: Integer = -1): TModalResult;
var
TmpPic: TGraphic;
***************
*** 1756,1761 ****
function MessageDlgEx(const Caption, Msg: string; const Picture: TGraphic;
const Buttons: array of string; const Results: array of Integer; const HelpCtx: Longint;
! const Center: TDlgCenterKind; const DefaultButton: Integer;
! const CancelButton: Integer; const HelpButton: Integer): TModalResult;
begin
with CreateDSAMessageForm(Caption, Msg, Picture, Buttons, Results, HelpCtx, '', Center,
--- 1782,1787 ----
function MessageDlgEx(const Caption, Msg: string; const Picture: TGraphic;
const Buttons: array of string; const Results: array of Integer; const HelpCtx: Longint;
! const Center: TDlgCenterKind = dckScreen; const DefaultButton: Integer = 0;
! const CancelButton: Integer = 1; const HelpButton: Integer = -1): TModalResult;
begin
with CreateDSAMessageForm(Caption, Msg, Picture, Buttons, Results, HelpCtx, '', Center,
***************
*** 1773,1777 ****
procedure DSAShowMessage(const DlgID: Integer; const Msg: string;
! const Center: TDlgCenterKind);
begin
DSAMessageDlg(DlgID, Msg, mtCustom, [mbOk], 0, Center);
--- 1799,1803 ----
procedure DSAShowMessage(const DlgID: Integer; const Msg: string;
! const Center: TDlgCenterKind = dckScreen);
begin
DSAMessageDlg(DlgID, Msg, mtCustom, [mbOk], 0, Center);
***************
*** 1781,1785 ****
procedure DSAShowMessageFmt(const DlgID: Integer; const Msg: string; const Params: array of const;
! const Center: TDlgCenterKind);
begin
DSAMessageDlg(DlgID, Format(Msg, Params), mtCustom, [mbOk], 0, Center);
--- 1807,1811 ----
procedure DSAShowMessageFmt(const DlgID: Integer; const Msg: string; const Params: array of const;
! const Center: TDlgCenterKind = dckScreen);
begin
DSAMessageDlg(DlgID, Format(Msg, Params), mtCustom, [mbOk], 0, Center);
***************
*** 1789,1795 ****
function DSAMessageDlg(const DlgID: Integer; const Msg: string; const DlgType: TMsgDlgType;
! const Buttons: TMsgDlgButtons; const HelpCtx: Longint; const Center: TDlgCenterKind;
! const DefaultButton: TMsgDlgBtn; const CancelButton: TMsgDlgBtn;
! const HelpButton: TMsgDlgBtn): TModalResult;
var
TmpPic: TGraphic;
--- 1815,1821 ----
function DSAMessageDlg(const DlgID: Integer; const Msg: string; const DlgType: TMsgDlgType;
! const Buttons: TMsgDlgButtons; const HelpCtx: Longint; const Center: TDlgCenterKind = dckScreen;
! const DefaultButton: TMsgDlgBtn = mbDefault; const CancelButton: TMsgDlgBtn = mbDefault;
! const HelpButton: TMsgDlgBtn = mbHelp): TModalResult;
var
TmpPic: TGraphic;
***************
*** 1807,1813 ****
function DSAMessageDlg(const DlgID: Integer; const Caption, Msg: string; const DlgType: TMsgDlgType;
! const Buttons: TMsgDlgButtons; const HelpCtx: Longint; const Center: TDlgCenterKind;
! const DefaultButton: TMsgDlgBtn; const CancelButton: TMsgDlgBtn;
! const HelpButton: TMsgDlgBtn): TModalResult;
var
TmpPic: TGraphic;
--- 1833,1839 ----
function DSAMessageDlg(const DlgID: Integer; const Caption, Msg: string; const DlgType: TMsgDlgType;
! const Buttons: TMsgDlgButtons; const HelpCtx: Longint; const Center: TDlgCenterKind = dckScreen;
! const DefaultButton: TMsgDlgBtn = mbDefault; const CancelButton: TMsgDlgBtn = mbDefault;
! const HelpButton: TMsgDlgBtn = mbHelp): TModalResult;
var
TmpPic: TGraphic;
***************
*** 1825,1831 ****
function DSAMessageDlg(const DlgID: Integer; const Caption, Msg: string; const Picture: TGraphic;
! const Buttons: TMsgDlgButtons; const HelpCtx: Longint; const Center: TDlgCenterKind;
! const DefaultButton: TMsgDlgBtn; const CancelButton: TMsgDlgBtn;
! const HelpButton: TMsgDlgBtn): TModalResult;
var
DefBtn: TMsgDlgBtn;
--- 1851,1857 ----
function DSAMessageDlg(const DlgID: Integer; const Caption, Msg: string; const Picture: TGraphic;
! const Buttons: TMsgDlgButtons; const HelpCtx: Longint; const Center: TDlgCenterKind = dckScreen;
! const DefaultButton: TMsgDlgBtn = mbDefault; const CancelButton: TMsgDlgBtn = mbDefault;
! const HelpButton: TMsgDlgBtn = mbHelp): TModalResult;
var
DefBtn: TMsgDlgBtn;
***************
*** 1867,1872 ****
function DSAMessageDlgEx(const DlgID: Integer; const Msg: string; const DlgType: TMsgDlgType;
const Buttons: array of string; const Results: array of Integer; const HelpCtx: Longint;
! const Center: TDlgCenterKind; const DefaultButton: Integer;
! const CancelButton: Integer; const HelpButton: Integer): Integer;
var
TmpPic: TGraphic;
--- 1893,1898 ----
function DSAMessageDlgEx(const DlgID: Integer; const Msg: string; const DlgType: TMsgDlgType;
const Buttons: array of string; const Results: array of Integer; const HelpCtx: Longint;
! const Center: TDlgCenterKind = dckScreen; const DefaultButton: Integer = 0;
! const CancelButton: Integer = 1; const HelpButton: Integer = -1): Integer;
var
TmpPic: TGraphic;
***************
*** 1885,1891 ****
function DSAMessageDlgEx(const DlgID: Integer; const Caption, Msg: string;
const DlgType: TMsgDlgType; const Buttons: array of string; const Results: array of Integer;
! const HelpCtx: Longint; const Center: TDlgCenterKind;
! const DefaultButton: Integer; const CancelButton: Integer;
! const HelpButton: Integer): TModalResult;
var
TmpPic: TGraphic;
--- 1911,1917 ----
function DSAMessageDlgEx(const DlgID: Integer; const Caption, Msg: string;
const DlgType: TMsgDlgType; const Buttons: array of string; const Results: array of Integer;
! const HelpCtx: Longint; const Center: TDlgCenterKind = dckScreen;
! const DefaultButton: Integer = 0; const CancelButton: Integer = 1;
! const HelpButton: Integer = -1): TModalResult;
var
TmpPic: TGraphic;
***************
*** 1904,1909 ****
function DSAMessageDlgEx(const DlgID: Integer; const Caption, Msg: string; const Picture: TGraphic;
const Buttons: array of string; const Results: array of Integer; const HelpCtx: Longint;
! const Center: TDlgCenterKind; const DefaultButton: Integer;
! const CancelButton: Integer; const HelpButton: Integer): Integer;
var
DSAItem: TDSARegItem;
--- 1930,1935 ----
function DSAMessageDlgEx(const DlgID: Integer; const Caption, Msg: string; const Picture: TGraphic;
const Buttons: array of string; const Results: array of Integer; const HelpCtx: Longint;
! const Center: TDlgCenterKind = dckScreen; const DefaultButton: Integer = 0;
! const CancelButton: Integer = 1; const HelpButton: Integer = -1): Integer;
var
DSAItem: TDSARegItem;
***************
*** 1941,1945 ****
procedure RegisterDSA(const DlgID: Integer; const Name, Description: string;
! const Storage: TDSAStorage; const CheckTextKind: TDSACheckTextKind);
begin
case DSARegister.Add(DlgID, Name, Description, Storage, CheckTextKind) of
--- 1967,1971 ----
procedure RegisterDSA(const DlgID: Integer; const Name, Description: string;
! const Storage: TDSAStorage; const CheckTextKind: TDSACheckTextKind = ctkShow);
begin
case DSARegister.Add(DlgID, Name, Description, Storage, CheckTextKind) of
***************
*** 1979,1983 ****
function GetDSAState(const DlgID: Integer; out ResCode: Integer;
! const OnCustomData: TDSACustomData): Boolean;
var
RegItem: TDSARegItem;
--- 2005,2009 ----
function GetDSAState(const DlgID: Integer; out ResCode: Integer;
! const OnCustomData: TDSACustomData = nil): Boolean;
var
RegItem: TDSARegItem;
***************
*** 1993,1997 ****
procedure SetDSAState(const DlgID: Integer; const DontShowAgain: Boolean;
! const LastResult: Integer; const OnCustomData: TDSACustomData);
var
RegItem: TDSARegItem;
--- 2019,2023 ----
procedure SetDSAState(const DlgID: Integer; const DontShowAgain: Boolean;
! const LastResult: Integer = mrNone; const OnCustomData: TDSACustomData = nil);
var
RegItem: TDSARegItem;
Index: JvOLBEditor.dfm
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvOLBEditor.dfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvOLBEditor.dfm 9 Jan 2003 13:36:08 -0000 1.1
--- JvOLBEditor.dfm 9 Feb 2003 12:24:52 -0000 1.2
***************
*** 1,3 ****
! object frmOLBEditor: TfrmOLBEditor
Left = 193
Top = 134
--- 1,3 ----
! object FrmOLBEditor: TFrmOLBEditor
Left = 193
Top = 134
***************
*** 14,17 ****
--- 14,28 ----
Font.Name = 'MS Shell Dlg 2'
Font.Style = []
+ Icon.Data = {
+ 0000010001001010100001001000280100001600000028000000100000002000
+ 00000100040000000000C0000000000000000000000000000000000000000000
+ 0000000080000080000000808000800000008000800080800000C0C0C0008080
+ 80000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF000000
+ 00000000000000000BBBB0000000000BB000BB000000000BB0000B000000000B
+ BB000BB00000000BBB000BB00000000000000BB00000000000000BB000000000
+ 00000BB00000000000000BB00000000000000BB00000000000000BB000000000
+ 00000BB0000000000000BBBB00000000000BBBBBB0000000000000000000FFFF
+ 0000F87F0000E73F0000E7BF0000E39F0000E39F0000FF9F0000FF9F0000FF9F
+ 0000FF9F0000FF9F0000FF9F0000FF9F0000FF0F0000FE070000FFFF0000}
OldCreateOrder = False
PopupMenu = popForm
***************
*** 43,52 ****
end
object btnDel: TToolButton
! Left = 36
Top = 0
Action = acDelete
end
object ToolButton3: TToolButton
! Left = 59
Top = 0
Width = 8
--- 54,63 ----
end
object btnDel: TToolButton
! Left = 38
Top = 0
Action = acDelete
end
object ToolButton3: TToolButton
! Left = 61
Top = 0
Width = 8
***************
*** 56,65 ****
end
object btnUp: TToolButton
! Left = 67
Top = 0
Action = acUp
end
object btnDown: TToolButton
! Left = 90
Top = 0
Action = acDown
--- 67,76 ----
end
object btnUp: TToolButton
! Left = 69
Top = 0
Action = acUp
end
object btnDown: TToolButton
! Left = 92
Top = 0
Action = acDown
***************
*** 70,74 ****
Top = 26
Width = 186
! Height = 183
Align = alClient
Indent = 19
--- 81,85 ----
Top = 26
Width = 186
! Height = 180
Align = alClient
Indent = 19
***************
*** 83,87 ****
object StatusBar1: TStatusBar
Left = 0
! Top = 209
Width = 186
Height = 19
--- 94,98 ----
object StatusBar1: TStatusBar
Left = 0
! Top = 206
Width = 186
Height = 19
***************
*** 98,102 ****
Bitmap = {
494C010104000900040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
! 0000000000003600000028000000400000003000000001001000000000000018
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 109,113 ----
Bitmap = {
494C010104000900040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
! 0000000000003600000028000000400000003000000001002000000000000030
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
***************
*** 231,291 ****
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000010421042104210421042
- 1042104210421042104210421042104210420000000010421042104210421042
- 1042104210421042104210421042104210420000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000010420000000000000000000000000000
- 0000000000000000000000000000000010420000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 00000000000000000000000000000000000000000000FF7FE07FFF7FE07FFF7F
- E07FFF7FE07F00000000FF7FE07F0000104200000000FF7FE07FFF7FE07FFF7F
- E07FFF7FE07F00000000FF7FE07F000010420000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 00000000000000000000000000000000000000000000E07FFF7FE07FFF7FE07F
- FF7FE07FFF7F000018630000FF7F0000104210420000E07FFF7FE07FFF7FE07F
- FF7FE07FFF7F000018630000FF7F000010420000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 00000000000000000000000000000000000000000000FF7FE07FFF7FE07FFF7F
- E07FFF7FE07F0000E07F186300000000104200400000FF7FE07FFF7FE07FFF7F
- E07FFF7FE07F0000E07F18630000000010420000000000000000000000001002
- 1002100200000000000000000000000000000000000000000000000000000000
- 10020000000000000000000000000000000000000000E07FFF7FE07FFF7FE07F
- FF7FE07FFF7F00000000000000000000104200400040E07FFF7FE07FFF7F1042
- 0040E07FFF7F0000000000000000000010420000000000000000000000001002
- 1002100200000000000000000000000000000000000000000000000000001002
- 100210020000000000000000000000000000FF7F0000FF7F1042E07FFF7FE07F
- FF7FE07FE07FFF7FE07FFF7FE07F00001042104200401042E07FFF7F10420040
- 1042FF7FE07FFF7FE07FFF7FE07F000010420000000000000000000000001002
- 1002100200000000000000000000000000000000000000000000000010021002
- 1002100210020000000000000000000000001042E07FE07F1042FF7FE07F1042
- E07FFF7FFF7FE07FFF7FE07FFF7F000010420000004000401042E07F00400040
- FF7FE07FFF7FE07FFF7FE07FFF7F000010420000000000000000000000001002
- 1002100200000000000000000000000000000000000000000000100210021002
- 10021002100210020000000000000000000000001042FF7F1042E07F1042E07F
- FF7FE07FE07FFF7FE07FFF7FE07F00001042000010420040004000400040FF7F
- E07FFF7FE07FFF7FE07FFF7FE07F000010420000000000000000100210021002
- 1002100210021002000000000000000000000000000000000000000000001002
- 100210020000000000000000000000000000104210421042FF7F1042FF7FE07F
- FF7FE07FFF7FE07FFF7FE07FFF7F0000104200001042004000400040FF7FE07F
- FF7FE07FFF7FE07FFF7FE07FFF7F000010420000000000000000000010021002
- 1002100210020000000000000000000000000000000000000000000000001002
- 100210020000000000000000000000000000FF7FE07F1042E07FFF7F10421042
- 1042104200000000000000000000000000001042004000400040004010420000
- 0000000000000000000000000000000000000000000000000000000000001002
- 1002100200000000000000000000000000000000000000000000000000001002
- 10021002000000000000000000000000000000001042E07F1042E07F1042E07F
- 0000000000000000000000000000000000000040004010420000004000401042
0000000000000000000000000000000000000000000000000000000000000000
- 1002000000000000000000000000000000000000000000000000000000001002
- 1002100200000000000000000000000000001042E07F00001042FF7F00001042
- E07F000000000000000000000000000000000000000000000000000000400040
- 1042000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 000000000000000000000000000000000000E07F000000001042E07F00000000
- 1042000000000000000000000000000000000000000000000000000000000040
- 0040104200000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000001042FF7F00000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
--- 242,494 ----
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000848484008484
! 8400848484008484840084848400848484008484840084848400848484008484
! 8400848484008484840084848400848484000000000000000000848484008484
! 8400848484008484840084848400848484008484840084848400848484008484
! 8400848484008484840084848400848484000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000848484000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000848484000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000FFFFFF0000FF
! FF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00000000000000
! 0000FFFFFF0000FFFF0000000000848484000000000000000000FFFFFF0000FF
! FF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00000000000000
! 0000FFFFFF0000FFFF0000000000848484000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 000000000000000000000000000000000000000000000000000000FFFF00FFFF
! FF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000000000C6C6
! C60000000000FFFFFF000000000084848400848484000000000000FFFF00FFFF
! FF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000000000C6C6
! C60000000000FFFFFF0000000000848484000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000FFFFFF0000FF
! FF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF000000000000FF
! FF00C6C6C6000000000000000000848484000000840000000000FFFFFF0000FF
! FF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF000000000000FF
! FF00C6C6C6000000000000000000848484000000000000000000000000000000
! 0000000000000000000084840000848400008484000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000848400000000000000000000000000000000
! 000000000000000000000000000000000000000000000000000000FFFF00FFFF
! FF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF00000000000000
! 000000000000000000000000000084848400000084000000840000FFFF00FFFF
! FF0000FFFF00FFFFFF00848484000000840000FFFF00FFFFFF00000000000000
! 0000000000000000000000000000848484000000000000000000000000000000
! 0000000000000000000084840000848400008484000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000084840000848400008484000000000000000000000000
! 000000000000000000000000000000000000FFFFFF0000000000FFFFFF008484
! 840000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF0000FFFF00FFFFFF0000FF
! FF00FFFFFF0000FFFF00000000008484840084848400000084008484840000FF
! FF00FFFFFF00848484000000840084848400FFFFFF0000FFFF00FFFFFF0000FF
! FF00FFFFFF0000FFFF0000000000848484000000000000000000000000000000
! 0000000000000000000084840000848400008484000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000008484000084840000848400008484000084840000000000000000
! 0000000000000000000000000000000000008484840000FFFF0000FFFF008484
! 8400FFFFFF0000FFFF008484840000FFFF00FFFFFF00FFFFFF0000FFFF00FFFF
! FF0000FFFF00FFFFFF0000000000848484000000000000008400000084008484
! 840000FFFF000000840000008400FFFFFF0000FFFF00FFFFFF0000FFFF00FFFF
! FF0000FFFF00FFFFFF0000000000848484000000000000000000000000000000
! 0000000000000000000084840000848400008484000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000848400008484000084840000848400008484000084840000848400000000
! 0000000000000000000000000000000000000000000084848400FFFFFF008484
! 840000FFFF008484840000FFFF00FFFFFF0000FFFF0000FFFF00FFFFFF0000FF
! FF00FFFFFF0000FFFF0000000000848484000000000084848400000084000000
! 84000000840000008400FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FF
! FF00FFFFFF0000FFFF0000000000848484000000000000000000000000000000
! 0000848400008484000084840000848400008484000084840000848400000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000084840000848400008484000000000000000000000000
! 000000000000000000000000000000000000848484008484840084848400FFFF
! FF0084848400FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFF
! FF0000FFFF00FFFFFF0000000000848484000000000084848400000084000000
! 840000008400FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFF
! FF0000FFFF00FFFFFF0000000000848484000000000000000000000000000000
! 0000000000008484000084840000848400008484000084840000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000084840000848400008484000000000000000000000000
! 000000000000000000000000000000000000FFFFFF0000FFFF008484840000FF
! FF00FFFFFF008484840084848400848484008484840000000000000000000000
! 0000000000000000000000000000000000008484840000008400000084000000
! 8400000084008484840000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000084840000848400008484000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000084840000848400008484000000000000000000000000
! 000000000000000000000000000000000000000000008484840000FFFF008484
! 840000FFFF008484840000FFFF00000000000000000000000000000000000000
! 0000000000000000000000000000000000000000840000008400848484000000
! 0000000084000000840084848400000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000848400000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000084840000848400008484000000000000000000000000
! 0000000000000000000000000000000000008484840000FFFF00000000008484
! 8400FFFFFF00000000008484840000FFFF000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000840000008400848484000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 00000000000000000000000000000000000000FFFF0000000000000000008484
! 840000FFFF000000000000000000848484000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000008400000084008484840000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000008484
! 8400FFFFFF000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
! 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
Index: JvOLBEditor.pas
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvOLBEditor.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvOLBEditor.pas 9 Jan 2003 13:36:08 -0000 1.1
--- JvOLBEditor.pas 9 Feb 2003 12:24:52 -0000 1.2
***************
*** 24,28 ****
--- 24,30 ----
Known Issues:
-----------------------------------------------------------------------------}
+
{$I JVCL.INC}
+
unit JvOLBEditor;
***************
*** 31,44 ****
[...1184 lines suppressed...]
! procedure TfrmOLBEditor.FormShow(Sender: TObject);
begin
LoadSettings;
end;
! procedure TfrmOLBEditor.acToolBarExecute(Sender: TObject);
begin
acToolBar.Checked := not acToolBar.Checked;
--- 860,869 ----
end;
! procedure TFrmOLBEditor.FormShow(Sender: TObject);
begin
LoadSettings;
end;
! procedure TFrmOLBEditor.acToolBarExecute(Sender: TObject);
begin
acToolBar.Checked := not acToolBar.Checked;
Index: JvOLBar.pas
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvOLBar.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvOLBar.pas 9 Jan 2003 13:36:08 -0000 1.1
--- JvOLBar.pas 9 Feb 2003 12:24:52 -0000 1.2
***************
*** 15,19 ****
All Rights Reserved.
! Contributor(s):
Last Modified: 2002-05-26
--- 15,19 ----
All Rights Reserved.
! Contributor(s):
[...2919 lines suppressed...]
SetCapture(Handle);
***************
*** 1700,1704 ****
end;
! procedure TJvOutlookBarEdit.WMNCPaint(var Message: TMessage);
//var
// DC: HDC;
--- 1749,1753 ----
end;
! procedure TJvOutlookBarEdit.WMNCPaint(var Msg: TMessage);
//var
// DC: HDC;
***************
*** 1739,1740 ****
--- 1788,1790 ----
end.
+
Index: JvOLE2Auto.pas
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvOLE2Auto.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvOLE2Auto.pas 9 Jan 2003 13:36:08 -0000 1.1
--- JvOLE2Auto.pas 9 Feb 2003 12:24:52 -0000 1.2
***************
*** 13,17 ****
The Initial Developers of the Original Code are: Fedor Koshevnikov, Igor Pavluk and Serge Korolev
Copyright (c) 1997, 1998 Fedor Koshevnikov, Igor Pavluk and Serge Korolev
! Copyright (c) 2001,2002 SGB Software
All Rights Reserved.
--- 13,17 ----
The Initial Developers of the Original Code are: Fedor Koshevnikov, Igor Pavluk and Serge Korolev
Copyright (c) 1997, 1998 Fedor Koshevnikov, Igor Pavluk and Serge Korolev
! Copyright (c) 2001,2002 SGB Software
All Rights Reserved.
[...1405 lines suppressed...]
*** 1052,1056 ****
const Params: array of const; const ParamNames: array of string): PVariant;
var
! DispIDs: array[0..MaxDispArgs] of TDispID;
begin
Result := CallFunctionByIDsNamedParams(NameToDispIDs(AName, ParamNames,
--- 1104,1108 ----
const Params: array of const; const ParamNames: array of string): PVariant;
var
! DispIDs: array [0..MaxDispArgs] of TDispID;
begin
Result := CallFunctionByIDsNamedParams(NameToDispIDs(AName, ParamNames,
***************
*** 1108,1110 ****
--- 1160,1164 ----
AddExitProc(DoneOLE);
{$ENDIF}
+
end.
+
Index: JvObjPickerComp.pas
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvObjPickerComp.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvObjPickerComp.pas 9 Jan 2003 13:36:08 -0000 1.1
--- JvObjPickerComp.pas 9 Feb 2003 12:24:52 -0000 1.2
***************
*** 21,36 ****
Known Issues:
-----------------------------------------------------------------------------}
{$I JVCL.INC}
unit JvObjPickerComp;
- // TODO OWNER
-
interface
uses
! Windows, ActiveX, Classes, ComObj, JvObjSel, SysUtils, JvBaseDlg, JvTypes;
type
// indicates the type of scope
--- 21,39 ----
Known Issues:
+ TODO OWNER
-----------------------------------------------------------------------------}
{$I JVCL.INC}
+ {$I WINDOWSONLY.INC}
unit JvObjPickerComp;
interface
+
uses
! Windows, ActiveX, Classes, ComObj, SysUtils,
! JvObjSel, JvBaseDlg, JvTypes;
+ // (rom) Jv the type names?
type
// indicates the type of scope
***************
*** 40,54 ****
stDownLevelJoinedDomain, // a downlevel domain joined by the target computer
stEnterpriseDomain, // all Windows 2000 domains of which the target computer is a member
! stGlobalCatalog, // all domains in the enterprise
stExternalUpLevelDomain, // all trusted, uplevel domains external to the enterprise
stExternalDownLevelDomain, // all trusted, downlevel domains external to the enterprise
stWorkGroup, // a workgroup joined by the target computer
stUserEnteredUpLevelScope, // enables the user to enter an up level scope
! stUserEnteredDownLevelScope // enables the user to enter a down level scope
! );
TScopeTypes = set of TScopeType;
- // scope flags
-
TScopeFlag = (
sfStartingScope, // scope should be initially selected (only one scope can have this flag set)
--- 43,54 ----
stDownLevelJoinedDomain, // a downlevel domain joined by the target computer
stEnterpriseDomain, // all Windows 2000 domains of which the target computer is a member
! stGlobalCatalog, // all domains in the enterprise
stExternalUpLevelDomain, // all trusted, uplevel domains external to the enterprise
stExternalDownLevelDomain, // all trusted, downlevel domains external to the enterprise
stWorkGroup, // a workgroup joined by the target computer
stUserEnteredUpLevelScope, // enables the user to enter an up level scope
! stUserEnteredDownLevelScope); // enables the user to enter a down level scope
TScopeTypes = set of TScopeType;
TScopeFlag = (
sfStartingScope, // scope should be initially selected (only one scope can have this flag set)
***************
*** 57,62 ****
sfProviderGC, // ADSPath is converted to use the GC provider
sfSidPath, // ADSPath with an objectSID attribute are converted to the form LDAP://<SID=x>
! sfDownLevelBuiltInPath // If not specified, ADSPath for downlevel, well-known objects are empty
! );
TScopeFlags = set of TScopeFlag;
--- 57,61 ----
sfProviderGC, // ADSPath is converted to use the GC provider
sfSidPath, // ADSPath with an objectSID attribute are converted to the form LDAP://<SID=x>
! sfDownLevelBuiltInPath); // If not specified, ADSPath for downlevel, well-known objects are empty
TScopeFlags = set of TScopeFlag;
***************
*** 76,81 ****
ulDomainLocalSecurityGroups,
ulContacts,
! ulComputers
! );
TUpLevelFilters = set of TUpLevelFilter;
--- 75,79 ----
ulDomainLocalSecurityGroups,
ulContacts,
! ulComputers);
TUpLevelFilters = set of TUpLevelFilter;
***************
*** 104,109 ****
dlLocalService,
dlNetworkService,
! dlRemoteLogon
! );
TDownLevelFilters = set of TDownLevelFilter;
--- 102,106 ----
dlLocalService,
dlNetworkService,
! dlRemoteLogon);
TDownLevelFilters = set of TDownLevelFilter;
***************
*** 131,139 ****
property Result: HRESULT read FResult default S_OK;
// the type of scope (e.g. enterprise domain, global catalog or computer)
! property ScopeTypes: TScopeTypes read FScopeTypes write FScopeTypes default
! [];
// flags that indicate the format of the returned ADSPath and whether this scope should be initially selected
! property ScopeFlags: TScopeFlags read FScopeFlags write FScopeFlags default
! [];
// filter flags for up level scope in either mode (native or mixed)
property UpLevelFilterBoth: TUpLevelFilters read FUpLevelFilterBoth write
--- 128,134 ----
property Result: HRESULT read FResult default S_OK;
// the type of scope (e.g. enterprise domain, global catalog or computer)
! property ScopeTypes: TScopeTypes read FScopeTypes write FScopeTypes default [];
// flags that indicate the format of the returned ADSPath and whether this scope should be initially selected
! property ScopeFlags: TScopeFlags read FScopeFlags write FScopeFlags default [];
// filter flags for up level scope in either mode (native or mixed)
property UpLevelFilterBoth: TUpLevelFilters read FUpLevelFilterBoth write
***************
*** 165,170 ****
//OWNER function Owner: TComponent;
// list of scopes
! property Items[Index: Integer]: TObjectPickerScope read GetItem write
! SetItem; default;
end;
--- 160,164 ----
//OWNER function Owner: TComponent;
// list of scopes
! property Items[Index: Integer]: TObjectPickerScope read GetItem write SetItem; default;
end;
***************
*** 180,185 ****
function GetUPN: string;
public
! constructor Create(const Selection: PDsSelection; const AttributeCount:
! Integer);
// the Relative Distinquishged Name (RDN) of the object
property Name: string read GetName;
--- 174,178 ----
function GetUPN: string;
public
! constructor Create(const Selection: PDsSelection; const AttributeCount: Integer);
// the Relative Distinquishged Name (RDN) of the object
property Name: string read GetName;
***************
*** 220,224 ****
// list of objects, each represents a single selected object
property Items[Index: Integer]: TObjectPickerSelection read GetItem;
! default;
end;
--- 213,217 ----
// list of objects, each represents a single selected object
property Items[Index: Integer]: TObjectPickerSelection read GetItem;
! default;
end;
***************
*** 226,232 ****
TObjectPickerOption = (
! opAllowMultiSelect, // allow selection of multiple objects
! opSkipTargetComputerDCCheck // skip DC check if target computer is a domain controller
! );
TObjectPickerOptions = set of TObjectPickerOption;
--- 219,224 ----
TObjectPickerOption = (
! opAllowMultiSelect, // allow selection of multiple objects
! opSkipTargetComputerDCCheck); // skip DC check if target computer is a domain controller
TObjectPickerOptions = set of TObjectPickerOption;
***************
*** 256,261 ****
property Attributes: TStrings read FAttributes write SetAttributes;
// global options, see TObjectPickerOptions
! property Options: TObjectPickerOptions read FOptions write FOptions default
! [];
// the available scopes and their filters
property Scopes: TObjectPickerScopes read FScopes write SetScopes;
--- 248,252 ----
property Attributes: TStrings read FAttributes write SetAttributes;
// global options, see TObjectPickerOptions
! property Options: TObjectPickerOptions read FOptions write FOptions default [];
// the available scopes and their filters
property Scopes: TObjectPickerScopes read FScopes write SetScopes;
***************
*** 266,273 ****
// object picker exception class
!
! EObjectPickerError = class(EJVCLException)
! // just to be able to distinquish between exceptions raised by the Object Picker specifically and all others
! end;
resourcestring
--- 257,262 ----
// object picker exception class
! // just to be able to distinquish between exceptions raised by the Object Picker specifically and all others
! EObjectPickerError = class(EJVCLException);
resourcestring
***************
*** 284,289 ****
end;
- { Utility functions }
-
function ScopeTypesToOrdinal(const ScopeTypes: TScopeTypes): Cardinal;
begin
--- 273,276 ----
***************
*** 442,447 ****
end;
- { TObjectPickerScope }
-
procedure TObjectPickerScope.Assign(Source: TPersistent);
begin
--- 429,432 ----
***************
*** 461,466 ****
end;
- { TObjectPickerScopes }
-
function TObjectPickerScopes.Add: TObjectPickerScope;
begin
--- 446,449 ----
***************
*** 492,497 ****
end;
! procedure TObjectPickerScopes.Initialize(var ScopesInitInfo: array of
! TDsOpScopeInitInfo);
var
I: Integer;
--- 475,479 ----
end;
! procedure TObjectPickerScopes.Initialize(var ScopesInitInfo: array of TDsOpScopeInitInfo);
var
I: Integer;
***************
*** 528,535 ****
end;
! { TObjectPickerSelection }
!
! constructor TObjectPickerSelection.Create(const Selection: PDsSelection; const
! AttributeCount: Integer);
begin
inherited Create;
--- 510,515 ----
end;
! constructor TObjectPickerSelection.Create(const Selection: PDsSelection;
! const AttributeCount: Integer);
begin
inherited Create;
***************
*** 545,555 ****
function TObjectPickerSelection.GetAttribute(Index: Integer): OleVariant;
type
! TOleVariantArray = array[0..(MaxInt div SizeOf(OleVariant)) - 1] of
! OleVariant;
POleVariantArray = ^TOleVariantArray;
begin
if (Index < 0) or (Index >= AttributeCount) then
! raise EObjectPickerError.CreateResFmt(@RsAttributeIndexOutOfBounds,
! [Index]);
Result := POleVariantArray(FSelection^.pvarFetchedAttributes)^[Index];
end;
--- 525,533 ----
function TObjectPickerSelection.GetAttribute(Index: Integer): OleVariant;
type
! TOleVariantArray = array [0..(MaxInt div SizeOf(OleVariant)) - 1] of OleVariant;
POleVariantArray = ^TOleVariantArray;
begin
if (Index < 0) or (Index >= AttributeCount) then
! raise EObjectPickerError.CreateResFmt(@RsAttributeIndexOutOfBounds, [Index]);
Result := POleVariantArray(FSelection^.pvarFetchedAttributes)^[Index];
end;
***************
*** 575,584 ****
end;
- { TObjectPickerSelections }
-
destructor TObjectPickerSelections.Destroy;
begin
FreeSelection;
! inherited;
end;
--- 553,560 ----
end;
destructor TObjectPickerSelections.Destroy;
begin
FreeSelection;
! inherited Destroy;
...
[truncated message content] |