From: Jos v.d.V. <jo...@us...> - 2006-05-21 15:05:33
|
Update of /cvsroot/win32forth/win32forth/apps/Player4 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13535/apps/Player4 Modified Files: PLAYER4.F Log Message: Jos: Remove my bug from Start/Resume and added CS_DBLCLKS in the main window to prevent a flickering catalog. Index: PLAYER4.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PLAYER4.F,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** PLAYER4.F 21 May 2006 11:42:10 -0000 1.52 --- PLAYER4.F 21 May 2006 15:05:28 -0000 1.53 *************** *** 102,105 **** --- 102,108 ---- z" Player 4th" ;M + :M WndClassStyle: ( -- style ) CS_DBLCLKS ;M + + :M DefaultIcon: ( -- hIcon ) \ return the default icon handle for window LoadAppIcon ;M *************** *** 288,297 **** : Stop/Next ( -- ) ! Playing?: Player4W if Close: Player4W then ; IDM_STOP_NEXT SetCommand ! \ if catalog-exist? ! \ if ( SetFocus: ControlCenter ) play-catalog-random: Player4W ! \ else Playing?: Player4W if Close: Player4W then ! \ then ! \ then ; IDM_STOP_NEXT SetCommand 5000 value step --- 291,299 ---- : Stop/Next ( -- ) ! catalog-exist? ! if SetFocus: ControlCenter play-catalog-random: Player4W ! else Playing?: Player4W if Close: Player4W then ! then ! ; IDM_STOP_NEXT SetCommand 5000 value step *************** *** 361,372 **** MENUBAR player4-Menu-bar POPUP "&File" ! MENUITEM "&Play file...\tCtrl+O" IDM_OPEN_FILE DoCommand ; ! MENUITEM "Play &folder...\tCtrl+F" IDM_OPEN_FOLDER DoCommand ; MENUITEM "&Play &list...\tShift+L" IDM_OPEN_PLAYLIST DoCommand ; MENUSEPARATOR ! MENUITEM "&Exit\tAlt+F4" IDM_QUIT DoCommand ; POPUP "&Catalog" ! MENUITEM "&Add file(s)...\tCtrl+M" IDM_ADD_FILES DoCommand ; MENUITEM "&Import directory tree...\tCtrl+I" IDM_IMPORT_FOLDER DoCommand ; MENUITEM "&Export the catalog to Player.csv" csv-catalog ; --- 363,374 ---- MENUBAR player4-Menu-bar POPUP "&File" ! MENUITEM "&Play file...\tCtrl+O" IDM_OPEN_FILE DoCommand ; ! MENUITEM "Play &folder...\tCtrl+F" IDM_OPEN_FOLDER DoCommand ; MENUITEM "&Play &list...\tShift+L" IDM_OPEN_PLAYLIST DoCommand ; MENUSEPARATOR ! MENUITEM "&Exit\tAlt+F4" IDM_QUIT DoCommand ; POPUP "&Catalog" ! MENUITEM "&Add file(s)...\tCtrl+M" IDM_ADD_FILES DoCommand ; MENUITEM "&Import directory tree...\tCtrl+I" IDM_IMPORT_FOLDER DoCommand ; MENUITEM "&Export the catalog to Player.csv" csv-catalog ; *************** *** 404,408 **** MENUITEM "&200%\tCtrl+2" IDM_VIEW_200 DoCommand ; MENUSEPARATOR ! MENUITEM "&FullScreen toggle\tCtrl+F" IDM_VIEW_FULLSCREEN DoCommand ; MENUSEPARATOR MENUITEM "&Audio on\tCtrl+A" IDM_AUDIO_ON DoCommand ; --- 406,410 ---- MENUITEM "&200%\tCtrl+2" IDM_VIEW_200 DoCommand ; MENUSEPARATOR ! MENUITEM "&FullScreen toggle\tCtrl+F" IDM_VIEW_FULLSCREEN DoCommand ; MENUSEPARATOR MENUITEM "&Audio on\tCtrl+A" IDM_AUDIO_ON DoCommand ; *************** *** 414,418 **** POPUP "&Help" ! MENUITEM "About Player 4th..." IDM_ABOUT DoCommand ; ENDBAR --- 416,420 ---- POPUP "&Help" ! MENUITEM "About Player 4th..." IDM_ABOUT DoCommand ; ENDBAR *************** *** 425,453 **** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! \ Accelerator Table - support \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ AccelTable table ! \ falgs key-code command-id ! \ File menu ! FCONTROL 'O' IDM_OPEN_FILE ACCELENTRY ! FCONTROL 'F' IDM_OPEN_FOLDER ACCELENTRY ! FCONTROL 'L' IDM_OPEN_PLAYLIST ACCELENTRY ! FALT VK_F4 IDM_QUIT ACCELENTRY ! \ Catalog menu ! FCONTROL 'M' IDM_ADD_FILES ACCELENTRY ! FCONTROL 'I' IDM_IMPORT_FOLDER ACCELENTRY ! FCONTROL 'R' IDM_START/RESUME ACCELENTRY \ Options menu ! FCONTROL '5' IDM_VIEW_50 ACCELENTRY ! FCONTROL '1' IDM_VIEW_100 ACCELENTRY ! FCONTROL '2' IDM_VIEW_200 ACCELENTRY ! FCONTROL 'F' IDM_VIEW_FULLSCREEN ACCELENTRY ! FCONTROL 'A' IDM_AUDIO_ON ACCELENTRY ! FSHIFT 'A' IDM_AUDIO_OFF ACCELENTRY \ Help menu --- 427,455 ---- \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! \ Accelerator Table - support \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ AccelTable table ! \ falgs key-code command-id ! \ File menu ! FCONTROL 'O' IDM_OPEN_FILE ACCELENTRY ! FCONTROL 'F' IDM_OPEN_FOLDER ACCELENTRY ! FCONTROL 'L' IDM_OPEN_PLAYLIST ACCELENTRY ! FALT VK_F4 IDM_QUIT ACCELENTRY ! \ Catalog menu ! FCONTROL 'M' IDM_ADD_FILES ACCELENTRY ! FCONTROL 'I' IDM_IMPORT_FOLDER ACCELENTRY ! FCONTROL 'R' IDM_START/RESUME ACCELENTRY \ Options menu ! FCONTROL '5' IDM_VIEW_50 ACCELENTRY ! FCONTROL '1' IDM_VIEW_100 ACCELENTRY ! FCONTROL '2' IDM_VIEW_200 ACCELENTRY ! FCONTROL 'F' IDM_VIEW_FULLSCREEN ACCELENTRY ! FCONTROL 'A' IDM_AUDIO_ON ACCELENTRY ! FSHIFT 'A' IDM_AUDIO_OFF ACCELENTRY \ Help menu *************** *** 455,460 **** \ other commands ! FCONTROL 'Q' IDM_STOP ACCELENTRY ! 0 VK_ESCAPE IDM_STOPPLAYER ACCELENTRY 0 VK_LEFT IDM_REWIND ACCELENTRY --- 457,462 ---- \ other commands ! FCONTROL 'Q' IDM_STOP ACCELENTRY ! 0 VK_ESCAPE IDM_STOPPLAYER ACCELENTRY 0 VK_LEFT IDM_REWIND ACCELENTRY |