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

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

Revision: 1129
          http://modplug.svn.sourceforge.net/modplug/?rev=1129&view=rev
Author:   saga-games
Date:     2011-10-30 16:17:35 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
[Imp] Added "Show Settings Folder" menu item to help menu
[Imp] Instrument Editor: Updated cutoff explanation

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_ins.cpp
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/Mainfrm.h
    trunk/OpenMPT/mptrack/mptrack.rc
    trunk/OpenMPT/mptrack/resource.h

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2011-10-30 13:12:33 UTC (rev 1128)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2011-10-30 16:17:35 UTC (rev 1129)
@@ -1381,22 +1381,26 @@
 void CCtrlInstruments::UpdateFilterText()
 //---------------------------------------
 {
-	if ((m_nInstrument) && (m_pModDoc))
+	if((m_nInstrument) && (m_pModDoc))
 	{
 		CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
 		MODINSTRUMENT *pIns = pSndFile->Instruments[m_nInstrument];
-		if (pIns)
+		if(pIns)
 		{
 			CHAR s[32];
 			// In IT Compatible mode, it is enough to just have resonance enabled to turn on the filter.
 			const bool resEnabled = (pIns->IsResonanceEnabled() && pIns->GetResonance() > 0 && pSndFile->IsCompatibleMode(TRK_IMPULSETRACKER));
 
-			if ((pIns->IsCutoffEnabled() && pIns->GetCutoff() < 0x7F) || resEnabled)
+			if((pIns->IsCutoffEnabled() && pIns->GetCutoff() < 0x7F) || resEnabled)
 			{
 				const BYTE cutoff = (resEnabled && !pIns->IsCutoffEnabled()) ? 0x7F : pIns->GetCutoff();
 				wsprintf(s, "Z%02X (%d Hz)", cutoff, pSndFile->CutOffToFrequency(cutoff));
-			} else {
-				wsprintf(s, "Off");
+			} else if(pIns->IsCutoffEnabled())
+			{
+				strcpy(s, "Z7F (Off)");
+			} else
+			{
+				strcpy(s, "No Change");
 			}
 			
 			SetDlgItemText(IDC_FILTERTEXT, s);

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2011-10-30 13:12:33 UTC (rev 1128)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2011-10-30 16:17:35 UTC (rev 1129)
@@ -105,6 +105,7 @@
 	ON_MESSAGE(WM_MOD_SPECIALKEY,			OnSpecialKey)
 	ON_MESSAGE(WM_MOD_KEYCOMMAND,			OnCustomKeyMsg) //rewbs.customKeys
 	ON_COMMAND(ID_INTERNETUPDATE,			OnInternetUpdate)
+	ON_COMMAND(ID_HELP_SHOWSETTINGSFOLDER,	OnShowSettingsFolder)
 	//}}AFX_MSG_MAP
 	ON_WM_INITMENU()
 	ON_WM_KILLFOCUS() //rewbs.fix3116
@@ -2564,6 +2565,13 @@
 }
 
 
+void CMainFrame::OnShowSettingsFolder()
+//-------------------------------------
+{
+	theApp.OpenDirectory(theApp.GetConfigPath());
+}
+
+
 HMENU CMainFrame::CreateFileMenu(const size_t nMaxCount, std::vector<CString>& vPaths, const LPCTSTR pszFolderName, const uint16 nIdRangeBegin)
 //---------------------------------------------------------------------------------------------------------------------------------------------
 {

Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h	2011-10-30 13:12:33 UTC (rev 1128)
+++ trunk/OpenMPT/mptrack/Mainfrm.h	2011-10-30 16:17:35 UTC (rev 1129)
@@ -646,6 +646,7 @@
 	afx_msg void OnViewMIDIMapping();
 	afx_msg void OnViewEditHistory();
 	afx_msg void OnInternetUpdate();
+	afx_msg void OnShowSettingsFolder();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 public:

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2011-10-30 13:12:33 UTC (rev 1128)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2011-10-30 16:17:35 UTC (rev 1129)
@@ -1702,6 +1702,10 @@
         BOTTOMMARGIN, 94
     END
 
+    IDD_CONTROL_GLOBALS, DIALOG
+    BEGIN
+    END
+
     IDD_CONTROL_COMMENTS, DIALOG
     BEGIN
         RIGHTMARGIN, 348
@@ -2116,9 +2120,10 @@
     BEGIN
         MENUITEM "&Contents",                   ID_HELP_FINDER
         MENUITEM "&Search...",                  ID_HELP_SEARCH
-        MENUITEM "&Report a bug",               ID_REPORT_BUG
+        MENUITEM "&Report a Bug",               ID_REPORT_BUG
         MENUITEM SEPARATOR
-        MENUITEM "&Example modules",            ID_EXAMPLE_MODULES
+        MENUITEM "&Example Modules",            ID_EXAMPLE_MODULES
+        MENUITEM "Show Settings Folder",        ID_HELP_SHOWSETTINGSFOLDER
         MENUITEM SEPARATOR
         MENUITEM "&OpenMPT Website",            ID_NETLINK_MODPLUG
         MENUITEM "&Web Resources",              ID_NETLINK_TOP_PICKS

Modified: trunk/OpenMPT/mptrack/resource.h
===================================================================
--- trunk/OpenMPT/mptrack/resource.h	2011-10-30 13:12:33 UTC (rev 1128)
+++ trunk/OpenMPT/mptrack/resource.h	2011-10-30 16:17:35 UTC (rev 1129)
@@ -1207,9 +1207,8 @@
 #define ID_FXCOMMANDS_BASE				44462
 // From here: Command range [ID_FXCOMMANDS_BASE, ID_FXCOMMANDS_BASE + 10]
 #define ID_PLUGINEDITOR_SLIDERS_BASE    44500
-// From here: Command range [ID_PLUGINEDITOR_SLIDERS_BASE, ID_PLUGINEDITOR_SLIDERS_BASE + NUM_PLUGINEDITOR_PARAMETERS]
 #define ID_PLUGINEDITOR_EDIT_BASE       44550
-// From here: Command range [ID_PLUGINEDITOR_EDIT_BASE, ID_PLUGINEDITOR_EDIT_BASE + NUM_PLUGINEDITOR_PARAMETERS]
+#define ID_HELP_SHOWSETTINGSFOLDER      44600
 
 // Next default values for new objects
 // 
@@ -1217,7 +1216,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        535
-#define _APS_NEXT_COMMAND_VALUE         44600
+#define _APS_NEXT_COMMAND_VALUE         44601
 #define _APS_NEXT_CONTROL_VALUE         2448
 #define _APS_NEXT_SYMED_VALUE           901
 #endif

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