From 08ccae6b49ec22615b4cc6b7a047f4b2bbcd69d7 Mon Sep 17 00:00:00 2001
From: Marek Kochanowicz <sirherrbatka@gmail.com>
Date: Sat, 8 Mar 2014 15:27:43 +0100
Subject: [PATCH] handle comboboxes
---
apps/opencs/model/world/columnbase.cpp | 5 +++++
apps/opencs/model/world/columnbase.hpp | 2 ++
apps/opencs/model/world/idtable.cpp | 5 +++++
apps/opencs/model/world/idtable.hpp | 2 ++
apps/opencs/view/world/dialoguesubview.cpp | 10 +++++++++-
5 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/apps/opencs/model/world/columnbase.cpp b/apps/opencs/model/world/columnbase.cpp
index 34bad20cc..f6363fe2e 100644
--- a/apps/opencs/model/world/columnbase.cpp
+++ b/apps/opencs/model/world/columnbase.cpp
@@ -17,4 +17,9 @@ bool CSMWorld::ColumnBase::isUserEditable() const
std::string CSMWorld::ColumnBase::getTitle() const
{
return Columns::getName (static_cast<Columns::ColumnId> (mColumnId));
+}
+
+int CSMWorld::ColumnBase::getId() const
+{
+ return mColumnId;
}
\ No newline at end of file
diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index e04333608..d990232f7 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -105,6 +105,8 @@ namespace CSMWorld
///< Can this column be edited directly by the user?
virtual std::string getTitle() const;
+
+ virtual int getId() const;
};
template<typename ESXRecordT>
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 453a7da6a..97837e368 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -230,4 +230,9 @@ std::pair<CSMWorld::UniversalId, std::string> CSMWorld::IdTable::view (int row)
id = "sys::default";
return std::make_pair (UniversalId (UniversalId::Type_Scene, id), hint);
+}
+
+int CSMWorld::IdTable::getColumnId(int column) const
+{
+ return mIdCollection->getColumn(column).getId();
}
\ No newline at end of file
diff --git a/apps/opencs/model/world/idtable.hpp b/apps/opencs/model/world/idtable.hpp
index 5a271de44..013741379 100644
--- a/apps/opencs/model/world/idtable.hpp
+++ b/apps/opencs/model/world/idtable.hpp
@@ -103,6 +103,8 @@ namespace CSMWorld
std::pair<UniversalId, std::string> view (int row) const;
///< Return the UniversalId and the hint for viewing \a row. If viewing is not
/// supported by this table, return (UniversalId::Type_None, "").
+
+ int getColumnId(int column) const;
};
}
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 3eaa9bd61..a946a6f6f 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -16,6 +16,7 @@
#include "../../model/world/columnbase.hpp"
#include "../../model/world/idtable.hpp"
+#include "../../model/world/columns.hpp"
#include "recordstatusdelegate.hpp"
#include "util.hpp"
@@ -123,13 +124,20 @@ QSize CSVWorld::DialogueDelegateDispatcher::sizeHint (const QStyleOptionViewItem
QWidget* CSVWorld::DialogueDelegateDispatcher::makeEditor(CSMWorld::ColumnBase::Display display, const QModelIndex& index)
{
+ bool hasEnums = CSMWorld::Columns::hasEnums(static_cast<CSMWorld::Columns::ColumnId>(mTable->getColumnId(index.column() ) ) );
QWidget* editor = NULL;
std::map<int, CommandDelegate*>::iterator delegateIt(mDelegates.find(display));
if (delegateIt != mDelegates.end())
{
editor = delegateIt->second->createEditor(dynamic_cast<QWidget*>(mParent), QStyleOptionViewItem(), index);
DialogueDelegateDispatcherProxy* proxy = new DialogueDelegateDispatcherProxy(editor, display);
- connect(editor, SIGNAL(editingFinished()), proxy, SLOT(editorDataCommited()));
+ if (hasEnums) //combox is used for all enums
+ {
+ connect(editor, SIGNAL(currentIndexChanged ( int)), proxy, SLOT(editorDataCommited()));
+ } else
+ {
+ connect(editor, SIGNAL(editingFinished()), proxy, SLOT(editorDataCommited()));
+ }
connect(proxy, SIGNAL(editorDataCommited(QWidget*, const QModelIndex&, CSMWorld::ColumnBase::Display)), this, SLOT(editorDataCommited(QWidget*, const QModelIndex&, CSMWorld::ColumnBase::Display)));
mProxys.push_back(proxy); //deleted in the destructor
}