From c32707148292d104c66276b43796d6057c8c7a5d Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:08:42 +0200 Subject: 3.10 --- library/process_xml.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'library/process_xml.cpp') diff --git a/library/process_xml.cpp b/library/process_xml.cpp index e81fb3f9..c7597247 100644 --- a/library/process_xml.cpp +++ b/library/process_xml.cpp @@ -415,9 +415,6 @@ void FfsXmlParser::readXmlGlobalSettings(xmlAccess::XmlGlobalSettings& outputCfg //try to read program language setting readXmlElementLogging("Language", global, outputCfg.programLanguage); - //ignore +/- 1 hour due to DST change - readXmlElementLogging("IgnoreOneHourDifference", global, outputCfg.ignoreOneHourDiff); - //copy locked files using VSS readXmlElementLogging("CopyLockedFiles", global, outputCfg.copyLockedFiles); @@ -465,6 +462,11 @@ void FfsXmlParser::readXmlGlobalSettings(xmlAccess::XmlGlobalSettings& outputCfg readXmlElementLogging("RespectCaseOnSearch", mainWindow, outputCfg.gui.textSearchRespectCase); + size_t folderPairMax = 0; + readXmlElementLogging("FolderPairsMax", mainWindow, folderPairMax); + outputCfg.gui.addFolderPairCountMax = std::max(static_cast(2), folderPairMax) - 1; //map folderPairMax to additionalFolderPairMax + + //########################################################### //read column attributes readXmlAttributeLogging("AutoAdjust", TiXmlHandleConst(mainWindow).FirstChild("LeftColumns").ToElement(), outputCfg.gui.autoAdjustColumnsLeft); @@ -824,9 +826,6 @@ bool writeXmlGlobalSettings(const xmlAccess::XmlGlobalSettings& inputCfg, TiXmlD //program language addXmlElement("Language", inputCfg.programLanguage, global); - //ignore +/- 1 hour due to DST change - addXmlElement("IgnoreOneHourDifference", inputCfg.ignoreOneHourDiff, global); - //copy locked files using VSS addXmlElement("CopyLockedFiles", inputCfg.copyLockedFiles, global); @@ -888,6 +887,9 @@ bool writeXmlGlobalSettings(const xmlAccess::XmlGlobalSettings& inputCfg, TiXmlD addXmlElement("RespectCaseOnSearch", inputCfg.gui.textSearchRespectCase, mainWindow); + addXmlElement("FolderPairsMax", inputCfg.gui.addFolderPairCountMax + 1 /*add main pair*/, mainWindow); + + //write column attributes TiXmlElement* leftColumn = new TiXmlElement("LeftColumns"); mainWindow->LinkEndChild(leftColumn); -- cgit