From 1c35a85adfef75fae749accac051f0359694d175 Mon Sep 17 00:00:00 2001 From: Marek Kochanowicz Date: Thu, 20 Feb 2014 19:27:51 +0100 Subject: [PATCH] fixed bugs, added extra display_type --- apps/opencs/model/world/columnbase.hpp | 1 + apps/opencs/model/world/tablemimedata.cpp | 3 +-- apps/opencs/view/filter/editwidget.cpp | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp index e689c6a3f5..e043336080 100644 --- a/apps/opencs/model/world/columnbase.hpp +++ b/apps/opencs/model/world/columnbase.hpp @@ -26,6 +26,7 @@ namespace CSMWorld enum Display { + Display_None, //Do not use Display_String, //CONCRETE TYPES STARTS HERE diff --git a/apps/opencs/model/world/tablemimedata.cpp b/apps/opencs/model/world/tablemimedata.cpp index de7875cc2a..b56c9c8c25 100644 --- a/apps/opencs/model/world/tablemimedata.cpp +++ b/apps/opencs/model/world/tablemimedata.cpp @@ -441,7 +441,6 @@ CSMWorld::ColumnBase::Display CSMWorld::TableMimeData::convertEnums (CSMWorld::U default: - return CSMWorld::ColumnBase::Display_String; - + return CSMWorld::ColumnBase::Display_None; } } \ No newline at end of file diff --git a/apps/opencs/view/filter/editwidget.cpp b/apps/opencs/view/filter/editwidget.cpp index 624fe3cde3..d3a2c50a44 100644 --- a/apps/opencs/view/filter/editwidget.cpp +++ b/apps/opencs/view/filter/editwidget.cpp @@ -130,7 +130,7 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st clear(); std::stringstream ss; - if (multipleElements) //TODO appending to the existing filter + if (multipleElements) { if (replaceMode) { @@ -169,7 +169,10 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st ss<<')'; } - insert (QString::fromStdString (ss.str().c_str())); + if (ss.str().length() >4) + { + insert (QString::fromStdString (ss.str().c_str())); + } } }