InfoCondition autocompletion

apps/opencs/model/world/data.cpp

@@ -271,7 +271,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
         new NestedChildColumn (Columns::ColumnId_InfoCondFunc, ColumnBase::Display_InfoCondFunc));
     // FIXME: don't have dynamic value enum delegate, use Display_String for now
     mTopicInfos.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_InfoCondVar, ColumnBase::Display_String));
+        new NestedChildColumn (Columns::ColumnId_InfoCondVar, ColumnBase::Display_InfoCondVar));
     mTopicInfos.getNestableColumn(index)->addColumn(
         new NestedChildColumn (Columns::ColumnId_InfoCondComp, ColumnBase::Display_InfoCondComp));
     mTopicInfos.getNestableColumn(index)->addColumn(

apps/opencs/model/world/idcompletionmanager.cpp

@@ -60,6 +60,10 @@ std::vector<CSMWorld::ColumnBase::Display> CSMWorld::IdCompletionManager::getDis
     {
         types.push_back(current->first);
     }
+
+    // Hack for Display_InfoCondVar
+    types.push_back(CSMWorld::ColumnBase::Display_InfoCondVar);
+
     return types;
 }
 
@@ -104,7 +108,7 @@ void CSMWorld::IdCompletionManager::generateCompleters(CSMWorld::Data &data)
                 QAbstractItemView *popup = new CSVWidget::CompleterPopup();
                 completer->setPopup(popup); // The completer takes ownership of the popup
                 completer->setMaxVisibleItems(10);
-                
+
                 mCompleters[current->first] = completer;
             }
         }

apps/opencs/view/world/idcompletiondelegate.cpp

@@ -1,6 +1,7 @@
 #include "idcompletiondelegate.hpp"
 
 #include "../../model/world/idcompletionmanager.hpp"
+#include "../../model/world/infoselectwrapper.hpp"
 
 #include "../widget/droplineedit.hpp"
 
@@ -27,6 +28,56 @@ QWidget *CSVWorld::IdCompletionDelegate::createEditor(QWidget *parent,
         return NULL;
     }
 
+    // The completer for InfoCondVar needs to return a completer based on the first column
+    if (display == CSMWorld::ColumnBase::Display_InfoCondVar)
+    {
+        QModelIndex sibling = index.sibling(index.row(), 0);
+        int conditionFunction = sibling.model()->data(sibling, Qt::EditRole).toInt();
+
+        switch (conditionFunction)
+        {
+            case CSMWorld::ConstInfoSelectWrapper::Function_Global:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_GlobalVariable);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_Journal:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Journal);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_Item:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Referenceable);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_Dead:
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotId:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Referenceable);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotFaction:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Faction);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotClass:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Class);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotRace:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Race);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotCell:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Cell);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_Local:
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotLocal:
+            {
+                return new CSVWidget::DropLineEdit(display, parent);
+            }
+            default: return 0; // The rest of them can't be edited anyway
+        }
+    }
+
     CSMWorld::IdCompletionManager &completionManager = getDocument().getIdCompletionManager();
     CSVWidget::DropLineEdit *editor = new CSVWidget::DropLineEdit(display, parent);
     editor->setCompleter(completionManager.getCompleter(display).get());