Index: base/applications/mplay32/lang/bg-BG.rc =================================================================== --- base/applications/mplay32/lang/bg-BG.rc (revision 62254) +++ base/applications/mplay32/lang/bg-BG.rc (working copy) @@ -8,11 +8,18 @@ BEGIN POPUP "&Файл" BEGIN - MENUITEM "&Отваряне...", IDM_OPEN_FILE - MENUITEM "&Затваряне", IDM_CLOSE_FILE + MENUITEM "&Отваряне...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Затваряне\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "Из&ход", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -25,6 +32,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Всички поддържани (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/cs-CZ.rc =================================================================== --- base/applications/mplay32/lang/cs-CZ.rc (revision 62254) +++ base/applications/mplay32/lang/cs-CZ.rc (working copy) @@ -9,11 +9,18 @@ BEGIN POPUP "&Soubor" BEGIN - MENUITEM "&Otevřít...", IDM_OPEN_FILE - MENUITEM "&Zavřít", IDM_CLOSE_FILE + MENUITEM "&Otevřít...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Zavřít\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Ukončit", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -26,6 +33,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Všechny podporované (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/de-DE.rc =================================================================== --- base/applications/mplay32/lang/de-DE.rc (revision 62254) +++ base/applications/mplay32/lang/de-DE.rc (working copy) @@ -4,11 +4,18 @@ BEGIN POPUP "&Datei" BEGIN - MENUITEM "Ö&ffnen...", IDM_OPEN_FILE - MENUITEM "Sch&ließen", IDM_CLOSE_FILE + MENUITEM "Ö&ffnen...\tStrg+O", IDM_OPEN_FILE + MENUITEM "Sch&ließen\tStrg+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Beenden", IDM_EXIT END + POPUP "&Wiedergabe" + BEGIN + MENUITEM "Wiedergabe/&Pause\tStrg+P", IDC_PLAY + MENUITEM "St&opp\tStrg+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "W&iederholen\tStrg+T", IDM_REPEAT + END POPUP "&Gerät" BEGIN MENUITEM "&Eigenschaften", IDM_DEVPROPS @@ -21,6 +28,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Alle unterstützten (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/en-US.rc =================================================================== --- base/applications/mplay32/lang/en-US.rc (revision 62254) +++ base/applications/mplay32/lang/en-US.rc (working copy) @@ -4,11 +4,18 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "&Open...", IDM_OPEN_FILE - MENUITEM "&Close", IDM_CLOSE_FILE + MENUITEM "&Open...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Close\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Exit", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -21,6 +28,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "All Supported (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/es-ES.rc =================================================================== --- base/applications/mplay32/lang/es-ES.rc (revision 62254) +++ base/applications/mplay32/lang/es-ES.rc (working copy) @@ -4,11 +4,18 @@ BEGIN POPUP "&Archivo" BEGIN - MENUITEM "&Abrir...", IDM_OPEN_FILE - MENUITEM "&Cerrar", IDM_CLOSE_FILE + MENUITEM "&Abrir...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Cerrar\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Salir", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -21,6 +28,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Todos los ficheros soportados (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/fr-FR.rc =================================================================== --- base/applications/mplay32/lang/fr-FR.rc (revision 62254) +++ base/applications/mplay32/lang/fr-FR.rc (working copy) @@ -4,11 +4,18 @@ BEGIN POPUP "&Fichier" BEGIN - MENUITEM "&Ouvrir...", IDM_OPEN_FILE - MENUITEM "&Fermer", IDM_CLOSE_FILE + MENUITEM "&Ouvrir...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Fermer\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Quitter", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -21,6 +28,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Tous les types supportés (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/he-IL.rc =================================================================== --- base/applications/mplay32/lang/he-IL.rc (revision 62254) +++ base/applications/mplay32/lang/he-IL.rc (working copy) @@ -4,11 +4,18 @@ BEGIN POPUP "&קובץ" BEGIN - MENUITEM "&פתח...", IDM_OPEN_FILE - MENUITEM "&סגור", IDM_CLOSE_FILE + MENUITEM "&פתח...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&סגור\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&יציאה", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -21,6 +28,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "כל הקבצים הנתמכים (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/it-IT.rc =================================================================== --- base/applications/mplay32/lang/it-IT.rc (revision 62254) +++ base/applications/mplay32/lang/it-IT.rc (working copy) @@ -4,11 +4,18 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "&Apri...", IDM_OPEN_FILE - MENUITEM "&Chiudi", IDM_CLOSE_FILE + MENUITEM "&Apri...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Chiudi\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Esci", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -21,6 +28,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Tutti i tipi supportati (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/ja-JP.rc =================================================================== --- base/applications/mplay32/lang/ja-JP.rc (revision 62254) +++ base/applications/mplay32/lang/ja-JP.rc (working copy) @@ -4,11 +4,18 @@ BEGIN POPUP "ファイル(&F)" BEGIN - MENUITEM "開く(&O)...", IDM_OPEN_FILE - MENUITEM "閉じる(&C)", IDM_CLOSE_FILE + MENUITEM "開く(&O)...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "閉じる(&C)\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "終了(&E)", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -21,6 +28,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "すべてのサポートされたファイル (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/nl-NL.rc =================================================================== --- base/applications/mplay32/lang/nl-NL.rc (revision 62254) +++ base/applications/mplay32/lang/nl-NL.rc (working copy) @@ -4,11 +4,18 @@ BEGIN POPUP "&Bestand" BEGIN - MENUITEM "&Openen...", IDM_OPEN_FILE - MENUITEM "&Sluiten", IDM_CLOSE_FILE + MENUITEM "&Openen...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Sluiten\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Afsluiten", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -21,6 +28,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Mediabestanden (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/no-NO.rc =================================================================== --- base/applications/mplay32/lang/no-NO.rc (revision 62254) +++ base/applications/mplay32/lang/no-NO.rc (working copy) @@ -4,11 +4,18 @@ BEGIN POPUP "&Fil" BEGIN - MENUITEM "&Åpne...", IDM_OPEN_FILE - MENUITEM "&Lukk", IDM_CLOSE_FILE + MENUITEM "&Åpne...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Lukk\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Avslutt", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -21,6 +28,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Alle kompaktible filer (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/pl-PL.rc =================================================================== --- base/applications/mplay32/lang/pl-PL.rc (revision 62254) +++ base/applications/mplay32/lang/pl-PL.rc (working copy) @@ -11,11 +11,18 @@ BEGIN POPUP "&Plik" BEGIN - MENUITEM "&Otwórz...", IDM_OPEN_FILE - MENUITEM "&Zamknij", IDM_CLOSE_FILE + MENUITEM "&Otwórz...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Zamknij\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Wyjdź", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -28,6 +35,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Wszystkie formaty (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/pt-BR.rc =================================================================== --- base/applications/mplay32/lang/pt-BR.rc (revision 62254) +++ base/applications/mplay32/lang/pt-BR.rc (working copy) @@ -6,11 +6,18 @@ BEGIN POPUP "&Arquivo" BEGIN - MENUITEM "&Abrir...", IDM_OPEN_FILE - MENUITEM "&Fechar", IDM_CLOSE_FILE + MENUITEM "&Abrir...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Fechar\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Sair", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -23,6 +30,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Todos os formatos (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/ro-RO.rc =================================================================== --- base/applications/mplay32/lang/ro-RO.rc (revision 62254) +++ base/applications/mplay32/lang/ro-RO.rc (working copy) @@ -10,11 +10,18 @@ BEGIN POPUP "&Fișier" BEGIN - MENUITEM "&Deschidere…", IDM_OPEN_FILE - MENUITEM "Î&nchide", IDM_CLOSE_FILE + MENUITEM "&Deschidere…\tCtrl+O", IDM_OPEN_FILE + MENUITEM "Î&nchide\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "I&eșire", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Dispozitiv" BEGIN MENUITEM "&Proprietăți…", IDM_DEVPROPS @@ -27,6 +34,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Toate admisibile (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/ru-RU.rc =================================================================== --- base/applications/mplay32/lang/ru-RU.rc (revision 62254) +++ base/applications/mplay32/lang/ru-RU.rc (working copy) @@ -4,11 +4,18 @@ BEGIN POPUP "&Файл" BEGIN - MENUITEM "&Открыть...", IDM_OPEN_FILE - MENUITEM "&Закрыть", IDM_CLOSE_FILE + MENUITEM "&Открыть...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Закрыть\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Выход", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -21,6 +28,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Все поддерживаемые (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/sk-SK.rc =================================================================== --- base/applications/mplay32/lang/sk-SK.rc (revision 62254) +++ base/applications/mplay32/lang/sk-SK.rc (working copy) @@ -9,11 +9,18 @@ BEGIN POPUP "&Súbor" BEGIN - MENUITEM "&Otvoriť...", IDM_OPEN_FILE - MENUITEM "&Zavrieť", IDM_CLOSE_FILE + MENUITEM "&Otvoriť...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Zavrieť\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "S&končiť", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -26,6 +33,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Všetky podporované (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/sq-AL.rc =================================================================== --- base/applications/mplay32/lang/sq-AL.rc (revision 62254) +++ base/applications/mplay32/lang/sq-AL.rc (working copy) @@ -8,11 +8,18 @@ BEGIN POPUP "&Skeda" BEGIN - MENUITEM "&Hape...", IDM_OPEN_FILE - MENUITEM "&Mbylle", IDM_CLOSE_FILE + MENUITEM "&Hape...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Mbylle\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Dil", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -25,6 +32,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Të gjith suportimet (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/sv-SE.rc =================================================================== --- base/applications/mplay32/lang/sv-SE.rc (revision 62254) +++ base/applications/mplay32/lang/sv-SE.rc (working copy) @@ -11,11 +11,18 @@ BEGIN POPUP "&Arkiv" BEGIN - MENUITEM "&Öppna...", IDM_OPEN_FILE - MENUITEM "&Stäng", IDM_CLOSE_FILE + MENUITEM "&Öppna...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Stäng\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Avsluta", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -28,6 +35,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Alla kompaktibla filer (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/tr-TR.rc =================================================================== --- base/applications/mplay32/lang/tr-TR.rc (revision 62254) +++ base/applications/mplay32/lang/tr-TR.rc (working copy) @@ -6,11 +6,18 @@ BEGIN POPUP "&Kütük" BEGIN - MENUITEM "&Aç...", IDM_OPEN_FILE - MENUITEM "&Kapat", IDM_CLOSE_FILE + MENUITEM "&Aç...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Kapat\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Çıkış", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Aygıt" BEGIN MENUITEM "&Husûsiyetler", IDM_DEVPROPS @@ -23,6 +30,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Desteklenen Kütükler (*.wav, *.cda, *.mid, *.midi, *.avi)\0*.wav;*.cda;*.mid;*.midi;*.avi\0" Index: base/applications/mplay32/lang/uk-UA.rc =================================================================== --- base/applications/mplay32/lang/uk-UA.rc (revision 62254) +++ base/applications/mplay32/lang/uk-UA.rc (working copy) @@ -12,11 +12,18 @@ BEGIN POPUP "&Файл" BEGIN - MENUITEM "&Відкрити...", IDM_OPEN_FILE - MENUITEM "&Закрити", IDM_CLOSE_FILE + MENUITEM "&Відкрити...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Закрити\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Вихід", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -29,6 +36,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "Всі підтримувані (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/zh-CN.rc =================================================================== --- base/applications/mplay32/lang/zh-CN.rc (revision 62254) +++ base/applications/mplay32/lang/zh-CN.rc (working copy) @@ -6,11 +6,18 @@ BEGIN POPUP "文件(&F)" BEGIN - MENUITEM "打开... (&O)", IDM_OPEN_FILE - MENUITEM "关闭(&C)", IDM_CLOSE_FILE + MENUITEM "打开... (&O)\tCtrl+O", IDM_OPEN_FILE + MENUITEM "关闭(&C)\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "退出(&E)", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -23,6 +30,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "所有支持的格式 (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/lang/zh-TW.rc =================================================================== --- base/applications/mplay32/lang/zh-TW.rc (revision 62254) +++ base/applications/mplay32/lang/zh-TW.rc (working copy) @@ -12,11 +12,18 @@ BEGIN POPUP "檔案(&F)" BEGIN - MENUITEM "開啟(&O)...", IDM_OPEN_FILE - MENUITEM "關閉(&C)", IDM_CLOSE_FILE + MENUITEM "開啟(&O)...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "關閉(&C)\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "結束(&E)", IDM_EXIT END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END POPUP "&Device" BEGIN MENUITEM "&Properties", IDM_DEVPROPS @@ -29,6 +36,15 @@ END END +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT +END + STRINGTABLE BEGIN IDS_ALL_TYPES_FILTER "所有支援格式 (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" Index: base/applications/mplay32/mplay32.c =================================================================== --- base/applications/mplay32/mplay32.c (revision 62254) +++ base/applications/mplay32/mplay32.c (working copy) @@ -18,6 +18,7 @@ WORD wDeviceId; BOOL bIsOpened = FALSE; BOOL bIsPaused = FALSE; +BOOL bRepeat = FALSE; UINT MaxFilePos = 0; @@ -421,6 +422,7 @@ PlayTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) { MCI_STATUS_PARMS mciStatus; + MCI_PLAY_PARMS mciPlay; DWORD dwPos; if (!bIsOpened) KillTimer(hwnd, IDT_PLAYTIMER); @@ -431,7 +433,16 @@ if((UINT)dwPos >= MaxFilePos) { - StopPlayback(hwnd); + if (!bRepeat) + { + StopPlayback(hwnd); + } + else + { + mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); + mciPlay.dwCallback = (DWORD_PTR)hwnd; + mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY, (DWORD_PTR)&mciPlay); + } } else { @@ -690,6 +701,20 @@ _tcscpy(szPrevFile, _T("\0")); break; + case IDM_REPEAT: + if (!bRepeat) + { + CheckMenuItem(hMainMenu, IDM_REPEAT, MF_BYCOMMAND | MF_CHECKED); + bRepeat = TRUE; + } + else + { + CheckMenuItem(hMainMenu, IDM_REPEAT, MF_BYCOMMAND | MF_UNCHECKED); + bRepeat = FALSE; + } + break; + + case IDM_DEVPROPS: ShowDeviceProperties(hwnd); break; @@ -728,6 +753,7 @@ HWND hwnd; MSG msg; DWORD dwError; + HANDLE hAccel; hInstance = hInst; @@ -757,6 +783,8 @@ hInstance, NULL); + hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(ID_ACCELERATORS)); + DragAcceptFiles(hwnd, TRUE); DisableMenuItems(); @@ -776,9 +804,14 @@ /* Message Loop */ while (GetMessage(&msg, NULL, 0, 0)) { - TranslateMessage(&msg); - DispatchMessage(&msg); + if (!TranslateAccelerator(hwnd, hAccel, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } } + DestroyAcceleratorTable(hAccel); + return 0; } Index: base/applications/mplay32/resource.h =================================================================== --- base/applications/mplay32/resource.h (revision 62254) +++ base/applications/mplay32/resource.h (working copy) @@ -30,6 +30,9 @@ /* Menu */ #define IDR_MAINMENU 500 +/* Accelerators */ +#define ID_ACCELERATORS 800 + /* Menu items */ #define IDM_OPEN_FILE 1000 #define IDM_CLOSE_FILE 1001 @@ -37,6 +40,7 @@ #define IDM_ABOUT 1003 #define IDM_VOLUMECTL 1004 #define IDM_DEVPROPS 1005 +#define IDM_REPEAT 1006 /* ToolBar Icons */ #define TBICON_PLAY 0