From 4aa8779c5de695478a3e6ed8cdf1d08ff36050c9 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sat, 10 Dec 2005 08:18:34 +0000
Subject: [PATCH] remove metrics dialogs

---
 stepmania/src/smpackage-net2003.vcproj     |  74 +++--
 stepmania/src/smpackage/EditMetricsDlg.cpp | 286 -----------------
 stepmania/src/smpackage/EditMetricsDlg.h   |  65 ----
 stepmania/src/smpackage/converttheme.bmp   | Bin 31578 -> 0 bytes
 stepmania/src/smpackage/editmetrics.bmp    | Bin 31578 -> 0 bytes
 stepmania/src/smpackage/onvertThemeDlg.cpp | 348 ---------------------
 stepmania/src/smpackage/onvertThemeDlg.h   |  53 ----
 7 files changed, 53 insertions(+), 773 deletions(-)
 delete mode 100644 stepmania/src/smpackage/EditMetricsDlg.cpp
 delete mode 100644 stepmania/src/smpackage/EditMetricsDlg.h
 delete mode 100644 stepmania/src/smpackage/converttheme.bmp
 delete mode 100644 stepmania/src/smpackage/editmetrics.bmp
 delete mode 100644 stepmania/src/smpackage/onvertThemeDlg.cpp
 delete mode 100644 stepmania/src/smpackage/onvertThemeDlg.h

diff --git a/stepmania/src/smpackage-net2003.vcproj b/stepmania/src/smpackage-net2003.vcproj
index 3baf0e74f6..16161fc37c 100644
--- a/stepmania/src/smpackage-net2003.vcproj
+++ b/stepmania/src/smpackage-net2003.vcproj
@@ -41,6 +41,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="smpackage\ZipArchive\Release\ZipArchive.lib"
 				OutputFile="../../Program/tools-debug.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -107,7 +108,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ZipArchive\Release\ZipArchive.lib"
+				AdditionalDependencies="smpackage\ZipArchive\Release\ZipArchive.lib"
 				OutputFile=".\../../Program/tools.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -162,12 +163,6 @@
 			<File
 				RelativePath=".\smpackage\EditInsallations.h">
 			</File>
-			<File
-				RelativePath=".\smpackage\EditMetricsDlg.cpp">
-			</File>
-			<File
-				RelativePath=".\smpackage\EditMetricsDlg.h">
-			</File>
 			<File
 				RelativePath=".\smpackage\EnterComment.cpp">
 			</File>
@@ -186,12 +181,6 @@
 			<File
 				RelativePath=".\smpackage\MainMenuDlg.h">
 			</File>
-			<File
-				RelativePath=".\smpackage\onvertThemeDlg.cpp">
-			</File>
-			<File
-				RelativePath=".\smpackage\onvertThemeDlg.h">
-			</File>
 			<File
 				RelativePath=".\smpackage\resource.h">
 			</File>
@@ -262,17 +251,14 @@
 			<File
 				RelativePath="menu.bmp">
 			</File>
-			<File
-				RelativePath="res\smpackage.ico">
-			</File>
 			<File
 				RelativePath="smpackage.ICO">
 			</File>
 			<File
-				RelativePath="smpackage.rc">
+				RelativePath="res\smpackage.ico">
 			</File>
 			<File
-				RelativePath="res\smpackage.rc2">
+				RelativePath=".\smpackage\smpackage.rc">
 			</File>
 			<File
 				RelativePath="res\StepMania.ICO">
@@ -290,6 +276,15 @@
 			<File
 				RelativePath=".\ProductInfo.h">
 			</File>
+			<File
+				RelativePath=".\SpecialFiles.cpp">
+			</File>
+			<File
+				RelativePath=".\SpecialFiles.h">
+			</File>
+			<File
+				RelativePath=".\StdString.h">
+			</File>
 			<Filter
 				Name="system">
 				<File
@@ -309,16 +304,53 @@
 		<Filter
 			Name="Rage"
 			Filter="">
+			<File
+				RelativePath=".\RageFileDriverMemory.cpp">
+			</File>
+			<File
+				RelativePath=".\RageFileDriverMemory.h">
+			</File>
+			<File
+				RelativePath=".\RageFileDriverZip.cpp">
+			</File>
+			<File
+				RelativePath=".\RageFileDriverZip.h">
+			</File>
+			<File
+				RelativePath=".\RageFileManager.cpp">
+			</File>
+			<File
+				RelativePath=".\RageFileManager.h">
+			</File>
 			<File
 				RelativePath=".\RageLog.cpp">
 			</File>
 			<File
 				RelativePath=".\RageLog.h">
 			</File>
+			<File
+				RelativePath=".\RageUtil.cpp">
+			</File>
+			<File
+				RelativePath=".\RageUtil.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="File Types"
+			Filter="">
+			<File
+				RelativePath=".\IniFile.cpp">
+			</File>
+			<File
+				RelativePath=".\IniFile.h">
+			</File>
+			<File
+				RelativePath=".\XmlFile.cpp">
+			</File>
+			<File
+				RelativePath=".\XmlFile.h">
+			</File>
 		</Filter>
-		<File
-			RelativePath="..\zlib\zdll.lib">
-		</File>
 	</Files>
 	<Globals>
 		<Global
diff --git a/stepmania/src/smpackage/EditMetricsDlg.cpp b/stepmania/src/smpackage/EditMetricsDlg.cpp
deleted file mode 100644
index a2e14ad04d..0000000000
--- a/stepmania/src/smpackage/EditMetricsDlg.cpp
+++ /dev/null
@@ -1,286 +0,0 @@
-// EditMetricsDlg.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "smpackage.h"
-#include "EditMetricsDlg.h"
-#include "IniFile.h"
-#include "RageUtil.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-
-#define BLACK	RGB(0,0,0)
-#define RED		RGB(255,0,0)
-#define SET_ITEM_STYLE(item,bInBase,bInTheme) {m_tree.SetItemColor(item,bInBase?BLACK:RED);m_tree.SetItemBold(item,bInTheme);}
-
-/////////////////////////////////////////////////////////////////////////////
-// EditMetricsDlg dialog
-
-
-EditMetricsDlg::EditMetricsDlg(CWnd* pParent /*=NULL*/)
-	: CDialog(EditMetricsDlg::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(EditMetricsDlg)
-	//}}AFX_DATA_INIT
-}
-
-
-void EditMetricsDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(EditMetricsDlg)
-	DDX_Control(pDX, IDC_EDIT_VALUE, m_editValue);
-	DDX_Control(pDX, IDC_EDIT_DEFAULT, m_editDefault);
-	DDX_Control(pDX, IDC_BUTTON_REMOVE, m_buttonRemove);
-	DDX_Control(pDX, IDC_BUTTON_OVERRIDE, m_buttonOverride);
-	DDX_Control(pDX, IDC_TREE, m_tree);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(EditMetricsDlg, CDialog)
-	//{{AFX_MSG_MAP(EditMetricsDlg)
-	ON_NOTIFY(TVN_SELCHANGED, IDC_TREE, OnSelchangedTree)
-	ON_BN_CLICKED(IDC_BUTTON_OVERRIDE, OnButtonOverride)
-	ON_BN_CLICKED(IDC_BUTTON_REMOVE, OnButtonRemove)
-	ON_BN_CLICKED(IDC_BUTTON_SAVE, OnButtonSave)
-	ON_EN_CHANGE(IDC_EDIT_VALUE, OnChangeEditValue)
-	ON_BN_CLICKED(IDC_BUTTON_HELP, OnButtonHelp)
-	ON_NOTIFY(NM_DBLCLK, IDC_TREE, OnDblclkTree)
-	ON_BN_CLICKED(IDC_BUTTON_CLOSE, OnButtonClose)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// EditMetricsDlg message handlers
-
-BOOL EditMetricsDlg::OnInitDialog() 
-{
-	CDialog::OnInitDialog();
-	
-	// TODO: Add extra initialization here
-
-	RefreshTree();
-
-	return TRUE;  // return TRUE unless you set the focus to a control
-	              // EXCEPTION: OCX Property Pages should return FALSE
-}
-
-IniFile iniBase;
-IniFile iniTheme;
-
-void EditMetricsDlg::RefreshTree()
-{
-	m_tree.DeleteAllItems();
-
-	iniBase.Reset();
-	iniBase.SetPath( "Themes\\default\\metrics.ini" );
-	iniBase.ReadFile();
-
-	iniTheme.Reset();
-	iniTheme.SetPath( "Themes\\"+m_sTheme+"\\metrics.ini" );
-	iniTheme.ReadFile();
-
-	IniFile iniCombined;
-	iniCombined.SetPath( "Themes\\default\\metrics.ini" );
-	iniCombined.ReadFile();
-	iniCombined.SetPath( "Themes\\"+m_sTheme+"\\metrics.ini" );
-	iniCombined.ReadFile();
-
-	CStringArray asKeys;
-	IniFile::const_iterator it;
-	for( it = iniCombined.begin(); it != iniCombined.end(); ++it )
-		asKeys.push_back( it->first );
-	SortCStringArray( asKeys );
-
-	for( unsigned i=0; i<asKeys.size(); i++ )
-	{
-		CString sKey = asKeys[i];
-		bool bInBase = iniBase.GetKey(sKey) != NULL;
-		bool bInTheme = iniTheme.GetKey(sKey) != NULL;
-
-		HTREEITEM item1 = m_tree.InsertItem( sKey );
-		SET_ITEM_STYLE( item1, bInBase, bInTheme );
-
-		const IniFile::key* pKey = iniCombined.GetKey( sKey );
-		CStringArray asNames;
-		for( IniFile::key::const_iterator val = pKey->begin(); val != pKey->end(); ++val )
-		{
-			CString sName = val->first, sValue = val->second;
-			asNames.push_back( sName );
-		}
-	
-		SortCStringArray( asNames );
-
-		for( unsigned j=0; j<asNames.size(); j++ )
-		{
-			CString sName = asNames[j];
-			CString sValue;
-			iniCombined.GetValue( sKey, sName, sValue );
-
-			CString sThrowAway;
-			bool bInBase = !!iniBase.GetValue( sKey, sName, sThrowAway );
-			bool bInTheme = !!iniTheme.GetValue( sKey, sName, sThrowAway );
-
-			HTREEITEM item2 = m_tree.InsertItem( sName, item1 );
-			SET_ITEM_STYLE( item2, bInBase, bInTheme );
-		}
-	}
-}
-
-void EditMetricsDlg::GetSelectedKeyAndName( CString& sKeyOut, CString& sNameOut )
-{
-	sKeyOut = "";
-	sNameOut = "";
-
-	HTREEITEM itemSel = m_tree.GetSelectedItem();
-	if( itemSel == NULL )
-		return;
-
-	HTREEITEM itemParent = m_tree.GetParentItem( itemSel );
-	if( itemParent == NULL )
-	{
-		sKeyOut = m_tree.GetItemText( itemSel );
-		return;
-	}
-
-	sKeyOut = m_tree.GetItemText( itemParent );
-	sNameOut = m_tree.GetItemText( itemSel );
-}
-
-void EditMetricsDlg::OnSelchangedTree(NMHDR* pNMHDR, LRESULT* pResult) 
-{
-	NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
-	// TODO: Add your control notification handler code here
-	
-	CString sKey, sName;
-	GetSelectedKeyAndName( sKey, sName );
-
-	if( sName == "" )
-	{
-		m_buttonOverride.EnableWindow( false );
-		m_buttonRemove.EnableWindow( false );
-		m_editValue.EnableWindow( false );
-		m_editValue.SetWindowText( "" );
-		m_editDefault.SetWindowText( "" );
-		return;
-	}
-	
-	CString sThrowAway;
-	bool bInBase = !!iniBase.GetValue( sKey, sName, sThrowAway );
-	bool bInTheme = !!iniTheme.GetValue( sKey, sName, sThrowAway );
-
-	m_buttonOverride.EnableWindow( bInBase && !bInTheme );
-	m_buttonRemove.EnableWindow( bInTheme );
-	m_editValue.EnableWindow( bInTheme );
-	if( bInTheme )
-	{
-		CString n;
-		iniTheme.GetValue(sKey,sName, n);
-		m_editValue.SetWindowText( n );
-		m_editDefault.SetWindowText( n );
-	} else {
-		m_editValue.SetWindowText( "" );
-		m_editDefault.SetWindowText( "" );
-	}
-
-	*pResult = 0;
-}
-
-void EditMetricsDlg::OnButtonOverride() 
-{
-	// TODO: Add your control notification handler code here
-	CString sKey, sName;
-	GetSelectedKeyAndName( sKey, sName );
-
-	HTREEITEM itemSel = m_tree.GetSelectedItem();
-	HTREEITEM itemParent = m_tree.GetParentItem( itemSel );
-	
-	SET_ITEM_STYLE( itemSel, true, true );
-	m_tree.RedrawWindow();
-
-	m_editValue.EnableWindow( true );
-	m_editValue.SetFocus();
-	m_buttonOverride.EnableWindow( false );
-	m_buttonRemove.EnableWindow( true );
-
-	iniTheme.SetValue( sKey, sName, "" );
-}
-
-void EditMetricsDlg::OnButtonRemove() 
-{
-	// TODO: Add your control notification handler code here
-	CString sKey, sName;
-	GetSelectedKeyAndName( sKey, sName );
-
-	HTREEITEM itemSel = m_tree.GetSelectedItem();
-	
-	CString sThrowAway;
-	bool bInBase = !!iniBase.GetValue( sKey, sName, sThrowAway );
-
-	if( bInBase )
-	{
-		m_tree.SetItemColor( itemSel, BLACK );
-		m_tree.SetItemBold( itemSel, false );
-		m_tree.RedrawWindow();
-		m_buttonOverride.EnableWindow( true );
-		m_buttonRemove.EnableWindow( false );
-		m_editValue.EnableWindow( false );
-	}
-	else
-		m_tree.DeleteItem( itemSel );
-
-	iniTheme.DeleteValue( sKey, sName );
-}
-
-void EditMetricsDlg::OnButtonSave() 
-{
-	// TODO: Add your control notification handler code here
-	iniTheme.WriteFile();
-}
-
-void EditMetricsDlg::OnChangeEditValue() 
-{
-	// TODO: If this is a RICHEDIT control, the control will not
-	// send this notification unless you override the CDialog::OnInitDialog()
-	// function and call CRichEditCtrl().SetEventMask()
-	// with the ENM_CHANGE flag ORed into the mask.
-	
-	// TODO: Add your control notification handler code here
-	CString sKey, sName;
-	GetSelectedKeyAndName( sKey, sName );
-
-	CString sText;
-	m_editValue.GetWindowText( sText );
-	iniTheme.SetValue( sKey, sName, sText );	
-}
-
-void EditMetricsDlg::OnButtonHelp() 
-{
-	// TODO: Add your control notification handler code here
-	AfxMessageBox( 
-		"Bold = A metric that is overridden by the current theme (exists in both the base theme, and the current theme)\n\n"
-		"Not Bold = A metric that is not overridden by the current theme (exists in the base theme but not in the current theme)\n\n"
-		"Red = A metric that exists in the current theme but not in the base theme (check to see if the metric name is misspelled)"
-		 );	
-}
-
-void EditMetricsDlg::OnDblclkTree(NMHDR* pNMHDR, LRESULT* pResult) 
-{
-	// TODO: Add your control notification handler code here
-	
-	OnButtonOverride();
-
-	*pResult = 0;
-}
-
-void EditMetricsDlg::OnButtonClose() 
-{
-	// TODO: Add your control notification handler code here
-	EndDialog( IDOK );	
-}
diff --git a/stepmania/src/smpackage/EditMetricsDlg.h b/stepmania/src/smpackage/EditMetricsDlg.h
deleted file mode 100644
index 749b777cf4..0000000000
--- a/stepmania/src/smpackage/EditMetricsDlg.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#if !defined(AFX_EDITMETRICSDLG_H__39D944CD_BCE4_4C30_876E_0B5A0CE42931__INCLUDED_)
-#define AFX_EDITMETRICSDLG_H__39D944CD_BCE4_4C30_876E_0B5A0CE42931__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// EditMetricsDlg.h : header file
-//
-
-#include "TreeCtrlEx.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// EditMetricsDlg dialog
-
-class EditMetricsDlg : public CDialog
-{
-// Construction
-public:
-	EditMetricsDlg(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(EditMetricsDlg)
-	enum { IDD = IDD_EDIT_METRICS };
-	CEdit	m_editValue;
-	CEdit	m_editDefault;
-	CButton	m_buttonRemove;
-	CButton	m_buttonOverride;
-	CTreeCtrlEx	m_tree;
-	//}}AFX_DATA
-
-	CString m_sTheme;
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(EditMetricsDlg)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(EditMetricsDlg)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnSelchangedTree(NMHDR* pNMHDR, LRESULT* pResult);
-	afx_msg void OnButtonOverride();
-	afx_msg void OnButtonRemove();
-	afx_msg void OnButtonNew();
-	afx_msg void OnButtonSave();
-	afx_msg void OnChangeEditValue();
-	afx_msg void OnButtonHelp();
-	afx_msg void OnDblclkTree(NMHDR* pNMHDR, LRESULT* pResult);
-	afx_msg void OnButtonClose();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-
-	void RefreshTree();
-	void GetSelectedKeyAndName( CString& sKeyOut, CString& sNameOut );
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_EDITMETRICSDLG_H__39D944CD_BCE4_4C30_876E_0B5A0CE42931__INCLUDED_)
diff --git a/stepmania/src/smpackage/converttheme.bmp b/stepmania/src/smpackage/converttheme.bmp
deleted file mode 100644
index 15e2bc7b6d98c5ff10e4a69890dfc274d033fc72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31578
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
Rg|zuTk@>f*d|)*I@IR-nTc-d3

diff --git a/stepmania/src/smpackage/editmetrics.bmp b/stepmania/src/smpackage/editmetrics.bmp
deleted file mode 100644
index d571f4244156c19c4b0f3495450f4f2618594f93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31578
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
a=8L*;mMez2vyfhFCo=zraZaWIfd2v7LNpBk

diff --git a/stepmania/src/smpackage/onvertThemeDlg.cpp b/stepmania/src/smpackage/onvertThemeDlg.cpp
deleted file mode 100644
index 5f3f57fba1..0000000000
--- a/stepmania/src/smpackage/onvertThemeDlg.cpp
+++ /dev/null
@@ -1,348 +0,0 @@
-// onvertThemeDlg.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "smpackage.h"
-#include "onvertThemeDlg.h"
-#include "smpackageUtil.h"	
-#include "EditMetricsDlg.h"	
-#include "EditMetricsDlg.h"	
-#include "IniFile.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// ConvertThemeDlg dialog
-
-
-ConvertThemeDlg::ConvertThemeDlg(CWnd* pParent /*=NULL*/)
-	: CDialog(ConvertThemeDlg::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(ConvertThemeDlg)
-		// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void ConvertThemeDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(ConvertThemeDlg)
-	DDX_Control(pDX, IDC_BUTTON_ANALYZE_METRICS, m_buttonAnalyzeMetrics);
-	DDX_Control(pDX, IDC_BUTTON_EDIT_METRICS, m_buttonEditMetrics);
-	DDX_Control(pDX, IDC_BUTTON_ANALYZE, m_buttonAnalyze);
-	DDX_Control(pDX, IDC_LIST_THEMES, m_listThemes);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(ConvertThemeDlg, CDialog)
-	//{{AFX_MSG_MAP(ConvertThemeDlg)
-	ON_LBN_SELCHANGE(IDC_LIST_THEMES, OnSelchangeListThemes)
-	ON_BN_CLICKED(IDC_BUTTON_ANALYZE, OnButtonAnalyze)
-	ON_BN_CLICKED(IDC_BUTTON_EDIT_METRICS, OnButtonEditMetrics)
-	ON_BN_CLICKED(IDC_BUTTON_ANALYZE_METRICS, OnButtonAnalyzeMetrics)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// ConvertThemeDlg message handlers
-
-BOOL ConvertThemeDlg::OnInitDialog() 
-{
-	CDialog::OnInitDialog();
-	
-	// TODO: Add extra initialization here
-	
-	CStringArray asThemes;
-	GetDirListing( "Themes\\*.*", asThemes, true, false );
-	for( unsigned i=0; i<asThemes.size(); i++ )
-//		if( asThemes[i] != "default" )	// allow editing of default
-			m_listThemes.AddString( asThemes[i] );
-
-	return TRUE;  // return TRUE unless you set the focus to a control
-	              // EXCEPTION: OCX Property Pages should return FALSE
-}
-
-// renames files and directories recursively
-void RecursiveRename( CString sDirStart, CString sOld, CString sNew )
-{
-	if( sDirStart.Right(1) != "\\" )
-		sDirStart += "\\";
-
-	CStringArray asFilesAndDirs;
-	GetDirListing( sDirStart+"*.*", asFilesAndDirs, false, false );
-	for( unsigned i=0; i<asFilesAndDirs.size(); i++ )
-	{
-		CString sOldFilePath = sDirStart+asFilesAndDirs[i];
-		CString sNewFilePath = sOldFilePath;
-		sNewFilePath.MakeLower();
-		sOld.MakeLower();
-		sNewFilePath.Replace( sOld, sNew );
-		if( sOldFilePath.CompareNoCase(sNewFilePath) != 0 )
-			MoveFile( sOldFilePath, sNewFilePath );
-	}
-
-	CStringArray asDirs;
-	GetDirListing( sDirStart+"*.*", asDirs, true, false );
-	for( i=0; i<asDirs.size(); i++ )
-		RecursiveRename( sDirStart+asDirs[i], sOld, sNew );
-}
-
-void ConvertThemeDlg::OnSelchangeListThemes() 
-{
-	// TODO: Add your control notification handler code here
-	BOOL bSomethingSelected = m_listThemes.GetCurSel() != LB_ERR;
-	m_buttonAnalyze.EnableWindow( bSomethingSelected );
-	m_buttonEditMetrics.EnableWindow( bSomethingSelected );
-	m_buttonAnalyzeMetrics.EnableWindow( bSomethingSelected );
-}
-
-bool FilesAreIdentical( CString sPath1, CString sPath2 )
-{
-	if( IsADirectory(sPath1) || IsADirectory(sPath2) )
-		return false;
-
-	FILE* fp1 = fopen( sPath1, "r" );
-	FILE* fp2 = fopen( sPath2, "r" );
-
-	bool bReturn;
-
-	if( GetFileSizeInBytes(sPath1) != GetFileSizeInBytes(sPath2) )
-	{
-		bReturn = false;
-		goto clean_up;
-	}
-
-	char buffer1[1024], buffer2[1024];
-	ZERO( buffer1 );
-	ZERO( buffer2 );
-	while( !feof(fp1) )
-	{
-		int size1 = fread( buffer1, 1, sizeof(buffer1), fp1 );
-		int size2 = fread( buffer2, 1, sizeof(buffer2), fp2 );
-		if( size1 != size2 )
-		{
-			bReturn = false;
-			goto clean_up;
-		}
-		if( memcmp( buffer1, buffer2, sizeof(size1) ) != 0 )
-		{
-			bReturn = false;
-			goto clean_up;
-		}
-	}
-
-	bReturn = true;
-	goto clean_up;
-
-clean_up:
-	fclose( fp1 );
-	fclose( fp2 );
-	return bReturn;
-}
-
-CString StripExtension( CString sPath )
-{
-	CString sDir, sFName, sExt;
-	splitrelpath( sPath, sDir, sFName, sExt );
-	return sDir + sFName;
-}
-
-void LaunchNotepad( CString sPathToOpen )
-{
-	PROCESS_INFORMATION pi;
-	STARTUPINFO	si;
-	ZeroMemory( &si, sizeof(si) );
-
-	char szCommand[MAX_PATH] = "notepad.exe ";
-	strcat( szCommand, sPathToOpen );
-	CreateProcess(
-		NULL,		// pointer to name of executable module
-		szCommand,		// pointer to command line string
-		NULL,  // process security attributes
-		NULL,   // thread security attributes
-		false,  // handle inheritance flag
-		0, // creation flags
-		NULL,  // pointer to new environment block
-		NULL,   // pointer to current directory name
-		&si,  // pointer to STARTUPINFO
-		&pi  // pointer to PROCESS_INFORMATION
-	);
-}
-
-void ConvertThemeDlg::OnButtonAnalyze() 
-{
-	CString sBaseDir = "Themes\\default\\";
-	int iSel = m_listThemes.GetCurSel();
-	CString sThemeName;
-	m_listThemes.GetText( iSel, sThemeName );
-	CString sThemeDir = "Themes\\"+sThemeName+"\\";
-
-	CStringArray asBaseFilePaths;
-	GetDirListing( sBaseDir+"BGAnimations\\*.*", asBaseFilePaths, false, true );
-	GetDirListing( sBaseDir+"Fonts\\*.*", asBaseFilePaths, false, true );
-	GetDirListing( sBaseDir+"Graphics\\*.*", asBaseFilePaths, false, true );
-	GetDirListing( sBaseDir+"Numbers\\*.*", asBaseFilePaths, false, true );
-	GetDirListing( sBaseDir+"Sounds\\*.*", asBaseFilePaths, false, true );
-
-	CStringArray asThemeFilePaths;
-	GetDirListing( sThemeDir+"BGAnimations\\*.*", asThemeFilePaths, false, true );
-	GetDirListing( sThemeDir+"Fonts\\*.*", asThemeFilePaths, false, true );
-	GetDirListing( sThemeDir+"Graphics\\*.*", asThemeFilePaths, false, true );
-	GetDirListing( sThemeDir+"Numbers\\*.*", asThemeFilePaths, false, true );
-	GetDirListing( sThemeDir+"Sounds\\*.*", asThemeFilePaths, false, true );
-
-	CStringArray asRedundant;
-	CStringArray asWarning;
-	unsigned i;
-	for( i=0; i<asThemeFilePaths.size(); i++ )
-	{
-		CString sThemeElement = asThemeFilePaths[i];
-		sThemeElement.Replace( sThemeDir, "" );
-		sThemeElement = StripExtension( sThemeElement );
-		bool bFoundMatch = false;
-
-		for( unsigned j=0; j<asBaseFilePaths.size(); j++ )
-		{
-			CString sBaseElement = asBaseFilePaths[j];
-			sBaseElement.Replace( sBaseDir, "" );
-			sBaseElement = StripExtension( sBaseElement );
-
-			if( sThemeElement.CompareNoCase(sBaseElement)==0 )	// file names match
-			{
-				bFoundMatch = true;
- 				if( FilesAreIdentical( asThemeFilePaths[i], asBaseFilePaths[j] ) )
-					asRedundant.push_back( asThemeFilePaths[i] );
-				break;	// skip to next file in asThemeFilePaths
-			}
-		}
-		if( !bFoundMatch )
-			asWarning.push_back( asThemeFilePaths[i] );
-	}
-
-	SortCStringArray( asRedundant );
-	SortCStringArray( asWarning );
-
-	FILE* fp = fopen( "elements_report.txt", "w" );
-	ASSERT( fp );
-	fprintf( fp, "Theme elements report for '"+sThemeName+"'.\n\n" );
-	fprintf( fp, "The following elements are REDUNDANT.\n"
-		"    (These elements are identical to the elements in the base theme.\n"
-		"    They are unnecessary and should be deleted.)\n" );
-	for( i=0; i<asRedundant.size(); i++ )
-		fprintf( fp, asRedundant[i] + "\n" );
-	fprintf( fp, "\n" );
-	fprintf( fp, "The following elements are possibly MISNAMED.\n"
-		"    (These files do not have a corresponding element in the base theme.\n"
-		"    This likely means that there is an error in the file name.)\n" );
-	for( i=0; i<asWarning.size(); i++ )
-		fprintf( fp, asWarning[i] + "\n" );
-	fclose( fp );
-
-	LaunchNotepad( "elements_report.txt" );
-}
-
-void ConvertThemeDlg::OnButtonEditMetrics() 
-{
-	// TODO: Add your control notification handler code here
-	EditMetricsDlg dlg;
-	int iSel = m_listThemes.GetCurSel();
-	CString sThemeName;
-	m_listThemes.GetText( iSel, sThemeName );
-	dlg.m_sTheme = sThemeName;
-	int nResponse = dlg.DoModal();	
-	
-}
-
-void ConvertThemeDlg::OnButtonAnalyzeMetrics() 
-{
-	int iSel = m_listThemes.GetCurSel();
-	CString sThemeName;
-	m_listThemes.GetText( iSel, sThemeName );
-
-	IniFile iniBase;
-	iniBase.SetPath( "Themes\\default\\metrics.ini" );
-	iniBase.ReadFile();
-
-	IniFile iniTheme;
-	iniTheme.SetPath( "Themes\\"+sThemeName+"\\metrics.ini" );
-	iniTheme.ReadFile();
-
-	CMapStringToString mapBaseClassPlusNameToValue;
-	unsigned i;
-	IniFile::const_iterator it;
-	for( it = iniBase.begin(); it != iniBase.end(); ++it )
-	{
-		CString sKey = it->first;
-		const IniFile::key &Key = it->second;
-		for( IniFile::key::const_iterator val = Key.begin(); val != Key.end(); ++val )
-		{
-			CString sName = val->first, sValue = val->second;
-			mapBaseClassPlusNameToValue[sKey+"-"+sName] = sValue;
-		}
-	}
-
-	CMapStringToString mapThemeClassPlusNameToValue;
-	for( it = iniTheme.begin(); it != iniTheme.end(); ++it )
-	{
-		CString sKey = it->first;
-		const IniFile::key &Key = it->second;
-		for( IniFile::key::const_iterator val = Key.begin(); val != Key.end(); ++val )
-		{
-			CString sName = val->first, sValue = val->second;
-			mapThemeClassPlusNameToValue[sKey+"-"+sName] = sValue;
-		}
-	}
-
-
-	CStringArray asRedundant;
-	CStringArray asWarning;
-	for( POSITION pos1=mapThemeClassPlusNameToValue.GetStartPosition(); pos1!=NULL; )
-	{
-		CString sThemeKey, sThemeValue;
-		mapThemeClassPlusNameToValue.GetNextAssoc( pos1, sThemeKey, sThemeValue );
-		bool bFoundMatch = false;
-
-		for( POSITION pos2=mapBaseClassPlusNameToValue.GetStartPosition(); pos2!=NULL; )
-		{
-			CString sBaseKey, sBaseValue;
-			mapBaseClassPlusNameToValue.GetNextAssoc( pos2, sBaseKey, sBaseValue );
-
-			if( sThemeKey == sBaseKey )	// match
-			{
-				bFoundMatch = true;
-				if( sThemeValue == sBaseValue )
-					asRedundant.push_back( sThemeKey );
-				break;	// skip to next file in asThemeFilePaths
-			}
-		}
-		if( !bFoundMatch )
-			asWarning.push_back( sThemeKey );
-	}
-
-	SortCStringArray( asRedundant );
-	SortCStringArray( asWarning );
-
-	FILE* fp = fopen( "metrics_report.txt", "w" );
-	ASSERT( fp );
-	fprintf( fp, "Theme metrics report for '"+sThemeName+"'.\n\n" );
-	fprintf( fp, "The following metrics are REDUNDANT.\n"
-		"    (These metrics are identical to the metrics in the base theme.\n"
-		"    They are unnecessary and should be deleted.)\n" );
-	for( i=0; i<asRedundant.size(); i++ )
-		fprintf( fp, asRedundant[i] + "\n" );
-	fprintf( fp, "\n" );
-	fprintf( fp, "The following elements are possibly MISNAMED.\n"
-		"    (These metrics do not have a corresponding metric in\n"
-		"    the base theme.  This likely means that there is an error in the metric name.)\n" );
-	for( i=0; i<asWarning.size(); i++ )
-		fprintf( fp, asWarning[i] + "\n" );
-	fclose( fp );
-
-	LaunchNotepad( "metrics_report.txt" );	
-}
diff --git a/stepmania/src/smpackage/onvertThemeDlg.h b/stepmania/src/smpackage/onvertThemeDlg.h
deleted file mode 100644
index 76710b8d4c..0000000000
--- a/stepmania/src/smpackage/onvertThemeDlg.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#if !defined(AFX_ONVERTTHEMEDLG_H__4A6650E2_F5C6_4914_8610_2118AB81455F__INCLUDED_)
-#define AFX_ONVERTTHEMEDLG_H__4A6650E2_F5C6_4914_8610_2118AB81455F__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// onvertThemeDlg.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// ConvertThemeDlg dialog
-
-class ConvertThemeDlg : public CDialog
-{
-// Construction
-public:
-	ConvertThemeDlg(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(ConvertThemeDlg)
-	enum { IDD = IDD_CONVERT_THEME };
-	CButton	m_buttonAnalyzeMetrics;
-	CButton	m_buttonEditMetrics;
-	CButton	m_buttonAnalyze;
-	CListBox	m_listThemes;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(ConvertThemeDlg)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(ConvertThemeDlg)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnSelchangeListThemes();
-	afx_msg void OnButtonAnalyze();
-	afx_msg void OnButtonEditMetrics();
-	afx_msg void OnButtonAnalyzeMetrics();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ONVERTTHEMEDLG_H__4A6650E2_F5C6_4914_8610_2118AB81455F__INCLUDED_)