mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

improved message text in search results

Browse Source
This commit is contained in:
Marc Zinnschlag 2015-03-27 19:10:45 +01:00
parent 705ee67265
commit babefacbfa
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/opencs/model/tools/search.cpp
View File

@ -24,7 +24,7 @@ void CSMTools::Search::searchTextCell (const CSMWorld::IdTableBase *model,
while ((pos = text.indexOf (search, pos, Qt::CaseInsensitive))!=-1) while ((pos = text.indexOf (search, pos, Qt::CaseInsensitive))!=-1)
{ {
std::ostringstream message; std::ostringstream message;
message << text.mid (pos).toUtf8().data(); message << getLocation (model, index, id) << text.mid (pos).toUtf8().data();
std::ostringstream hint; std::ostringstream hint;
hint << "r: " << index.column() << " " << pos << " " << search.length(); hint << "r: " << index.column() << " " << pos << " " << search.length();
@ -49,7 +49,7 @@ void CSMTools::Search::searchRegExCell (const CSMWorld::IdTableBase *model,
while ((pos = mRegExp.indexIn (text, pos))!=-1) while ((pos = mRegExp.indexIn (text, pos))!=-1)
{ {
std::ostringstream message; std::ostringstream message;
message << text.mid (pos).toUtf8().data(); message << getLocation (model, index, id) << text.mid (pos).toUtf8().data();
int length = mRegExp.matchedLength(); int length = mRegExp.matchedLength();
@ -76,7 +76,7 @@ void CSMTools::Search::searchRecordStateCell (const CSMWorld::IdTableBase *model
CSMWorld::Columns::getEnums (CSMWorld::Columns::ColumnId_Modification); CSMWorld::Columns::getEnums (CSMWorld::Columns::ColumnId_Modification);
std::ostringstream message; std::ostringstream message;
message << id.getId() << " " << states.at (data); message << getLocation (model, index, id) << states.at (data);
std::ostringstream hint; std::ostringstream hint;
hint << "r: " << index.column(); hint << "r: " << index.column();
@ -85,6 +85,19 @@ void CSMTools::Search::searchRecordStateCell (const CSMWorld::IdTableBase *model
} }
} }
std::string CSMTools::Search::getLocation (const CSMWorld::IdTableBase *model, const QModelIndex& index, const CSMWorld::UniversalId& id) const
{
std::ostringstream stream;
stream
<< id.getId()
<< ", "
<< model->headerData (index.column(), Qt::Horizontal).toString().toUtf8().data()
<< ": ";
return stream.str();
}
CSMTools::Search::Search() : mType (Type_None) {} CSMTools::Search::Search() : mType (Type_None) {}
CSMTools::Search::Search (Type type, const std::string& value) CSMTools::Search::Search (Type type, const std::string& value)

2
apps/opencs/model/tools/search.hpp
View File

@ -55,6 +55,8 @@ namespace CSMTools
void searchRecordStateCell (const CSMWorld::IdTableBase *model, void searchRecordStateCell (const CSMWorld::IdTableBase *model,
const QModelIndex& index, const CSMWorld::UniversalId& id, const QModelIndex& index, const CSMWorld::UniversalId& id,
CSMDoc::Messages& messages) const; CSMDoc::Messages& messages) const;
std::string getLocation (const CSMWorld::IdTableBase *model, const QModelIndex& index, const CSMWorld::UniversalId& id) const;
public: public: