Swiftdiff options
Diffstat (limited to 'Swift/Controllers/HighlightManager.cpp')
| -rw-r--r-- | Swift/Controllers/HighlightManager.cpp | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/Swift/Controllers/HighlightManager.cpp b/Swift/Controllers/HighlightManager.cpp index fa98a6e..46af389 100644 --- a/Swift/Controllers/HighlightManager.cpp +++ b/Swift/Controllers/HighlightManager.cpp @@ -54,16 +54,6 @@ void HighlightManager::handleSettingChanged(const std::string& settingPath) } } -void HighlightManager::loadSettings() -{ - std::string highlightRules = settings_->getSetting(SettingConstants::HIGHLIGHT_RULES); - if (highlightRules == "@") { - rules_ = getDefaultRules(); - } else { - rules_ = rulesFromString(highlightRules); - } -} - std::string HighlightManager::rulesToString() const { std::stringstream stream; @@ -98,13 +88,6 @@ std::vector<HighlightRule> HighlightManager::getDefaultRules() return rules; } -void HighlightManager::storeSettings() -{ - storingSettings_ = true; // don't reload settings while saving - settings_->storeSetting(SettingConstants::HIGHLIGHT_RULES, rulesToString()); - storingSettings_ = false; -} - HighlightRule HighlightManager::getRule(int index) const { assert(index >= 0 && static_cast<size_t>(index) < rules_.size()); @@ -115,21 +98,39 @@ void HighlightManager::setRule(int index, const HighlightRule& rule) { assert(index >= 0 && static_cast<size_t>(index) < rules_.size()); rules_[static_cast<size_t>(index)] = rule; - storeSettings(); + //storeSettings(); } void HighlightManager::insertRule(int index, const HighlightRule& rule) { assert(index >= 0 && boost::numeric_cast<std::vector<std::string>::size_type>(index) <= rules_.size()); rules_.insert(rules_.begin() + index, rule); - storeSettings(); + //storeSettings(); } void HighlightManager::removeRule(int index) { assert(index >= 0 && boost::numeric_cast<std::vector<std::string>::size_type>(index) < rules_.size()); rules_.erase(rules_.begin() + index); - storeSettings(); + //storeSettings(); +} + +void HighlightManager::storeSettings() +{ + storingSettings_ = true; // don't reload settings while saving + settings_->storeSetting(SettingConstants::HIGHLIGHT_RULES, rulesToString()); + storingSettings_ = false; +} + +void HighlightManager::loadSettings() +{ + std::string highlightRules = settings_->getSetting(SettingConstants::HIGHLIGHT_RULES); + std::vector<HighlightRule> rules = rulesFromString(highlightRules); + if (rules.empty()) { + rules_ = getDefaultRules(); + } else { + rules_ = rules; + } } Highlighter* HighlightManager::createHighlighter() |