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

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

Revision: 1089
          http://modplug.svn.sourceforge.net/modplug/?rev=1089&view=rev
Author:   saga-games
Date:     2011-10-05 21:40:31 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
[Mod] Keyboard Setup Dialog: The commented out message boxes were replaced by Windows sounds.
[Fix] Tree View: Fixed mnemonics in context menus.
[Mod] Clarified log message when opening a module.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/View_tre.cpp

Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	2011-10-05 20:47:34 UTC (rev 1088)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	2011-10-05 21:40:31 UTC (rev 1089)
@@ -531,6 +531,7 @@
 	{
 		// Annoying message box is annoying.
 		//Reporting::Error("Nothing to restore for this slot.", "Invalid key data", this);
+		::MessageBeep(MB_ICONWARNING);
 		return;
 	}
 	
@@ -552,6 +553,7 @@
 	{
 		// Annoying message box is annoying.
 		//Reporting::Warning("No key currently set for this slot.", "Invalid key data", this);
+		::MessageBeep(MB_ICONWARNING);
 		return;
 	}
 
@@ -593,6 +595,7 @@
 	}
 	if (!kc.event)
 	{
+		::MessageBeep(MB_ICONWARNING);
 /*		CString error = "You need to select at least one key event type (up, down or hold).";
 		Reporting::Warning(error, "Invalid key data");
 		return;

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2011-10-05 20:47:34 UTC (rev 1088)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2011-10-05 21:40:31 UTC (rev 1089)
@@ -232,7 +232,7 @@
 	if (GetLog() != nullptr)
 	{
 		CString sTemp;
-		sTemp.Format("File: %s\nLast saved with: %s, current version is %s\n\n%s", lpszPathName, (LPCTSTR)MptVersion::ToStr(m_SndFile.m_dwLastSavedWithVersion), MptVersion::str, GetLog());
+		sTemp.Format("File: %s\nLast saved with: %s, your version is %s\n\n%s", lpszPathName, (LPCTSTR)MptVersion::ToStr(m_SndFile.m_dwLastSavedWithVersion), MptVersion::str, GetLog());
 		Reporting::Information(sTemp);
 		ClearLog();
 	}

Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp	2011-10-05 20:47:34 UTC (rev 1088)
+++ trunk/OpenMPT/mptrack/View_tre.cpp	2011-10-05 21:40:31 UTC (rev 1089)
@@ -2457,7 +2457,7 @@
 					if ((pModDoc) && (!pModDoc->GetNumInstruments()))
 					{
 						AppendMenu(hMenu, MF_SEPARATOR, NULL, "");
-						AppendMenu(hMenu, (pModDoc->IsSampleMuted((SAMPLEINDEX)modItemID) ? MF_CHECKED:0)|MF_STRING, ID_MODTREE_MUTE, "&Mute Sample");
+						AppendMenu(hMenu, (pModDoc->IsSampleMuted((SAMPLEINDEX)modItemID) ? MF_CHECKED : 0) | MF_STRING, ID_MODTREE_MUTE, "&Mute Sample");
 						AppendMenu(hMenu, MF_STRING, ID_MODTREE_SOLO, "&Solo Sample");
 						AppendMenu(hMenu, MF_STRING, ID_MODTREE_UNMUTEALL, "&Unmute all");
 					}
@@ -2474,14 +2474,17 @@
 					if ((pModDoc) && (pModDoc->GetNumInstruments()))
 					{
 						AppendMenu(hMenu, MF_SEPARATOR, NULL, "");
-						AppendMenu(hMenu, (pModDoc->IsInstrumentMuted((INSTRUMENTINDEX)modItemID) ? MF_CHECKED:0)|MF_STRING, ID_MODTREE_MUTE, "&Mute Instrument");
-						AppendMenu(hMenu, MF_STRING, ID_MODTREE_SOLO, "&Solo Instrument");
+						AppendMenu(hMenu, (pModDoc->IsInstrumentMuted((INSTRUMENTINDEX)modItemID) ? MF_CHECKED : 0) | MF_STRING, ID_MODTREE_MUTE, "&Mute Instrument");
+						AppendMenu(hMenu, MF_STRING, ID_MODTREE_SOLO, "S&olo Instrument");
 						AppendMenu(hMenu, MF_STRING, ID_MODTREE_UNMUTEALL, "&Unmute all");
 // -> CODE#0023
 // -> DESC="IT project files (.itp)"
-						AppendMenu(hMenu, MF_SEPARATOR, NULL, "");
-						AppendMenu(hMenu, MF_STRING, ID_MODTREE_SETPATH, "&Set path");
-						AppendMenu(hMenu, MF_STRING, ID_MODTREE_SAVEITEM, "&Save");
+						if(pModDoc->GetSoundFile()->m_dwSongFlags & SONG_ITPROJECT)
+						{
+							AppendMenu(hMenu, MF_SEPARATOR, NULL, "");
+							AppendMenu(hMenu, MF_STRING, ID_MODTREE_SETPATH, "Set p&ath");
+							AppendMenu(hMenu, MF_STRING, ID_MODTREE_SAVEITEM, "&Save");
+						}
 // -! NEW_FEATURE#0023
 					}
 				}

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