diff options
Diffstat (limited to 'src/editorwindow.cc')
| -rw-r--r-- | src/editorwindow.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/editorwindow.cc b/src/editorwindow.cc index 1ced0c0..f01548d 100644 --- a/src/editorwindow.cc +++ b/src/editorwindow.cc @@ -24,7 +24,7 @@ EditorWindow::EditorWindow(QWidget *parent) : QWidget(parent) editorwindow_mapwidget = new MapWidget(this); editorwindow_sidebar = new SideBar(this); - connect(editorwindow_mapwidget, SIGNAL(selected(EntityWidget *)), editorwindow_sidebar, SLOT(setEntity(EntityWidget *))); + connect(editorwindow_mapwidget, SIGNAL(propertiesChanged(EntityProperties *)), editorwindow_sidebar, SLOT(setProperties(EntityProperties *))); connect(editorwindow_sidebar, SIGNAL(entityChanged()), editorwindow_mapwidget, SLOT(resizeChildren())); } @@ -108,7 +108,7 @@ bool EditorWindow::loadFile(const QString &filename) entity = editorwindow_mapwidget->addEntity(); } if (entity && in_subsection) { - entity->add_subsection(ini.section()); + entity->properties()->add_subsection(ini.section()); } } else if(ini.got_key()) { @@ -117,24 +117,24 @@ bool EditorWindow::loadFile(const QString &filename) // read entity properties into the MapWidget instance if (ini.got_key_vector3f("location" , x, y, z)) { - entity->set_location(x, y, z); + entity->properties()->set_location(x, y, z); //qDebug() << "got location " << x << " " << y << " " << z; } else if (ini.got_key_string("label", str)) { - entity->set_label(str); + entity->properties()->set_label(str); } else if (ini.got_key_string("name", str)) { - entity->set_name(str); + entity->properties()->set_name(str); } else if (ini.got_key_float("radius", f)) { - entity->set_radius(f); + entity->properties()->set_radius(f); } else if (ini.got_key()) { - entity->add_property(ini.key(), ini.value()); + entity->properties()->add_value(ini.key(), ini.value()); } } else if (entity && in_subsection) { - entity->add_subsection_property(ini.key(), ini.value()); + entity->properties()->add_subsection_value(ini.key(), ini.value()); } else if (ini.in_section("zone")) { |