mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 06:45:35 +00:00
Code Issues Releases Wiki Activity

fixed bugs, added extra display_type

Browse source
This commit is contained in:
Marek Kochanowicz 2014-02-20 19:27:51 +01:00
parent 7dff34ebf1
commit 1c35a85adf
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/opencs/model/world/columnbase.hpp
View file

@ -26,6 +26,7 @@ namespace CSMWorld
enum Display enum Display
{ {
Display_None, //Do not use
Display_String, Display_String,
//CONCRETE TYPES STARTS HERE //CONCRETE TYPES STARTS HERE

3
apps/opencs/model/world/tablemimedata.cpp
View file

@ -441,7 +441,6 @@ CSMWorld::ColumnBase::Display CSMWorld::TableMimeData::convertEnums (CSMWorld::U
default: default:
return CSMWorld::ColumnBase::Display_String; return CSMWorld::ColumnBase::Display_None;
} }
} }

5
apps/opencs/view/filter/editwidget.cpp
View file

@ -130,7 +130,7 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st
clear(); clear();
std::stringstream ss; std::stringstream ss;
if (multipleElements) //TODO appending to the existing filter if (multipleElements)
{ {
if (replaceMode) if (replaceMode)
{ {
@ -169,9 +169,12 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st
ss<<')'; ss<<')';
} }
if (ss.str().length() >4)
{
insert (QString::fromStdString (ss.str().c_str())); insert (QString::fromStdString (ss.str().c_str()));
} }
} }
}
std::string CSVFilter::EditWidget::generateFilter (std::pair< std::string, std::vector< std::string > >& seekedString) const std::string CSVFilter::EditWidget::generateFilter (std::pair< std::string, std::vector< std::string > >& seekedString) const
{ {