mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 15:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

ENH: Adding MODIFIED property to cache values that have been changed by the user.

Browse Source
This commit is contained in:
Brad King
2004-06-23 10:13:02 -04:00
parent f1842f9137
commit 4eb0400c98
3 changed files with 82 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CursesDialog/cmCursesMainForm.cxx
+32 -11
View File
@@ -784,9 +784,7 @@ void cmCursesMainForm::RemoveEntry(const char* value)
// copy from the list box to the cache manager
void cmCursesMainForm::FillCacheManagerFromUI()
{
std::string tmpString;
{
int size = m_Entries->size();
for(int i=0; i < size; i++)
{
@@ -795,17 +793,40 @@ void cmCursesMainForm::FillCacheManagerFromUI()
(*m_Entries)[i]->m_Key.c_str());
if (!it.IsAtEnd())
{
tmpString = (*m_Entries)[i]->m_Entry->GetValue();
std::string oldValue = it.GetValue();
std::string newValue = (*m_Entries)[i]->m_Entry->GetValue();
std::string fixedOldValue;
std::string fixedNewValue;
this->FixValue(it.GetType(), oldValue, fixedOldValue);
this->FixValue(it.GetType(), newValue, fixedNewValue);
// Remove trailing spaces, convert path to unix slashes
std::string tmpSubString =
tmpString.substr(0,tmpString.find_last_not_of(" ")+1);
if ( it.GetType() == cmCacheManager::PATH ||
it.GetType() == cmCacheManager::FILEPATH )
if(!(fixedOldValue == fixedNewValue))
{
cmSystemTools::ConvertToUnixSlashes(tmpSubString);
// The user has changed the value. Mark it as modified.
it.SetProperty("MODIFIED", true);
}
it.SetValue(tmpSubString.c_str());
it.SetValue(fixedNewValue.c_str());
}
}
}
void cmCursesMainForm::FixValue(cmCacheManager::CacheEntryType type,
const std::string& in, std::string& out) const
{
out = in.substr(0,in.find_last_not_of(" ")+1);
if(type == cmCacheManager::PATH || type == cmCacheManager::FILEPATH)
{
cmSystemTools::ConvertToUnixSlashes(out);
}
if(type == cmCacheManager::BOOL)
{
if(cmSystemTools::IsOff(out.c_str()))
{
out = "OFF";
}
else
{
out = "ON";
}
}
}
Source/CursesDialog/cmCursesMainForm.h
+3
View File
@@ -117,6 +117,9 @@ protected:
// Copy the cache values from the user interface to the actual
// cache.
void FillCacheManagerFromUI();
// Fix formatting of values to a consistent form.
void FixValue(cmCacheManager::CacheEntryType type,
const std::string& in, std::string& out) const;
// Re-post the existing fields. Used to toggle between
// normal and advanced modes. Render() should be called
// afterwards.