From 6fac4c5dd981d0f11f409fb9099e04e01e826e93 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 26 Apr 2015 13:31:35 +0200
Subject: [PATCH] made user settings handling in search sub view more
 consistent

---
 apps/opencs/view/tools/searchsubview.cpp | 18 +++++++-----------
 apps/opencs/view/tools/searchsubview.hpp |  2 --
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/apps/opencs/view/tools/searchsubview.cpp b/apps/opencs/view/tools/searchsubview.cpp
index 9a654c802..2038612a2 100644
--- a/apps/opencs/view/tools/searchsubview.cpp
+++ b/apps/opencs/view/tools/searchsubview.cpp
@@ -49,8 +49,7 @@ void CSVTools::SearchSubView::replace (bool selection)
 }
 
 CSVTools::SearchSubView::SearchSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
-: CSVDoc::SubView (id), mDocument (document), mPaddingBefore (10), mPaddingAfter (10),
-  mLocked (false)
+: CSVDoc::SubView (id), mDocument (document), mLocked (false)
 {
     QVBoxLayout *layout = new QVBoxLayout;
 
@@ -91,14 +90,6 @@ void CSVTools::SearchSubView::setEditLock (bool locked)
 void CSVTools::SearchSubView::updateUserSetting (const QString &name, const QStringList &list)
 {
     mTable->updateUserSetting (name, list);
-
-    if (!list.empty())
-    {
-        if (name=="search/char-before")
-            mPaddingBefore = list.at (0).toInt();
-        else if (name=="search/char-after")
-            mPaddingAfter = list.at (0).toInt();
-    }
 }
 
 void CSVTools::SearchSubView::stateChanged (int state, CSMDoc::Document *document)
@@ -108,8 +99,13 @@ void CSVTools::SearchSubView::stateChanged (int state, CSMDoc::Document *documen
 
 void CSVTools::SearchSubView::startSearch (const CSMTools::Search& search)
 {
+    CSMSettings::UserSettings &userSettings = CSMSettings::UserSettings::instance();
+
+    int paddingBefore = userSettings.setting ("search/char-before", QString ("5")).toInt();
+    int paddingAfter = userSettings.setting ("search/char-after", QString ("5")).toInt();
+
     mSearch = search;
-    mSearch.setPadding (mPaddingBefore, mPaddingAfter);
+    mSearch.setPadding (paddingBefore, paddingAfter);
     
     mTable->clear();
     mDocument.runSearch (getUniversalId(), mSearch);
diff --git a/apps/opencs/view/tools/searchsubview.hpp b/apps/opencs/view/tools/searchsubview.hpp
index eeefa9afb..6dedd6ef2 100644
--- a/apps/opencs/view/tools/searchsubview.hpp
+++ b/apps/opencs/view/tools/searchsubview.hpp
@@ -26,8 +26,6 @@ namespace CSVTools
             ReportTable *mTable;
             SearchBox mSearchBox;
             CSMDoc::Document& mDocument;
-            int mPaddingBefore;
-            int mPaddingAfter;
             CSMTools::Search mSearch;
             bool mLocked;