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

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

Author: sagamusix
Date: Sun Dec  1 23:13:00 2024
New Revision: 22441
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22441

Log:
[Mod] Turn Pattern Editor.IgnoreSongTimeSignature into an official setting editable via the Display settings.

Modified:
   trunk/OpenMPT/mptrack/ColorConfigDlg.cpp
   trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/ColorConfigDlg.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/ColorConfigDlg.cpp	Sun Dec  1 23:06:51 2024	(r22440)
+++ trunk/OpenMPT/mptrack/ColorConfigDlg.cpp	Sun Dec  1 23:13:00 2024	(r22441)
@@ -184,6 +184,7 @@
 	if (TrackerSettings::Instance().m_dwPatternSetup & PATTERN_STDHIGHLIGHT) CheckDlgButton(IDC_CHECK1, BST_CHECKED);
 	if (TrackerSettings::Instance().m_dwPatternSetup & PATTERN_EFFECTHILIGHT) CheckDlgButton(IDC_CHECK2, BST_CHECKED);
 	if (TrackerSettings::Instance().m_dwPatternSetup & PATTERN_2NDHIGHLIGHT) CheckDlgButton(IDC_CHECK4, BST_CHECKED);
+	CheckDlgButton(IDC_CHECK3, TrackerSettings::Instance().patternIgnoreSongTimeSignature ? BST_CHECKED : BST_UNCHECKED);
 	CheckDlgButton(IDC_CHECK5, TrackerSettings::Instance().rememberSongWindows ? BST_CHECKED : BST_UNCHECKED);
 	SetDlgItemInt(IDC_PRIMARYHILITE, TrackerSettings::Instance().m_nRowHighlightMeasures);
 	SetDlgItemInt(IDC_SECONDARYHILITE, TrackerSettings::Instance().m_nRowHighlightBeats);
@@ -267,6 +268,7 @@
 	if(IsDlgButtonChecked(IDC_CHECK1)) TrackerSettings::Instance().m_dwPatternSetup |= PATTERN_STDHIGHLIGHT;
 	if(IsDlgButtonChecked(IDC_CHECK2)) TrackerSettings::Instance().m_dwPatternSetup |= PATTERN_EFFECTHILIGHT;
 	if(IsDlgButtonChecked(IDC_CHECK4)) TrackerSettings::Instance().m_dwPatternSetup |= PATTERN_2NDHIGHLIGHT;
+	TrackerSettings::Instance().patternIgnoreSongTimeSignature = IsDlgButtonChecked(IDC_CHECK3) != BST_UNCHECKED;
 	TrackerSettings::Instance().rememberSongWindows = IsDlgButtonChecked(IDC_CHECK5) != BST_UNCHECKED;
 	TrackerSettings::Instance().accidentalFlats = IsDlgButtonChecked(IDC_RADIO2) != BST_UNCHECKED;
 

Modified: trunk/OpenMPT/mptrack/mptrack.rc
==============================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	Sun Dec  1 23:06:51 2024	(r22440)
+++ trunk/OpenMPT/mptrack/mptrack.rc	Sun Dec  1 23:13:00 2024	(r22441)
@@ -1332,7 +1332,8 @@
     CONTROL         "Secondar&y highlight",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,156,80,10
     EDITTEXT        IDC_SECONDARYHILITE,102,156,24,12,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "Rows per beat (default)",IDC_STATIC,132,159,144,8
-    LTEXT           "Note: Songs' time signatures will override the default highlight values",IDC_STATIC,18,172,258,8
+    CONTROL         "Always use default highlight values instead of songs' time signatures",IDC_CHECK3,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,174,258,10
     GROUPBOX        "Colours",IDC_STATIC,6,204,312,102
     LTEXT           "Select colo&ur for:",IDC_STATIC,18,218,63,8
     CONTROL         "",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS,84,216,11,12