Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1:/tmp/cvs-serv2179/run Modified Files: JvAnimatedImage.pas JvBDECheckPasswordForm.pas JvBDEExceptionForm.pas JvBDELoginDialog.pas JvColorForm.pas JvComponent.pas JvDBQueryParamsForm.pas JvDualListForm.pas JvExceptionForm.pas JvGridPreviewForm.pas JvGrids.pas JvHLEditorPropertyForm.pas JvImageForm.pas JvJVCLAboutForm.pas JvLogForm.pas JvLoginForm.pas JvMarkupLabel.pas JvMarkupViewer.pas JvMenus.pas JvPainterEffectsForm.pas JvPainterQBForm.pas JvParserForm.pas JvPatchForm.pas JvPicClip.pas JvProfilerForm.pas JvProgressForm.pas JvQuickPreviewForm.pas JvSegmentedLEDDisplayMapperFrame.pas JvSpeedbarSetupForm.pas JvSpellerForm.pas JvStrings.pas JvTypes.pas JvVirtualKeySelectionFrame.pas JvWallpaperEditForm.pas JvYearGridEditForm.pas JvgAlignForm.pas JvgCheckVersionInfoForm.pas JvgQPrintPreviewForm.pas JvgQPrintSetupForm.pas Log Message: restructuring: types from JvConsts to JvTypes dxgettext translation support for the forms Index: JvAnimatedImage.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAnimatedImage.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvAnimatedImage.pas 24 Jun 2003 16:14:47 -0000 1.3 --- JvAnimatedImage.pas 10 Oct 2003 23:13:33 -0000 1.4 *************** *** 164,168 **** uses JvHook, ! JvConsts, JvJVCLUtils; --- 164,168 ---- uses JvHook, ! JvTypes, JvJVCLUtils; Index: JvBDECheckPasswordForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBDECheckPasswordForm.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvBDECheckPasswordForm.pas 24 Jun 2003 16:14:47 -0000 1.2 --- JvBDECheckPasswordForm.pas 10 Oct 2003 23:13:33 -0000 1.3 *************** *** 34,38 **** Windows, Messages, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, Buttons, ! DBTables, DB; type --- 34,38 ---- Windows, Messages, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, Buttons, ! DBTables, DB, JvComponent; type *************** *** 40,44 **** const OldPassword, NewPassword: string): Boolean of object; ! TJvChPswdForm = class(TForm) OldPswdLabel: TLabel; OldPswd: TEdit; --- 40,44 ---- const OldPassword, NewPassword: string): Boolean of object; ! TJvChPswdForm = class(TJvForm) OldPswdLabel: TLabel; OldPswd: TEdit; Index: JvBDEExceptionForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBDEExceptionForm.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvBDEExceptionForm.pas 24 Jun 2003 16:14:47 -0000 1.2 --- JvBDEExceptionForm.pas 10 Oct 2003 23:13:33 -0000 1.3 *************** *** 41,45 **** TDBErrorEvent = procedure(Error: TDBError; var Msg: string) of object; ! TJvBdeErrorDlg = class(TForm) BasicPanel: TPanel; ErrorText: TLabel; --- 41,45 ---- TDBErrorEvent = procedure(Error: TDBError; var Msg: string) of object; ! TJvBdeErrorDlg = class(TJvForm) BasicPanel: TPanel; ErrorText: TLabel; Index: JvBDELoginDialog.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBDELoginDialog.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvBDELoginDialog.pas 24 Jun 2003 16:14:47 -0000 1.3 --- JvBDELoginDialog.pas 10 Oct 2003 23:13:33 -0000 1.4 *************** *** 105,109 **** Windows, Registry, BDE, IniFiles, Graphics, ! JvJVCLUtils, JvConsts; const --- 105,109 ---- Windows, Registry, BDE, IniFiles, Graphics, ! JvJVCLUtils, JvTypes, JvConsts; const Index: JvColorForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvColorForm.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvColorForm.pas 29 Sep 2003 00:23:38 -0000 1.3 --- JvColorForm.pas 10 Oct 2003 23:13:33 -0000 1.4 *************** *** 39,43 **** type ! TJvClrFrm = class(TForm) Bevel1: TBevel; OtherBtn: TSpeedButton; --- 39,43 ---- type ! TJvClrFrm = class(TJvForm) Bevel1: TBevel; OtherBtn: TSpeedButton; Index: JvComponent.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvComponent.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvComponent.pas 10 Oct 2003 21:39:36 -0000 1.4 --- JvComponent.pas 10 Oct 2003 23:13:33 -0000 1.5 *************** *** 39,42 **** --- 39,45 ---- QStdCtrls, QExtCtrls, QControls, QForms, QCheckLst, Types, {$ENDIF} + {$IFDEF USE_DXGETTEXT} + gnugettext, + {$ENDIF} JVCLVer, JvTypes; *************** *** 100,104 **** TJvForm = class(TForm) private - FAboutJVCL: TJVCLAboutInfo; {$IFDEF JVCLThemesEnabledD56} function GetParentBackground: Boolean; --- 103,106 ---- *************** *** 107,112 **** property ParentBackground: Boolean read GetParentBackground write SetParentBackground; {$ENDIF} ! published ! property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False; end; --- 109,116 ---- property ParentBackground: Boolean read GetParentBackground write SetParentBackground; {$ENDIF} ! {$IFDEF USE_DXGETTEXT} ! public ! constructor Create(AOwner: TComponent); override; ! {$ENDIF} end; *************** *** 156,159 **** --- 160,171 ---- JvThemes.SetParentBackground(Self, Value); end; + + {$IFDEF USE_DXGETTEXT} + constructor TJvForm.Create(AOwner: TComponent); + begin + inherited Create(AOwner); + TranslateComponent(Self); + end; + {$ENDIF} function TJvForm.GetParentBackground: Boolean; Index: JvDBQueryParamsForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDBQueryParamsForm.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvDBQueryParamsForm.pas 24 Jun 2003 16:14:47 -0000 1.3 --- JvDBQueryParamsForm.pas 10 Oct 2003 23:13:33 -0000 1.4 *************** *** 31,38 **** uses ! SysUtils, Classes, Controls, Forms, StdCtrls, DB; type ! TJvQueryParamsDialog = class(TForm) GroupBox1: TGroupBox; Label1: TLabel; --- 31,38 ---- uses ! SysUtils, Classes, Controls, Forms, StdCtrls, DB, JvComponent; type ! TJvQueryParamsDialog = class(TJvForm) GroupBox1: TGroupBox; Label1: TLabel; Index: JvDualListForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDualListForm.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvDualListForm.pas 22 Jun 2003 05:51:08 -0000 1.2 --- JvDualListForm.pas 10 Oct 2003 23:13:33 -0000 1.3 *************** *** 33,40 **** Windows, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls, ExtCtrls, ! JvListBox, JvCtrls; type ! TJvDualListForm = class(TForm) SrcList: TJvListBox; DstList: TJvListBox; --- 33,40 ---- Windows, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls, ExtCtrls, ! JvListBox, JvCtrls, JvComponent; type ! TJvDualListForm = class(TJvForm) SrcList: TJvListBox; DstList: TJvListBox; Index: JvExceptionForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExceptionForm.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvExceptionForm.pas 2 Oct 2003 18:55:59 -0000 1.4 --- JvExceptionForm.pas 10 Oct 2003 23:13:33 -0000 1.5 *************** *** 39,43 **** TErrorEvent = procedure(Error: Exception; var Msg: string) of object; ! TJvErrorDialog = class(TForm) BasicPanel: TPanel; ErrorText: TLabel; --- 39,43 ---- TErrorEvent = procedure(Error: Exception; var Msg: string) of object; ! TJvErrorDialog = class(TJvForm) BasicPanel: TPanel; ErrorText: TLabel; Index: JvGridPreviewForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvGridPreviewForm.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvGridPreviewForm.pas 3 Oct 2003 23:10:52 -0000 1.3 --- JvGridPreviewForm.pas 10 Oct 2003 23:13:33 -0000 1.4 *************** *** 31,40 **** uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! ExtCtrls, grids, JvGridPrinter, StdCtrls, Spin, ComCtrls, Buttons, Printers, ! ExtDlgs; type ! ! TJvGridPreviewF = class(TForm) ScrollBox1: TScrollBox; PreviewImage: TImage; --- 31,40 ---- uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! ExtCtrls, Grids, StdCtrls, Spin, ComCtrls, Buttons, Printers, ! ExtDlgs, ! JvGridPrinter, JvComponent; type ! TJvGridPreviewF = class(TJvForm) ScrollBox1: TScrollBox; PreviewImage: TImage; *************** *** 108,112 **** uses ! JvConsts, JvTypes; {$R *.DFM} --- 108,112 ---- uses ! JvTypes; {$R *.DFM} Index: JvGrids.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvGrids.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvGrids.pas 12 Sep 2003 11:47:18 -0000 1.4 --- JvGrids.pas 10 Oct 2003 23:13:33 -0000 1.5 *************** *** 33,37 **** Windows, Messages, Classes, Controls, Graphics, StdCtrls, Forms, Grids, ! JvAppStore, JvConsts, JvFormPlacement; type --- 33,37 ---- Windows, Messages, Classes, Controls, Graphics, StdCtrls, Forms, Grids, ! JvAppStore, JvTypes, JvFormPlacement; type Index: JvHLEditorPropertyForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvHLEditorPropertyForm.pas,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** JvHLEditorPropertyForm.pas 3 Oct 2003 23:10:52 -0000 1.12 --- JvHLEditorPropertyForm.pas 10 Oct 2003 23:13:33 -0000 1.13 *************** *** 36,45 **** Windows, Messages, SysUtils, Classes, Graphics, ComCtrls, Controls, Forms, StdCtrls, ExtCtrls, ! JvFormPlacement, JvEditor, JvHLEditor; type TJvHLEdPropDlg = class; ! TJvHLEditorParamsForm = class(TForm) Pages: TPageControl; bCancel: TButton; --- 36,45 ---- Windows, Messages, SysUtils, Classes, Graphics, ComCtrls, Controls, Forms, StdCtrls, ExtCtrls, ! JvFormPlacement, JvEditor, JvHLEditor, JvComponent; type TJvHLEdPropDlg = class; ! TJvHLEditorParamsForm = class(TJvForm) Pages: TPageControl; bCancel: TButton; Index: JvImageForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvImageForm.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvImageForm.pas 23 Jun 2003 19:18:08 -0000 1.1 --- JvImageForm.pas 10 Oct 2003 23:13:33 -0000 1.2 *************** *** 33,40 **** uses SysUtils, Classes, Controls, Forms, ! ExtCtrls, Jpeg; type ! TFormImg = class(TForm) Image1: TImage; end; --- 33,40 ---- uses SysUtils, Classes, Controls, Forms, ! ExtCtrls, Jpeg, JvComponent; type ! TFormImg = class(TJvForm) Image1: TImage; end; Index: JvJVCLAboutForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvJVCLAboutForm.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvJVCLAboutForm.pas 1 Aug 2003 13:17:14 -0000 1.2 --- JvJVCLAboutForm.pas 10 Oct 2003 23:13:33 -0000 1.3 *************** *** 32,40 **** uses ! Windows, Messages, SysUtils, Classes, Controls, Forms, IniFiles, StdCtrls, ExtCtrls, ! JclSysInfo, JclWin32, JVCLVer, JvBaseDlg, Dialogs, jpeg, Buttons; type ! TJvJVCLAboutForm = class(TForm) Bevel1: TBevel; lblVersion: TLabel; --- 32,41 ---- uses ! Windows, Messages, SysUtils, Classes, Controls, Forms, IniFiles, StdCtrls, ! ExtCtrls, ! JclSysInfo, JclWin32, JVCLVer, JvBaseDlg, Dialogs, jpeg, Buttons, JvComponent; type ! TJvJVCLAboutForm = class(TJvForm) Bevel1: TBevel; lblVersion: TLabel; Index: JvLogForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvLogForm.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvLogForm.pas 23 Jun 2003 19:18:08 -0000 1.2 --- JvLogForm.pas 10 Oct 2003 23:13:33 -0000 1.3 *************** *** 37,41 **** type ! TFoLog = class(TForm) ToolBar1: TToolBar; ToolButton1: TToolButton; --- 37,41 ---- type ! TFoLog = class(TJvForm) ToolBar1: TToolBar; ToolButton1: TToolButton; Index: JvLoginForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvLoginForm.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvLoginForm.pas 24 Jun 2003 16:14:47 -0000 1.6 --- JvLoginForm.pas 10 Oct 2003 23:13:33 -0000 1.7 *************** *** 164,174 **** uses Registry, Consts, IniFiles, ! JvJVCLUtils, JvConsts; {$R *.DFM} const ! keyLoginSection = 'Login Dialog'; ! keyLastLoginUserName = 'Last Logged User'; function CreateLoginDialog(UnlockMode, ASelectDatabase: Boolean; --- 164,174 ---- uses Registry, Consts, IniFiles, ! JvJVCLUtils, JvConsts, JvTypes; {$R *.DFM} const ! keyLoginSection = 'Login Dialog'; // do not localize ! keyLastLoginUserName = 'Last Logged User'; // do not localize function CreateLoginDialog(UnlockMode, ASelectDatabase: Boolean; Index: JvMarkupLabel.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvMarkupLabel.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvMarkupLabel.pas 10 Oct 2003 21:40:17 -0000 1.6 --- JvMarkupLabel.pas 10 Oct 2003 23:13:33 -0000 1.7 *************** *** 74,78 **** uses ! JvThemes; --- 74,78 ---- uses ! JvTypes, JvThemes; Index: JvMarkupViewer.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvMarkupViewer.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvMarkupViewer.pas 10 Oct 2003 21:40:17 -0000 1.5 --- JvMarkupViewer.pas 10 Oct 2003 23:13:33 -0000 1.6 *************** *** 83,87 **** uses ! JvThemes; { TJvMarkupViewer } --- 83,87 ---- uses ! JvTypes, JvThemes; { TJvMarkupViewer } Index: JvMenus.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvMenus.pas,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** JvMenus.pas 10 Oct 2003 13:01:05 -0000 1.9 --- JvMenus.pas 10 Oct 2003 23:13:33 -0000 1.10 *************** *** 649,658 **** uses ! CommCtrl, Forms, ExtCtrls, Consts, JvConsts, JvJVCLUtils, JvJCLUtils, Math {$IFDEF COMPILER6_UP}, Types{$ENDIF}; const DefMarginColor: TColor = clBlue; - Tab = #9#9; Separator = '-'; --- 649,657 ---- uses ! CommCtrl, Forms, ExtCtrls, Consts, JvTypes, JvJVCLUtils, JvJCLUtils, Math {$IFDEF COMPILER6_UP}, Types{$ENDIF}; const DefMarginColor: TColor = clBlue; Separator = '-'; *************** *** 2059,2068 **** begin // find the largest text element ! MaxWidth := Canvas.TextWidth(DelChars(Item.Caption, '&') + Tab); if (Item.Parent <> nil) and (Item.ShortCut <> scNone) then begin for I := 0 to Item.Parent.Count - 1 do MaxWidth := Max(Canvas.TextWidth(DelChars(Item.Parent.Items[I].Caption, ! '&') + Tab), MaxWidth); end; --- 2058,2067 ---- begin // find the largest text element ! MaxWidth := Canvas.TextWidth(DelChars(Item.Caption, '&') + Tab + Tab); if (Item.Parent <> nil) and (Item.ShortCut <> scNone) then begin for I := 0 to Item.Parent.Count - 1 do MaxWidth := Max(Canvas.TextWidth(DelChars(Item.Parent.Items[I].Caption, ! '&') + Tab + Tab), MaxWidth); end; *************** *** 2135,2139 **** if IsPopup then begin ! Result := Canvas.TextWidth(DelChars(Item.Caption, '&') + Tab); MaxW := Canvas.TextWidth(ShortCutToText(Item.ShortCut) + ' '); if (Item.Parent <> nil) and (Item.ShortCut <> scNone) then --- 2134,2138 ---- if IsPopup then begin ! Result := Canvas.TextWidth(DelChars(Item.Caption, '&') + Tab + Tab); MaxW := Canvas.TextWidth(ShortCutToText(Item.ShortCut) + ' '); if (Item.Parent <> nil) and (Item.ShortCut <> scNone) then *************** *** 2142,2146 **** with Item.Parent.Items[I] do begin ! Result := Max(Result, Canvas.TextWidth(DelChars(Caption, '&') + Tab)); MaxW := Max(MaxW, Canvas.TextWidth(ShortCutToText(ShortCut) + ' ')); end; --- 2141,2145 ---- with Item.Parent.Items[I] do begin ! Result := Max(Result, Canvas.TextWidth(DelChars(Caption, '&') + Tab + Tab)); MaxW := Max(MaxW, Canvas.TextWidth(ShortCutToText(ShortCut) + ' ')); end; *************** *** 2148,2152 **** Result := Result + MaxW; if Item.Count > 0 then ! Inc(Result, Canvas.TextWidth(Tab)); end else --- 2147,2151 ---- Result := Result + MaxW; if Item.Count > 0 then ! Inc(Result, Canvas.TextWidth(Tab + Tab)); end else Index: JvPainterEffectsForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvPainterEffectsForm.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvPainterEffectsForm.pas 26 Sep 2003 12:20:01 -0000 1.2 --- JvPainterEffectsForm.pas 10 Oct 2003 23:13:33 -0000 1.3 *************** *** 31,38 **** uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! StdCtrls, ExtCtrls, ComCtrls, JvDrawImage; type ! TPainterEffectsF = class(TForm) effectspanel: TPanel; EBar: TScrollBar; --- 31,38 ---- uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! StdCtrls, ExtCtrls, ComCtrls, JvDrawImage, JvComponent; type ! TPainterEffectsF = class(TJvForm) effectspanel: TPanel; EBar: TScrollBar; Index: JvPainterQBForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvPainterQBForm.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvPainterQBForm.pas 3 Oct 2003 23:10:52 -0000 1.4 --- JvPainterQBForm.pas 10 Oct 2003 23:13:33 -0000 1.5 *************** *** 32,39 **** uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! StdCtrls, ExtCtrls, Menus, ComCtrls, JvDrawImage; type ! TPainterQBF = class(TForm) Bevel1: TBevel; qbpresets: TComboBox; --- 32,39 ---- uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! StdCtrls, ExtCtrls, Menus, ComCtrls, JvDrawImage, JvComponent; type ! TPainterQBF = class(TJvForm) Bevel1: TBevel; qbpresets: TComboBox; Index: JvParserForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvParserForm.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvParserForm.pas 28 Jul 2003 06:40:27 -0000 1.2 --- JvParserForm.pas 10 Oct 2003 23:13:33 -0000 1.3 *************** *** 33,40 **** uses SysUtils, Classes, Controls, Forms, StdCtrls, ! JvTypes; type ! TFormParsers = class(TForm) ListBox1: TListBox; GroupBox1: TGroupBox; --- 33,40 ---- uses SysUtils, Classes, Controls, Forms, StdCtrls, ! JvTypes, JvComponent; type ! TFormParsers = class(TJvForm) ListBox1: TListBox; GroupBox1: TGroupBox; Index: JvPatchForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvPatchForm.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvPatchForm.pas 3 Oct 2003 23:10:52 -0000 1.2 --- JvPatchForm.pas 10 Oct 2003 23:13:33 -0000 1.3 *************** *** 33,40 **** uses SysUtils, Classes, Controls, Forms, StdCtrls, Mask, ! JvToolEdit; type ! TFoPatch = class(TForm) GroupBox1: TGroupBox; Label1: TLabel; --- 33,40 ---- uses SysUtils, Classes, Controls, Forms, StdCtrls, Mask, ! JvToolEdit, JvComponent; type ! TFoPatch = class(TJvForm) GroupBox1: TGroupBox; Label1: TLabel; Index: JvPicClip.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvPicClip.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvPicClip.pas 24 Jun 2003 16:14:47 -0000 1.3 --- JvPicClip.pas 10 Oct 2003 23:13:33 -0000 1.4 *************** *** 93,97 **** uses SysUtils, Consts, ! JvJVCLUtils, JvConsts; constructor TJvPicClip.Create(AOwner: TComponent); --- 93,97 ---- uses SysUtils, Consts, ! JvJVCLUtils, JvTypes; constructor TJvPicClip.Create(AOwner: TComponent); Index: JvProfilerForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvProfilerForm.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvProfilerForm.pas 3 Oct 2003 23:10:52 -0000 1.2 --- JvProfilerForm.pas 10 Oct 2003 23:13:33 -0000 1.3 *************** *** 56,60 **** end; ! TProfReport = class(TForm) Panel1: TPanel; SaveBtn: TButton; --- 56,60 ---- end; ! TProfReport = class(TJvForm) Panel1: TPanel; SaveBtn: TButton; Index: JvProgressForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvProgressForm.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvProgressForm.pas 23 Jun 2003 19:18:08 -0000 1.4 --- JvProgressForm.pas 10 Oct 2003 23:13:33 -0000 1.5 *************** *** 36,45 **** uses Windows, SysUtils, Forms, Graphics, ExtCtrls, StdCtrls, Controls, ComCtrls, ! Classes; type TJvPrivateProgressUpdate = procedure (Sender:TObject; var AMin, AMax, APosition, AInterval:integer; var ACaption,ALabel:string; AnImage:TPicture; var AContinue:boolean) of object; ! TfrmProgress = class(TForm) pbProgress: TProgressBar; imProgress: TImage; --- 36,46 ---- uses Windows, SysUtils, Forms, Graphics, ExtCtrls, StdCtrls, Controls, ComCtrls, ! Classes, JvComponent; type TJvPrivateProgressUpdate = procedure (Sender:TObject; var AMin, AMax, APosition, AInterval:integer; var ACaption,ALabel:string; AnImage:TPicture; var AContinue:boolean) of object; ! ! TfrmProgress = class(TJvForm) pbProgress: TProgressBar; imProgress: TImage; Index: JvQuickPreviewForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvQuickPreviewForm.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvQuickPreviewForm.pas 26 Sep 2003 12:20:01 -0000 1.2 --- JvQuickPreviewForm.pas 10 Oct 2003 23:13:33 -0000 1.3 *************** *** 32,39 **** uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! Buttons, ExtCtrls, StdCtrls, JvDrawImage; type ! TQuickPreviewF = class(TForm) ScrollBox1: TScrollBox; Image1: TImage; --- 32,39 ---- uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! Buttons, ExtCtrls, StdCtrls, JvDrawImage, JvComponent; type ! TQuickPreviewF = class(TJvForm) ScrollBox1: TScrollBox; Image1: TImage; Index: JvSegmentedLEDDisplayMapperFrame.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSegmentedLEDDisplayMapperFrame.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvSegmentedLEDDisplayMapperFrame.pas 3 Oct 2003 23:10:52 -0000 1.5 --- JvSegmentedLEDDisplayMapperFrame.pas 10 Oct 2003 23:13:33 -0000 1.6 *************** *** 34,38 **** uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! JvComponent, JvSegmentedLEDDisplay, ActnList, Menus; type --- 34,42 ---- uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! ActnList, Menus, ! {$IFDEF USE_DXGETTEXT} ! gnugettext, ! {$ENDIF} ! JvComponent, JvSegmentedLEDDisplay; type *************** *** 287,290 **** --- 291,297 ---- begin inherited Create(AOwner); + {$IFDEF USE_DXGETTEXT} + TranslateComponent(Self); + {$ENDIF} FCopiedValue := -1; end; Index: JvSpeedbarSetupForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSpeedbarSetupForm.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvSpeedbarSetupForm.pas 24 Jun 2003 16:14:48 -0000 1.4 --- JvSpeedbarSetupForm.pas 10 Oct 2003 23:13:33 -0000 1.5 *************** *** 32,41 **** uses Windows, ! SysUtils, Messages, Classes, Graphics, Controls, Forms, ! StdCtrls, Grids, ExtCtrls, ! JvxCtrls, JvSpeedBar, JvConsts; type ! TJvSpeedbarSetupWindow = class(TForm) ButtonsList: TDrawGrid; ButtonsLabel: TLabel; --- 32,41 ---- uses Windows, ! SysUtils, Messages, Classes, Graphics, Controls, Forms, StdCtrls, Grids, ! ExtCtrls, ! JvTypes, JvxCtrls, JvSpeedBar, JvComponent; type ! TJvSpeedbarSetupWindow = class(TJvForm) ButtonsList: TDrawGrid; ButtonsLabel: TLabel; *************** *** 92,96 **** uses Consts, Math, ! JvJVCLUtils; {$R *.DFM} --- 92,96 ---- uses Consts, Math, ! JvConsts, JvJVCLUtils; {$R *.DFM} Index: JvSpellerForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSpellerForm.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvSpellerForm.pas 3 Oct 2003 23:10:52 -0000 1.6 --- JvSpellerForm.pas 10 Oct 2003 23:13:33 -0000 1.7 *************** *** 31,40 **** uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! StdCtrls, ExtCtrls; type TJvSpeller = class; ! TJvSpellerFrm = class(TForm) Panel1: TPanel; lblcontext: TLabel; --- 31,41 ---- uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! StdCtrls, ExtCtrls, ! JvComponent; type TJvSpeller = class; ! TJvSpellerFrm = class(TJvForm) Panel1: TPanel; lblcontext: TLabel; Index: JvStrings.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvStrings.pas,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JvStrings.pas 10 Oct 2003 14:08:16 -0000 1.8 --- JvStrings.pas 10 Oct 2003 23:13:33 -0000 1.9 *************** *** 26,30 **** -----------------------------------------------------------------------------} {$I JVCL.INC} - {$I WINDOWSONLY.INC} unit JvStrings; --- 26,29 ---- *************** *** 35,39 **** Windows, {$ENDIF} ! SysUtils, Classes, Graphics, Dialogs; {regular expressions} --- 34,44 ---- Windows, {$ENDIF} ! {$IFDEF COMPLIB_VCL} ! Graphics, ! {$ENDIF} ! {$IFDEF COMPLIB_CLX} ! QGraphics, ! {$ENDIF} ! SysUtils, Classes; {regular expressions} *************** *** 213,218 **** const - tab = chr(9); - B64Table = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'; ValidURLChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789$-_@.&+-!*"''(),;/#?:'; --- 218,221 ---- *************** *** 927,932 **** FileAttrs: Integer; begin ! FileAttrs := faArchive + faDirectory; if FindFirst(myDir + '\*.*', FileAttrs, sr) = 0 then while FindNext(sr) = 0 do begin --- 930,940 ---- FileAttrs: Integer; begin ! FileAttrs := faAnyFile or faDirectory; ! {$IFDEF MSWINDOWS} if FindFirst(myDir + '\*.*', FileAttrs, sr) = 0 then + {$ENDIF} + {$IFDEF LINUX} + if FindFirst(myDir + '/*', FileAttrs, sr) = 0 then + {$ENDIF} while FindNext(sr) = 0 do begin *************** *** 934,943 **** begin if (sr.name <> '.') and (sr.name <> '..') then ! RecurseDirFiles(myDir + '\' + sr.Name, aFileList); end ! else if (sr.Attr and faArchive) <> 0 then ! begin ! aFileList.append(myDir + '\' + sr.Name); ! end; end; FindClose(sr); --- 942,949 ---- begin if (sr.name <> '.') and (sr.name <> '..') then ! RecurseDirFiles(myDir + PathDelim + sr.Name, aFileList); end ! else ! aFileList.append(myDir + PathDelim + sr.Name); end; FindClose(sr); *************** *** 949,955 **** FileAttrs: Integer; e: string; begin ! FileAttrs := faArchive + faDirectory; if FindFirst(myDir + '\*.*', FileAttrs, sr) = 0 then while FindNext(sr) = 0 do begin --- 955,969 ---- FileAttrs: Integer; e: string; + {$IFDEF LINUX} + st: TStatBuf; + {$ENDIF} begin ! FileAttrs := faAnyFile or faDirectory; ! {$IFDEF MSWINDOWS} if FindFirst(myDir + '\*.*', FileAttrs, sr) = 0 then + {$ENDIF} + {$IFDEF LINUX} + if FindFirst(myDir + '/*', FileAttrs, sr) = 0 then + {$ENDIF} while FindNext(sr) = 0 do begin *************** *** 957,973 **** begin if (sr.name <> '.') and (sr.name <> '..') then ! RecurseDirProgs(myDir + '\' + sr.Name, aFileList); end ! else if (sr.Attr and faArchive) <> 0 then begin ! e := lowercase(extractfileext(sr.name)); if e = '.exe' then ! aFileList.append(myDir + '\' + sr.Name); end; end; FindClose(sr); end; - {$IFDEF MSWINDOWS} procedure LoadResourceFile(aFile: string; ms: TMemoryStream); var --- 971,998 ---- begin if (sr.name <> '.') and (sr.name <> '..') then ! RecurseDirProgs(myDir + PathDelim + sr.Name, aFileList); end ! {$IFDEF MSWINDOWS} ! else begin ! e := LowerCase(ExtractFileExt(sr.name)); if e = '.exe' then ! aFileList.append(myDir + PathDelim + sr.Name); ! end; ! {$ENDIF} ! {$IFDEF LINUX} ! else ! begin ! if stat(PChar(myDir + PathDelim + sr.Name), st) = 0 then ! begin ! if st.st_mode and (S_IXUSR or S_IXGRP or S_IXOTH) <> 0 then ! aFileList.append(myDir + PathDelim + sr.Name); ! end; end; + {$ENDIF} end; FindClose(sr); end; procedure LoadResourceFile(aFile: string; ms: TMemoryStream); var *************** *** 993,997 **** FreeResource(HGlobal); end; - {$ENDIF} procedure GetNames(aText: string; aList: TStringList); --- 1018,1021 ---- Index: JvTypes.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTypes.pas,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** JvTypes.pas 10 Oct 2003 21:51:08 -0000 1.16 --- JvTypes.pas 10 Oct 2003 23:13:33 -0000 1.17 *************** *** 40,44 **** uses {$IFDEF COMPLIB_VCL} ! Windows, Messages, Graphics, Controls, {$ENDIF} {$IFDEF COMPLIB_CLX} --- 40,44 ---- uses {$IFDEF COMPLIB_VCL} ! Windows, Messages, Controls, Forms, Graphics, {$ENDIF} {$IFDEF COMPLIB_CLX} *************** *** 233,244 **** end; ! const ! CrLf = #13#10; ! Cr = #13; ! Lf = #10; ! Tab = #9; {$IFNDEF COMPILER6_UP} ! SLineBreak = #13#10; ! {$ENDIF} type --- 233,248 ---- end; ! const ! CrLf = #13#10; ! Cr = #13; ! Lf = #10; ! Tab = #9; ! {$IFNDEF COMPILER6_UP} ! SLineBreak = #13#10; ! PathDelim = '\'; ! DriveDelim = ':'; ! PathSep = ';'; ! {$ENDIF} type *************** *** 396,400 **** --- 400,428 ---- TJvListViewColumnSortEvent = procedure(Sender: TObject; Column: Integer; var AMethod:TJvSortMethod) of object; + + const + { Command message for JvSpeedbar editor } + CM_SPEEDBARCHANGED = CM_BASE + 80; + { Command message for TJvSpeedButton } + CM_JVBUTTONPRESSED = CM_BASE + 81; + { Command messages for TJvWindowHook } + CM_RECREATEWINDOW = CM_BASE + 82; + CM_DESTROYHOOK = CM_BASE + 83; + { Notify message for TJvxTrayIcon } + CM_TRAYICON = CM_BASE + 84; + + { TBitmap.GetTransparentColor from GRAPHICS.PAS use this value } + PaletteMask = $02000000; + + const + crHand = TCursor(14000); + crDragHand = TCursor(14001); + implementation + + + initialization + Screen.Cursors[crHand] := LoadCursor(hInstance, 'JV_HANDCUR'); + Screen.Cursors[crDragHand] := LoadCursor(hInstance, 'JV_DRAGCUR'); end. Index: JvVirtualKeySelectionFrame.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvVirtualKeySelectionFrame.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvVirtualKeySelectionFrame.pas 3 Oct 2003 23:10:53 -0000 1.3 --- JvVirtualKeySelectionFrame.pas 10 Oct 2003 23:13:33 -0000 1.4 *************** *** 36,39 **** --- 36,42 ---- uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, + {$IFDEF USE_DXGETTEXT} + gnugettext, + {$ENDIF} StdCtrls; *************** *** 71,75 **** constructor TJvVirtualKeySelectionFrame.Create(AOwner: TComponent); begin ! inherited; EnumKeys; --- 74,81 ---- constructor TJvVirtualKeySelectionFrame.Create(AOwner: TComponent); begin ! inherited Create(AOwner); ! {$IFDEF USE_DXGETTEXT} ! TranslateComponent(Self); ! {$ENDIF} EnumKeys; Index: JvWallpaperEditForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvWallpaperEditForm.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvWallpaperEditForm.pas 23 Jun 2003 19:18:08 -0000 1.1 --- JvWallpaperEditForm.pas 10 Oct 2003 23:13:33 -0000 1.2 *************** *** 36,40 **** type ! TFoWallpaperChooser = class(TForm) GroupBox1: TGroupBox; Button1: TButton; --- 36,40 ---- type ! TFoWallpaperChooser = class(TJvForm) GroupBox1: TGroupBox; Button1: TButton; Index: JvYearGridEditForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvYearGridEditForm.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvYearGridEditForm.pas 26 Sep 2003 12:20:02 -0000 1.2 --- JvYearGridEditForm.pas 10 Oct 2003 23:13:33 -0000 1.3 *************** *** 31,38 **** uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! StdCtrls, Buttons, ExtCtrls; type ! TYearGridEditF = class(TForm) Panel1: TPanel; BitBtn1: TBitBtn; --- 31,39 ---- uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! StdCtrls, Buttons, ExtCtrls, ! JvComponent; type ! TYearGridEditF = class(TJvForm) Panel1: TPanel; BitBtn1: TBitBtn; Index: JvgAlignForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgAlignForm.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvgAlignForm.pas 25 Jun 2003 18:09:52 -0000 1.2 --- JvgAlignForm.pas 10 Oct 2003 23:13:33 -0000 1.3 *************** *** 35,43 **** Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ! JvgTypes; type ! TAlignForm = class(TForm) g_Horz: TRadioGroup; g_Vert: TRadioGroup; --- 35,43 ---- Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ! JvgTypes, JvComponent; type ! TAlignForm = class(TJvForm) g_Horz: TRadioGroup; g_Vert: TRadioGroup; Index: JvgCheckVersionInfoForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgCheckVersionInfoForm.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvgCheckVersionInfoForm.pas 3 Oct 2003 23:10:53 -0000 1.4 --- JvgCheckVersionInfoForm.pas 10 Oct 2003 23:13:33 -0000 1.5 *************** *** 36,43 **** Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ExtCtrls, StdCtrls, Buttons, JvgSpeedButton, JvgWizardHeader, JvgShadow, ! ComCtrls, JvgSmallFontsDefense; type ! TJvgfCheckVersionInfo = class(TForm) JvgWizardHeader: TJvgWizardHeader; sbNext: TJvgSpeedButton; --- 36,43 ---- Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ExtCtrls, StdCtrls, Buttons, JvgSpeedButton, JvgWizardHeader, JvgShadow, ! ComCtrls, JvgSmallFontsDefense, JvComponent; type ! TJvgfCheckVersionInfo = class(TJvForm) JvgWizardHeader: TJvgWizardHeader; sbNext: TJvgSpeedButton; Index: JvgQPrintPreviewForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgQPrintPreviewForm.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvgQPrintPreviewForm.pas 3 Oct 2003 23:10:53 -0000 1.4 --- JvgQPrintPreviewForm.pas 10 Oct 2003 23:13:33 -0000 1.5 *************** *** 39,43 **** type ! TJvgfPrintPreview = class(TForm) Panel2: TPanel; ToolBar1: TToolBar; --- 39,43 ---- type ! TJvgfPrintPreview = class(TJvForm) Panel2: TPanel; ToolBar1: TToolBar; Index: JvgQPrintSetupForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgQPrintSetupForm.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvgQPrintSetupForm.pas 22 Jun 2003 09:42:14 -0000 1.1 --- JvgQPrintSetupForm.pas 10 Oct 2003 23:13:33 -0000 1.2 *************** *** 33,40 **** uses ! Windows, Controls, Forms, StdCtrls, ExtCtrls, Classes; type ! TJvgPrintSetup = class(TForm) rgOrientation: TRadioGroup; rgRadioGroup2: TRadioGroup; --- 33,40 ---- uses ! Windows, Controls, Forms, StdCtrls, ExtCtrls, Classes, JvComponent; type ! TJvgPrintSetup = class(TJvForm) rgOrientation: TRadioGroup; rgRadioGroup2: TRadioGroup; |