eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-12 10:49:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Load Settings even for different version.

Browse Source 
Cleanup Settings implementation.
This commit is contained in:
Bruno Herbelin
2022-03-20 12:06:09 +01:00
parent c080959f64
commit fe66c95a29
1 changed files with 4 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Settings.cpp
View File

@@ -17,7 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
**/ **/
#include <algorithm>
#include <iostream> #include <iostream>
#include <locale> #include <locale>
using namespace std; using namespace std;
@@ -63,10 +62,10 @@ void Settings::Save(uint64_t runtime)
xmlDoc.InsertFirstChild(pDec); xmlDoc.InsertFirstChild(pDec);
XMLElement *pRoot = xmlDoc.NewElement(application.name.c_str()); XMLElement *pRoot = xmlDoc.NewElement(application.name.c_str());
xmlDoc.InsertEndChild(pRoot);
#ifdef VIMIX_VERSION_MAJOR #ifdef VIMIX_VERSION_MAJOR
pRoot->SetAttribute("major", VIMIX_VERSION_MAJOR); pRoot->SetAttribute("major", VIMIX_VERSION_MAJOR);
pRoot->SetAttribute("minor", VIMIX_VERSION_MINOR); pRoot->SetAttribute("minor", VIMIX_VERSION_MINOR);
xmlDoc.InsertEndChild(pRoot);
#endif #endif
// runtime // runtime
if (runtime>0) if (runtime>0)
@@ -76,7 +75,7 @@ void Settings::Save(uint64_t runtime)
XMLComment *pComment = xmlDoc.NewComment(comment.c_str()); XMLComment *pComment = xmlDoc.NewComment(comment.c_str());
pRoot->InsertEndChild(pComment); pRoot->InsertEndChild(pComment);
// block: windows // Windows
{ {
XMLElement *windowsNode = xmlDoc.NewElement( "Windows" ); XMLElement *windowsNode = xmlDoc.NewElement( "Windows" );
@@ -176,21 +175,6 @@ void Settings::Save(uint64_t runtime)
BrushNode->InsertEndChild( XMLElementFromGLM(&xmlDoc, application.brush) ); BrushNode->InsertEndChild( XMLElementFromGLM(&xmlDoc, application.brush) );
pRoot->InsertEndChild(BrushNode); pRoot->InsertEndChild(BrushNode);
// bloc connections
{
XMLElement *connectionsNode = xmlDoc.NewElement( "Connections" );
// map<int, std::string>::iterator iter;
// for (iter=application.instance_names.begin(); iter != application.instance_names.end(); iter++)
// {
// XMLElement *connection = xmlDoc.NewElement( "Instance" );
// connection->SetAttribute("name", iter->second.c_str());
// connection->SetAttribute("id", iter->first);
// connectionsNode->InsertEndChild(connection);
// }
pRoot->InsertEndChild(connectionsNode);
}
// bloc views // bloc views
{ {
XMLElement *viewsNode = xmlDoc.NewElement( "Views" ); XMLElement *viewsNode = xmlDoc.NewElement( "Views" );
@@ -339,21 +323,10 @@ void Settings::Load()
if (pRoot == nullptr) if (pRoot == nullptr)
return; return;
// cancel on different root name
if (application.name.compare( string( pRoot->Value() ) ) != 0 )
return;
#ifdef VIMIX_VERSION_MAJOR
// cancel on different version
int version_major = -1, version_minor = -1;
pRoot->QueryIntAttribute("major", &version_major);
pRoot->QueryIntAttribute("minor", &version_minor);
if (version_major != VIMIX_VERSION_MAJOR || version_minor != VIMIX_VERSION_MINOR)
return;
#endif
// runtime // runtime
pRoot->QueryUnsigned64Attribute("runtime", &application.total_runtime); pRoot->QueryUnsigned64Attribute("runtime", &application.total_runtime);
// General application preferences
XMLElement * applicationNode = pRoot->FirstChildElement("Application"); XMLElement * applicationNode = pRoot->FirstChildElement("Application");
if (applicationNode != nullptr) { if (applicationNode != nullptr) {
applicationNode->QueryFloatAttribute("scale", &application.scale); applicationNode->QueryFloatAttribute("scale", &application.scale);
@@ -444,7 +417,7 @@ void Settings::Load()
transitionnode->QueryIntAttribute("profile", &application.transition.profile); transitionnode->QueryIntAttribute("profile", &application.transition.profile);
} }
// bloc windows // Windows
{ {
XMLElement * pElement = pRoot->FirstChildElement("Windows"); XMLElement * pElement = pRoot->FirstChildElement("Windows");
if (pElement) if (pElement)
@@ -505,22 +478,6 @@ void Settings::Load()
} }
// bloc Connections
{
XMLElement * pElement = pRoot->FirstChildElement("Connections");
if (pElement)
{
// XMLElement* connectionNode = pElement->FirstChildElement("Instance");
// for( ; connectionNode ; connectionNode=connectionNode->NextSiblingElement())
// {
// int id = 0;
// connectionNode->QueryIntAttribute("id", &id);
// application.instance_names[id] = connectionNode->Attribute("name");
// }
}
}
// bloc history of recent // bloc history of recent
{ {
XMLElement * pElement = pRoot->FirstChildElement("Recent"); XMLElement * pElement = pRoot->FirstChildElement("Recent");