tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve property tree for Icinga Studio 

refs #10042
This commit is contained in:
Gunnar Beutner 2015-09-30 14:13:18 +02:00
parent f779b20ec0
commit de9806b14c
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
icinga-studio/mainform.cpp
View File

@ -246,8 +246,8 @@ void MainForm::ObjectDetailsCompletionHandler(boost::exception_ptr eptr, const s
std::map<String, wxStringProperty *> parents;
typedef std::pair<String, Value> kv_pair;
BOOST_FOREACH(const kv_pair& kv, object->Attrs) {
typedef std::pair<String, Value> kv_pair_attr;
BOOST_FOREACH(const kv_pair_attr& kv, object->Attrs) {
std::vector<String> tokens;
boost::algorithm::split(tokens, kv.first, boost::is_any_of("."));
@ -257,14 +257,28 @@ void MainForm::ObjectDetailsCompletionHandler(boost::exception_ptr eptr, const s
if (it == parents.end()) {
parent = new wxStringProperty(tokens[0].GetData(), wxPG_LABEL, "<object>");
m_PropertyGrid->Append(parent);
parents[tokens[0]] = parent;
} else
parent = it->second;
wxPGProperty *prop = ValueToProperty(tokens[1], kv.second);
parent->AppendChild(prop);
m_PropertyGrid->SetPropertyReadOnly(prop);
}
/* Make sure the property node for the real object (as opposed to joined objects) is the first one */
String propName = type->Name.ToLower();
wxStringProperty *objProp = parents[propName];
if (objProp) {
m_PropertyGrid->Append(objProp);
m_PropertyGrid->SetPropertyReadOnly(objProp);
parents.erase(propName);
}
typedef std::pair<String, wxStringProperty *> kv_pair_prop;
BOOST_FOREACH(const kv_pair_prop& kv, parents) {
m_PropertyGrid->Append(kv.second);
m_PropertyGrid->SetPropertyReadOnly(kv.second);
}
}