Fix connections and defaults

2 files changed, 64 insertions, 40 deletions

diff --git a/sigmodr/widgets/MapEditor.cpp b/sigmodr/widgets/MapEditor.cpp
index 58165951..39bc136c 100644
--- a/sigmodr/widgets/MapEditor.cpp
+++ b/sigmodr/widgets/MapEditor.cpp
@@ -67,7 +67,7 @@ MapEditor::MapEditor(Map* map, QWidget* parent) :
     buttonDown->setIcon(KIcon("arrow-down"));
     buttonBottom->setIcon(KIcon("arrow-down-double"));
     connect(buttonAdd, SIGNAL(pressed()), m_scene, SLOT(addTile()));
-    connect(buttonRemove, SIGNAL(pressed()), m_scene, SLOT(remove()));
+    connect(buttonRemove, SIGNAL(pressed()), m_scene, SLOT(removeSelected()));
     connect(m_scene, SIGNAL(itemsSelected(bool)), buttonRemove, SLOT(setEnabled(bool)));
     connect(buttonTop, SIGNAL(pressed()), m_scene, SLOT(moveToTop()));
     connect(m_scene, SIGNAL(tilesSelected(bool)), buttonTop, SLOT(setEnabled(bool)));
@@ -77,10 +77,10 @@ MapEditor::MapEditor(Map* map, QWidget* parent) :
     connect(m_scene, SIGNAL(tilesSelected(bool)), buttonDown, SLOT(setEnabled(bool)));
     connect(buttonBottom, SIGNAL(pressed()), m_scene, SLOT(moveToBottom()));
     connect(m_scene, SIGNAL(tilesSelected(bool)), buttonBottom, SLOT(setEnabled(bool)));
-    connect(varShowEffects, SIGNAL(stateChanged(int)), m_scene, SIGNAL(showEffects(int)));
-    connect(varShowTiles, SIGNAL(stateChanged(int)), m_scene, SIGNAL(showTiles(int)));
-    connect(varShowTrainers, SIGNAL(stateChanged(int)), m_scene, SIGNAL(showTrainers(int)));
-    connect(varShowWarps, SIGNAL(stateChanged(int)), m_scene, SIGNAL(showWarps(int)));
+    connect(varShowEffects, SIGNAL(stateChanged(int)), m_scene, SLOT(showEffects(int)));
+    connect(varShowTiles, SIGNAL(stateChanged(int)), m_scene, SLOT(showTiles(int)));
+    connect(varShowTrainers, SIGNAL(stateChanged(int)), m_scene, SLOT(showTrainers(int)));
+    connect(varShowWarps, SIGNAL(stateChanged(int)), m_scene, SLOT(showWarps(int)));
     QVBoxLayout* layout = new QVBoxLayout;
     layout->addWidget(formWidget);
     setLayout(layout);
diff --git a/sigmodr/widgets/gui/mapeditor.ui b/sigmodr/widgets/gui/mapeditor.ui
index e63a54c0..015dea38 100644
--- a/sigmodr/widgets/gui/mapeditor.ui
+++ b/sigmodr/widgets/gui/mapeditor.ui
@@ -11,26 +11,26 @@
    <item rowspan="6" row="0" column="0" colspan="3" >
     <widget class="QGraphicsView" name="varView" >
      <property name="toolTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="statusTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="whatsThis" >
-      <string></string>
+      <string/>
      </property>
     </widget>
    </item>
    <item row="0" column="3" >
     <widget class="KPushButton" name="buttonAdd" >
      <property name="toolTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="statusTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="whatsThis" >
-      <string></string>
+      <string/>
      </property>
      <property name="text" >
       <string>Add</string>
@@ -40,13 +40,13 @@
    <item row="1" column="3" >
     <widget class="KPushButton" name="buttonRemove" >
      <property name="toolTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="statusTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="whatsThis" >
-      <string></string>
+      <string/>
      </property>
      <property name="text" >
       <string>Remove</string>
@@ -56,117 +56,141 @@
    <item row="2" column="3" >
     <widget class="KPushButton" name="buttonTop" >
      <property name="toolTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="statusTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="whatsThis" >
-      <string></string>
+      <string/>
      </property>
     </widget>
    </item>
    <item row="3" column="3" >
     <widget class="KPushButton" name="buttonUp" >
      <property name="toolTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="statusTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="whatsThis" >
-      <string></string>
+      <string/>
      </property>
     </widget>
    </item>
    <item row="4" column="3" >
     <widget class="KPushButton" name="buttonDown" >
      <property name="toolTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="statusTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="whatsThis" >
-      <string></string>
+      <string/>
      </property>
     </widget>
    </item>
    <item row="5" column="3" >
     <widget class="KPushButton" name="buttonBottom" >
      <property name="toolTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="statusTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="whatsThis" >
-      <string></string>
+      <string/>
      </property>
     </widget>
    </item>
    <item row="6" column="0" >
     <widget class="QCheckBox" name="varShowEffects" >
      <property name="toolTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="statusTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="whatsThis" >
-      <string></string>
+      <string/>
      </property>
      <property name="text" >
       <string>Effects</string>
      </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
+     <property name="tristate" >
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="6" column="1" >
     <widget class="QCheckBox" name="varShowTiles" >
      <property name="toolTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="statusTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="whatsThis" >
-      <string></string>
+      <string/>
      </property>
      <property name="text" >
       <string>Tiles</string>
      </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
+     <property name="tristate" >
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="6" column="2" >
     <widget class="QCheckBox" name="varShowTrainers" >
      <property name="toolTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="statusTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="whatsThis" >
-      <string></string>
+      <string/>
      </property>
      <property name="text" >
       <string>Trainers</string>
      </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
+     <property name="tristate" >
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="6" column="3" >
     <widget class="QCheckBox" name="varShowWarps" >
      <property name="toolTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="statusTip" >
-      <string></string>
+      <string/>
      </property>
      <property name="whatsThis" >
-      <string></string>
+      <string/>
      </property>
      <property name="text" >
       <string>Warps</string>
      </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
+     <property name="tristate" >
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
   </layout>
@@ -180,8 +204,8 @@
  </customwidgets>
  <tabstops>
   <tabstop>varView</tabstop>
-  <tabstop>buttonAddTile</tabstop>
-  <tabstop>buttonRemoveTiles</tabstop>
+  <tabstop>buttonAdd</tabstop>
+  <tabstop>buttonRemove</tabstop>
   <tabstop>buttonTop</tabstop>
   <tabstop>buttonUp</tabstop>
   <tabstop>buttonDown</tabstop>