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

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

Revision: 959
          http://modplug.svn.sourceforge.net/modplug/?rev=959&view=rev
Author:   saga-games
Date:     2011-08-05 15:48:20 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
[Mod] Improved Close dialog a bit, made NoModifiedDocumentsDialog an official setting (in the general settings)

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/CloseMainDialog.cpp
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/Mainfrm.h
    trunk/OpenMPT/mptrack/Moptions.cpp
    trunk/OpenMPT/mptrack/version.h

Modified: trunk/OpenMPT/mptrack/CloseMainDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CloseMainDialog.cpp	2011-08-04 19:56:25 UTC (rev 958)
+++ trunk/OpenMPT/mptrack/CloseMainDialog.cpp	2011-08-05 15:48:20 UTC (rev 959)
@@ -146,8 +146,10 @@
 void CloseMainDialog::UpdateSwitchButtonState()
 //---------------------------------------------
 {
-	const CString text = (m_List.GetSelCount() == m_List.GetCount()) ? "&Select none" : "&Select all";
+	CString text = (m_List.GetSelCount() == m_List.GetCount()) ? "Se&lect none" : "Se&lect all";
 	((CButton *)GetDlgItem(IDC_BUTTON1))->SetWindowText(text);
+	text = (m_List.GetSelCount() > 0) ? "&Save selected" : "Cl&ose";
+	((CButton *)GetDlgItem(IDOK))->SetWindowText(text);
 }
 
 

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2011-08-04 19:56:25 UTC (rev 958)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2011-08-05 15:48:20 UTC (rev 959)
@@ -482,7 +482,7 @@
 void CMainFrame::OnClose()
 //------------------------
 {
-	if(GetPrivateProfileLong("Misc", "NoModifiedDocumentsDialog", 0, theApp.GetConfigFileName()) == 0)
+	if(!(GetSettings().m_dwPatternSetup & PATTERN_NOCLOSEDIALOG))
 	{
 		// Show modified documents window
 		CloseMainDialog dlg;
@@ -1310,7 +1310,7 @@
 {
 	if ((!hwnd) || (m_hFollowSong == hwnd))
 	{
-		memset(NotifyBuffer, 0, sizeof(NotifyBuffer));
+		MemsetZero(NotifyBuffer);
 		gsdwTotalSamples = 0;
 		return TRUE;
 	}

Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h	2011-08-04 19:56:25 UTC (rev 958)
+++ trunk/OpenMPT/mptrack/Mainfrm.h	2011-08-05 15:48:20 UTC (rev 959)
@@ -187,7 +187,7 @@
 #define PATTERN_KBDNOTEOFF			0x40000		// Record note-off events
 #define PATTERN_FOLLOWSONGOFF		0x80000		// follow song off by default
 #define PATTERN_MIDIRECORD			0x100000	// MIDI Record on by default
-//#define PATTERN_ALTERNTIVEBPMSPEED	0x200000	// deprecated
+#define PATTERN_NOCLOSEDIALOG		0x200000	// Don't use OpenMPT's custom close dialog with a list of saved files when closing the main window
 //#define PATTERN_HILITETIMESIGS		0x400000	// highlight on song signature, deprecated (now always enabled)
 #define PATTERN_OLDCTXMENUSTYLE		0x800000	// mpt 1.16 pattern context menu style
 #define PATTERN_SYNCMUTE			0x1000000	// maintain sample sync on mute

Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp	2011-08-04 19:56:25 UTC (rev 958)
+++ trunk/OpenMPT/mptrack/Moptions.cpp	2011-08-05 15:48:20 UTC (rev 959)
@@ -583,7 +583,8 @@
 	{PATTERN_NOTEFADE,		"Note fade on key up",				"Enable to fade / stop notes on key up in pattern tab." },
 	{PATTERN_OVERFLOWPASTE,	"Overflow paste mode",				"Wrap pasted pattern data into next pattern. This is useful for creating echo channels."},
 	{PATTERN_RESETCHANNELS,	"Reset channels on loop",			"If enabled, channels will be reset to their initial state when song looping is enabled.\nNote: This does not affect manual song loops (i.e. triggered by pattern commands) and is recommended to be enabled."},
-	{PATTERN_LIVEUPDATETREE,"Update sample status in tree",		"If enabled, active samples and instruments will be indicated by a different icon in the treeview."}
+	{PATTERN_LIVEUPDATETREE,"Update sample status in tree",		"If enabled, active samples and instruments will be indicated by a different icon in the treeview."},
+	{PATTERN_NOCLOSEDIALOG,	"Disable modern close dialog",		"When closing the main window, a confirmation window is shown for every unsaved document instead of one single window with a list of unsaved documents."},
 };
 
 

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2011-08-04 19:56:25 UTC (rev 958)
+++ trunk/OpenMPT/mptrack/version.h	2011-08-05 15:48:20 UTC (rev 959)
@@ -15,7 +15,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					20
 #define VER_MINOR					00
-#define VER_MINORMINOR				03
+#define VER_MINORMINOR				04
 
 //Creates version number from version parts that appears in version string.
 //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of 


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