mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 17:09:42 +00:00
Code Issues Releases Wiki Activity

made user settings handling in search sub view more consistent

Browse source
This commit is contained in:
Marc Zinnschlag 2015-04-26 13:31:35 +02:00
parent dab650a3d5
commit 6fac4c5dd9
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/opencs/view/tools/searchsubview.cpp
View file

@ -49,8 +49,7 @@ void CSVTools::SearchSubView::replace (bool selection)
} }
CSVTools::SearchSubView::SearchSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document) CSVTools::SearchSubView::SearchSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
: CSVDoc::SubView (id), mDocument (document), mPaddingBefore (10), mPaddingAfter (10), : CSVDoc::SubView (id), mDocument (document), mLocked (false)
mLocked (false)
{ {
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
@ -91,14 +90,6 @@ void CSVTools::SearchSubView::setEditLock (bool locked)
void CSVTools::SearchSubView::updateUserSetting (const QString &name, const QStringList &list) void CSVTools::SearchSubView::updateUserSetting (const QString &name, const QStringList &list)
{ {
mTable->updateUserSetting (name, 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) 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) 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 = search;
mSearch.setPadding (mPaddingBefore, mPaddingAfter); mSearch.setPadding (paddingBefore, paddingAfter);
mTable->clear(); mTable->clear();
mDocument.runSearch (getUniversalId(), mSearch); mDocument.runSearch (getUniversalId(), mSearch);

2
apps/opencs/view/tools/searchsubview.hpp
View file

@ -26,8 +26,6 @@ namespace CSVTools
ReportTable *mTable; ReportTable *mTable;
SearchBox mSearchBox; SearchBox mSearchBox;
CSMDoc::Document& mDocument; CSMDoc::Document& mDocument;
int mPaddingBefore;
int mPaddingAfter;
CSMTools::Search mSearch; CSMTools::Search mSearch;
bool mLocked; bool mLocked;