From 2e30fe48aa3ec24cb917e5aa4b1bf9b7c1891f3f Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Thu, 19 Mar 2009 02:13:30 -0400
Subject: Connect up the editor in the Map widget

---
 sigmodr/widgets/MapUI.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'sigmodr/widgets/MapUI.cpp')

diff --git a/sigmodr/widgets/MapUI.cpp b/sigmodr/widgets/MapUI.cpp
index 8dd0356c..2d948d69 100644
--- a/sigmodr/widgets/MapUI.cpp
+++ b/sigmodr/widgets/MapUI.cpp
@@ -19,6 +19,9 @@
 #include "MapUI.h"
 #include "MapUI_p.h"
 
+// Sigmodr widget includes
+#include "MapEditor.h"
+
 // Sigmod includes
 #include <sigmod/Game.h>
 #include <sigmod/Map.h>
@@ -30,7 +33,8 @@
 #include <KComboBox>
 #include <KLineEdit>
 
-// FIXME: Update map editing to new collage map
+// Qt includes
+#include <QtGui/QGridLayout>
 
 using namespace Sigmod;
 using namespace Sigmodr::Widgets;
@@ -71,8 +75,13 @@ QWidget* MapUI::Private::makeWidgets(ObjectUI* widget)
     QWidget *form = openUiFile(":/gui/map.ui", widget);
     ui_name = form->findChild<KLineEdit*>("varName");
     ui_type = form->findChild<KComboBox*>("varType");
+    QGridLayout* editorLayout = form->findChild<QGridLayout*>("editorLayout");
+    ui_editor = new MapEditor(m_map, widget);
+    editorLayout->addWidget(ui_editor, 0, 0);
     connect(ui_name, SIGNAL(textChanged(QString)), this, SLOT(nameChanged(QString)));
     connect(ui_type, SIGNAL(currentIndexChanged(int)), this, SLOT(typeChanged(int)));
+    connect(ui_editor, SIGNAL(changed()), this, SIGNAL(changed()));
+    widget->setTabOrder(ui_type, ui_editor);
     ui_type->addItems(Map::TypeStr);
     return form;
 }
@@ -81,6 +90,7 @@ void MapUI::Private::resetGui()
 {
     ui_name->setText(m_map->name());
     ui_type->setCurrentIndex(m_map->type());
+    ui_editor->setMap(m_map);
 }
 
 void MapUI::Private::nameChanged(const QString& name)
-- 
cgit