[OMPT-svn-commit] OpenMPT r22862 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: sagamusix
Date: Sat Feb  1 13:19:30 2025
New Revision: 22862
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22862

Log:
[Imp] Add label to metronome volume setting.

Modified:
   trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
   trunk/OpenMPT/mptrack/PatternEditorDialogs.h
   trunk/OpenMPT/mptrack/mptrack.rc
   trunk/OpenMPT/mptrack/resource.h

Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp	Mon Jan 27 19:24:00 2025	(r22861)
+++ trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp	Sat Feb  1 13:19:30 2025	(r22862)
@@ -1783,16 +1783,26 @@
 	}
 	SetSampleInfo(TrackerSettings::Instance().metronomeSampleMeasure, m_measureCombo, m_measureEdit, m_measureButton);
 	SetSampleInfo(TrackerSettings::Instance().metronomeSampleBeat, m_beatCombo, m_beatEdit, m_beatButton);
+	GetDlgItem(IDC_VOLUME)->SetWindowText(GetVolumeString());
 	return TRUE;
 }
 
 
+CString MetronomeSettingsDlg::GetVolumeString() const
+{
+	CString s = (m_volumeSlider.GetPos() >= 0) ? _T("+") : _T("");
+	s.AppendFormat(_T("%.2f dB"), m_volumeSlider.GetPos() * METRONOME_VOLUME_SCALE);
+	return s;
+}
+
+
 void MetronomeSettingsDlg::OnHScroll(UINT, UINT, CScrollBar *bar)
 {
 	if(bar == static_cast<CWnd *>(&m_volumeSlider))
 	{
 		TrackerSettings::Instance().metronomeVolume = m_volumeSlider.GetPos() * METRONOME_VOLUME_SCALE;
 		CMainFrame::GetMainFrame()->UpdateMetronomeVolume();
+		GetDlgItem(IDC_VOLUME)->SetWindowText(GetVolumeString());
 	}
 }
 
@@ -1892,8 +1902,7 @@
 	switch(id)
 	{
 	case IDC_SLIDER1:
-		s = (m_volumeSlider.GetPos() >= 0) ? _T("+") : _T("");
-		s.AppendFormat(_T("%.2f dB"), m_volumeSlider.GetPos() * METRONOME_VOLUME_SCALE);
+		s = GetVolumeString();
 		break;
 	}
 

Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.h
==============================================================================
--- trunk/OpenMPT/mptrack/PatternEditorDialogs.h	Mon Jan 27 19:24:00 2025	(r22861)
+++ trunk/OpenMPT/mptrack/PatternEditorDialogs.h	Sat Feb  1 13:19:30 2025	(r22862)
@@ -229,6 +229,7 @@
 	BOOL OnInitDialog() override;
 	CString GetToolTipText(UINT id, HWND hwnd) const override;
 
+	CString GetVolumeString() const;
 	void SetSampleInfo(const mpt::PathString &path, CComboBox &combo, CEdit &edit, CButton &browseButton);
 	bool GetSampleInfo(Setting<mpt::PathString> &path, CComboBox &combo, CEdit &edit, CButton &browseButton);
 	mpt::PathString BrowseForSample(const mpt::PathString &path);

Modified: trunk/OpenMPT/mptrack/mptrack.rc
==============================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	Mon Jan 27 19:24:00 2025	(r22861)
+++ trunk/OpenMPT/mptrack/mptrack.rc	Sat Feb  1 13:19:30 2025	(r22862)
@@ -669,6 +669,7 @@
     GROUPBOX        "Common Settings",IDC_STATIC,6,6,264,54
     CONTROL         "&Enable Metronome",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,18,75,10
     LTEXT           "&Volume:",IDC_STATIC,12,39,26,8
+    RTEXT           "Static",IDC_VOLUME,210,19,48,8
     CONTROL         "",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOOLTIPS | WS_TABSTOP,54,36,204,15
     GROUPBOX        "Measure",IDC_STATIC,6,66,264,55
     COMBOBOX        IDC_COMBO1,12,78,192,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

Modified: trunk/OpenMPT/mptrack/resource.h
==============================================================================
--- trunk/OpenMPT/mptrack/resource.h	Mon Jan 27 19:24:00 2025	(r22861)
+++ trunk/OpenMPT/mptrack/resource.h	Sat Feb  1 13:19:30 2025	(r22862)
@@ -728,6 +728,7 @@
 #define IDC_DELPLUGIN                   2239
 #define IDC_AUTOSAVE_USECUSTOMDIR       2245
 #define IDC_BUTTON_MODTYPE2             2246
+#define IDC_VOLUME                      2247
 #define IDC_SLIDER_SAMPLEPREAMP3        2248
 #define IDC_SLIDER_GLOBALVOL            2249
 #define IDC_EDIT_VSTIVOL                2250