[OMPT-svn-commit] SF.net SVN: modplug:[5362] trunk/OpenMPT/mptrack

[<sag...@us...>]

Revision: 5362
          http://sourceforge.net/p/modplug/code/5362
Author:   saga-games
Date:     2015-06-26 22:37:08 +0000 (Fri, 26 Jun 2015)
Log Message:
-----------
[New] Pattern tab: Added hidden setting Pattern Editor.NoEditPopup, which disables the "editing is disabled" popup and allows note previewing (keyjazz) in all pattern editor columns while editing is disabled.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.h
    trunk/OpenMPT/mptrack/View_pat.cpp

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2015-06-26 21:48:05 UTC (rev 5361)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2015-06-26 22:37:08 UTC (rev 5362)
@@ -258,6 +258,7 @@
 	, gbPatternVUMeters(conf, "Pattern Editor", "VU-Meters", false)
 	, gbPatternPluginNames(conf, "Pattern Editor", "Plugin-Names", true)
 	, gbPatternRecord(conf, "Pattern Editor", "Record", true)
+	, patternNoEditPopup(conf, "Pattern Editor", "NoEditPopup", false)
 	, m_dwPatternSetup(conf, "Pattern Editor", "PatternSetup", GetDefaultPatternSetup())
 	, m_nRowHighlightMeasures(conf, "Pattern Editor", "RowSpacing", 16)
 	, m_nRowHighlightBeats(conf, "Pattern Editor", "RowSpacing2", 4)

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	2015-06-26 21:48:05 UTC (rev 5361)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	2015-06-26 22:37:08 UTC (rev 5362)
@@ -592,6 +592,7 @@
 	CachedSetting<bool> gbPatternVUMeters;
 	CachedSetting<bool> gbPatternPluginNames;
 	CachedSetting<bool> gbPatternRecord;
+	CachedSetting<bool> patternNoEditPopup;
 	CachedSetting<uint32> m_dwPatternSetup;
 	CachedSetting<uint32> m_nRowHighlightMeasures; // primary (measures) and secondary (beats) highlight
 	CachedSetting<uint32> m_nRowHighlightBeats;	// primary (measures) and secondary (beats) highlight

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2015-06-26 21:48:05 UTC (rev 5361)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2015-06-26 22:37:08 UTC (rev 5362)
@@ -693,6 +693,8 @@
 			UINT nFlags = HIWORD(pMsg->lParam);
 			KeyEventType kT = ih->GetKeyEventType(nFlags);
 			InputTargetContext ctx = (InputTargetContext)(kCtxViewPatterns + 1 + m_Cursor.GetColumnType());
+			// If editing is disabled, preview notes no matter which column we are in
+			if(!IsEditingEnabled() && TrackerSettings::Instance().patternNoEditPopup) ctx = kCtxViewPatternsNote;
 
 			if (ih->KeyEvent(ctx, nChar, nRepCnt, nFlags, kT) != kcNull)
 			{
@@ -6795,6 +6797,7 @@
 //----------------------------------------
 {
 	if(IsEditingEnabled()) return true;
+	if(TrackerSettings::Instance().patternNoEditPopup) return false;
 
 	HMENU hMenu;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.