/* === S Y N F I G ========================================================= */
-/*! \file template.cpp
+/*! \file settings.cpp
** \brief Template File
**
-** $Id: settings.cpp,v 1.2 2005/01/12 04:08:32 darco Exp $
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
#include <fstream>
#include <iostream>
+#include <algorithm>
#include "settings.h"
#include <synfig/general.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
if(key.size()>iter->first.size() && String(key.begin(),key.begin()+iter->first.size())==iter->first)
{
synfig::String key_(key.begin()+iter->first.size()+1,key.end());
-
+
// If the domain has it, then we have got a hit
if(iter->second->get_value(key_,value))
return true;
value=simple_value_map.find(key)->second;
return true;
}
-
+
// key not found
return false;
}
if(key.size()>iter->first.size() && String(key.begin(),key.begin()+iter->first.size())==iter->first)
{
synfig::String key_(key.begin()+iter->first.size()+1,key.end());
-
+
return iter->second->set_value(key_,value);
}
}
return true;
}
+//! Compare two key names, putting pref.* keys first
+static bool
+compare_pref_first (synfig::String first, synfig::String second)
+{
+ return first.substr(0, 5) == "pref."
+ ? second.substr(0, 5) == "pref."
+ ? first < second
+ : true
+ : second.substr(0, 5) == "pref."
+ ? false
+ : first < second;
+}
+
Settings::KeyList
Settings::get_key_list()const
{
key_list.push_back(iter->first+'.'+*key_iter);
}
}
-
+
// Get keys from the simple variables
{
ValueBaseMap::const_iterator iter;
}
// Sort the keys
- key_list.sort();
-
+ // We make sure the 'pref.*' keys come first to fix bug 1694393,
+ // where windows were being created before the parameter
+ // specifying which window manager hint to use had been loaded
+ key_list.sort(compare_pref_first);
+
return key_list;
}
Settings::save_to_file(const synfig::String& filename)const
{
synfig::String tmp_filename(filename+".TMP");
-
+
try
{
std::ofstream file(tmp_filename.c_str());
if(!file)return false;
-
+
KeyList key_list(get_key_list());
-
+
// Save the keys
{
KeyList::const_iterator iter;
for(iter=key_list.begin();iter!=key_list.end();++iter)
{
if(!file)return false;
- file<<*iter<<'='<<get_value(*iter)<<endl;
+ String ret = get_value(*iter);
+ if (ret != String()) file<<*iter<<'='<<(ret == "none" ? "normal" : ret)<<endl;
}
}
-
+
if(!file)
return false;
}catch(...) { return false; }
-
+
#ifdef _WIN32
char old_file[80]="sif.XXXXXXXX";
mktemp(old_file);
- rename(filename.c_str(),old_file);
+ rename(filename.c_str(),old_file);
if(rename(tmp_filename.c_str(),filename.c_str())!=0)
{
rename(old_file,tmp_filename.c_str());
if(rename(tmp_filename.c_str(),filename.c_str())!=0)
return false;
#endif
-
+
return true;
}
continue;
std::string key(line.begin(),equal);
std::string value(equal+1,line.end());
-
+
//synfig::info("Settings::load_from_file(): Trying Key \"%s\" with a value of \"%s\".",key.c_str(),value.c_str());
try{
if(!set_value(key,value))
}
catch(...)
{
- synfig::error("Settings::load_from_file(): Attept to set key \"%s\" with a value of \"%s\" has thrown an exception.",key.c_str(),value.c_str());
+ synfig::error("Settings::load_from_file(): Attempt to set key \"%s\" with a value of \"%s\" has thrown an exception.",key.c_str(),value.c_str());
throw;
}
}