mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-14 15:40:18 +00:00
Code Issues Projects Releases Wiki Activity

removed global filter scope (would have caused sync problems between projects)

Browse Source
This commit is contained in:
Marc Zinnschlag 2013-08-24 14:46:42 +02:00
parent 3cf60da5a7
commit cf58670c85
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/opencs/model/filter/filter.hpp
View File

@ -13,10 +13,9 @@ namespace CSMFilter
{ {
enum Scope enum Scope
{ {
Scope_Global = 0, // per user Scope_Project = 0, // per project
Scope_Project = 1, // per project Scope_Session = 1, // exists only for one editing session; not saved
Scope_Session = 2, // exists only for one editing session; not saved Scope_Content = 2 // embedded in the edited content file
Scope_Content = 3 // embedded in the edited content file
}; };
Scope mScope; Scope mScope;

4
apps/opencs/view/filter/filtercreator.cpp
View File

@ -10,7 +10,6 @@ std::string CSVFilter::FilterCreator::getNamespace() const
{ {
switch (mScope->currentIndex()) switch (mScope->currentIndex())
{ {
case CSMFilter::Filter::Scope_Global: return "global::";
case CSMFilter::Filter::Scope_Project: return "project::"; case CSMFilter::Filter::Scope_Project: return "project::";
case CSMFilter::Filter::Scope_Session: return "session::"; case CSMFilter::Filter::Scope_Session: return "session::";
} }
@ -38,7 +37,6 @@ CSVFilter::FilterCreator::FilterCreator (CSMWorld::Data& data, QUndoStack& undoS
mScope = new QComboBox (this); mScope = new QComboBox (this);
mScope->addItem ("Global");
mScope->addItem ("Project"); mScope->addItem ("Project");
mScope->addItem ("Session"); mScope->addItem ("Session");
/// \ŧodo re-enable for OpenMW 1.1 /// \ŧodo re-enable for OpenMW 1.1
@ -51,7 +49,7 @@ CSVFilter::FilterCreator::FilterCreator (CSMWorld::Data& data, QUndoStack& undoS
QLabel *label = new QLabel ("Scope", this); QLabel *label = new QLabel ("Scope", this);
insertAtBeginning (label, false); insertAtBeginning (label, false);
mScope->setCurrentIndex (2); mScope->setCurrentIndex (1);
} }
void CSVFilter::FilterCreator::reset() void CSVFilter::FilterCreator::reset()