Menu
▾
▴
[Win32forth-cvs] win32forth/apps/Player4 CommandID.f,1.2,1.3 PLAYER4.F,1.54,1.55 PLAYER4.ff,1.3,1.4 PLAYER4.frm,1.6,1.7 Pl_MciWindow.f,1.20,1.21
|
From: Dirk B. <db...@us...> - 2006-05-24 15:27:55
|
Update of /cvsroot/win32forth/win32forth/apps/Player4 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7250/apps/Player4 Modified Files: CommandID.f PLAYER4.F PLAYER4.ff PLAYER4.frm Pl_MciWindow.f Log Message: "Control center" dialog updated and some minor changes. Index: PLAYER4.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PLAYER4.F,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** PLAYER4.F 23 May 2006 19:39:59 -0000 1.54 --- PLAYER4.F 24 May 2006 15:27:43 -0000 1.55 *************** *** 288,301 **** \ ----------------------------------------------------------------------------- : Pause/Resume ( -- ) ! Playing?: Player4W if Pause/Resume: Player4W then ; ! : Stop/Next ( -- ) ! Playing?: Player4W ! if Close: Player4W ! else catalog-exist? ! if play-catalog-random: Player4W ! then ! then ! ; IDM_STOP_NEXT SetCommand 5000 value step --- 288,301 ---- \ ----------------------------------------------------------------------------- : Pause/Resume ( -- ) ! Playing?: Player4W if Pause/Resume: Player4W then ; IDM_PAUSE/RESUME SetCommand ! : Stop ( -- ) ! Playing?: Player4W if AbortPlaying: Player4W then ; IDM_STOP SetCommand ! ! : Next ( -- ) ! Playing?: Player4W ! if Close: Player4W ! else catalog-exist? if play-catalog-random: Player4W then ! then ; IDM_NEXT SetCommand 5000 value step *************** *** 308,312 **** ' Pause/Resume SetFunc: PauseButton ! ' Stop/Next SetFunc: StopButton ' Forward SetFunc: ForwardButton ' Rewind SetFunc: BackButton --- 308,313 ---- ' Pause/Resume SetFunc: PauseButton ! ' Stop SetFunc: StopButton ! ' Next SetFunc: NextButton ' Forward SetFunc: ForwardButton ' Rewind SetFunc: BackButton *************** *** 460,469 **** \ other commands FCONTROL 'Q' IDM_STOP ACCELENTRY 0 VK_ESCAPE IDM_STOPPLAYER ACCELENTRY 0 VK_LEFT IDM_REWIND ACCELENTRY 0 VK_RIGHT IDM_FORWARD ACCELENTRY ! 0 VK_PRIOR IDM_STOP_NEXT ACCELENTRY \ page up ! 0 VK_NEXT IDM_STOP_NEXT ACCELENTRY \ page down MainWindow HandlesThem --- 461,472 ---- \ other commands FCONTROL 'Q' IDM_STOP ACCELENTRY + FCONTROL 'S' IDM_STOP ACCELENTRY + FCONTROL 'P' IDM_PAUSE/RESUME ACCELENTRY 0 VK_ESCAPE IDM_STOPPLAYER ACCELENTRY 0 VK_LEFT IDM_REWIND ACCELENTRY 0 VK_RIGHT IDM_FORWARD ACCELENTRY ! 0 VK_PRIOR IDM_NEXT ACCELENTRY \ page up ! 0 VK_NEXT IDM_NEXT ACCELENTRY \ page down MainWindow HandlesThem Index: Pl_MciWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Pl_MciWindow.f,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Pl_MciWindow.f 21 May 2006 11:42:10 -0000 1.20 --- Pl_MciWindow.f 24 May 2006 15:27:43 -0000 1.21 *************** *** 120,127 **** : ReTitle ( addr len -- ) ! ?dup ! if ! WindowTitle: parent zcount title$ place ! s" - " title$ +place title$ +place \ append filename s" - " title$ +place GetLength: self (.ms) title$ +place s" / " title$ +place GetPosition: self (.ms) title$ +place --- 120,125 ---- : ReTitle ( addr len -- ) ! WindowTitle: parent zcount title$ place ?dup ! if s" - " title$ +place title$ +place \ append filename s" - " title$ +place GetLength: self (.ms) title$ +place s" / " title$ +place GetPosition: self (.ms) title$ +place *************** *** 133,136 **** --- 131,135 ---- Playing? if 0 0 ReTitle + SW_HIDE Show: MouseHandlerWindow Close: super false to Playing? Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/CommandID.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CommandID.f 21 May 2006 11:42:10 -0000 1.2 --- CommandID.f 24 May 2006 15:27:43 -0000 1.3 *************** *** 34,44 **** NewID IDM_AUDIO_OFF \ Other commands NewID IDM_STOP ! NewID IDM_ABOUT ! NewID IDM_STOPPLAYER NewID IDM_REWIND NewID IDM_FORWARD ! NewID IDM_STOP_NEXT IdCounter constant IDM_LAST --- 34,48 ---- NewID IDM_AUDIO_OFF + \ Help menu + NewID IDM_ABOUT + \ Other commands + NewID IDM_PAUSE/RESUME NewID IDM_STOP ! NewID IDM_NEXT NewID IDM_REWIND NewID IDM_FORWARD ! ! NewID IDM_STOPPLAYER IdCounter constant IDM_LAST Index: PLAYER4.frm =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PLAYER4.frm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PLAYER4.frm 21 May 2006 11:42:10 -0000 1.6 --- PLAYER4.frm 24 May 2006 15:27:43 -0000 1.7 *************** *** 1,15 **** \ PLAYER4.FRM PushButton PauseButton PushButton StopButton PushButton BackButton PushButton ForwardButton - 96 constant FontHeight :Object ControlCenter <Super DialogWindow ! Font WinFont ' 2drop value WmCommand-Func \ function pointer for WM_COMMAND ! ColorObject FrmColor \ the background color :M ClassInit: ( -- ) --- 1,18 ---- \ PLAYER4.FRM + \- textbox needs excontrols.f PushButton PauseButton PushButton StopButton + PushButton NextButton PushButton BackButton PushButton ForwardButton :Object ControlCenter <Super DialogWindow ! Font WinFont \ default font ' 2drop value WmCommand-Func \ function pointer for WM_COMMAND ! ColorObject FrmColor \ the background color ! ! PushButton Button6 :M ClassInit: ( -- ) *************** *** 19,23 **** :M WindowStyle: ( -- style ) ! WS_POPUPWINDOW WS_DLGFRAME or ;M --- 22,26 ---- :M WindowStyle: ( -- style ) ! WS_POPUPWINDOW WS_DLGFRAME or ;M *************** *** 36,44 **** :M StartSize: ( -- width height ) ! 284 40 ;M :M StartPos: ( -- x y ) ! CenterWindow: Self FontHeight + ;M --- 39,52 ---- :M StartSize: ( -- width height ) ! 395 40 ;M :M StartPos: ( -- x y ) ! 150 175 ! ;M ! ! :M Close: ( -- ) ! \ Insert your code here ! Close: super ;M *************** *** 46,50 **** s" MS Sans Serif" SetFaceName: WinFont 8 Width: WinFont ! Create: WinFont \ set form color to system color --- 54,58 ---- s" MS Sans Serif" SetFaceName: WinFont 8 Width: WinFont ! Create: WinFont drop \ set form color to system color *************** *** 53,57 **** self Start: PauseButton ! 10 10 95 20 Move: PauseButton Handle: Winfont SetFont: PauseButton s" Pause / Resume" SetText: PauseButton --- 61,65 ---- self Start: PauseButton ! 10 10 95 21 Move: PauseButton Handle: Winfont SetFont: PauseButton s" Pause / Resume" SetText: PauseButton *************** *** 60,75 **** 110 10 95 20 Move: StopButton Handle: Winfont SetFont: StopButton ! s" Stop / Next" SetText: StopButton self Start: BackButton ! 210 10 30 20 Move: BackButton Handle: Winfont SetFont: BackButton s" <<" SetText: BackButton self Start: ForwardButton ! 245 10 30 20 Move: ForwardButton Handle: Winfont SetFont: ForwardButton s" >>" SetText: ForwardButton ;M --- 68,93 ---- 110 10 95 20 Move: StopButton Handle: Winfont SetFont: StopButton ! s" Stop " SetText: StopButton ! ! self Start: NextButton ! 212 10 95 20 Move: NextButton ! Handle: Winfont SetFont: NextButton ! s" Next" SetText: NextButton self Start: BackButton ! 319 10 30 20 Move: BackButton Handle: Winfont SetFont: BackButton s" <<" SetText: BackButton self Start: ForwardButton ! 354 10 30 20 Move: ForwardButton Handle: Winfont SetFont: ForwardButton s" >>" SetText: ForwardButton + self Start: Button6 + 336 19 43 0 Move: Button6 + Handle: Winfont SetFont: Button6 + s" Button6" SetText: Button6 + ;M *************** *** 77,83 **** over LOWORD ( ID ) self \ object address on stack WMCommand-Func ?dup \ must not be zero ! if ( SetFocus: Self ) execute ! else 2drop \ drop ID and object address ! then 0 ;M :M SetCommand: ( cfa -- ) \ set WMCommand function --- 95,101 ---- over LOWORD ( ID ) self \ object address on stack WMCommand-Func ?dup \ must not be zero ! if execute ! else 2drop \ drop ID and object address ! then 0 ;M :M SetCommand: ( cfa -- ) \ set WMCommand function *************** *** 95,100 **** ;M - \ :M On_SetFocus: - \ SetFocus: parent ;M - ;Object --- 113,115 ---- Index: PLAYER4.ff =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PLAYER4.ff,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvs2ECAsJ and /tmp/cvsMni5DS differ |
