ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/public/ibx/branches/journaling/design/IBDBReg.pas

Comparing ibx/trunk/design/IBDBReg.pas (file contents):
Revision 15 by tony, Thu Feb 28 16:56:14 2013 UTC vs.
Revision 315 by tony, Thu Feb 25 11:56:36 2021 UTC

#	Line 27 | Line 27
27		{    IBX For Lazarus (Firebird Express)                                  }
28		{    Contributor: Tony Whyman, MWA Software http://www.mwasoftware.co.uk }
29		{    Portions created by MWA Software are copyright McCallum Whyman      }
30	<	{    Associates Ltd 2011                                                 }
30	>	{    Associates Ltd 2011 - 2018                                               }
31		{************************************************************************}
32
33		unit IBDBReg;
#	Line 39 | Line 39 | unit IBDBReg;
39		*)
40		{$A+}                           (* Aligned records: On *)
41		{$B-}                           (* Short circuit boolean expressions: Off *)
42	–	{$G+}                           (* Imported data: On *)
42		{$H+}                           (* Huge Strings: On *)
43		{$J-}                           (* Modification of Typed Constants: Off *)
44		{$M+}                           (* Generate run-time type information: On *)
#	Line 47 | Line 46 | unit IBDBReg;
46		{$Q-}                           (* Overflow checks: Off *)
47		{$R-}                           (* Range checks: Off *)
48		{$T+}                           (* Typed address: On *)
50	–	{$U+}                           (* Pentim-safe FDIVs: On *)
49		{$W-}                           (* Always generate stack frames: Off *)
50		{$X+}                           (* Extended syntax: On *)
51		{$Z1}                           (* Minimum Enumeration Size: 1 Byte *)
52
53		interface
54
55	<	uses {Windows,} SysUtils, Classes, Graphics, Dialogs, Controls, Forms, TypInfo,
55	>	uses SysUtils, Classes, Graphics, Dialogs, Controls, Forms, TypInfo,
56		DB, IBTable, IBDatabase,  IBEventsEditor,  LazarusPackageIntf,
57	<	IBUpdateSQL, IBXConst, ComponentEditors, PropEdits, DBPropEdits, FieldsEditor;
57	>	IBUpdateSQL, IBUpdate, ComponentEditors, PropEdits, DBPropEdits, FieldsEditor,
58	>	dbFieldLinkPropEditor, dbFieldListPropEditor, IBDialogs;
59
60		type
61
#	Line 64 | Line 63 | type
63		Property editor the DataBase Name property.  Brings up the Open dialog }
64
65		TIBFileNameProperty = class(TStringProperty)
66	+	protected
67	+	function GetFilter: string; virtual;
68		public
69		procedure Edit; override;
70		function GetAttributes: TPropertyAttributes; override;
71		end;
72
73	+	{ TIBLibraryNameProperty }
74	+
75	+	TIBLibraryNameProperty = class(TIBFileNameProperty)
76	+	protected
77	+	function GetFilter: string; override;
78	+	end;
79	+
80		{ TIBNameProperty
81		}
82		TIBNameProperty = class(TStringProperty)
#	Line 84 | Line 92 | type
92		procedure GetValues(Proc: TGetStrProc); override;
93		end;
94
95	+	{ TIBPackageNameProperty
96	+	Editor for the TIBStoredProc.PackageName property.  Displays a drop-down list of all
97	+	the StoredProcedures in the Database.}
98	+	TIBPackageNameProperty = class(TIBNameProperty)
99	+	public
100	+	procedure GetValues(Proc: TGetStrProc); override;
101	+	end;
102	+
103		{ TIBTableNameProperty
104		Editor for the TIBTable.TableName property.  Displays a drop-down list of all
105		the Tables in the Database.}
#	Line 92 | Line 108 | type
108		procedure GetValues(Proc: TGetStrProc); override;
109		end;
110
111	+	{ TDBStringProperty }
112	+
113		TDBStringProperty = class(TStringProperty)
114	+	private
115	+	function ConnecttoDB: boolean;
116		public
117		function GetAttributes: TPropertyAttributes; override;
118		procedure GetValueList(List: TStrings); virtual;
119		procedure GetValues(Proc: TGetStrProc); override;
120	+	procedure Edit; override;
121		end;
122
123	+	{ TIBIndexFieldNamesProperty }
124	+
125		TIBIndexFieldNamesProperty = class(TDBStringProperty)
126		public
127		procedure GetValueList(List: TStrings); override;
#	Line 126 | Line 149 | type
149		function GetVerbCount: Integer; override;
150		end;
151
152	+	{ TIBArrayGridEditor }
153	+
154	+	TIBArrayGridEditor = class(TComponentEditor)
155	+	public
156	+	procedure ExecuteVerb(Index: Integer); override;
157	+	function GetVerb(Index: Integer): string; override;
158	+	function GetVerbCount: Integer; override;
159	+	end;
160	+
161		{ TIBQueryEditor }
162
163		TIBQueryEditor = class(TFieldsComponentEditor)
#	Line 180 | Line 212 | type
212		function GetVerbCount: Integer; override;
213		end;
214
215	<	TIBStoredProcParamsProperty = class(TCollectionPropertyEditor)
215	>	{ TIBXServiceEditor }
216	>
217	>	TIBXServiceEditor = class(TComponentEditor)
218		public
219	<	procedure Edit; override;
219	>	procedure ExecuteVerb(Index: Integer); override;
220	>	function GetVerb(Index: Integer): string; override;
221	>	function GetVerbCount: Integer; override;
222	>	end;
223	>
224	>	TIBStoredProcParamsProperty = class(TCollectionPropertyEditor)
225		end;
226	<	(*
226	>
227	>	{ TIBTableFieldLinkProperty }
228	>
229		TIBTableFieldLinkProperty = class(TFieldLinkProperty)
230		private
231		FTable: TIBTable;
232		protected
233	+	function GetIndexDefs: TIndexDefs; override;
234		function GetIndexFieldNames: string; override;
235		function GetMasterFields: string; override;
236		procedure SetIndexFieldNames(const Value: string); override;
#	Line 196 | Line 238 | type
238		public
239		procedure Edit; override;
240		end;
241	<	*)
241	>
242		{ TSQLPropertyEditor }
243
244		TSQLPropertyEditor = class(TStringsPropertyEditor)
#	Line 298 | Line 340 | type
340		procedure Edit; override;
341		end;
342
343	+	{ TIBUpdateRefreshSQLProperty }
344	+
345	+	TIBUpdateRefreshSQLProperty = class(TSQLPropertyEditor)
346	+	protected
347	+	FIBUpdate: TIBUpdate;
348	+	FDatabase: TIBDatabase;
349	+	function GetObjects: boolean;
350	+	public
351	+	procedure Edit; override;
352	+	end;
353	+
354	+
355		{ TIBEventListProperty }
356
357		TIBEventListProperty = class(TClassProperty)
#	Line 314 | Line 368 | type
368		procedure Edit; override;
369		end;
370
371	+	{ TDBDynamicGridFieldProperty }
372	+
373	+	TDBDynamicGridFieldProperty = class(TFieldProperty)
374	+	public
375	+	procedure FillValues(const Values: TStringList); override;
376	+	end;
377	+
378	+	{ TDBLookupPropertiesGridFieldProperty }
379	+
380	+	TDBLookupPropertiesGridFieldProperty = class(TFieldProperty)
381	+	public
382	+	procedure FillValues(const Values: TStringList); override;
383	+	end;
384	+
385	+	{ TIBTreeViewFieldProperty }
386	+
387	+	TIBTreeViewFieldProperty = class(TFieldProperty)
388	+	public
389	+	procedure FillValues(const Values: TStringList); override;
390	+	end;
391	+
392	+	{ TIBDynamicGridIndexNamesProperty }
393	+
394	+	TIBDynamicGridIndexNamesProperty = class(TIndexFieldNamesProperty)
395	+	protected
396	+	function GetFieldDefs: TFieldDefs; override;
397	+	function GetIndexFieldNames: string; override;
398	+	procedure SetIndexFieldNames(const Value: string); override;
399	+	end;
400	+
401	+	{ TIBFieldDefsProperty }
402	+
403	+	TIBFieldDefsProperty = class(TCollectionPropertyEditor)
404	+	public
405	+	procedure Edit; override;
406	+	end;
407	+
408	+	{ TIBIndexDefsProperty }
409	+
410	+	TIBIndexDefsProperty = class(TCollectionPropertyEditor)
411	+	public
412	+	procedure Edit; override;
413	+	end;
414	+
415	+
416		procedure Register;
417
418		implementation
419
420	<	uses IB, IBQuery, IBStoredProc, IBCustomDataSet,
421	<	IBIntf, IBSQL, IBSQLMonitor, IBDatabaseInfo, IBEvents,
422	<	IBServices, IBDatabaseEdit, IBTransactionEdit,
423	<	IBBatchMove, DBLoginDlg, IBExtract,LResources, IBSelectSQLEditor,
420	>	uses IB, IBQuery, IBStoredProc, IBCustomDataSet, IBMessages,
421	>	IBSQL, IBSQLMonitor, IBDatabaseInfo, IBEvents, IBInternals,
422	>	IBServices, IBXServices, IBDatabaseEdit, IBTransactionEdit,
423	>	IBBatchMove, IBExtract,LResources, IBSelectSQLEditor,
424		IBModifySQLEditor,IBDeleteSQLEditor,IBRefreshSQLEditor,
425		IBInsertSQLEditor, IBGeneratorEditor, IBUpdateSQLEditor, IBDataSetEditor,
426	<	IBSQLEditor, ibserviceeditor, LCLVersion;
427	<
428	<
426	>	IBSQLEditor, ibserviceeditor, LCLVersion, IBDynamicGrid, IBLookupComboEditBox,
427	>	IBTreeView, DBControlGrid, ibxscript, IBLocalDBSupport, IBDSDialogs,
428	>	IBArrayGrid, IBVersion, IBDataOutput, IBXServiceEditor;
429	>
430	>	const
431	>	IBPalette1 = 'Firebird'; {do not localize}
432	>	IBPalette2 = 'Firebird Legacy Admin'; {do not localize}
433	>	IBPalette3 = 'Firebird Data Controls';   {do not localize}
434	>	IBPalette4 = 'Firebird Admin'; {do not localize}
435	>
436	>	resourcestring
437	>	SInterbaseExpressVersion = 'Firebird Express for Lazarus ' + IBX_VERSION;
438	>	SEditSQL = 'Edit SQL';
439	>	SIBSQLEditor = 'IBSQL Editor';
440	>	SIBServiceEditor = 'Edit IB Service';
441	>	SIBUpdateSQLEditor = '&UpdateSQL Editor...';
442	>	SIBDataSetEditor = '&Dataset Editor...';
443	>	SExecute = 'E&xecute';
444	>	SIBDatabaseEditor = 'Da&tabase Editor...';
445	>	SIBTransactionEditor = '&Transaction Editor...';
446	>	SIBUpdateLayout = 'Update Layout';
447
448		procedure Register;
449		begin
450	+	AllowUseOfFBLIB := true;
451		if not TryIBLoad then
452		begin
453		MessageDlg('IBX is unable to locate the Firebird Library - have you remembered to install it?',mtError,[mbOK],0);
454		Exit;
455		end;
456
457	<	RegisterNoIcon([TIBStringField, TIBBCDField]);
457	>	RegisterNoIcon([TIBStringField, TIBBCDField, TIBMemoField, TIBArrayField,
458	>	TIBSmallintField, TIBIntegerField, TIBLargeIntField, TIBDateTimeField,
459	>	TIBTimeField]);
460		{$if lcl_fullversion < 01010000}
461		{see http://bugs.freepascal.org/view.php?id=19035 }
462		RegisterNoIcon([TIntegerField]);
463		{$endif}
464		RegisterComponents(IBPalette1, [ TIBQuery, TIBDataSet,
465	<	TIBDatabase, TIBTransaction, TIBUpdateSQL, TIBEvents,
465	>	TIBDatabase, TIBTransaction, TIBUpdateSQL, TIBUpdate, TIBEvents,
466		TIBSQL, TIBDatabaseInfo, TIBSQLMonitor,
467	<	TIBStoredProc,TIBBatchMove,  TIBTable,TIBExtract]);
468	<	if IBServiceAPIPresent  then
467	>	TIBStoredProc,TIBBatchMove,  TIBTable,TIBExtract, TIBXScript, TIBLocalDBSupport,
468	>	TIBBlockFormatOut,TIBCSVDataOut,TIBInsertStmtsOut]);
469	>	if FirebirdAPI.HasServiceAPI  then
470	>	begin
471	>	RegisterComponents(IBPalette4, [TIBXServicesConnection, TIBXConfigService,
472	>	TIBXClientSideBackupService, TIBXServerSideBackupService,
473	>	TIBXClientSideRestoreService, TIBXServerSideRestoreService,
474	>	TIBXValidationService, TIBXOnlineValidationService, TIBXStatisticalService,
475	>	TIBXLogService, TIBXSecurityService, TIBXServerProperties,
476	>	TIBXLimboTransactionResolutionService,TIBXServicesUserList, TIBXServicesLimboTransactionsList]);
477		RegisterComponents(IBPalette2, [TIBConfigService, TIBBackupService,
478	<	TIBRestoreService, TIBValidationService, TIBStatisticalService,
478	>	TIBRestoreService, TIBValidationService,
479	>	TIBOnlineValidationService, TIBStatisticalService,
480		TIBLogService, TIBSecurityService, TIBServerProperties]);
481	+	end;
482	+
483	+	RegisterComponents(IBPalette3,[TIBLookupComboEditBox,TIBDynamicGrid,TIBTreeView,TDBControlGrid, TIBArrayGrid]);
484	+
485		RegisterPropertyEditor(TypeInfo(TIBFileName), TIBDatabase, 'DatabaseName', TIBFileNameProperty); {do not localize}
486	+	RegisterPropertyEditor(TypeInfo(TIBFileName), TIBDatabase, 'FirebirdLibraryPathName', TIBLibraryNameProperty); {do not localize}
487	+	RegisterPropertyEditor(TypeInfo(TIBFileName), TIBXServicesConnection, 'FirebirdLibraryPathName', TIBLibraryNameProperty); {do not localize}
488		RegisterPropertyEditor(TypeInfo(string), TIBStoredProc, 'StoredProcName', TIBStoredProcNameProperty); {do not localize}
489	+	RegisterPropertyEditor(TypeInfo(string), TIBStoredProc, 'PackageName', TIBPackageNameProperty); {do not localize}
490		RegisterPropertyEditor(TypeInfo(TParams), TIBStoredProc, 'Params', TIBStoredProcParamsProperty);
491		RegisterPropertyEditor(TypeInfo(string), TIBTable, 'TableName', TIBTableNameProperty); {do not localize}
492		RegisterPropertyEditor(TypeInfo(string), TIBTable, 'IndexName', TIBIndexNameProperty); {do not localize}
493		RegisterPropertyEditor(TypeInfo(string), TIBTable, 'IndexFieldNames', TIBIndexFieldNamesProperty); {do not localize}
494	<	//  RegisterPropertyEditor(TypeInfo(string), TIBTable, 'MasterFields', TIBTableFieldLinkProperty); {do not localize}
494	>	RegisterPropertyEditor(TypeInfo(string), TIBTable, 'MasterFields', TIBTableFieldLinkProperty); {do not localize}
495	>	RegisterPropertyEditor(TypeInfo(TFieldDefs), TIBTable, 'FieldDefs', TIBFieldDefsProperty); {do not localize}
496	>	RegisterPropertyEditor(TypeInfo(TIndexDefs), TIBTable, 'IndexDefs', TIBIndexDefsProperty); {do not localize}
497		RegisterPropertyEditor(TypeInfo(TStrings), TIBQuery, 'SQL', TIBQuerySQLProperty); {do not localize}
498		RegisterPropertyEditor(TypeInfo(TStrings), TIBDataSet, 'SelectSQL', TIBDatasetSQLProperty); {do not localize}
499		RegisterPropertyEditor(TypeInfo(TStrings), TIBDataSet, 'ModifySQL', TIBUpdateSQLProperty); {do not localize}
#	Line 367 | Line 505 | begin
505		RegisterPropertyEditor(TypeInfo(TStrings), TIBUpdateSQL, 'ModifySQL', TIBUpdateSQLUpdateProperty); {do not localize}
506		RegisterPropertyEditor(TypeInfo(TStrings), TIBUpdateSQL, 'InsertSQL', TIBUpdateSQLInsertSQLProperty); {do not localize}
507		RegisterPropertyEditor(TypeInfo(TStrings), TIBUpdateSQL, 'DeleteSQL', TIBUpdateSQLDeleteProperty); {do not localize}
508	+	RegisterPropertyEditor(TypeInfo(TStrings), TIBUpdate, 'RefreshSQL', TIBUpdateRefreshSQLProperty); {do not localize}
509		RegisterPropertyEditor(TypeInfo(TStrings), TIBEvents, 'Events', TIBEventListProperty); {do not localize}
510		RegisterPropertyEditor(TypeInfo(TPersistent), TIBDataSet, 'GeneratorField', TIBGeneratorProperty);  {do not localize}
511		RegisterPropertyEditor(TypeInfo(TPersistent), TIBQuery, 'GeneratorField', TIBGeneratorProperty);  {do not localize}
512	+	RegisterPropertyEditor(TypeInfo(TPersistent), TIBTable, 'GeneratorField', TIBGeneratorProperty);  {do not localize}
513
514		RegisterComponentEditor(TIBDatabase, TIBDatabaseEditor);
515		RegisterComponentEditor(TIBTransaction, TIBTransactionEditor);
#	Line 379 | Line 519 | begin
519		RegisterComponentEditor(TIBStoredProc, TIBStoredProcEditor);
520		RegisterComponentEditor(TIBSQL, TIBSQLEditor);
521		RegisterComponentEditor(TIBCustomService, TIBServiceEditor);
522	+	RegisterComponentEditor(TIBArrayGrid, TIBArrayGridEditor);
523	+	RegisterComponentEditor(TIBXServicesConnection, TIBXServiceEditor);
524	+
525	+
526	+	{Firebird Data Access Controls}
527	+	RegisterPropertyEditor(TypeInfo(string), TDBLookupProperties, 'KeyField', TDBDynamicGridFieldProperty);
528	+	RegisterPropertyEditor(TypeInfo(string), TDBLookupProperties, 'ListField', TDBDynamicGridFieldProperty);
529	+	RegisterPropertyEditor(TypeInfo(string), TIBDynamicGrid, 'IndexFieldNames', TIBDynamicGridIndexNamesProperty);
530	+	RegisterPropertyEditor(TypeInfo(string), TDBLookupProperties, 'DataFieldName', TDBLookupPropertiesGridFieldProperty);
531	+	RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'KeyField', TIBTreeViewFieldProperty);
532	+	RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'TextField', TIBTreeViewFieldProperty);
533	+	RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'ParentField', TIBTreeViewFieldProperty);
534	+	RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'HasChildField', TIBTreeViewFieldProperty);
535	+	RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'ImageIndexField', TIBTreeViewFieldProperty);
536	+	RegisterPropertyEditor(TypeInfo(string), TIBTreeView, 'SelectedIndexField', TIBTreeViewFieldProperty);
537	+
538	+	IBGUIInterface :=  TIBDSLCLInterface.Create;
539	+	end;
540	+
541	+	procedure LoadDataSourceFields(DataSource: TDataSource; List: TStrings);
542	+	var
543	+	DataSet: TDataSet;
544	+	i: Integer;
545	+	begin
546	+	if Assigned(DataSource) then
547	+	begin
548	+	DataSet := DataSource.DataSet;
549	+	if Assigned(DataSet) then
550	+	begin
551	+	if DataSet.Fields.Count > 0 then
552	+	DataSet.GetFieldNames(List)
553	+	else
554	+	begin
555	+	DataSet.FieldDefs.Update;
556	+	for i := 0 to DataSet.FieldDefs.Count - 1 do
557	+	List.Add(DataSet.FieldDefs[i].Name);
558	+	end;
559	+	end;
560	+	end;
561	+	end;
562	+
563	+	{ TIBLibraryNameProperty }
564	+
565	+	function TIBLibraryNameProperty.GetFilter: string;
566	+	begin
567	+	Result := SLibraryNameFilter; {do not localise}
568	+	end;
569	+
570	+	{ TIBXServiceEditor }
571	+
572	+	procedure TIBXServiceEditor.ExecuteVerb(Index: Integer);
573	+	begin
574	+	if Index < inherited GetVerbCount then
575	+	inherited ExecuteVerb(Index) else
576	+	begin
577	+	Dec(Index, inherited GetVerbCount);
578	+	case Index of
579	+	0 : if IBXServiceEditor.EditIBXService(TIBXServicesConnection(Component)) then Designer.Modified;
580	+	end;
581	+	end;
582	+	end;
583	+
584	+	function TIBXServiceEditor.GetVerb(Index: Integer): string;
585	+	begin
586	+	if Index < inherited GetVerbCount then
587	+	Result := inherited GetVerb(Index) else
588	+	begin
589	+	Dec(Index, inherited GetVerbCount);
590	+	case Index of
591	+	0: Result := SIBServiceEditor;
592	+	1 : Result := SInterbaseExpressVersion;
593	+	end;
594	+	end;
595	+	end;
596	+
597	+	function TIBXServiceEditor.GetVerbCount: Integer;
598	+	begin
599	+	Result := inherited GetVerbCount + 2;
600	+	end;
601	+
602	+	{ TIBUpdateRefreshSQLProperty }
603	+
604	+	function TIBUpdateRefreshSQLProperty.GetObjects: boolean;
605	+	begin
606	+	Result := false;
607	+	FIBUpdate := GetComponent(0) as TIBUpdate;
608	+	if not assigned(FIBUpdate) or not assigned(FIBUpdate.DataSet) then
609	+	Exit;
610	+	FDatabase := nil;
611	+	if FIBUpdate.DataSet is TIBQuery then
612	+	begin
613	+	FDatabase := (FIBUpdate.DataSet as TIBQuery).Database;
614	+	Result := true
615	+	end;
616	+	end;
617	+
618	+	procedure TIBUpdateRefreshSQLProperty.Edit;
619	+	begin
620	+	GetObjects;
621	+	if IBRefreshSQLEditor.EditSQL(FIBUpdate.DataSet,FIBUpdate.RefreshSQL) then Modified;
622	+	end;
623	+
624	+	{ TIBPackageNameProperty }
625	+
626	+	procedure TIBPackageNameProperty.GetValues(Proc: TGetStrProc);
627	+	var
628	+	StoredProc : TIBStoredProc;
629	+	i : integer;
630	+	begin
631	+	StoredProc := GetComponent(0) as TIBStoredProc;
632	+	if StoredProc.Database = nil then
633	+	Exit;
634	+
635	+	with StoredProc do
636	+	try
637	+	for I := 0 to PackageNames.Count - 1 do
638	+	Proc (PackageNames[i]);
639	+	except on E: Exception do
640	+	MessageDlg(E.Message,mtError,[mbOK],0)
641	+	end;
642	+	end;
643	+
644	+	{ TIBIndexDefsProperty }
645	+
646	+	procedure TIBIndexDefsProperty.Edit;
647	+	var IndexDefs: TIndexDefs;
648	+	begin
649	+	IndexDefs := TIndexDefs(GetObjectValue);
650	+	if IndexDefs <> nil then
651	+	IndexDefs.Update;
652	+	inherited Edit;
653	+	end;
654	+
655	+	{ TIBFieldDefsProperty }
656	+
657	+	procedure TIBFieldDefsProperty.Edit;
658	+	var FieldDefs: TFieldDefs;
659	+	begin
660	+	FieldDefs := TFieldDefs(GetObjectValue);
661	+	if FieldDefs <> nil then
662	+	FieldDefs.Update;
663	+	inherited Edit;
664	+	end;
665	+
666	+	{ TIBArrayGridEditor }
667	+
668	+	procedure TIBArrayGridEditor.ExecuteVerb(Index: Integer);
669	+	begin
670	+	if Index < inherited GetVerbCount then
671	+	inherited ExecuteVerb(Index)
672	+	else
673	+	case Index of
674	+	0: TIBArrayGrid(Component).UpdateLayout;
675	+	end;
676	+	end;
677	+
678	+	function TIBArrayGridEditor.GetVerb(Index: Integer): string;
679	+	begin
680	+	if Index < inherited GetVerbCount then
681	+	Result := inherited GetVerb(Index) else
682	+	begin
683	+	Dec(Index, inherited GetVerbCount);
684	+	case Index of
685	+	0: Result := SIBUpdateLayout;
686	+	1 : Result := SInterbaseExpressVersion ;
687	+	end;
688	+	end;
689	+	end;
690	+
691	+	function TIBArrayGridEditor.GetVerbCount: Integer;
692	+	begin
693	+	Result := 2;
694	+	end;
695	+
696	+	{ TDBLookupPropertiesGridFieldProperty }
697	+
698	+	procedure TDBLookupPropertiesGridFieldProperty.FillValues(
699	+	const Values: TStringList);
700	+	var
701	+	P: TDBLookupProperties;
702	+	begin
703	+	P :=TDBLookupProperties(GetComponent(0));
704	+	if not (P is TDBLookupProperties) then exit;
705	+	LoadDataSourceFields(TIBDynamicGrid(P.Owner.Grid).DataSource, Values);
706	+	end;
707	+
708	+	{ TIBTreeViewFieldProperty }
709	+
710	+	procedure TIBTreeViewFieldProperty.FillValues(const Values: TStringList);
711	+	var ListSource: TDataSource;
712	+	begin
713	+	ListSource :=  TIBTreeView(GetComponent(0)).DataSource;
714	+	LoadDataSourceFields(ListSource, Values);
715	+	end;
716	+
717	+	{ TIBDynamicGridIndexNamesProperty }
718	+
719	+	function TIBDynamicGridIndexNamesProperty.GetFieldDefs: TFieldDefs;
720	+	var Grid: TIBDynamicGrid;
721	+	begin
722	+	Result := nil;
723	+	Grid := TIBDynamicGrid(GetComponent(0));
724	+	if assigned(Grid.DataSource) and assigned(Grid.DataSource.DataSet) then
725	+	Result := Grid.DataSource.DataSet.FieldDefs
726	+	end;
727	+
728	+	function TIBDynamicGridIndexNamesProperty.GetIndexFieldNames: string;
729	+	var Grid: TIBDynamicGrid;
730	+	begin
731	+	Grid := TIBDynamicGrid(GetComponent(0));
732	+	Result := Grid.IndexFieldNames
733	+	end;
734	+
735	+	procedure TIBDynamicGridIndexNamesProperty.SetIndexFieldNames(
736	+	const Value: string);
737	+	var Grid: TIBDynamicGrid;
738	+	begin
739	+	Grid := TIBDynamicGrid(GetComponent(0));
740	+	Grid.IndexFieldNames := Value
741	+	end;
742	+
743	+	{ TDBDynamicGridFieldProperty }
744	+
745	+	procedure TDBDynamicGridFieldProperty.FillValues(const Values: TStringList);
746	+	var
747	+	P: TDBLookupProperties;
748	+	begin
749	+	P :=TDBLookupProperties(GetComponent(0));
750	+	if not (P is TDBLookupProperties) then exit;
751	+	LoadDataSourceFields(P.ListSource, Values);
752		end;
753
754		{ TIBServiceEditor }
#	Line 413 | Line 783 | begin
783		Result := inherited GetVerbCount + 2;
784		end;
785
786	+	function TIBFileNameProperty.GetFilter: string;
787	+	begin
788	+	Result := SDatabaseFilter; {do not localize}
789	+	end;
790	+
791		{ TIBFileNameProperty }
792		procedure TIBFileNameProperty.Edit;
793		begin
794		with TOpenDialog.Create(Application) do
795		try
796		InitialDir := ExtractFilePath(GetStrValue);
797	<	Filter := SDatabaseFilter; {do not localize}
797	>	Filter := GetFilter;
798		if Execute then
799		SetStrValue(FileName);
800		finally
#	Line 463 | Line 838 | end;
838
839		procedure TIBTableNameProperty.GetValues(Proc: TGetStrProc);
840		var
841	<	TableName : TIBTable;
841	>	Table : TIBTable;
842		i : integer;
843		begin
844	<	TableName := GetComponent(0) as TIBTable;
845	<	with TableName do
844	>	Table := GetComponent(0) as TIBTable;
845	>	if Table.Database = nil then
846	>	Exit;
847	>	with Table do
848		for I := 0 to TableNames.Count - 1 do
849		Proc (TableNames[i]);
850		end;
851
852		{ TDBStringProperty }
853
854	+	function TDBStringProperty.ConnecttoDB: boolean;
855	+	var DataSet: TIBCustomDataSet;
856	+	begin
857	+	Result := false;
858	+	DataSet := (GetComponent(0) as TIBCustomDataSet);
859	+	if assigned(Dataset.Database) then
860	+	begin
861	+	try
862	+	DataSet.Database.Connected := true;
863	+	except on E: Exception do
864	+	ShowMessage(E.Message)
865	+	end;
866	+	Result := DataSet.Database.Connected
867	+	end;
868	+	end;
869	+
870		function TDBStringProperty.GetAttributes: TPropertyAttributes;
871		begin
872		Result := [paValueList, paSortList, paMultiSelect];
#	Line 488 | Line 881 | var
881		I: Integer;
882		Values: TStringList;
883		begin
884	+	if not ConnecttoDB then Exit;
885		Values := TStringList.Create;
886		try
887		GetValueList(Values);
#	Line 497 | Line 891 | begin
891		end;
892		end;
893
894	+	procedure TDBStringProperty.Edit;
895	+	begin
896	+	if ConnecttoDB then
897	+	inherited Edit;
898	+	end;
899	+
900		{ Utility Functions }
901
902		function GetPropertyValue(Instance: TPersistent; const PropName: string): TPersistent;
#	Line 558 | Line 958 | var
958		Query: TIBQuery;
959		begin
960		Query := GetComponent(0) as TIBQuery;
961	<	if IBSelectSQLEditor.EditSQL(Query.Database,Query.SQL) then Modified;
961	>	if IBSelectSQLEditor.EditSQL(Query,Query.SQL) then Modified;
962		end;
963
964		{ TIBDatasetSQLProperty }
#	Line 568 | Line 968 | var
968		IBDataset: TIBDataset;
969		begin
970		IBDataset := GetComponent(0) as TIBDataset;
971	<	if IBSelectSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.SelectSQL) then Modified;
971	>	if IBSelectSQLEditor.EditSQL(IBDataSet,IBDataSet.SelectSQL) then Modified;
972		end;
973
974		{ TIBSQLProperty }
#	Line 578 | Line 978 | var
978		IBSQL: TIBSQL;
979		begin
980		IBSQL := GetComponent(0) as TIBSQL;
981	<	if IBSelectSQLEditor.EditSQL(IBSQL.Database,IBSQL.SQL) then Modified;
981	>	if IBSQLEditor.EditSQL(IBSQL) then Modified;
982		end;
983
984		{ TIBUpdateSQLEditor }
#	Line 592 | Line 992 | function TIBUpdateSQLEditor.GetVerb(Inde
992		begin
993		case Index of
994		0 : Result := SIBUpdateSQLEditor;
995	<	1: Result := SInterbaseExpressVersion;
995	>	1: Result := SInterbaseExpressVersion ;
996		end;
997		end;
998
#	Line 604 | Line 1004 | end;
1004		{ TIBDataSetEditor }
1005
1006		procedure TIBDataSetEditor.ExecuteVerb(Index: Integer);
607	–	var
608	–	IBDataset: TIBDataset;
1007		begin
1008		if Index < inherited GetVerbCount then
1009		inherited ExecuteVerb(Index) else
#	Line 629 | Line 1027 | begin
1027		case Index of
1028		0: Result := SIBDataSetEditor;
1029		1: Result := SExecute;
1030	<	2: Result := SInterbaseExpressVersion;
1030	>	2: Result := SInterbaseExpressVersion ;
1031		end;
1032		end;
1033		end;
#	Line 686 | Line 1084 | begin
1084		Dec(Index, inherited GetVerbCount);
1085		case Index of
1086		0: Result := SIBDatabaseEditor;
1087	<	1 : Result := SInterbaseExpressVersion;
1087	>	1 : Result := SInterbaseExpressVersion ;
1088		end;
1089		end;
1090		end;
#	Line 709 | Line 1107 | function TIBTransactionEditor.GetVerb(In
1107		begin
1108		case Index of
1109		0: Result := SIBTransactionEditor;
1110	<	1: Result := SInterbaseExpressVersion;
1110	>	1: Result := SInterbaseExpressVersion ;
1111		end;
1112		end;
1113
#	Line 731 | Line 1129 | begin
1129		Dec(Index, inherited GetVerbCount);
1130		case Index of
1131		0: Query.ExecSQL;
1132	<	1: if ibselectsqleditor.EditSQL(Query.Database,Query.SQL) then Designer.Modified;
1132	>	1: if ibselectsqleditor.EditSQL(Query,Query.SQL) then Designer.Modified;
1133		end;
1134		end;
1135		end;
#	Line 745 | Line 1143 | begin
1143		case Index of
1144		0: Result := SExecute;
1145		1: Result := SEditSQL;
1146	<	2: Result := SInterbaseExpressVersion;
1146	>	2: Result := SInterbaseExpressVersion ;
1147		end;
1148		end;
1149		end;
#	Line 775 | Line 1173 | begin
1173		Dec(Index, inherited GetVerbCount);
1174		case Index of
1175		0: Result := SExecute;
1176	<	1: Result := SInterbaseExpressVersion;
1176	>	1: Result := SInterbaseExpressVersion ;
1177		end;
1178		end;
1179		end;
#	Line 785 | Line 1183 | begin
1183		Result := inherited GetVerbCount + 2;
1184		end;
1185
788	–	{ TIBStoredProcParamsProperty }
789	–
790	–	procedure TIBStoredProcParamsProperty.Edit;
791	–	var
792	–	StoredProc: TIBStoredProc;
793	–	Params: TParams;
794	–	begin
795	–	StoredProc := (GetComponent(0) as TIBStoredProc);
796	–	Params := TParams.Create(nil);
797	–	try
798	–	StoredProc.CopyParams(Params);
799	–	finally
800	–	Params.Free;
801	–	end;
802	–	inherited Edit;
803	–	end;
804	–	(*
1186		{ TIBTableFieldLinkProperty }
1187
1188		procedure TIBTableFieldLinkProperty.Edit;
1189		begin
1190		FTable := DataSet as TIBTable;
1191	+	if assigned(FTable.Database) then
1192	+	FTable.Database.Connected := true;
1193		inherited Edit;
1194		end;
1195
1196	+	function TIBTableFieldLinkProperty.GetIndexDefs: TIndexDefs;
1197	+	begin
1198	+	Result :=  FTable.IndexDefs
1199	+	end;
1200	+
1201		function TIBTableFieldLinkProperty.GetIndexFieldNames: string;
1202		begin
1203		Result := FTable.IndexFieldNames;
#	Line 828 | Line 1216 | end;
1216		procedure TIBTableFieldLinkProperty.SetMasterFields(const Value: string);
1217		begin
1218		FTable.MasterFields := Value;
1219	<	end;*)
1219	>	end;
1220
1221		{ TIBUpdateSQLProperty }
1222
#	Line 837 | Line 1225 | var
1225		IBDataset: TIBDataset;
1226		begin
1227		IBDataset := GetComponent(0) as TIBDataset;
1228	<	if IBModifySQLEditor.EditSQL(IBDataSet.Database,IBDataSet.ModifySQL) then Modified;
1228	>	if IBModifySQLEditor.EditSQL(IBDataSet,IBDataSet.ModifySQL) then Modified;
1229		end;
1230
1231		{ TIBUpdateSQLUpdateProperty }
#	Line 845 | Line 1233 | end;
1233		procedure TIBUpdateSQLUpdateProperty.Edit;
1234		begin
1235		GetObjects;
1236	<	if IBModifySQLEditor.EditSQL(FDatabase,FIBUpdateSQL.ModifySQL) then Modified;
1236	>	if IBModifySQLEditor.EditSQL(FIBUpdateSQL.DataSet,FIBUpdateSQL.ModifySQL) then Modified;
1237		end;
1238
1239		{ TIBRefreshSQLProperty }
#	Line 853 | Line 1241 | end;
1241		procedure TIBRefreshSQLProperty.Edit;
1242		var
1243		IBDataset: TIBDataset;
856	–	aDatabase: TIBDatabase;
1244		begin
1245		IBDataset := GetComponent(0) as TIBDataset;
1246	<	if IBRefreshSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.RefreshSQL) then Modified;
1246	>	if IBRefreshSQLEditor.EditSQL(IBDataSet,IBDataSet.RefreshSQL) then Modified;
1247		end;
1248
1249		{ TIBUpdateSQLRefreshSQLProperty }
#	Line 864 | Line 1251 | end;
1251		procedure TIBUpdateSQLRefreshSQLProperty.Edit;
1252		begin
1253		GetObjects;
1254	<	if IBRefreshSQLEditor.EditSQL(FDatabase,FIBUpdateSQL.RefreshSQL) then Modified;
1254	>	if IBRefreshSQLEditor.EditSQL(FIBUpdateSQL.DataSet,FIBUpdateSQL.RefreshSQL) then Modified;
1255		end;
1256
1257		{ TIBDeleteSQLProperty }
1258
1259		procedure TIBDeleteSQLProperty.Edit;
1260		var
1261	<	IBDataset: TIBDataset;
1261	>	IBDataset: TIBDataSet;
1262		begin
1263	<	IBDataset := GetComponent(0) as TIBDataset;
1264	<	if IBDeleteSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.DeleteSQL) then Modified;
1263	>	IBDataset := GetComponent(0) as TIBDataSet;
1264	>	if IBDeleteSQLEditor.EditSQL(IBDataSet,IBDataSet.DeleteSQL) then Modified;
1265		end;
1266
1267		{ TIBUpdateSQLDeleteProperty }
#	Line 887 | Line 1274 | end;
1274		procedure TIBUpdateSQLDeleteProperty.Edit;
1275		begin
1276		GetObjects;
1277	<	if IBDeleteSQLEditor.EditSQL(FDatabase,FIBUpdateSQL.DeleteSQL) then Modified;
1277	>	if IBDeleteSQLEditor.EditSQL(FIBUpdateSQL.DataSet,FIBUpdateSQL.DeleteSQL) then Modified;
1278		end;
1279
1280		{ TUpdateSQLPropertyEditor }
#	Line 910 | Line 1297 | end;
1297
1298		procedure TIBInsertSQLProperty.Edit;
1299		var
1300	<	IBDataset: TIBDataset;
1300	>	IBDataset: TIBDataSet;
1301		begin
1302	<	IBDataset := GetComponent(0) as TIBDataset;
1303	<	if IBInsertSQLEditor.EditSQL(IBDataSet.Database,IBDataSet.InsertSQL) then Modified;
1302	>	IBDataset := GetComponent(0) as TIBDataSet;
1303	>	if IBInsertSQLEditor.EditSQL(IBDataSet,IBDataSet.InsertSQL) then Modified;
1304		end;
1305
1306		{ TIBUpdateSQLInsertSQLProperty }
#	Line 921 | Line 1308 | end;
1308		procedure TIBUpdateSQLInsertSQLProperty.Edit;
1309		begin
1310		GetObjects;
1311	<	if IBInsertSQLEditor.EditSQL(FDatabase,FIBUpdateSQL.InsertSQL) then Modified;
1311	>	if IBInsertSQLEditor.EditSQL(FIBUpdateSQL.Dataset,FIBUpdateSQL.InsertSQL) then Modified;
1312		end;
1313
1314		{ TIBGeneratorProperty }
#	Line 940 | Line 1327 | end;
1327
1328		procedure TIBSQLEditor.ExecuteVerb(Index: Integer);
1329		begin
1330	<	if IBSQLEditor.EditIBSQL(TIBSQL(Component)) then Modified;
1330	>	if IBSQLEditor.EditSQL(TIBSQL(Component)) then Modified;
1331		end;
1332
1333		function TIBSQLEditor.GetVerb(Index: Integer): string;
1334		begin
1335		case Index of
1336		0 : Result := SIBSQLEditor;
1337	<	1: Result := SInterbaseExpressVersion;
1337	>	1: Result := SInterbaseExpressVersion ;
1338		end;
1339		end;
1340
#	Line 963 | Line 1350 | var
1350		IBSQL: TIBSQL;
1351		begin
1352		IBSQL := GetComponent(0) as TIBSQL;
1353	<	if IBSQLEditor.EditIBSQL(IBSQL) then Modified;
1353	>	if IBSQLEditor.EditSQL(IBSQL) then Modified;
1354		end;
1355
1356		initialization

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines