Connect up the editor in the Map widget

3 files changed, 14 insertions, 9 deletions

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)
diff --git a/sigmodr/widgets/MapUI_p.h b/sigmodr/widgets/MapUI_p.h
index d74a30a9..ee95aa39 100644
--- a/sigmodr/widgets/MapUI_p.h
+++ b/sigmodr/widgets/MapUI_p.h
@@ -32,8 +32,7 @@ namespace Sigmodr
 {
 namespace Widgets
 {
-class TileDelegate;
-class TilemapModel;
+class MapEditor;
 
 class SIGMODRWIDGETS_NO_EXPORT MapUI::Private : public ObjectUIPrivate
 {
@@ -54,6 +53,7 @@ class SIGMODRWIDGETS_NO_EXPORT MapUI::Private : public ObjectUIPrivate
     private:
         KLineEdit* ui_name;
         KComboBox* ui_type;
+        MapEditor* ui_editor;
 };
 }
 }
diff --git a/sigmodr/widgets/gui/map.ui b/sigmodr/widgets/gui/map.ui
index 95d8f387..9a0f287a 100644
--- a/sigmodr/widgets/gui/map.ui
+++ b/sigmodr/widgets/gui/map.ui
@@ -62,11 +62,7 @@
      <property name="title" >
       <string>Map</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" >
-       <widget class="QWidget" name="varMap" />
-      </item>
-     </layout>
+     <layout class="QGridLayout" name="editorLayout" />
     </widget>
    </item>
   </layout>
@@ -96,7 +92,6 @@
  <tabstops>
   <tabstop>varName</tabstop>
   <tabstop>varType</tabstop>
-  <tabstop>varMap</tabstop>
  </tabstops>
  <resources/>
  <connections/>