From f6f253b54516459d9426d1c830c65fecc88307c7 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Fri, 6 Jan 2006 07:48:26 +0000
Subject: [PATCH] localize text in all dialogs

---
 .../src/smpackage/ChangeGameSettings.cpp      |   3 ++
 stepmania/src/smpackage/CreateLanguageDlg.cpp |   3 ++
 stepmania/src/smpackage/CreateLanguageDlg.h   |   5 +-
 stepmania/src/smpackage/EnterComment.cpp      |  11 +++++
 stepmania/src/smpackage/EnterComment.h        |   1 +
 stepmania/src/smpackage/EnterName.cpp         |  12 ++++-
 stepmania/src/smpackage/EnterName.h           |   1 +
 stepmania/src/smpackage/MainMenuDlg.cpp       |  21 +-------
 stepmania/src/smpackage/MainMenuDlg.h         |   4 +-
 .../src/smpackage/SMPackageInstallDlg.cpp     |   3 ++
 stepmania/src/smpackage/SMPackageInstallDlg.h |   3 ++
 stepmania/src/smpackage/SMPackageUtil.cpp     |  34 ++++++++++---
 stepmania/src/smpackage/ShowComment.cpp       |   3 +-
 .../src/smpackage/SmpackageExportDlg.cpp      |   4 +-
 stepmania/src/smpackage/SmpackageExportDlg.h  |   3 ++
 stepmania/src/smpackage/TransparentStatic.cpp |  46 ++++++++++++++++++
 stepmania/src/smpackage/TransparentStatic.h   |  20 ++++++++
 stepmania/src/smpackage/UninstallOld.cpp      |   5 +-
 .../src/smpackage/{menu.bmp => header.bmp}    | Bin 31578 -> 31578 bytes
 stepmania/src/smpackage/install.bmp           | Bin 31432 -> 0 bytes
 stepmania/src/smpackage/manage.bmp            | Bin 31578 -> 0 bytes
 stepmania/src/smpackage/resource.h            |  10 ++--
 stepmania/src/smpackage/smpackage.rc          |  45 +++++++++--------
 stepmania/src/smpackage/smpackageUtil.h       |   1 +
 24 files changed, 176 insertions(+), 62 deletions(-)
 create mode 100644 stepmania/src/smpackage/TransparentStatic.cpp
 create mode 100644 stepmania/src/smpackage/TransparentStatic.h
 rename stepmania/src/smpackage/{menu.bmp => header.bmp} (84%)
 delete mode 100644 stepmania/src/smpackage/install.bmp
 delete mode 100644 stepmania/src/smpackage/manage.bmp

diff --git a/stepmania/src/smpackage/ChangeGameSettings.cpp b/stepmania/src/smpackage/ChangeGameSettings.cpp
index ca599249ca..a6c02146cb 100644
--- a/stepmania/src/smpackage/ChangeGameSettings.cpp
+++ b/stepmania/src/smpackage/ChangeGameSettings.cpp
@@ -50,6 +50,9 @@ BOOL ChangeGameSettings::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	
+	// TODO: Add extra initialization here
+	SMPackageUtil::LocalizeDialogAndContents( *this );
+
 	//
 	// Fill the radio buttons
 	//
diff --git a/stepmania/src/smpackage/CreateLanguageDlg.cpp b/stepmania/src/smpackage/CreateLanguageDlg.cpp
index dac9c679b5..2f4818586e 100644
--- a/stepmania/src/smpackage/CreateLanguageDlg.cpp
+++ b/stepmania/src/smpackage/CreateLanguageDlg.cpp
@@ -32,6 +32,9 @@ BOOL CreateLanguageDlg::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 
+	// TODO: Add extra initialization here
+	SMPackageUtil::LocalizeDialogAndContents( *this );
+
 	vector<const LanguageInfo*> v;
 	GetLanguageInfos( v );
 	FOREACH_CONST( const LanguageInfo*, v, i )
diff --git a/stepmania/src/smpackage/CreateLanguageDlg.h b/stepmania/src/smpackage/CreateLanguageDlg.h
index 2f115a0337..75129c9ae6 100644
--- a/stepmania/src/smpackage/CreateLanguageDlg.h
+++ b/stepmania/src/smpackage/CreateLanguageDlg.h
@@ -17,8 +17,11 @@ public:
 
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL OnInitDialog();
 
+	// Generated message map functions
+	//{{AFX_MSG(CreateLanguageDlg)
+	virtual BOOL OnInitDialog();
+	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 public:
 	CComboBox m_comboLanguages;
diff --git a/stepmania/src/smpackage/EnterComment.cpp b/stepmania/src/smpackage/EnterComment.cpp
index e184e3a71f..39de37137e 100644
--- a/stepmania/src/smpackage/EnterComment.cpp
+++ b/stepmania/src/smpackage/EnterComment.cpp
@@ -6,6 +6,7 @@
 #include "stdafx.h"
 #include "smpackage.h"
 #include "EnterComment.h"
+#include "SMPackageUtil.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -36,6 +37,16 @@ void EnterComment::DoDataExchange(CDataExchange* pDX)
 	DDX_Check(pDX, IDC_DONTASK, m_bDontAsk);
 }
 
+BOOL EnterComment::OnInitDialog() 
+{
+	CDialog::OnInitDialog();
+	
+	// TODO: Add extra initialization here
+	SMPackageUtil::LocalizeDialogAndContents( *this );
+
+	return TRUE;  // return TRUE unless you set the focus to a control
+	              // EXCEPTION: OCX Property Pages should return FALSE
+}
 
 BEGIN_MESSAGE_MAP(EnterComment, CDialog)
 	//{{AFX_MSG_MAP(EnterComment)
diff --git a/stepmania/src/smpackage/EnterComment.h b/stepmania/src/smpackage/EnterComment.h
index 90664c64cb..c9cb129847 100644
--- a/stepmania/src/smpackage/EnterComment.h
+++ b/stepmania/src/smpackage/EnterComment.h
@@ -39,6 +39,7 @@ protected:
 	// Generated message map functions
 	//{{AFX_MSG(EnterComment)
 	virtual void OnOK();
+	virtual BOOL OnInitDialog();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 public:
diff --git a/stepmania/src/smpackage/EnterName.cpp b/stepmania/src/smpackage/EnterName.cpp
index 533c78f1f9..776f927f07 100644
--- a/stepmania/src/smpackage/EnterName.cpp
+++ b/stepmania/src/smpackage/EnterName.cpp
@@ -6,6 +6,7 @@
 #include "stdafx.h"
 #include "smpackage.h"
 #include "EnterName.h"
+#include "SMPackageUtil.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -25,7 +26,6 @@ EnterName::EnterName(CWnd* pParent /*=NULL*/)
 	//}}AFX_DATA_INIT
 }
 
-
 void EnterName::DoDataExchange(CDataExchange* pDX)
 {
 	CDialog::DoDataExchange(pDX);
@@ -34,6 +34,16 @@ void EnterName::DoDataExchange(CDataExchange* pDX)
 	//}}AFX_DATA_MAP
 }
 
+BOOL EnterName::OnInitDialog() 
+{
+	CDialog::OnInitDialog();
+	
+	// TODO: Add extra initialization here
+	SMPackageUtil::LocalizeDialogAndContents( *this );
+
+	return TRUE;  // return TRUE unless you set the focus to a control
+	              // EXCEPTION: OCX Property Pages should return FALSE
+}
 
 BEGIN_MESSAGE_MAP(EnterName, CDialog)
 	//{{AFX_MSG_MAP(EnterName)
diff --git a/stepmania/src/smpackage/EnterName.h b/stepmania/src/smpackage/EnterName.h
index 8998ddfb70..613613f6f7 100644
--- a/stepmania/src/smpackage/EnterName.h
+++ b/stepmania/src/smpackage/EnterName.h
@@ -39,6 +39,7 @@ protected:
 	// Generated message map functions
 	//{{AFX_MSG(EnterName)
 	virtual void OnOK();
+	virtual BOOL OnInitDialog();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
diff --git a/stepmania/src/smpackage/MainMenuDlg.cpp b/stepmania/src/smpackage/MainMenuDlg.cpp
index bb92116808..cdd694c434 100644
--- a/stepmania/src/smpackage/MainMenuDlg.cpp
+++ b/stepmania/src/smpackage/MainMenuDlg.cpp
@@ -43,6 +43,7 @@ void MainMenuDlg::DoDataExchange(CDataExchange* pDX)
 	//{{AFX_DATA_MAP(MainMenuDlg)
 		// NOTE: the ClassWizard will add DDX and DDV calls here
 	//}}AFX_DATA_MAP
+	DDX_Control(pDX, IDC_STATIC_HEADER_TEXT, m_staticHeaderText);
 }
 
 
@@ -58,7 +59,6 @@ BEGIN_MESSAGE_MAP(MainMenuDlg, CDialog)
 	//}}AFX_MSG_MAP
 	ON_BN_CLICKED(IDC_BUTTON_LAUNCH_GAME, OnBnClickedButtonLaunchGame)
 	ON_BN_CLICKED(IDC_VIEW_STATISTICS, OnBnClickedViewStatistics)
-	ON_BN_CLICKED(IDC_CLEAR_CACHE, OnBnClickedClearCache)
 	ON_BN_CLICKED(IDC_LANGUAGES, OnBnClickedLanguages)
 END_MESSAGE_MAP()
 
@@ -174,6 +174,7 @@ BOOL MainMenuDlg::OnInitDialog()
 	
 	// TODO: Add extra initialization here
 	SMPackageUtil::LocalizeDialogAndContents( *this );
+	SMPackageUtil::SetHeaderFont( *this );
 
 	TCHAR szCurDir[MAX_PATH];
 	GetCurrentDirectory( ARRAYSIZE(szCurDir), szCurDir );
@@ -255,24 +256,6 @@ void MainMenuDlg::OnBnClickedViewStatistics()
 		MessageBox( "Failed to open '" + sFile + "': " + GetLastErrorString() );
 }
 
-void MainMenuDlg::OnBnClickedClearCache()
-{
-	// TODO: Add your control notification handler code here
-	if( DoesFileExist(SpecialFiles::CACHE_DIR) )
-	{
-		if( DeleteRecursive(SpecialFiles::CACHE_DIR) )
-			MessageBox( "The cache has been cleared." );
-		else
-			MessageBox( "There was an error clearing the cache." );
-	}
-	else
-	{
-		MessageBox( "The cache is already cleared." );
-	}
-
-	FlushDirCache();
-}
-
 void MainMenuDlg::OnBnClickedLanguages()
 {
 	// TODO: Add your control notification handler code here
diff --git a/stepmania/src/smpackage/MainMenuDlg.h b/stepmania/src/smpackage/MainMenuDlg.h
index 419bcf7459..88c9aa5f9e 100644
--- a/stepmania/src/smpackage/MainMenuDlg.h
+++ b/stepmania/src/smpackage/MainMenuDlg.h
@@ -7,6 +7,8 @@
 // MainMenuDlg.h : header file
 //
 
+#include "TransparentStatic.h"
+
 /////////////////////////////////////////////////////////////////////////////
 // MainMenuDlg dialog
 
@@ -32,6 +34,7 @@ public:
 
 // Implementation
 protected:
+	CTransparentStatic	m_staticHeaderText;
 
 	// Generated message map functions
 	//{{AFX_MSG(MainMenuDlg)
@@ -50,7 +53,6 @@ protected:
 public:
 	afx_msg void OnBnClickedButtonLaunchGame();
 	afx_msg void OnBnClickedViewStatistics();
-	afx_msg void OnBnClickedClearCache();
 	afx_msg void OnBnClickedLanguages();
 };
 
diff --git a/stepmania/src/smpackage/SMPackageInstallDlg.cpp b/stepmania/src/smpackage/SMPackageInstallDlg.cpp
index 84b9385490..1600a65788 100644
--- a/stepmania/src/smpackage/SMPackageInstallDlg.cpp
+++ b/stepmania/src/smpackage/SMPackageInstallDlg.cpp
@@ -48,6 +48,7 @@ void CSMPackageInstallDlg::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_BUTTON_EDIT, m_buttonEdit);
 	DDX_Control(pDX, IDC_COMBO_DIR, m_comboDir);
 	//}}AFX_DATA_MAP
+	DDX_Control(pDX, IDC_STATIC_HEADER_TEXT, m_staticHeaderText);
 }
 
 
@@ -77,6 +78,8 @@ BOOL CSMPackageInstallDlg::OnInitDialog()
 	SetIcon(m_hIcon, FALSE);		// Set small icon
 
 	// TODO: Add extra initialization here
+	SMPackageUtil::LocalizeDialogAndContents( *this );
+	SMPackageUtil::SetHeaderFont( *this );
 
 	// mount the zip
 	if( !FILEMAN->Mount( "zip", m_sPackagePath, TEMP_MOUNT_POINT ) )
diff --git a/stepmania/src/smpackage/SMPackageInstallDlg.h b/stepmania/src/smpackage/SMPackageInstallDlg.h
index 80d6783d9f..1ea05d71d0 100644
--- a/stepmania/src/smpackage/SMPackageInstallDlg.h
+++ b/stepmania/src/smpackage/SMPackageInstallDlg.h
@@ -7,6 +7,8 @@
 // SMPackageInstallDlg.h : header file
 //
 
+#include "TransparentStatic.h"
+
 /////////////////////////////////////////////////////////////////////////////
 // CSMPackageInstallDlg dialog
 
@@ -38,6 +40,7 @@ protected:
 
 	HICON m_hIcon;
 	RString m_sPackagePath;
+	CTransparentStatic	m_staticHeaderText;
 
 	// Generated message map functions
 	//{{AFX_MSG(CSMPackageInstallDlg)
diff --git a/stepmania/src/smpackage/SMPackageUtil.cpp b/stepmania/src/smpackage/SMPackageUtil.cpp
index 1ec141df30..5882df95f2 100644
--- a/stepmania/src/smpackage/SMPackageUtil.cpp
+++ b/stepmania/src/smpackage/SMPackageUtil.cpp
@@ -7,6 +7,7 @@
 #include "RageUtil.h"	
 #include "RageFileManager.h"	
 #include "ThemeManager.h"	
+#include "resource.h"	
 
 void SMPackageUtil::WriteStepManiaInstallDirs( const vector<RString>& asInstallDirsToWrite )
 {
@@ -211,23 +212,40 @@ RString SMPackageUtil::GetLanguageCodeFromDisplayString( const RString &sDisplay
 	return s;
 }
 
+void SMPackageUtil::SetHeaderFont( CDialog &dlg )
+{
+	CWnd *pWnd = dlg.GetDlgItem( IDC_STATIC_HEADER_TEXT );
+	ASSERT( pWnd );
+	CFont *pFont = new CFont; 
+	const int FONT_POINTS = 16;
+	pFont->CreatePointFont( FONT_POINTS*10, "Arial Black" );
+	pWnd->SetFont( pFont );
+}
+
 void SMPackageUtil::LocalizeDialogAndContents( CDialog &dlg )
 {
-	CString s1;
-	dlg.GetWindowText( s1 );
-	RString sGroup = "Tools-"+s1;
-	dlg.SetWindowText( THEME->GetString(sGroup,"DialogCaption") );
+	CString sTemp;
+	dlg.GetWindowText( sTemp );
+	RString sGroup = "Tools-"+sTemp;
+	dlg.GetWindowText( sTemp );
+	RString s = sTemp;
+	dlg.SetWindowText( THEME->GetString(sGroup,s) );
 
 	for( CWnd *pChild = dlg.GetTopWindow(); pChild != NULL; pChild = pChild->GetNextWindow() )
 	{
-		pChild->GetWindowText( s1 );
-		if( s1.IsEmpty() )
+		pChild->GetWindowText( sTemp );
+		RString s = sTemp;
+		if( s.empty() )
 			continue;
-		pChild->SetWindowText( THEME->GetString(sGroup,RString(s1)) );
+		vector<RString> vsBits;
+		split( s, "\n", vsBits, true );
+		FOREACH( RString, vsBits, iter )
+			*iter = THEME->GetString(sGroup,RString(*iter));
+		s = join("\n",vsBits);
+		pChild->SetWindowText( s );
 	}
 }
 
-
 static const RString TEMP_MOUNT_POINT = "/@package/";
 
 RageFileOsAbsolute::~RageFileOsAbsolute()
diff --git a/stepmania/src/smpackage/ShowComment.cpp b/stepmania/src/smpackage/ShowComment.cpp
index 007beffe6d..af74ca8130 100644
--- a/stepmania/src/smpackage/ShowComment.cpp
+++ b/stepmania/src/smpackage/ShowComment.cpp
@@ -6,6 +6,7 @@
 #include "stdafx.h"
 #include "smpackage.h"
 #include "ShowComment.h"
+#include "SMPackageUtil.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -36,7 +37,6 @@ void ShowComment::DoDataExchange(CDataExchange* pDX)
 	DDX_Check(pDX, IDC_DONTSHOW, m_bDontShow);
 }
 
-
 BEGIN_MESSAGE_MAP(ShowComment, CDialog)
 	//{{AFX_MSG_MAP(ShowComment)
 	//}}AFX_MSG_MAP
@@ -50,6 +50,7 @@ BOOL ShowComment::OnInitDialog()
 	CDialog::OnInitDialog();
 	
 	// TODO: Add extra initialization here
+	SMPackageUtil::LocalizeDialogAndContents( *this );
 	
 	m_edit.SetWindowText( m_sComment );
 
diff --git a/stepmania/src/smpackage/SmpackageExportDlg.cpp b/stepmania/src/smpackage/SmpackageExportDlg.cpp
index 1533cc561f..1071e3d64a 100644
--- a/stepmania/src/smpackage/SmpackageExportDlg.cpp
+++ b/stepmania/src/smpackage/SmpackageExportDlg.cpp
@@ -49,6 +49,7 @@ void CSmpackageExportDlg::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_BUTTON_EXPORT_AS_ONE, m_buttonExportAsOne);
 	DDX_Control(pDX, IDC_TREE, m_tree);
 	//}}AFX_DATA_MAP
+	DDX_Control(pDX, IDC_STATIC_HEADER_TEXT, m_staticHeaderText);
 }
 
 
@@ -71,7 +72,8 @@ BOOL CSmpackageExportDlg::OnInitDialog()
 	CDialog::OnInitDialog();
 	
 	// TODO: Add extra initialization here
-	//
+	SMPackageUtil::LocalizeDialogAndContents( *this );
+	SMPackageUtil::SetHeaderFont( *this );
 
 	RefreshInstallationList();
 	
diff --git a/stepmania/src/smpackage/SmpackageExportDlg.h b/stepmania/src/smpackage/SmpackageExportDlg.h
index bb2b378c08..9af7efc36a 100644
--- a/stepmania/src/smpackage/SmpackageExportDlg.h
+++ b/stepmania/src/smpackage/SmpackageExportDlg.h
@@ -6,6 +6,7 @@
 #endif // _MSC_VER > 1000
 
 #include "afxtempl.h"
+#include "TransparentStatic.h"
 
 // SmpackageExportDlg.h : header file
 //
@@ -45,6 +46,8 @@ protected:
 	void GetCheckedPaths( vector<RString>& aCheckedItemsOut );
 	bool MakeComment( RString &comment );
 
+	CTransparentStatic	m_staticHeaderText;
+
 	// Generated message map functions
 	//{{AFX_MSG(CSmpackageExportDlg)
 	virtual BOOL OnInitDialog();
diff --git a/stepmania/src/smpackage/TransparentStatic.cpp b/stepmania/src/smpackage/TransparentStatic.cpp
new file mode 100644
index 0000000000..3e78a63243
--- /dev/null
+++ b/stepmania/src/smpackage/TransparentStatic.cpp
@@ -0,0 +1,46 @@
+// TransparentStatic.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "TransparentStatic.h"
+
+
+// CTransparentStatic
+
+IMPLEMENT_DYNAMIC(CTransparentStatic, CStatic)
+CTransparentStatic::CTransparentStatic()
+{
+}
+
+CTransparentStatic::~CTransparentStatic()
+{
+}
+
+
+BEGIN_MESSAGE_MAP(CTransparentStatic, CStatic)
+   ON_MESSAGE(WM_SETTEXT,OnSetText)
+   ON_WM_CTLCOLOR_REFLECT()
+END_MESSAGE_MAP()
+
+
+
+// CTransparentStatic message handlers
+
+LRESULT CTransparentStatic::OnSetText(WPARAM wParam,LPARAM lParam)
+{
+   LRESULT Result = Default();
+   CRect Rect;
+   GetWindowRect(&Rect);
+   GetParent()->ScreenToClient(&Rect);
+   GetParent()->InvalidateRect(&Rect);
+   GetParent()->UpdateWindow();
+   return Result;
+}
+
+
+HBRUSH CTransparentStatic::CtlColor(CDC* pDC, UINT /*nCtlColor*/)
+{
+   pDC->SetBkMode(TRANSPARENT);
+   return (HBRUSH)GetStockObject(NULL_BRUSH);
+}
+
diff --git a/stepmania/src/smpackage/TransparentStatic.h b/stepmania/src/smpackage/TransparentStatic.h
new file mode 100644
index 0000000000..394ec525a9
--- /dev/null
+++ b/stepmania/src/smpackage/TransparentStatic.h
@@ -0,0 +1,20 @@
+#pragma once
+
+
+// CTransparentStatic
+
+class CTransparentStatic : public CStatic
+{
+	DECLARE_DYNAMIC(CTransparentStatic)
+
+public:
+	CTransparentStatic();
+	virtual ~CTransparentStatic();
+
+protected:
+   afx_msg LRESULT OnSetText(WPARAM,LPARAM);
+   afx_msg HBRUSH CtlColor(CDC* /*pDC*/, UINT /*nCtlColor*/);
+   DECLARE_MESSAGE_MAP()
+};
+
+
diff --git a/stepmania/src/smpackage/UninstallOld.cpp b/stepmania/src/smpackage/UninstallOld.cpp
index 1703a2acb1..d57480e7df 100644
--- a/stepmania/src/smpackage/UninstallOld.cpp
+++ b/stepmania/src/smpackage/UninstallOld.cpp
@@ -6,7 +6,7 @@
 #include "stdafx.h"
 #include "smpackage.h"
 #include "UninstallOld.h"
-
+#include "SMPackageUtil.h"
 
 // UninstallOld dialog
 
@@ -29,6 +29,9 @@ void UninstallOld::DoDataExchange(CDataExchange* pDX)
 BOOL UninstallOld::OnInitDialog()
 {
 	CDialog::OnInitDialog();
+
+	SMPackageUtil::LocalizeDialogAndContents( *this );
+
 	return TRUE;  // return TRUE  unless you set the focus to a control
 }
 
diff --git a/stepmania/src/smpackage/menu.bmp b/stepmania/src/smpackage/header.bmp
similarity index 84%
rename from stepmania/src/smpackage/menu.bmp
rename to stepmania/src/smpackage/header.bmp
index 6cdddd32267508afd6689e3ec10b6c7c3f979454..5070a581e04140105fb809f2c54cdbd8a1ccf7c0 100644
GIT binary patch
delta 192
zcmcchjq%nu#tHhYj0_A6j2lhXI&BVMnZP)?&?N=JNOc1-CNfTr@^A+-)-q1^^K#iN
z$F+fRvXhVVW?8O{jFZj$Kn$RWW`GNj0aPOu<PK!4VVukx;=NgcYX#$^Fz?OsTq_wT
ze+h>&UPO8UjakJw`A#&HaUmAO0BSlG?+H{4Wb97#1nS<(IC*EXBhd0KjGNb`?hxMm
Oj$aq(!pfse3=9B&Jw<B(

delta 3519
zcmZ{n&x;&I6vubX^l1p$>@37}MOZKgPaYKSn=~D>v4V&wDk5U?2YAh;{{atTpMrvV
z5id$)4=RG*x~rREdZv%TKfpgga`y9muX=WN5({>!>iw?od#|eZ@sr)hPj<h2HQUkn
z<@KL#Ou7)l*~#RK-RkrF-X!FC?z{WNy{u&yef!~?x30$+o5DvOV`eKBM#~TlMHZXt
zWOD5iROX{Jzj)k?;^=Iy%>)E#y>uzYn)$Uu2(@u8{4~b>p}KpTm-Q5Pc|HV5*qUhC
zm1rx`SS>m>OJak)C<->QfHc6JOH60$OwdH2Be=ztbsKVFzT8Qf_jYLasCDfE-N2j=
zQ^&^1O#!IA#e|7QK~9Nam2?zlGwPc&*}AAy1hczr3mqYE_D6Ze)r*t?+;`QDw{Di1
zi9(XkMl%PG{H~V#Op9VcfTHF@rpQ)?O>Y*PLa3M^N(jPKMbznclbeun0n8TWBrj!|
zIOWj>YurtZF!Y>$If4VZGs7|ENCEbWjmS+$;dg1B{5_?l_?7~-v(wH-c|W?WwT8_b
zcW;)GUA0kuItyqK$76PV2!=;Kv=Z}xGt~`HVBbT{ECC_mp+mZ%i`+Ff5?E@7%b_b<
zO_^`fx);bXO#9k|h~5U|xjE_O&~r2|GU*qE=_oQ__x1lM8HmMv5hy&wXQRBrS}1@#
zfX%nnD{to|hB%8A0PwS!W0Yx1*E4Fv3p?H=Frr$XR8b~#N2L}{4jfsBi3$5vg@(lS
zQ1uHjS1p)Gne5vpt(6BWmZqC?6mLK)xZZj=k4kbTue64oc%f!O1=!d6IAMK3Ne~1-
znu*WW@?uyw^kDN%^};*1$|i<T*NQ=<iE(}{d<YC+<(I>%KN_Vs$UG3?6}#%vd_a55
zV={pthBmpF^`YEEmQ0~2tuz+CNo%=6z^)UF*GW%gS(jxTwnd|$bMFt=aa0tb9B6DS
zdGONns-J<e%b!OKHeXkl-@Q|2vd17hx>qrW(7>aDPX~)ryEgou6$f4@afsGkSXi{y
z6bQPBWN3q{Fl~sXLcoa{tLMJy*Bh<<AyQ4`tDd4uL*$4noHtagOvEtPeMI71M=*4w
zzNu|1X}{!XOu<m=imR@RSsGI%sHg1VSMLFga>(Gmt1ar7i4W*7c#-@h`t^qiWLnJB
zBrFzn><DoUTRzPs*tmxa-0^_M!mQ1qXiDs)zO*8sJUOhtgq(8BJqnORpD$~`;bi12
z#=w*2Wo|k;<6!+R2R62q1VEO+Gx7Z-Z<yHC+zFZL-}mp7j*PwDVlz6q8|Gw2041Vf
zs!AcOsPHUt0%Z|o!r@@Sh~^>~WFvQs)mRjloe5dJQT4d-HJ1GgU}=`&+JHP=0STwG
zCb1}kQUMUI0}wuRCp=S0FY-!e0m$ld-xPWW#d>^d(ERhkY3a|Fe?a(J^(l`GRV_H=
zc(%)0EskA#KM9eTM&!7X3^)X=PnaNWa8s;IvQ;yi6QCLN1|^TSR=L+jW=`#zgU^7B
zZ~Jh-H^~?aexP_<2bJE`cn*9#rBqw{Q(f>8ovr1G+@GtZVe|J#r=>E#BI$h}_@u%4
z%Dz3hCPG)6eJ=E@398;Py|fZ?mfa$2>D|tl63o!k^P=xhrVXytZ74X89VcaI?KQG%
zE3Flh1Qf&hWn)!ntpqaa6eI{M1p8>t<eVPHE5!3gl&xndxl_bvYk7|tlD@JZR?Cl1
zXDYIxZIy505&ZfjJlfOB@~a%NfOt6JIn%>GyX-{c<O?XzPgoo4*ob66^=7GXMEqAr
zLHyv#$V^hu{;cXxZtuHWxYiY1y!QXVo|?!nep~3v?C@m~&rw*rS(|`8SZpdc7PDg(
z4ywhkcVJ^Ase>z9QfU5F{qgDTtNztK%u_O>qBz>~6UdGkokKjlE~1jRHBw_L3WxOC
zL`oK$X^)MXzF*erN$Oy4TME@!{r=g>L}hVyGI_Ln_VfMUX4Ur(eytuo_>sTrxt*Q=
E0Npk&Y5)KL

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

literal 31432
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

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

literal 31578
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

diff --git a/stepmania/src/smpackage/resource.h b/stepmania/src/smpackage/resource.h
index 8a7a863e81..524d564ef7 100644
--- a/stepmania/src/smpackage/resource.h
+++ b/stepmania/src/smpackage/resource.h
@@ -7,12 +7,9 @@
 #define IDR_MAINFRAME                   128
 #define IDD_INSTALL                     129
 #define IDD_EXPORTER                    130
-#define INSTALL                         133
-#define MANAGE                          135
 #define IDD_DIALOG_NAME                 137
 #define IDD_EDIT_INSTALLATIONS          138
 #define IDD_MENU                        139
-#define MENU                            140
 #define IDD_ENTER_COMMENT               146
 #define IDD_SHOW_COMMENT                147
 #define IDD_UNINSTALL_OLD_PACKAGES      148
@@ -66,6 +63,7 @@
 #define IDC_DONTSHOW                    1042
 #define IDC_PACKAGES                    1044
 #define IDC_BUTTON1                     1045
+#define IDB_HEADER                      1045
 #define IDC_BUTTON_DELETE               1046
 #define IDC_PROGRESS1                   1047
 #define IDC_RADIO_DEFAULT               1048
@@ -87,15 +85,15 @@
 #define IDC_STATIC_NEED_TRANSLATION     1061
 #define IDC_COMBO_LANGUAGES             1065
 #define IDC_CHECK_EXPORT_ALREADY_TRANSLATED 1066
-#define IDC_CHECK1                      1066
+#define IDC_STATIC_HEADER_TEXT          1067
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        152
+#define _APS_NEXT_RESOURCE_VALUE        153
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1067
+#define _APS_NEXT_CONTROL_VALUE         1068
 #define _APS_NEXT_SYMED_VALUE           104
 #endif
 #endif
diff --git a/stepmania/src/smpackage/smpackage.rc b/stepmania/src/smpackage/smpackage.rc
index 6c73c64d07..5723134d8d 100644
--- a/stepmania/src/smpackage/smpackage.rc
+++ b/stepmania/src/smpackage/smpackage.rc
@@ -75,7 +75,7 @@ IDR_MAINFRAME           ICON                    "smpackage.ICO"
 
 IDD_INSTALL DIALOGEX 0, 0, 332, 234
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
-CAPTION "Stepmania Package Manager"
+CAPTION "StepMania Tools"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     EDITTEXT        IDC_EDIT_MESSAGE1,7,42,320,45,ES_MULTILINE | 
@@ -84,7 +84,7 @@ BEGIN
     DEFPUSHBUTTON   "Finish >",IDOK,200,215,55,15
     PUSHBUTTON      "Cancel",IDCANCEL,275,215,50,15
     PUSHBUTTON      "< Back",IDC_BUTTON_BACK,145,215,55,15,WS_DISABLED
-    CONTROL         133,IDC_STATIC,"Static",SS_BITMAP,0,0,258,37
+    CONTROL         1045,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38
     EDITTEXT        IDC_EDIT_MESSAGE3,5,180,320,13,ES_MULTILINE | 
                     ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT 
                     WS_TABSTOP
@@ -96,19 +96,20 @@ BEGIN
     PUSHBUTTON      "Edit Installations",IDC_BUTTON_EDIT,233,194,59,14
     CONTROL         "",IDC_PROGRESS1,"msctls_progress32",NOT WS_VISIBLE | 
                     WS_BORDER,7,60,318,14
+    LTEXT           "Install a package",IDC_STATIC_HEADER_TEXT,5,2,280,24
 END
 
 IDD_EXPORTER DIALOGEX 0, 0, 332, 234
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | 
     WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
-CAPTION "Stepmania Package Manager"
+CAPTION "StepMania Tools"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Close",IDOK,255,215,69,14
     PUSHBUTTON      "Launch Game",IDC_BUTTON_PLAY,5,215,70,15
     PUSHBUTTON      "Export As One",IDC_BUTTON_EXPORT_AS_ONE,255,104,69,15
-    CONTROL         135,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38
+    CONTROL         1045,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38
     PUSHBUTTON      "Export As Individual",IDC_BUTTON_EXPORT_AS_INDIVIDUAL,
                     255,137,69,15
     CONTROL         "Tree2",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | 
@@ -119,6 +120,7 @@ BEGIN
     PUSHBUTTON      "Edit Installations",IDC_BUTTON_EDIT,253,39,71,14
     LTEXT           "Select Installation:",IDC_STATIC,7,42,66,11
     PUSHBUTTON      "Open Program Folder",IDC_BUTTON_OPEN,83,215,79,15
+    LTEXT           "Export Packages",IDC_STATIC_HEADER_TEXT,5,2,280,24
 END
 
 IDD_DIALOG_NAME DIALOG  0, 0, 261, 58
@@ -155,23 +157,23 @@ BEGIN
                     IDC_STATIC,18,144,196,17
 END
 
-IDD_MENU DIALOGEX 0, 0, 332, 325
+IDD_MENU DIALOGEX 0, 0, 332, 303
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "StepMania Tools Main Menu"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "Exit",IDOK,275,304,50,14
-    CONTROL         140,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38
+    DEFPUSHBUTTON   "Exit",IDOK,275,282,50,14
+    CONTROL         1045,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38
     GROUPBOX        "Installation",IDC_STATIC,7,41,318,28
     PUSHBUTTON      "Edit Installations",IDC_EDIT_INSTALLATIONS,241,49,75,15
-    GROUPBOX        "Create and Share",IDC_STATIC,7,219,318,79
-    PUSHBUTTON      "Export Packages",IDC_EXPORT_PACKAGES,15,234,75,15
+    GROUPBOX        "Create and Share",IDC_STATIC,7,198,318,79
+    PUSHBUTTON      "Export Packages",IDC_EXPORT_PACKAGES,15,213,75,15
     LTEXT           "Create .smzip package files to share with other users.  Packages can contain songs, courses, themes, backgrounds, and more.",
-                    IDC_STATIC,104,233,215,18
-    PUSHBUTTON      "Create Song",IDC_CREATE_SONG,15,255,75,15
+                    IDC_STATIC,104,212,215,18
+    PUSHBUTTON      "Create Song",IDC_CREATE_SONG,15,234,75,15
     LTEXT           "Create a new song in from your favorite mp3 or ogg music file.",
-                    IDC_STATIC,103,254,215,20
-    GROUPBOX        "Troubleshooting",IDC_STATIC,7,109,318,109
+                    IDC_STATIC,103,233,215,20
+    GROUPBOX        "Troubleshooting",IDC_STATIC,7,109,318,87
     PUSHBUTTON      "Change Preferences",IDC_CHANGE_PREFERENCES,16,120,75,15
     PUSHBUTTON      "Open Preferences",IDC_OPEN_PREFERENCES,16,152,75,15
     LTEXT           "Using this feature, you can:\n - Change the graphics API that the game will use.\n - Change the sound API that the game will use.\n - Clear all preferences if the game won't start.\n - Open the preferences file to make changes by hand.",
@@ -182,17 +184,16 @@ BEGIN
                     ES_READONLY
     LTEXT           "Erase all of your keyboard and joystick mappings if you've made a mistake.",
                     IDC_STATIC,104,174,214,18
-    PUSHBUTTON      "Launch Game",IDC_BUTTON_LAUNCH_GAME,189,304,70,14
+    PUSHBUTTON      "Launch Game",IDC_BUTTON_LAUNCH_GAME,189,282,70,14
     PUSHBUTTON      "View Statistics",IDC_VIEW_STATISTICS,16,85,75,15
     LTEXT           "View high scores and usage statistics and other data saved from your play.",
                     IDC_STATIC,103,84,215,20
     GROUPBOX        "Statistics",IDC_STATIC,7,72,318,35
-    PUSHBUTTON      "Clear Cache",IDC_CLEAR_CACHE,16,196,75,15
-    LTEXT           "Erase the song and course cache.  Use this if you change a song file and the change isn't showing in-game.",
-                    IDC_STATIC,104,196,214,18
-    PUSHBUTTON      "Languages",IDC_LANGUAGES,15,276,75,15
+    PUSHBUTTON      "Languages",IDC_LANGUAGES,15,255,75,15
     LTEXT           "Create a new or manage existing language translations.",
-                    IDC_STATIC,103,275,215,20
+                    IDC_STATIC,103,254,215,20
+    LTEXT           "StepMania Tools Main Menu",IDC_STATIC_HEADER_TEXT,5,2,
+                    280,24
 END
 
 IDD_ENTER_COMMENT DIALOGEX 0, 0, 312, 202
@@ -401,7 +402,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 325
         TOPMARGIN, 7
-        BOTTOMMARGIN, 318
+        BOTTOMMARGIN, 296
     END
 
     IDD_ENTER_COMMENT, DIALOG
@@ -460,9 +461,7 @@ END
 // Bitmap
 //
 
-INSTALL                 BITMAP                  "install.bmp"
-MANAGE                  BITMAP                  "manage.bmp"
-MENU                    BITMAP                  "menu.bmp"
+IDB_HEADER              BITMAP                  "header.bmp"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/stepmania/src/smpackage/smpackageUtil.h b/stepmania/src/smpackage/smpackageUtil.h
index 87142cc5ce..6e001d9893 100644
--- a/stepmania/src/smpackage/smpackageUtil.h
+++ b/stepmania/src/smpackage/smpackageUtil.h
@@ -24,6 +24,7 @@ namespace SMPackageUtil
 
 	bool GetFileContentsOsAbsolute( const RString &sAbsoluteOsFile, RString &sOut );
 
+	void SetHeaderFont( CDialog &dlg );
 	void LocalizeDialogAndContents( CDialog &dlg );
 }