[General][WIP] Merge Upstream 2017-03-11.

[csp-qt/common_source_project-fm7.git] / source / src / res / fm77.rc

diff --git a/source/src/res/fm77.rc b/source/src/res/fm77.rc
index db79fdb..9e668ca 100644 (file)
--- a/source/src/res/fm77.rc
+++ b/source/src/res/fm77.rc
@@ -147,7 +147,6 @@ BEGIN
         MENUITEM "Fast Forward",                ID_FAST_FORWARD
         MENUITEM "Fast Rewind",                 ID_FAST_REWIND
         MENUITEM SEPARATOR
-        MENUITEM "Play Tape Sound",             ID_PLAY_TAPE_SOUND
         MENUITEM "Waveform Shaper",             ID_USE_WAVE_SHAPER
         MENUITEM SEPARATOR
         MENUITEM "Recent",                      ID_RECENT_TAPE
@@ -247,6 +246,10 @@ BEGIN
         MENUITEM "PSG+WHG+THG",                 ID_SOUND_DEVICE_TYPE6
         MENUITEM "PSG+OPN+WHG+THG",             ID_SOUND_DEVICE_TYPE7
         MENUITEM SEPARATOR
+        MENUITEM "Play FDD Noise",              ID_SOUND_NOISE_FDD
+        MENUITEM "Play CMT Noise",              ID_SOUND_NOISE_CMT
+        MENUITEM "Play CMT Sound",              ID_SOUND_PLAY_TAPE
+        MENUITEM SEPARATOR
         MENUITEM "Volume",                      ID_SOUND_VOLUME
     END
     POPUP "Input"
@@ -277,7 +280,7 @@ IDI_ICON1               ICON    DISCARDABLE     "fm77.ico"
 // Dialog
 //
 
-IDD_VOLUME DIALOG DISCARDABLE  0, 0, 250, 300
+IDD_VOLUME DIALOG DISCARDABLE  0, 0, 250, 360
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Volume"
 FONT 9, "MS PGothic"
@@ -309,8 +312,14 @@ BEGIN
     LTEXT           "Sound Device #9",IDC_VOLUME_CAPTION8,6,246,60,8
     CONTROL         "",IDC_VOLUME_PARAM_L8,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,70,246,175,12
     CONTROL         "",IDC_VOLUME_PARAM_R8,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,70,261,175,12
-    DEFPUSHBUTTON   "OK",IDOK,70,280,50,14
-    DEFPUSHBUTTON   "Reset",IDC_VOLUME_RESET,130,280,50,14
+    LTEXT           "Sound Device #10",IDC_VOLUME_CAPTION9,6,276,60,8
+    CONTROL         "",IDC_VOLUME_PARAM_L9,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,70,276,175,12
+    CONTROL         "",IDC_VOLUME_PARAM_R9,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,70,291,175,12
+    LTEXT           "Sound Device #11",IDC_VOLUME_CAPTION10,6,306,60,8
+    CONTROL         "",IDC_VOLUME_PARAM_L10,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,70,306,175,12
+    CONTROL         "",IDC_VOLUME_PARAM_R10,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,70,321,175,12
+    DEFPUSHBUTTON   "OK",IDOK,70,340,50,14
+    DEFPUSHBUTTON   "Reset",IDC_VOLUME_RESET,130,340,50,14
 END
 
 IDD_JOYSTICK DIALOG DISCARDABLE  0, 0, 175, 120