From 4f0e9ef915cce16baf214ce38264eca67309f571 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 22 Jul 2003 03:11:12 +0000
Subject: [PATCH] Implement "don't ask" for EnterComment.

---
 .../src/smpackage/SmpackageExportDlg.cpp      | 39 ++++++++++++-------
 stepmania/src/smpackage/SmpackageExportDlg.h  |  3 +-
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/stepmania/src/smpackage/SmpackageExportDlg.cpp b/stepmania/src/smpackage/SmpackageExportDlg.cpp
index bae44d8c4a..6e6337464f 100644
--- a/stepmania/src/smpackage/SmpackageExportDlg.cpp
+++ b/stepmania/src/smpackage/SmpackageExportDlg.cpp
@@ -210,11 +210,29 @@ bool ExportPackage( CString sPackageName, const CStringArray& asDirectoriesToExp
 	return true;
 }
 
+bool CSmpackageExportDlg::MakeComment( CString &comment )
+{
+	bool DontAskForComment;
+	if( GetPref("DontAskForComment", DontAskForComment) && DontAskForComment )
+	{
+		comment = "";
+		return true;
+	}
+
+	EnterComment commentDlg;
+	int nResponse = commentDlg.DoModal();
+	if( nResponse != IDOK )
+		return false;	// cancelled
+
+	comment = commentDlg.m_sEnteredComment;
+	if( commentDlg.m_bDontAsk )
+		SetPref( "DontAskForComment", true );
+
+	return true;
+}
 
 void CSmpackageExportDlg::OnButtonExportAsOne() 
 {
-	// TODO: Add your control notification handler code here
-
 	CStringArray asPaths;
 	GetCheckedPaths( asPaths );
 
@@ -240,11 +258,8 @@ void CSmpackageExportDlg::OnButtonExportAsOne()
 
 	// Generate a comment
 	CString sComment;
-	EnterComment commentDlg;
-	nResponse = commentDlg.DoModal();
-	if( nResponse != IDOK )
-		return;	// cancelled
-	sComment = commentDlg.m_sEnteredComment;
+	if( !MakeComment(sComment) )
+		return;		// cancelled
 
 	if( ExportPackage( sPackageName, asPaths, sComment ) )
 		AfxMessageBox( ssprintf("Successfully exported package '%s' to your Desktop.",sPackageName) );
@@ -252,8 +267,6 @@ void CSmpackageExportDlg::OnButtonExportAsOne()
 
 void CSmpackageExportDlg::OnButtonExportAsIndividual() 
 {
-	// TODO: Add your control notification handler code here
-
 	CStringArray asPaths;
 	GetCheckedPaths( asPaths );
 
@@ -265,12 +278,8 @@ void CSmpackageExportDlg::OnButtonExportAsIndividual()
 	
 	// Generate a comment
 	CString sComment;
-	EnterComment commentDlg;
-	int nResponse = commentDlg.DoModal();
-	if( nResponse != IDOK )
-		return;	// cancelled
-	sComment = commentDlg.m_sEnteredComment;
-
+	if( !MakeComment(sComment) )
+		return;		// cancelled
 
 	bool bAllSucceeded = true;
 	CStringArray asExportedPackages;
diff --git a/stepmania/src/smpackage/SmpackageExportDlg.h b/stepmania/src/smpackage/SmpackageExportDlg.h
index c33774057d..b8e42d52e1 100644
--- a/stepmania/src/smpackage/SmpackageExportDlg.h
+++ b/stepmania/src/smpackage/SmpackageExportDlg.h
@@ -43,7 +43,8 @@ protected:
 	void GetTreeItems( CArray<HTREEITEM,HTREEITEM>& aItemsOut );
 	void GetCheckedTreeItems( CArray<HTREEITEM,HTREEITEM>& aCheckedItemsOut );
 	void GetCheckedPaths( CStringArray& aCheckedItemsOut );
-	
+	bool MakeComment( CString &comment );
+
 	// Generated message map functions
 	//{{AFX_MSG(CSmpackageExportDlg)
 	virtual BOOL OnInitDialog();