Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2012-02-19 13:26:32 +0000
committerStijn Buys <ingar@osirion.org>2012-02-19 13:26:32 +0000
commit46f48143ed59eddafa86f2711f518792f362a46c (patch)
tree42db107c1ea0f361bb9cdda18959a3fa6d3b84c9 /src/editorwindow.cc
parent8aa0a55840f02482884e29b33b770daa6028b81e (diff)
Added text area with all entity properties, made location editable.
Diffstat (limited to 'src/editorwindow.cc')
-rw-r--r--src/editorwindow.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/editorwindow.cc b/src/editorwindow.cc
index 3435d43..3f1dce7 100644
--- a/src/editorwindow.cc
+++ b/src/editorwindow.cc
@@ -23,7 +23,9 @@ EditorWindow::EditorWindow(QWidget *parent) : QWidget(parent)
{
editorwindow_mapwidget = new MapWidget(this);
editorwindow_sidebar = new SideBar(this);
+
connect(editorwindow_mapwidget, SIGNAL(selected(MapEntity *)), editorwindow_sidebar, SLOT(setEntity(MapEntity *)));
+ connect(editorwindow_sidebar, SIGNAL(entityChanged()), editorwindow_mapwidget, SLOT(resizeChildren()));
}
void EditorWindow::resizeEvent (QResizeEvent *event)
@@ -113,6 +115,9 @@ bool EditorWindow::loadFile(const QString &filename)
} else if (ini.got_key_float("radius", f)) {
entity->set_radius(f);
+
+ } else if (ini.got_key()) {
+ entity->add_property(ini.key(), ini.value());
}
} else if (ini.in_section("zone")) {