From 04a590b6f2bbe5e656e0581c8d00c3684df986c0 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Fri, 21 Oct 2005 07:42:52 +0000
Subject: [PATCH] set default install dir when launching smpackage

---
 stepmania/src/smpackage/MainMenuDlg.cpp   |  5 ++++-
 stepmania/src/smpackage/SMPackageUtil.cpp | 16 ++++++++++++++++
 stepmania/src/smpackage/smpackage.clw     | 20 ++++++++++----------
 stepmania/src/smpackage/smpackage.dsp     |  2 +-
 stepmania/src/smpackage/smpackage.rc      |  4 ++--
 stepmania/src/smpackage/smpackageUtil.h   |  1 +
 6 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/stepmania/src/smpackage/MainMenuDlg.cpp b/stepmania/src/smpackage/MainMenuDlg.cpp
index 2e0800379d..030dbc06a4 100644
--- a/stepmania/src/smpackage/MainMenuDlg.cpp
+++ b/stepmania/src/smpackage/MainMenuDlg.cpp
@@ -9,6 +9,7 @@
 #include "onvertThemeDlg.h"
 #include "ChangeGameSettings.h"
 #include "RageUtil.h"
+#include "SMPackageUtil.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -184,7 +185,9 @@ BOOL MainMenuDlg::OnInitDialog()
 	TCHAR szCurDir[MAX_PATH];
 	GetCurrentDirectory( ARRAYSIZE(szCurDir), szCurDir );
 	GetDlgItem( IDC_EDIT_INSTALLATION )->SetWindowText( szCurDir );
-	
+	AddStepManiaInstallDir( szCurDir );
+	SetDefaultInstallDir( szCurDir );
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
diff --git a/stepmania/src/smpackage/SMPackageUtil.cpp b/stepmania/src/smpackage/SMPackageUtil.cpp
index 43fcfa90c0..d755f90f79 100644
--- a/stepmania/src/smpackage/SMPackageUtil.cpp
+++ b/stepmania/src/smpackage/SMPackageUtil.cpp
@@ -86,6 +86,22 @@ void SetDefaultInstallDir( int iInstallDirIndex )
 	WriteStepManiaInstallDirs( asInstallDirs );
 }
 
+void SetDefaultInstallDir( CString sInstallDir )
+{
+	CStringArray asInstallDirs;
+	GetStepManiaInstallDirs( asInstallDirs );
+
+	bool bAlreadyInList = false;
+	for( unsigned i=0; i<asInstallDirs.size(); i++ )
+	{
+		if( asInstallDirs[i].CompareNoCase(sInstallDir) == 0 )
+		{
+			SetDefaultInstallDir( i );
+			break;
+		}
+	}
+}
+
 bool GetPref( CString name, bool &val )
 {
 	CRegistry Reg;
diff --git a/stepmania/src/smpackage/smpackage.clw b/stepmania/src/smpackage/smpackage.clw
index 3429107b89..40c099d2e5 100644
--- a/stepmania/src/smpackage/smpackage.clw
+++ b/stepmania/src/smpackage/smpackage.clw
@@ -16,23 +16,23 @@ Resource1=IDR_MAINFRAME
 Resource2=IDD_ENTER_STRING
 Class3=CSMPackageInstallDlg
 Class4=CSmpackageExportDlg
-Resource3=IDD_INSTALL
+Resource3=IDD_UNINSTALL_OLD_PACKAGES
 Class5=EnterName
-Resource4=IDD_ENTER_COMMENT
+Resource4=IDD_CONVERT_THEME
 Class6=EditInsallations
-Resource5=IDD_DIALOG_NAME
+Resource5=IDD_MENU
 Class7=MainMenuDlg
-Resource6=IDD_EDIT_METRICS
+Resource6=IDD_DIALOG_NAME
 Class8=ConvertThemeDlg
-Resource7=IDD_EDIT_INSTALLATIONS
+Resource7=IDD_SHOW_COMMENT
 Class9=EditMetricsDlg
-Resource8=IDD_CONVERT_THEME
-Resource9=IDD_UNINSTALL_OLD_PACKAGES
+Resource8=IDD_ENTER_COMMENT
+Resource9=IDD_EXPORTER
 Class10=EnterComment
-Resource10=IDD_EXPORTER
+Resource10=IDD_INSTALL
 Class11=ShowComment
-Resource11=IDD_MENU
-Resource12=IDD_SHOW_COMMENT
+Resource11=IDD_EDIT_METRICS
+Resource12=IDD_EDIT_INSTALLATIONS
 Class12=ChangeGameSettings
 Resource13=IDD_CHANGE_GAME_SETTINGS
 
diff --git a/stepmania/src/smpackage/smpackage.dsp b/stepmania/src/smpackage/smpackage.dsp
index 749760a7bf..a93d0640f4 100644
--- a/stepmania/src/smpackage/smpackage.dsp
+++ b/stepmania/src/smpackage/smpackage.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="smpackage" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 60000
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
diff --git a/stepmania/src/smpackage/smpackage.rc b/stepmania/src/smpackage/smpackage.rc
index 10623884fc..ce89a9b0f6 100644
--- a/stepmania/src/smpackage/smpackage.rc
+++ b/stepmania/src/smpackage/smpackage.rc
@@ -146,8 +146,8 @@ BEGIN
                     WS_TABSTOP
     EDITTEXT        IDC_EDIT,19,168,136,13,ES_AUTOHSCROLL
     PUSHBUTTON      "Add",IDC_BUTTON_ADD,165,168,50,14
-    PUSHBUTTON      "Remove",IDC_BUTTON_REMOVE,164,42,50,15
-    PUSHBUTTON      "Make Default",IDC_BUTTON_MAKE_DEFAULT,164,72,50,15
+    PUSHBUTTON      "Remove",IDC_BUTTON_REMOVE,164,44,50,15
+    PUSHBUTTON      "Make Default",IDC_BUTTON_MAKE_DEFAULT,164,24,50,15
     GROUPBOX        "Add New Installation",IDC_STATIC,7,130,218,59
     GROUPBOX        "Current Installations (the top installation is the default)",
                     IDC_STATIC,7,7,218,114
diff --git a/stepmania/src/smpackage/smpackageUtil.h b/stepmania/src/smpackage/smpackageUtil.h
index fbd03de91f..0d45ec6b0a 100644
--- a/stepmania/src/smpackage/smpackageUtil.h
+++ b/stepmania/src/smpackage/smpackageUtil.h
@@ -7,6 +7,7 @@ void WriteStepManiaInstallDirs( const CStringArray& asInstallDirsToWrite );
 void GetStepManiaInstallDirs( CStringArray& asInstallDirsOut );
 void AddStepManiaInstallDir( CString sNewInstallDir );
 void SetDefaultInstallDir( int iInstallDirIndex );
+void SetDefaultInstallDir( CString sInstallDir );
 
 bool GetPref( CString name, bool &val );
 bool SetPref( CString name, bool val );