Subversion Repositories spk

Rev

Rev 158 | Rev 161 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 158 Rev 160
Line 1088... Line 1088...
1088 
		{
 1088 
		{
1089 
			if (m_pPackages->CloseDir(0, 0, true))
 1089 
			if (m_pPackages->CloseDir(0, 0, true))
1090 
			{
 1090 
			{
1091 
				// write the modname
 1091 
				// write the modname
1092 
				if (!m_pPackages->GetModKey().Empty())
 1092 
				if (!m_pPackages->GetModKey().Empty())
1093 
					PluginManager::WriteRegistryValue(m_pPackages->GetModKey(), m_pPackages->GetSelectedModName());
 1093 
					PluginManager::WriteRegistryValue(m_pPackages->GetModKey(), m_pPackages->selectedModName());
1094 
				m_pPackages->Reset();
 1094 
				m_pPackages->Reset();
1095 
			}
 1095 
			}
1096 
			else
 1096 
			else
1097 
			{
 1097 
			{
1098 
				this->DisplayMessageBox(true, "Error", "unable to close directory", MessageBoxButtons::OK, MessageBoxIcon::Error);
 1098 
				this->DisplayMessageBox(true, "Error", "unable to close directory", MessageBoxButtons::OK, MessageBoxIcon::Error);
Line 1115... Line 1115...
1115 
			//if ( m_iSaveGameManager == 1 )
 1115 
			//if ( m_iSaveGameManager == 1 )
1116 
				//m_pPackages->RestoreSaves();
 1116 
				//m_pPackages->RestoreSaves();
1117 
			m_pPackages->UpdatePackages();
 1117 
			m_pPackages->UpdatePackages();
1118 
			m_pPackages->ReadGameLanguage(true);
 1118 
			m_pPackages->ReadGameLanguage(true);
1119 
			System::String ^mod = PluginManager::ReadRegistryValue(m_pPackages->GetModKey());
 1119 
			System::String ^mod = PluginManager::ReadRegistryValue(m_pPackages->GetModKey());
1120 
			m_pPackages->SetMod(CyStringFromSystemString(mod));
 1120 
			m_pPackages->setMod(_S(mod));
1121 
			if(m_lAvailablePackages)
 1121 
			if(m_lAvailablePackages)
1122 
				m_lAvailablePackages->MemoryClear();
 1122 
				m_lAvailablePackages->MemoryClear();
1123 
			this->FindPackages();
 1123 
			this->FindPackages();
1124 
		}
 1124 
		}
1125 
		else
 1125 
		else
Line 2616... Line 2616...
2616 
		m_pPackages->ReadGlobals(globals);
 2616 
		m_pPackages->ReadGlobals(globals);
2617 
 
 2617 
 
2618 
		EditGlobals ^edit = gcnew EditGlobals(&globals);
 2618 
		EditGlobals ^edit = gcnew EditGlobals(&globals);
2619 
 
 2619 
 
2620 
		// make our saved changes
 2620 
		// make our saved changes
- 
 
 2621 
		auto& packageGlobals = m_pPackages->GetGlobals();
2621 
		for ( SStringList *str = m_pPackages->GetGlobals()->Head(); str; str = str->;next )
 2622 
		for(auto itr = packageGlobals.begin(); itr != packageGlobals.end(); itr++)
2622 
			edit->SetEditedItem(SystemStringFromCyString(str->str), SystemStringFromCyString(str->data));
 2623 
			edit->SetEditedItem(_US((*itr)->str), _US((*itr)->data));
2623 
 
 2624 
 
2624 
		if ( edit->ShowDialog(this) == Windows::Forms::DialogResult::OK )
 2625 
		if ( edit->ShowDialog(this) == Windows::Forms::DialogResult::OK )
2625 
		{
 2626 
		{
2626 
			// compare whats different and save
 2627 
			// compare whats different and save
2627 
			m_pPackages->GetGlobals()->Clear();
 2628 
			packageGlobals.clear();
2628 
			for ( SStringList *str = edit->GetSavedSettings()->Head(); str; str = str->next )
 2629 
			for (SStringList* str = edit->GetSavedSettings()->Head(); str; str = str->next)
2629 
				m_pPackages->GetGlobals()->PushBack(str->str, str->data);
 2630 
				packageGlobals.pushBack(str->str.ToString(), str->data.ToString());
2630 
		}
 2631 
		}
2631 
	}
 2632 
	}
2632 
 
 2633 
 
2633 
	void MainGui::ViewFileLog()
 2634 
	void MainGui::ViewFileLog()
2634 
	{
 2635 
	{