Author: hbelusca
Date: Sun Aug 24 14:59:44 2014
New Revision: 63938
URL:
http://svn.reactos.org/svn/reactos?rev=63938&view=rev
Log:
[MPLAY32]
- Add a "Play" menu, add keyboard accelerators and add a repeat mode.
Patch by Ricardo Henke.
- Few whitespace fixes.
- Fix french resources. TO ALL TRANSLATORS: Please update the translations!
CORE-7929 #resolve #comment Committed, thanks!
Modified:
trunk/reactos/base/applications/mplay32/lang/bg-BG.rc
trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc
trunk/reactos/base/applications/mplay32/lang/de-DE.rc
trunk/reactos/base/applications/mplay32/lang/en-US.rc
trunk/reactos/base/applications/mplay32/lang/es-ES.rc
trunk/reactos/base/applications/mplay32/lang/fr-FR.rc
trunk/reactos/base/applications/mplay32/lang/he-IL.rc
trunk/reactos/base/applications/mplay32/lang/it-IT.rc
trunk/reactos/base/applications/mplay32/lang/ja-JP.rc
trunk/reactos/base/applications/mplay32/lang/nl-NL.rc
trunk/reactos/base/applications/mplay32/lang/no-NO.rc
trunk/reactos/base/applications/mplay32/lang/pl-PL.rc
trunk/reactos/base/applications/mplay32/lang/pt-BR.rc
trunk/reactos/base/applications/mplay32/lang/ro-RO.rc
trunk/reactos/base/applications/mplay32/lang/ru-RU.rc
trunk/reactos/base/applications/mplay32/lang/sk-SK.rc
trunk/reactos/base/applications/mplay32/lang/sq-AL.rc
trunk/reactos/base/applications/mplay32/lang/sv-SE.rc
trunk/reactos/base/applications/mplay32/lang/tr-TR.rc
trunk/reactos/base/applications/mplay32/lang/uk-UA.rc
trunk/reactos/base/applications/mplay32/lang/zh-CN.rc
trunk/reactos/base/applications/mplay32/lang/zh-TW.rc
trunk/reactos/base/applications/mplay32/mplay32.c
trunk/reactos/base/applications/mplay32/resource.h
Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -8,10 +8,17 @@
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
@@ -23,6 +30,15 @@
BEGIN
MENUITEM "&Ðа...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -9,10 +9,17 @@
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
@@ -24,6 +31,15 @@
BEGIN
MENUITEM "&O programu...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -4,10 +4,17 @@
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
@@ -19,6 +26,15 @@
BEGIN
MENUITEM "&Ãber...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -4,10 +4,17 @@
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
@@ -19,6 +26,15 @@
BEGIN
MENUITEM "&About...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -4,10 +4,17 @@
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
@@ -19,6 +26,15 @@
BEGIN
MENUITEM "&Acerca de...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -4,21 +4,37 @@
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 "&Device"
+ POPUP "&Lecture"
BEGIN
- MENUITEM "&Properties", IDM_DEVPROPS
+ MENUITEM "Lecture/&Pause\tCtrl+P", IDC_PLAY
+ MENUITEM "St&op\tCtrl+S", IDC_STOP
MENUITEM SEPARATOR
- MENUITEM "&Volume Control", IDM_VOLUMECTL
+ MENUITEM "Répé&ter\tCtrl+T", IDM_REPEAT
+ END
+ POPUP "Périp&hérique"
+ BEGIN
+ MENUITEM "&Propriétés", IDM_DEVPROPS
+ MENUITEM SEPARATOR
+ MENUITEM "Contrôle du &volume", IDM_VOLUMECTL
END
POPUP "&Aide"
BEGIN
MENUITEM "&Ã propos...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -4,10 +4,17 @@
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
@@ -19,6 +26,15 @@
BEGIN
MENUITEM "&××××ת", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -4,10 +4,17 @@
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
@@ -19,6 +26,15 @@
BEGIN
MENUITEM "&Informazioni...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -4,10 +4,17 @@
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
@@ -19,6 +26,15 @@
BEGIN
MENUITEM "ãã¼ã¸ã§ã³æ
å ±(&A)...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -4,10 +4,17 @@
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
@@ -19,6 +26,15 @@
BEGIN
MENUITEM "&Over...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -4,10 +4,17 @@
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
@@ -19,6 +26,15 @@
BEGIN
MENUITEM "&Om...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -12,10 +12,17 @@
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 "&UrzÄ
dzenie"
BEGIN
@@ -27,6 +34,15 @@
BEGIN
MENUITEM "&O programie...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -6,10 +6,17 @@
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
@@ -21,6 +28,15 @@
BEGIN
MENUITEM "&Sobre...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -10,10 +10,17 @@
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
@@ -25,6 +32,15 @@
BEGIN
MENUITEM "&Despreâ¦", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -4,10 +4,17 @@
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 "&УÑÑÑойÑÑво"
BEGIN
@@ -19,6 +26,15 @@
BEGIN
MENUITEM "&РпÑогÑамме...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -9,10 +9,17 @@
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
@@ -24,6 +31,15 @@
BEGIN
MENUITEM "Ä&o je...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -8,10 +8,17 @@
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
@@ -23,6 +30,15 @@
BEGIN
MENUITEM "&Rreth...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -11,10 +11,17 @@
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
@@ -26,6 +33,15 @@
BEGIN
MENUITEM "&Om...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -6,10 +6,17 @@
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
@@ -21,6 +28,15 @@
BEGIN
MENUITEM "&Ãzerine...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -12,10 +12,17 @@
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
@@ -27,6 +34,15 @@
BEGIN
MENUITEM "&ÐÑо пÑогÑамÑ...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -6,10 +6,17 @@
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
@@ -21,6 +28,15 @@
BEGIN
MENUITEM "å
³äº... (&A)", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -12,10 +12,17 @@
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
@@ -27,6 +34,15 @@
BEGIN
MENUITEM "éæ¼(&A)...", IDM_ABOUT
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
Modified: trunk/reactos/base/applications/mplay32/mplay32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -18,6 +18,7 @@
WORD wDeviceId;
BOOL bIsOpened = FALSE;
BOOL bIsPaused = FALSE;
+BOOL bRepeat = FALSE;
UINT MaxFilePos = 0;
@@ -432,6 +433,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);
@@ -442,7 +444,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
{
@@ -548,9 +559,11 @@
switch (Message)
{
case WM_CREATE:
+ {
InitControls(hwnd);
hMainMenu = GetMenu(hwnd);
break;
+ }
case WM_DROPFILES:
{
@@ -579,25 +592,25 @@
{
case IDC_PLAY:
lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PLAY);
- break;
+ break;
case IDC_STOP:
lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_STOP);
- break;
+ break;
case IDC_EJECT:
lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EJECT);
- break;
+ break;
case IDC_BACKWARD:
lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_BACKWARD);
- break;
+ break;
case IDC_SEEKBACK:
lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_SEEKBACK);
- break;
+ break;
case IDC_SEEKFORW:
lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_SEEKFORW);
- break;
+ break;
case IDC_FORWARD:
lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_FORWARD);
- break;
+ break;
}
break;
}
@@ -652,9 +665,11 @@
break;
case WM_COMMAND:
+ {
switch (LOWORD(wParam))
{
case IDC_PLAY:
+ {
if (bIsOpened)
{
if (bIsPaused)
@@ -670,6 +685,7 @@
PlayFile(hwnd, NULL);
}
break;
+ }
case IDC_STOP:
StopPlayback(hwnd);
@@ -701,6 +717,21 @@
_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;
@@ -710,17 +741,19 @@
break;
case IDM_ABOUT:
- {
+ {
HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN));
ShellAbout(hwnd, szAppTitle, 0, mplayIcon);
- DeleteObject(mplayIcon);
- break;
- }
+ DeleteObject(mplayIcon);
+ break;
+ }
+
case IDM_EXIT:
PostMessage(hwnd, WM_CLOSE, 0, 0);
return 0;
}
break;
+ }
case WM_DESTROY:
StopPlayback(hwnd);
@@ -739,6 +772,7 @@
HWND hwnd;
MSG msg;
DWORD dwError;
+ HANDLE hAccel;
hInstance = hInst;
@@ -777,6 +811,8 @@
return 0;
}
+ hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(ID_ACCELERATORS));
+
DragAcceptFiles(hwnd, TRUE);
DisableMenuItems();
@@ -796,9 +832,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 (INT)msg.wParam;
}
Modified: trunk/reactos/base/applications/mplay32/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] Sun Aug 24 14:59:44
2014
@@ -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