Connect up the UI for setting walkable area view

5 files changed, 32 insertions, 17 deletions

diff --git a/sigmodr/widgets/gui/mapeditor.ui b/sigmodr/widgets/gui/mapeditor.ui
index a645ae50..cd928c0e 100644
--- a/sigmodr/widgets/gui/mapeditor.ui
+++ b/sigmodr/widgets/gui/mapeditor.ui
@@ -8,7 +8,7 @@
    </sizepolicy>
   </property>
   <layout class="QGridLayout" name="gridLayout" >
-   <item rowspan="9" row="0" column="0" colspan="3" >
+   <item rowspan="9" row="0" column="0" colspan="4" >
     <widget class="QGraphicsView" name="varView" >
      <property name="toolTip" >
       <string/>
@@ -21,7 +21,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="3" >
+   <item row="0" column="4" >
     <widget class="KIntNumInput" name="varWidth" >
      <property name="toolTip" >
       <string/>
@@ -40,7 +40,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="3" >
+   <item row="1" column="4" >
     <widget class="KIntNumInput" name="varHeight" >
      <property name="toolTip" >
       <string/>
@@ -59,7 +59,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="3" >
+   <item row="2" column="4" >
     <widget class="KIntNumInput" name="varGridSize" >
      <property name="toolTip" >
       <string/>
@@ -78,7 +78,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="3" >
+   <item row="3" column="4" >
     <widget class="KPushButton" name="buttonAdd" >
      <property name="toolTip" >
       <string/>
@@ -94,7 +94,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="3" >
+   <item row="4" column="4" >
     <widget class="KPushButton" name="buttonRemove" >
      <property name="toolTip" >
       <string/>
@@ -110,7 +110,7 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="3" >
+   <item row="5" column="4" >
     <widget class="KPushButton" name="buttonTop" >
      <property name="toolTip" >
       <string/>
@@ -123,7 +123,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="3" >
+   <item row="6" column="4" >
     <widget class="KPushButton" name="buttonUp" >
      <property name="toolTip" >
       <string/>
@@ -136,7 +136,7 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="3" >
+   <item row="7" column="4" >
     <widget class="KPushButton" name="buttonDown" >
      <property name="toolTip" >
       <string/>
@@ -149,7 +149,7 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="3" >
+   <item row="8" column="4" >
     <widget class="KPushButton" name="buttonBottom" >
      <property name="toolTip" >
       <string/>
@@ -250,6 +250,22 @@
      </property>
     </widget>
    </item>
+   <item row="9" column="4" >
+    <widget class="QCheckBox" name="varDrawMask" >
+     <property name="toolTip" >
+      <string/>
+     </property>
+     <property name="statusTip" >
+      <string/>
+     </property>
+     <property name="whatsThis" >
+      <string/>
+     </property>
+     <property name="text" >
+      <string>Show walkable area</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -268,6 +284,7 @@
   <tabstop>varView</tabstop>
   <tabstop>varWidth</tabstop>
   <tabstop>varHeight</tabstop>
+  <tabstop>varGridSize</tabstop>
   <tabstop>buttonAdd</tabstop>
   <tabstop>buttonRemove</tabstop>
   <tabstop>buttonTop</tabstop>
@@ -278,5 +295,6 @@
   <tabstop>varShowTiles</tabstop>
   <tabstop>varShowTrainers</tabstop>
   <tabstop>varShowWarps</tabstop>
+  <tabstop>varDrawMask</tabstop>
  </tabstops>
 </ui>
diff --git a/sigmodr/widgets/mapeditor/MapEditor.cpp b/sigmodr/widgets/mapeditor/MapEditor.cpp
index ea129233..535f673a 100644
--- a/sigmodr/widgets/mapeditor/MapEditor.cpp
+++ b/sigmodr/widgets/mapeditor/MapEditor.cpp
@@ -68,6 +68,7 @@ MapEditor::MapEditor(Map* map, QWidget* parent) :
     ui_showTiles = formWidget->findChild<QCheckBox*>("varShowTiles");
     ui_showTrainers = formWidget->findChild<QCheckBox*>("varShowTrainers");
     ui_showWarps = formWidget->findChild<QCheckBox*>("varShowWarps");
+    ui_drawMask = formWidget->findChild<QCheckBox*>("varDrawMask");
     ui_buttonAdd->setIcon(KIcon("list-add"));
     ui_buttonRemove->setIcon(KIcon("list-remove"));
     ui_buttonTop->setIcon(KIcon("arrow-up-double"));
@@ -106,6 +107,7 @@ void MapEditor::reset()
     ui_width->setValue(m_map->width());
     ui_height->setValue(m_map->height());
     m_rect->setGridSize(ui_gridSize->value());
+    ui_drawMask->setChecked(false);
     makeConnections();
 }
 
@@ -146,4 +148,5 @@ void MapEditor::makeConnections()
     connect(ui_showTiles, SIGNAL(stateChanged(int)), m_scene, SLOT(showTiles(int)));
     connect(ui_showTrainers, SIGNAL(stateChanged(int)), m_scene, SLOT(showTrainers(int)));
     connect(ui_showWarps, SIGNAL(stateChanged(int)), m_scene, SLOT(showWarps(int)));
+    connect(ui_drawMask, SIGNAL(toggled(bool)), m_scene, SIGNAL(maskTiles(bool)));
 }
diff --git a/sigmodr/widgets/mapeditor/MapEditor.h b/sigmodr/widgets/mapeditor/MapEditor.h
index 038b9082..436ea501 100644
--- a/sigmodr/widgets/mapeditor/MapEditor.h
+++ b/sigmodr/widgets/mapeditor/MapEditor.h
@@ -84,6 +84,7 @@ class SIGMODRWIDGETS_NO_EXPORT MapEditor : public QWidget
         QCheckBox* ui_showTiles;
         QCheckBox* ui_showTrainers;
         QCheckBox* ui_showWarps;
+        QCheckBox* ui_drawMask;
         QGraphicsView* ui_view;
 };
 }
diff --git a/sigmodr/widgets/mapeditor/MapScene.cpp b/sigmodr/widgets/mapeditor/MapScene.cpp
index 0152332e..384e5e7c 100644
--- a/sigmodr/widgets/mapeditor/MapScene.cpp
+++ b/sigmodr/widgets/mapeditor/MapScene.cpp
@@ -281,11 +281,6 @@ void MapScene::showWarps(const int state)
     }
 }
 
-void MapScene::tileMask(const bool mask)
-{
-    emit(maskTiles(mask));
-}
-
 void MapScene::itemSelectionChanged()
 {
     QList<QGraphicsItem*> items = selectedItems();
diff --git a/sigmodr/widgets/mapeditor/MapScene.h b/sigmodr/widgets/mapeditor/MapScene.h
index dce59187..a5bf855f 100644
--- a/sigmodr/widgets/mapeditor/MapScene.h
+++ b/sigmodr/widgets/mapeditor/MapScene.h
@@ -65,8 +65,6 @@ class SIGMODRWIDGETS_NO_EXPORT MapScene : public QGraphicsScene
         void showTiles(const int state);
         void showTrainers(const int state);
         void showWarps(const int state);
-        
-        void tileMask(const bool mask);
     signals:
         void changed();