jvcl-checkins
|
From: Peter Thornqvist <peter3@us...> - 2004-03-01 23:16:07
|
Update of /cvsroot/jvcl/dev/JVCL3/examples/RxLib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1618/examples/RxLib
Modified Files:
ABOUT.PAS ABOUT.dfm CTRLS.PAS CTRLS.dfm
Log Message:
- Mantis #1407 (RxDemo Ctrls unit reverses TShowClock enum)
Index: CTRLS.PAS
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/examples/RxLib/CTRLS.PAS,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CTRLS.PAS 27 Jan 2004 09:30:16 -0000 1.6
--- CTRLS.PAS 1 Mar 2004 22:56:52 -0000 1.7
***************
*** 30,40 ****
uses
! SysUtils, WinTypes, WinProcs, Messages, Classes, Graphics, Controls,
! Forms, Dialogs, StdCtrls, TabNotBk, JvxSlider, ExtCtrls,
! JvSwitch, Mask, JvToolEdit, Spin, FileCtrl, JvSplit, Grids,
! Outline, DirOutln, JvDice, JvClock, JvSpin, JvLabel,
! ComCtrls, JvComponent, JvColorCombo, JvCombobox, JvEdit, JvValidateEdit,
! JvMaskEdit, JvFormPlacement, JvTextListBox, JvAnimatedImage, JvBaseEdits,
! JvExExtCtrls, JvExMask, JvExControls, JvExStdCtrls;
type
--- 30,39 ----
uses
! SysUtils, Windows, Forms, Messages, Classes, Graphics, Controls,
! JvClock, Dialogs, JvComponent, JvFormPlacement, JvDice, JvExStdCtrls,
! JvTextListBox, JvAnimatedImage, FileCtrl, StdCtrls, JvExExtCtrls,
! JvSplit, ExtCtrls, JvExMask, JvMaskEdit, JvSpin, Spin, JvExControls,
! JvLabel, JvEdit, JvValidateEdit, JvToolEdit, JvBaseEdits, Mask, JvSwitch,
! JvxSlider, JvColorCombo, JvCombobox, ComCtrls, TabNotBk;
type
***************
*** 112,116 ****
GroupBox15: TGroupBox;
TextListBox1: TJvTextListBox ;
- JvClock: TJvClock;
JvDice: TJvDice;
Label30: TLabel;
--- 111,114 ----
***************
*** 165,168 ****
--- 163,169 ----
ColorComboBox1: TJvColorComboBox;
ColorComboBox2: TJvColorComboBox;
+ AnimatedImage1: TJvAnimatedImage;
+ Panel3: TPanel;
+ JvClock1: TJvClock;
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure FormShow(Sender: TObject);
***************
*** 199,203 ****
procedure SpinEdit6Change(Sender: TObject);
procedure SpinEdit7Change(Sender: TObject);
! procedure JvClockAlarm(Sender: TObject);
procedure Button4Click(Sender: TObject);
procedure SpinEdit8Change(Sender: TObject);
--- 200,204 ----
procedure SpinEdit6Change(Sender: TObject);
procedure SpinEdit7Change(Sender: TObject);
! procedure JvClock1Alarm(Sender: TObject);
procedure Button4Click(Sender: TObject);
procedure SpinEdit8Change(Sender: TObject);
***************
*** 422,507 ****
procedure TControlsForm.ComboBox7Change(Sender: TObject);
begin
! // case ComboBox7.ItemIndex of
! // 0:
! // begin
! // AnimatedImage1.Glyph := RunnerImage.Picture.Bitmap;
! // AnimatedImage1.GlyphNum := 12;
! // end;
! // 1:
! // begin
! // AnimatedImage1.Glyph := FlagImage.Picture.Bitmap;
! // AnimatedImage1.GlyphNum := 4;
! // end;
! // 2:
! // begin
! // AnimatedImage1.Glyph := SearchImage.Picture.Bitmap;
! // AnimatedImage1.GlyphNum := 12;
! // end;
! // 3:
! // begin
! // AnimatedImage1.Glyph := BookImage.Picture.Bitmap;
! // AnimatedImage1.GlyphNum := 5;
! // end;
! // end;
end;
procedure TControlsForm.Button2Click(Sender: TObject);
begin
! // AnimatedImage1.Active := not AnimatedImage1.Active;
end;
procedure TControlsForm.SpinEdit3Change(Sender: TObject);
begin
! // AnimatedImage1.Interval := SpinEdit3.Value;
end;
procedure TControlsForm.SpinEdit4Change(Sender: TObject);
begin
! // AnimatedImage1.GlyphNum := SpinEdit4.Value;
end;
procedure TControlsForm.AnimatedImage1StartStop(Sender: TObject);
begin
! // SpinEdit4.Value := AnimatedImage1.GlyphNum;
! // SpinEdit3.Value := AnimatedImage1.Interval;
! // if AnimatedImage1.Active then
! // Button2.Caption := 'Stop'
! // else
! // Button2.Caption := 'Start';
end;
procedure TControlsForm.ComboBox8Change(Sender: TObject);
begin
! JvClock.ShowMode := TShowClock(ComboBox8.ItemIndex);
end;
procedure TControlsForm.Button3Click(Sender: TObject);
begin
! FontDialog1.Font := JvClock.Font;
if FontDialog1.Execute then
! JvClock.Font := FontDialog1.Font;
end;
procedure TControlsForm.CheckBox6Click(Sender: TObject);
begin
! JvClock.AlarmEnabled := CheckBox6.Checked;
end;
procedure TControlsForm.SpinEdit5Change(Sender: TObject);
begin
! JvClock.AlarmHour := SpinEdit5.Value;
end;
procedure TControlsForm.SpinEdit6Change(Sender: TObject);
begin
! JvClock.AlarmMinute := SpinEdit6.Value;
end;
procedure TControlsForm.SpinEdit7Change(Sender: TObject);
begin
! JvClock.AlarmSecond := SpinEdit7.Value;
end;
! procedure TControlsForm.JvClockAlarm(Sender: TObject);
begin
MessageDlg('Alarm!', mtInformation, [mbOk], 0);
--- 423,508 ----
procedure TControlsForm.ComboBox7Change(Sender: TObject);
begin
! case ComboBox7.ItemIndex of
! 0:
! begin
! AnimatedImage1.Glyph := RunnerImage.Picture.Bitmap;
! AnimatedImage1.GlyphNum := 12;
! end;
! 1:
! begin
! AnimatedImage1.Glyph := FlagImage.Picture.Bitmap;
! AnimatedImage1.GlyphNum := 4;
! end;
! 2:
! begin
! AnimatedImage1.Glyph := SearchImage.Picture.Bitmap;
! AnimatedImage1.GlyphNum := 12;
! end;
! 3:
! begin
! AnimatedImage1.Glyph := BookImage.Picture.Bitmap;
! AnimatedImage1.GlyphNum := 5;
! end;
! end;
end;
procedure TControlsForm.Button2Click(Sender: TObject);
begin
! AnimatedImage1.Active := not AnimatedImage1.Active;
end;
procedure TControlsForm.SpinEdit3Change(Sender: TObject);
begin
! AnimatedImage1.Interval := SpinEdit3.Value;
end;
procedure TControlsForm.SpinEdit4Change(Sender: TObject);
begin
! AnimatedImage1.GlyphNum := SpinEdit4.Value;
end;
procedure TControlsForm.AnimatedImage1StartStop(Sender: TObject);
begin
! SpinEdit4.Value := AnimatedImage1.GlyphNum;
! SpinEdit3.Value := AnimatedImage1.Interval;
! if AnimatedImage1.Active then
! Button2.Caption := 'Stop'
! else
! Button2.Caption := 'Start';
end;
procedure TControlsForm.ComboBox8Change(Sender: TObject);
begin
! JvClock1.ShowMode := TShowClock(ComboBox8.ItemIndex);
end;
procedure TControlsForm.Button3Click(Sender: TObject);
begin
! FontDialog1.Font := JvClock1.Font;
if FontDialog1.Execute then
! JvClock1.Font := FontDialog1.Font;
end;
procedure TControlsForm.CheckBox6Click(Sender: TObject);
begin
! JvClock1.AlarmEnabled := CheckBox6.Checked;
end;
procedure TControlsForm.SpinEdit5Change(Sender: TObject);
begin
! JvClock1.AlarmHour := SpinEdit5.Value;
end;
procedure TControlsForm.SpinEdit6Change(Sender: TObject);
begin
! JvClock1.AlarmMinute := SpinEdit6.Value;
end;
procedure TControlsForm.SpinEdit7Change(Sender: TObject);
begin
! JvClock1.AlarmSecond := SpinEdit7.Value;
end;
! procedure TControlsForm.JvClock1Alarm(Sender: TObject);
begin
MessageDlg('Alarm!', mtInformation, [mbOk], 0);
***************
*** 565,588 ****
procedure TControlsForm.Button6Click(Sender: TObject);
! //var
! // Image: TJvAnimatedCursorImage ;
begin
! // if OpenDialog.Execute then begin
! // OpenDialog.InitialDir := ExtractFilePath(OpenDialog.FileName);
! // Image := TJvAnimatedCursorImage .Create;
! // try
! // AnimatedImage1.Active := False;
! // Image.LoadFromFile(OpenDialog.FileName);
! // Image.AssignToBitmap(AnimatedImage1.Glyph, clFuchsia, True,
! // AnimatedImage1.Orientation = goVertical);
! // ComboBox7.ItemIndex := -1;
! // AnimatedImage1.Interval := Image.DefaultRate;
! // SpinEdit3.Value := AnimatedImage1.Interval;
! // AnimatedImage1.TransparentColor := clFuchsia;
! // AnimatedImage1.Active := True;
! // finally
! // Image.Free;
! // end;
! // end;
end;
--- 566,589 ----
procedure TControlsForm.Button6Click(Sender: TObject);
! var
! Image: TJvAni;
begin
! if OpenDialog.Execute then begin
! OpenDialog.InitialDir := ExtractFilePath(OpenDialog.FileName);
! Image := TJvAni.Create;
! try
! AnimatedImage1.Active := False;
! Image.LoadFromFile(OpenDialog.FileName);
! Image.AssignToBitmap(AnimatedImage1.Glyph, clFuchsia, True,
! AnimatedImage1.Orientation = goVertical);
! ComboBox7.ItemIndex := -1;
! AnimatedImage1.Interval := Image.Header.dwJIFRate div 4;
! SpinEdit3.Value := AnimatedImage1.Interval;
! AnimatedImage1.TransparentColor := clFuchsia;
! AnimatedImage1.Active := True;
! finally
! Image.Free;
! end;
! end;
end;
Index: CTRLS.dfm
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/examples/RxLib/CTRLS.dfm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CTRLS.dfm 23 Jan 2004 10:02:02 -0000 1.6
--- CTRLS.dfm 1 Mar 2004 22:56:52 -0000 1.7
***************
*** 214,218 ****
Height = 22
DroppedDownWidth = 145
! FontName = 'Roman'
Device = fdPrinter
Font.Charset = DEFAULT_CHARSET
--- 214,219 ----
Height = 22
DroppedDownWidth = 145
! MaxMRUCount = 0
! FontName = 'Courier'
Device = fdPrinter
Font.Charset = DEFAULT_CHARSET
***************
*** 1651,1655 ****
object RunnerImage: TImage
Left = 64
! Top = 56
Width = 33
Height = 37
--- 1652,1656 ----
object RunnerImage: TImage
Left = 64
! Top = 39
Width = 33
Height = 37
***************
*** 1898,1902 ****
object FlagImage: TImage
Left = 64
! Top = 52
Width = 33
Height = 37
--- 1899,1903 ----
object FlagImage: TImage
Left = 64
! Top = 39
Width = 33
Height = 37
***************
*** 1981,1985 ****
object SearchImage: TImage
Left = 64
! Top = 56
Width = 33
Height = 37
--- 1982,1986 ----
object SearchImage: TImage
Left = 64
! Top = 39
Width = 33
Height = 37
***************
*** 2426,2432 ****
object BookImage: TImage
Left = 64
! Top = 56
Width = 33
! Height = 37
Picture.Data = {
07544269746D6170660D0000424D660D0000000000007600000028000000B400
--- 2427,2433 ----
object BookImage: TImage
Left = 64
! Top = 39
Width = 33
! Height = 36
Picture.Data = {
07544269746D6170660D0000424D660D0000000000007600000028000000B400
***************
*** 2540,2543 ****
--- 2541,2551 ----
Visible = False
end
+ object AnimatedImage1: TJvAnimatedImage
+ Left = 32
+ Top = 62
+ Width = 50
+ Height = 50
+ TransparentColor = clNone
+ end
object ComboBox7: TComboBox
Left = 104
***************
*** 2743,2763 ****
ParentFont = False
end
- object JvClock: TJvClock
- Left = 6
- Top = 32
- Width = 115
- Height = 111
- AlarmHour = 12
- AutoSize = True
- BevelOuter = bvLowered
- ShowMode = scAnalog
- Font.Charset = DEFAULT_CHARSET
- Font.Color = clWindowText
- Font.Height = -19
- Font.Name = 'MS Sans Serif'
- Font.Style = []
- ParentFont = False
- OnAlarm = JvClockAlarm
- end
object ComboBox8: TComboBox
Left = 128
--- 2751,2754 ----
***************
*** 2773,2781 ****
ItemHeight = 13
ParentFont = False
! TabOrder = 1
OnChange = ComboBox8Change
Items.Strings = (
! 'Analog'
! 'Digital')
end
object Button3: TButton
--- 2764,2772 ----
ItemHeight = 13
ParentFont = False
! TabOrder = 0
OnChange = ComboBox8Change
Items.Strings = (
! 'Digital'
! 'Analog')
end
object Button3: TButton
***************
*** 2791,2795 ****
Font.Style = []
ParentFont = False
! TabOrder = 2
OnClick = Button3Click
end
--- 2782,2786 ----
Font.Style = []
ParentFont = False
! TabOrder = 1
OnClick = Button3Click
end
***************
*** 2806,2810 ****
Font.Style = []
ParentFont = False
! TabOrder = 3
OnClick = CheckBox6Click
end
--- 2797,2801 ----
Font.Style = []
ParentFont = False
! TabOrder = 2
OnClick = CheckBox6Click
end
***************
*** 2812,2816 ****
Left = 128
Top = 120
! Width = 33
Height = 22
Font.Charset = DEFAULT_CHARSET
--- 2803,2807 ----
Left = 128
Top = 120
! Width = 35
Height = 22
Font.Charset = DEFAULT_CHARSET
***************
*** 2822,2833 ****
MinValue = 0
ParentFont = False
! TabOrder = 4
Value = 12
OnChange = SpinEdit5Change
end
object SpinEdit6: TSpinEdit
! Left = 160
Top = 120
! Width = 33
Height = 22
Font.Charset = DEFAULT_CHARSET
--- 2813,2824 ----
MinValue = 0
ParentFont = False
! TabOrder = 3
Value = 12
OnChange = SpinEdit5Change
end
object SpinEdit6: TSpinEdit
! Left = 162
Top = 120
! Width = 35
Height = 22
Font.Charset = DEFAULT_CHARSET
***************
*** 2839,2850 ****
MinValue = 0
ParentFont = False
! TabOrder = 5
Value = 0
OnChange = SpinEdit6Change
end
object SpinEdit7: TSpinEdit
! Left = 192
Top = 120
! Width = 33
Height = 22
Font.Charset = DEFAULT_CHARSET
--- 2830,2841 ----
MinValue = 0
ParentFont = False
! TabOrder = 4
Value = 0
OnChange = SpinEdit6Change
end
object SpinEdit7: TSpinEdit
! Left = 196
Top = 120
! Width = 35
Height = 22
Font.Charset = DEFAULT_CHARSET
***************
*** 2856,2863 ****
MinValue = 0
ParentFont = False
! TabOrder = 6
Value = 0
OnChange = SpinEdit7Change
end
end
object GroupBox15: TGroupBox
--- 2847,2884 ----
MinValue = 0
ParentFont = False
! TabOrder = 5
Value = 0
OnChange = SpinEdit7Change
end
+ object Panel3: TPanel
+ Left = 6
+ Top = 32
+ Width = 110
+ Height = 110
+ BevelOuter = bvNone
+ TabOrder = 6
+ object JvClock1: TJvClock
+ Left = 0
+ Top = 0
+ Width = 110
+ Height = 110
+ AlarmHour = 12
+ AutoSize = True
+ BevelInner = bvNone
+ BevelOuter = bvNone
+ ShowMode = scAnalog
+ Align = alClient
+ BorderWidth = 1
+ BorderStyle = bsSingle
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -17
+ Font.Name = 'MS Sans Serif'
+ Font.Style = []
+ ParentColor = True
+ ParentFont = False
+ OnAlarm = JvClock1Alarm
+ end
+ end
end
object GroupBox15: TGroupBox
***************
*** 3000,3004 ****
'CheckBox7.Checked'
'Edit1.Text'
- 'JvClock.Font'
'Panel2.Width'
'DirectoryListBox1.Height'
--- 3021,3024 ----
Index: ABOUT.PAS
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/examples/RxLib/ABOUT.PAS,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ABOUT.PAS 27 Jan 2004 12:51:54 -0000 1.4
--- ABOUT.PAS 1 Mar 2004 22:56:52 -0000 1.5
***************
*** 50,54 ****
procedure AppIconDblClick(Sender: TObject);
procedure SecretPanel1DblClick(Sender: TObject);
- procedure LabelMouseEnter(Sender: TObject);
procedure LabelClick(Sender: TObject);
private
--- 50,53 ----
***************
*** 91,106 ****
end;
- procedure TAboutForm.LabelMouseEnter(Sender: TObject);
- begin
- with Sender as TJvLabel do begin
- if MouseInControl then begin
- Font.Color := clHighlight;
- end
- else begin
- Font.Color := clWindowText;
- end;
- end;
- end;
-
procedure TAboutForm.LabelClick(Sender: TObject);
begin
--- 90,93 ----
Index: ABOUT.dfm
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/examples/RxLib/ABOUT.dfm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ABOUT.dfm 27 Jan 2004 12:51:54 -0000 1.3
--- ABOUT.dfm 1 Mar 2004 22:56:52 -0000 1.4
***************
*** 11,15 ****
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Sans Serif'
Font.Style = []
OldCreateOrder = True
--- 11,15 ----
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Shell Dlg 2'
Font.Style = []
OldCreateOrder = True
***************
*** 160,164 ****
'Serge V.Korolev'
''
! '© 1995,1998'
'')
Align = alClient
--- 160,164 ----
'Serge V.Korolev'
''
! #169' 1995,1998'
'')
Align = alClient
***************
*** 175,185 ****
Left = 13
Top = 63
! Width = 182
Height = 13
! Caption = ' Copyright © AO ROSNO 1995, 1996 '
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Sans Serif'
Font.Style = []
ParentFont = False
--- 175,185 ----
Left = 13
Top = 63
! Width = 184
Height = 13
! Caption = ' Copyright '#169' AO ROSNO 1995, 1996 '
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Shell Dlg 2'
Font.Style = []
ParentFont = False
***************
*** 188,192 ****
Left = 13
Top = 47
! Width = 65
Height = 13
Caption = ' Version 2.50 '
--- 188,192 ----
Left = 13
Top = 47
! Width = 66
Height = 13
Caption = ' Version 2.50 '
***************
*** 194,198 ****
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Sans Serif'
Font.Style = []
ParentFont = False
--- 194,198 ----
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Shell Dlg 2'
Font.Style = []
ParentFont = False
***************
*** 214,218 ****
Width = 145
Height = 29
! Hint = 'RX Library Web Site|'
Alignment = taCenter
AutoSize = False
--- 214,218 ----
Width = 145
Height = 29
! Hint = 'JVCL Web Site'
Alignment = taCenter
AutoSize = False
***************
*** 221,225 ****
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
ParentFont = False
--- 221,225 ----
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Shell Dlg 2'
Font.Style = [fsBold]
ParentFont = False
***************
*** 229,240 ****
WordWrap = True
OnClick = LabelClick
- OnMouseEnter = LabelMouseEnter
- OnMouseLeave = LabelMouseEnter
AutoOpenURL = False
HotTrackFont.Charset = DEFAULT_CHARSET
! HotTrackFont.Color = clWindowText
HotTrackFont.Height = -11
! HotTrackFont.Name = 'MS Sans Serif'
! HotTrackFont.Style = []
ImageIndex = 0
end
--- 229,239 ----
WordWrap = True
OnClick = LabelClick
AutoOpenURL = False
+ HotTrack = True
HotTrackFont.Charset = DEFAULT_CHARSET
! HotTrackFont.Color = clHighlight
HotTrackFont.Height = -11
! HotTrackFont.Name = 'MS Shell Dlg 2'
! HotTrackFont.Style = [fsBold, fsUnderline]
ImageIndex = 0
end
***************
*** 242,252 ****
Left = 13
Top = 79
! Width = 185
Height = 13
! Caption = ' Copyright © Master-Bank 1997, 1998 '
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Sans Serif'
Font.Style = []
ParentFont = False
--- 241,251 ----
Left = 13
Top = 79
! Width = 190
Height = 13
! Caption = ' Copyright '#169' Master-Bank 1997, 1998 '
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Shell Dlg 2'
Font.Style = []
ParentFont = False
***************
*** 270,274 ****
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Sans Serif'
Font.Style = []
ParentFont = False
--- 269,273 ----
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Shell Dlg 2'
Font.Style = []
ParentFont = False
***************
*** 285,289 ****
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Sans Serif'
Font.Style = []
ParentFont = False
--- 284,288 ----
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Shell Dlg 2'
Font.Style = []
ParentFont = False
***************
*** 300,304 ****
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Sans Serif'
Font.Style = []
ParentFont = False
--- 299,303 ----
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Shell Dlg 2'
Font.Style = []
ParentFont = False
***************
*** 316,320 ****
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Sans Serif'
Font.Style = []
ModalResult = 1
--- 315,319 ----
Font.Color = clWindowText
Font.Height = -11
! Font.Name = 'MS Shell Dlg 2'
Font.Style = []
ModalResult = 1
|