From: Peter T. <pe...@us...> - 2003-03-30 16:47:36
|
Update of /cvsroot/jvcl/jvcl/examples/JVCLMegaDemo In directory sc8-pr-cvs1:/tmp/cvs-serv30252/examples/JVCLMegaDemo Modified Files: JvControlsU.dfm JvDialogsU.dfm JvDialogsU.pas jvTransparentFormd.pas jvWinDialogsU.dfm jvWinDialogsU.pas Log Message: Several changes and mergings. See changelog.txt for details Index: JvControlsU.dfm =================================================================== RCS file: /cvsroot/jvcl/jvcl/examples/JVCLMegaDemo/JvControlsU.dfm,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 Binary files /tmp/cvsF0QMMY and /tmp/cvsebVOiN differ Index: JvDialogsU.dfm =================================================================== RCS file: /cvsroot/jvcl/jvcl/examples/JVCLMegaDemo/JvDialogsU.dfm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JvDialogsU.dfm 2 Mar 2003 09:20:42 -0000 1.7 --- JvDialogsU.dfm 30 Mar 2003 16:46:21 -0000 1.8 *************** *** 1,5 **** object JvDialogs: TJvDialogs ! Left = 75 ! Top = 66 Width = 583 Height = 505 --- 1,5 ---- object JvDialogs: TJvDialogs ! Left = 262 ! Top = 119 Width = 583 Height = 505 *************** *** 332,336 **** Caption = 'Open Dialog 2000' TabOrder = 5 - OnClick = JvBitBtn6Click Glyph.Data = { 76060000424D7606000000000000360400002800000018000000180000000100 --- 332,335 ---- *************** *** 466,470 **** Caption = 'Save Dialog 2000' TabOrder = 7 - OnClick = JvBitBtn8Click Glyph.Data = { 76060000424D7606000000000000360400002800000018000000180000000100 --- 465,468 ---- *************** *** 1203,1207 **** Caption = 'Control Panel' TabOrder = 18 - OnClick = JvBitBtn19Click Glyph.Data = { 76060000424D7606000000000000360400002800000018000000180000000100 --- 1201,1204 ---- *************** *** 2007,2011 **** Caption = 'Password Form' TabOrder = 30 - OnClick = JvBitBtn32Click Glyph.Data = { 76060000424D7606000000000000360400002800000018000000180000000100 --- 2004,2007 ---- *************** *** 2074,2078 **** Caption = 'Exch. ListBox' TabOrder = 31 - OnClick = JvBitBtn33Click Glyph.Data = { 76060000424D7606000000000000360400002800000018000000180000000100 --- 2070,2073 ---- *************** *** 2141,2145 **** Caption = 'Login Dialog' TabOrder = 32 - OnClick = JvBitBtn34Click Glyph.Data = { 76060000424D7606000000000000360400002800000018000000180000000100 --- 2136,2139 ---- *************** *** 2208,2212 **** Caption = 'Serial Number' TabOrder = 33 - OnClick = JvBitBtn35Click Glyph.Data = { 76060000424D7606000000000000360400002800000018000000180000000100 --- 2202,2205 ---- *************** *** 2347,2351 **** Caption = 'Progress Dialog' TabOrder = 35 - OnClick = JvBitBtn37Click Glyph.Data = { 76060000424D7606000000000000360400002800000018000000180000000100 --- 2340,2343 ---- *************** *** 3016,3063 **** HotTrackFont.Style = [] end - object JvPasswordForm1: TJvPasswordForm - Title = 'Enter password' - OkCaption = '&OK' - CancelCaption = '&Cancel' - LabelCaption = '&Password:' - OnCancel = JvPasswordForm1Cancel - OnOk = JvPasswordForm1Ok - PasswordChar = '*' - Left = 800 - Top = 312 - end - object JvExchListboxes1: TJvExchListboxes - FirstListbox.Strings = ( - 'Line 1' - 'Line 2' - 'Line 3' - 'Line 4' - 'Line 5') - SecondListbox.Strings = ( - 'Item 1' - 'Item 2' - 'Item 3' - 'Item 4' - 'Item 5') - FirstCaption = 'First Column' - SecondCaption = 'Second Column' - Title = 'Listbox Editor' - Left = 800 - Top = 360 - end - object JvLoginDlg1: TJvLoginDlg - FirstLabel = '&Username:' - SecondLabel = '&Password:' - Title = 'Login' - Left = 800 - Top = 408 - end - object JvSerialDlg1: TJvSerialDlg - FirstLabel = '&Name:' - SecondLabel = '&Serial:' - Title = 'Enter Serial' - Left = 800 - Top = 464 - end object JvImageDlg1: TJvImageDlg Picture.Data = { --- 3008,3011 ---- *************** *** 10793,10801 **** Top = 608 end - object JvProgressDlg1: TJvProgressDlg - Text = 'Progress' - Left = 800 - Top = 512 - end object JvDiskPrompt1: TJvDiskPrompt Title = 'Insert Disk...' --- 10741,10744 ---- *************** *** 10882,10893 **** Top = 192 end - object JvOpenDialog20001: TJvOpenDialog2000 - Left = 616 - Top = 224 - end - object JvSaveDialog20001: TJvSaveDialog2000 - Left = 616 - Top = 264 - end object JvConnectNetwork1: TJvConnectNetwork Left = 616 --- 10825,10828 ---- *************** *** 10919,10926 **** Left = 680 Top = 168 - end - object JvControlPanelDialog1: TJvControlPanelDialog - Left = 680 - Top = 216 end object JvAppletDialog1: TJvAppletDialog --- 10854,10857 ---- Index: JvDialogsU.pas =================================================================== RCS file: /cvsroot/jvcl/jvcl/examples/JVCLMegaDemo/JvDialogsU.pas,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** JvDialogsU.pas 2 Mar 2003 05:52:44 -0000 1.9 --- JvDialogsU.pas 30 Mar 2003 16:46:29 -0000 1.10 *************** *** 33,41 **** uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! JvComponent, JvBaseDlg, JvPasswordForm, StdCtrls, JvExchListboxes, ! JvLoginDlg, JvNagScreen, JvImageDlg, JvWinDialogs, ! JvProgressDlg, JvCommonDialogD, JvDiskPrompt, JvCopyError, JvDeleteError, JvPageSetup, JvPageSetupTitled, JvObjPickerComp, ! JvCalc, JvTipOfDay, JvSerialDlg, ExtCtrls, JvCaptionPanel, JvFindFiles, JvGroupBox, Buttons, JvBitBtn, JvDlg, JvBrowseFolder, JvSelectDirectory, JvDialogs, JvConnectNetwork, JvAddPrinter, JvRenameError, JvFindReplace; --- 33,40 ---- uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! JvComponent, JvBaseDlg, StdCtrls, JvNagScreen, JvImageDlg, JvWinDialogs, ! JvCommonDialogD, JvDiskPrompt, JvCopyError, JvDeleteError, JvPageSetup, JvPageSetupTitled, JvObjPickerComp, ! JvCalc, JvTipOfDay, ExtCtrls, JvCaptionPanel, JvFindFiles, JvGroupBox, Buttons, JvBitBtn, JvDlg, JvBrowseFolder, JvSelectDirectory, JvDialogs, JvConnectNetwork, JvAddPrinter, JvRenameError, JvFindReplace; *************** *** 43,52 **** type TJvDialogs = class(TForm) - JvPasswordForm1: TJvPasswordForm; - JvExchListboxes1: TJvExchListboxes; - JvLoginDlg1: TJvLoginDlg; JvImageDlg1: TJvImageDlg; JvCalculator1: TJvCalculator; - JvProgressDlg1: TJvProgressDlg; JvDiskPrompt1: TJvDiskPrompt; JvCopyError1: TJvCopyError; --- 42,47 ---- *************** *** 55,59 **** JvPageSetupTitledDialog1: TJvPageSetupTitledDialog; JvObjectPickerDialog1: TJvObjectPickerDialog; - JvSerialDlg1: TJvSerialDlg; JvCaptionPanel1: TJvCaptionPanel; Button17: TButton; --- 50,53 ---- *************** *** 67,72 **** JvOpenDialog1: TJvOpenDialog; JvSaveDialog1: TJvSaveDialog; - JvOpenDialog20001: TJvOpenDialog2000; - JvSaveDialog20001: TJvSaveDialog2000; JvBitBtn5: TJvBitBtn; JvBitBtn6: TJvBitBtn; --- 61,64 ---- *************** *** 97,101 **** JvOrganizeFavoritesDialog1: TJvOrganizeFavoritesDialog; JvComputerNameDialog1: TJvComputerNameDialog; - JvControlPanelDialog1: TJvControlPanelDialog; JvAppletDialog1: TJvAppletDialog; JvChangeIconDialog1: TJvChangeIconDialog; --- 89,92 ---- *************** *** 141,147 **** procedure JvBitBtn4Click(Sender: TObject); procedure JvBitBtn5Click(Sender: TObject); - procedure JvBitBtn6Click(Sender: TObject); procedure JvBitBtn7Click(Sender: TObject); - procedure JvBitBtn8Click(Sender: TObject); procedure JvBitBtn9Click(Sender: TObject); procedure JvBitBtn10Click(Sender: TObject); --- 132,136 ---- *************** *** 154,158 **** procedure JvBitBtn17Click(Sender: TObject); procedure JvBitBtn18Click(Sender: TObject); - procedure JvBitBtn19Click(Sender: TObject); procedure JvBitBtn20Click(Sender: TObject); procedure JvBitBtn21Click(Sender: TObject); --- 143,146 ---- *************** *** 167,176 **** procedure JvBitBtn30Click(Sender: TObject); procedure JvBitBtn31Click(Sender: TObject); - procedure JvBitBtn32Click(Sender: TObject); - procedure JvBitBtn33Click(Sender: TObject); - procedure JvBitBtn34Click(Sender: TObject); - procedure JvBitBtn35Click(Sender: TObject); procedure JvBitBtn36Click(Sender: TObject); - procedure JvBitBtn37Click(Sender: TObject); procedure JvBitBtn39Click(Sender: TObject); procedure JvBitBtn40Click(Sender: TObject); --- 155,159 ---- *************** *** 242,250 **** end; - procedure TJvDialogs.JvBitBtn6Click(Sender: TObject); - begin - jvOpenDialog20001.Execute; - end; - procedure TJvDialogs.JvBitBtn7Click(Sender: TObject); begin --- 225,228 ---- *************** *** 252,260 **** end; - procedure TJvDialogs.JvBitBtn8Click(Sender: TObject); - begin - jvSaveDialog20001.Execute; - end; - procedure TJvDialogs.JvBitBtn9Click(Sender: TObject); begin --- 230,233 ---- *************** *** 307,315 **** end; - procedure TJvDialogs.JvBitBtn19Click(Sender: TObject); - begin - jvControlPanelDialog1.Execute; - end; - procedure TJvDialogs.JvBitBtn20Click(Sender: TObject); var --- 280,283 ---- *************** *** 383,406 **** end; - procedure TJvDialogs.JvBitBtn32Click(Sender: TObject); - begin - JvPasswordForm1.Execute; - end; - - procedure TJvDialogs.JvBitBtn33Click(Sender: TObject); - begin - JvExchListboxes1.Execute; - end; - - procedure TJvDialogs.JvBitBtn34Click(Sender: TObject); - begin - JvLoginDlg1.Execute; - end; - - procedure TJvDialogs.JvBitBtn35Click(Sender: TObject); - begin - JvSerialDlg1.Execute; - end; - procedure TJvDialogs.JvBitBtn36Click(Sender: TObject); begin --- 351,354 ---- *************** *** 411,433 **** finally Free; - end; - - end; - - procedure TJvDialogs.JvBitBtn37Click(Sender: TObject); - var - I: Integer; - begin - with JvProgressDlg1 do - begin - Text := 'Progressing....'; - Show; - StartProgression; - for I := 0 to 100 do - begin - Value := I; - Sleep(100); - end; - Close; end; --- 359,362 ---- Index: jvTransparentFormd.pas =================================================================== RCS file: /cvsroot/jvcl/jvcl/examples/JVCLMegaDemo/jvTransparentFormd.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** jvTransparentFormd.pas 1 Mar 2003 06:29:06 -0000 1.5 --- jvTransparentFormd.pas 30 Mar 2003 16:46:30 -0000 1.6 *************** *** 5,9 **** uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! StdCtrls, JvComponent, JvTransparentForm, JvBaseDlg, JvLoginDlg; type --- 5,9 ---- uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ! StdCtrls, JvComponent, JvTransparentForm; type Index: jvWinDialogsU.dfm =================================================================== RCS file: /cvsroot/jvcl/jvcl/examples/JVCLMegaDemo/jvWinDialogsU.dfm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** jvWinDialogsU.dfm 28 Feb 2003 07:27:10 -0000 1.3 --- jvWinDialogsU.dfm 30 Mar 2003 16:46:31 -0000 1.4 *************** *** 48,52 **** Caption = 'Controlpanel' TabOrder = 4 - OnClick = Button5Click end object Button6: TButton --- 48,51 ---- *************** *** 57,61 **** Caption = 'Appletdialog' TabOrder = 5 - OnClick = Button6Click end object Button7: TButton --- 56,59 ---- *************** *** 156,160 **** Caption = 'Save Dialog 2000' TabOrder = 16 - OnClick = Button17Click end object Button18: TButton --- 154,157 ---- *************** *** 165,169 **** Caption = 'Open Dialog 2000' TabOrder = 17 - OnClick = Button18Click end object Button19: TButton --- 162,165 ---- *************** *** 215,222 **** Top = 104 end - object JvControlPanelDialog1: TJvControlPanelDialog - Left = 192 - Top = 136 - end object JvAppletDialog1: TJvAppletDialog Left = 192 --- 211,214 ---- *************** *** 329,349 **** Left = 416 Top = 200 - end - object JvOpenDialog20001: TJvOpenDialog2000 - DefaultExt = '*.cpl' - FileName = '*.cpl' - Filter = 'Appletfile|*.cpl' - Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist, ofEnableSizing] - Title = 'Open Applet' - Left = 416 - Top = 232 - end - object JvSaveDialog20001: TJvSaveDialog2000 - DefaultExt = '*.*' - FileName = '*.*' - Filter = 'all files (*.*)|*.*' - Title = 'Save something' - Left = 416 - Top = 264 end object JvAddPrinterDialog1: TJvAddPrinterDialog --- 321,324 ---- Index: jvWinDialogsU.pas =================================================================== RCS file: /cvsroot/jvcl/jvcl/examples/JVCLMegaDemo/jvWinDialogsU.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** jvWinDialogsU.pas 28 Feb 2003 13:24:56 -0000 1.4 --- jvWinDialogsU.pas 30 Mar 2003 16:46:32 -0000 1.5 *************** *** 35,39 **** JvOrganizeFavoritesDialog1: TJvOrganizeFavoritesDialog; JvComputerNameDialog1: TJvComputerNameDialog; - JvControlPanelDialog1: TJvControlPanelDialog; JvAppletDialog1: TJvAppletDialog; JvChangeIconDialog1: TJvChangeIconDialog; --- 35,38 ---- *************** *** 49,54 **** JvConnectNetwork1: TJvConnectNetwork; JvDisconnectNetwork1: TJvDisconnectNetwork; - JvOpenDialog20001: TJvOpenDialog2000; - JvSaveDialog20001: TJvSaveDialog2000; JvAddPrinterDialog1: TJvAddPrinterDialog; procedure Button1Click(Sender: TObject); --- 48,51 ---- *************** *** 56,61 **** procedure Button3Click(Sender: TObject); procedure Button4Click(Sender: TObject); - procedure Button5Click(Sender: TObject); - procedure Button6Click(Sender: TObject); procedure Button7Click(Sender: TObject); procedure Button15Click(Sender: TObject); --- 53,56 ---- *************** *** 70,75 **** procedure Button10Click(Sender: TObject); procedure Button9Click(Sender: TObject); - procedure Button18Click(Sender: TObject); - procedure Button17Click(Sender: TObject); procedure Button16Click(Sender: TObject); end; --- 65,68 ---- *************** *** 99,116 **** end; - procedure TJvWinDialogs.Button5Click(Sender: TObject); - begin - JvControlPanelDialog1.execute; - end; - - procedure TJvWinDialogs.Button6Click(Sender: TObject); - begin - if JvOpenDialog20001.execute then - begin - jvAppletDialog1.AppletName := jvOpenDialog20001.FileName; - JvAppletDialog1.execute; - end; - end; - procedure TJvWinDialogs.Button7Click(Sender: TObject); begin --- 92,95 ---- *************** *** 172,185 **** begin JvDisconnectNetwork1.execute; - end; - - procedure TJvWinDialogs.Button18Click(Sender: TObject); - begin - JvOpenDialog20001.Execute; - end; - - procedure TJvWinDialogs.Button17Click(Sender: TObject); - begin - JvSaveDialog20001.execute; end; --- 151,154 ---- |