summaryrefslogtreecommitdiffstats
path: root/sigmodr/widgets/gui
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2009-04-02 23:10:34 -0400
committerBen Boeckel <MathStuf@gmail.com>2009-04-02 23:10:47 -0400
commitd911d9fe8bb2378070142610c8bdfe9ed505c56a (patch)
treec6e501875c8df699ee771b1d057f96be58f57149 /sigmodr/widgets/gui
parentbfa661013ada083d2999e06fd3c56a80afa687e6 (diff)
downloadsigen-d911d9fe8bb2378070142610c8bdfe9ed505c56a.tar.gz
sigen-d911d9fe8bb2378070142610c8bdfe9ed505c56a.tar.xz
sigen-d911d9fe8bb2378070142610c8bdfe9ed505c56a.zip
Move the collision watching down into the maps
Diffstat (limited to 'sigmodr/widgets/gui')
-rw-r--r--sigmodr/widgets/gui/worldmapeditor.ui21
1 files changed, 2 insertions, 19 deletions
diff --git a/sigmodr/widgets/gui/worldmapeditor.ui b/sigmodr/widgets/gui/worldmapeditor.ui
index 0d921bf8..58091ba3 100644
--- a/sigmodr/widgets/gui/worldmapeditor.ui
+++ b/sigmodr/widgets/gui/worldmapeditor.ui
@@ -44,7 +44,7 @@
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="0" column="2">
<widget class="QCheckBox" name="varDrawMasked">
<property name="toolTip">
<string/>
@@ -60,23 +60,7 @@
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QCheckBox" name="varWatchCollisions">
- <property name="toolTip">
- <string/>
- </property>
- <property name="statusTip">
- <string/>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Allow collisions</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
+ <item row="1" column="0" colspan="3">
<widget class="QGraphicsView" name="varView">
<property name="toolTip">
<string/>
@@ -107,7 +91,6 @@
<tabstop>varGridSize</tabstop>
<tabstop>varZoom</tabstop>
<tabstop>varDrawMasked</tabstop>
- <tabstop>varWatchCollisions</tabstop>
<tabstop>varView</tabstop>
</tabstops>
</ui>