Fixed bug when block can slide over the same one

[vexed] / mainwindow.ui

diff --git a/mainwindow.ui b/mainwindow.ui
index 776ad1d..a2775ef 100644 (file)
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -20,7 +20,7 @@
       <x>9</x>
       <y>9</y>
       <width>761</width>
-      <height>401</height>
+      <height>452</height>
      </rect>
     </property>
     <layout class="QVBoxLayout" name="mainLayout">
@@ -81,14 +81,14 @@
            </property>
            <property name="minimumSize">
             <size>
-             <width>340</width>
-             <height>272</height>
+             <width>450</width>
+             <height>360</height>
             </size>
            </property>
            <property name="maximumSize">
             <size>
-             <width>340</width>
-             <height>272</height>
+             <width>450</width>
+             <height>360</height>
             </size>
            </property>
            <property name="palette">
@@ -242,6 +242,17 @@
           </layout>
          </item>
          <item>
+          <layout class="QHBoxLayout" name="solveLandscape">
+           <item>
+            <widget class="QPushButton" name="solve">
+             <property name="text">
+              <string>Solve!</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
           <spacer name="verticalSpacer_2">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
@@ -300,7 +311,7 @@
      <x>0</x>
      <y>0</y>
      <width>778</width>
-     <height>21</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuLevel_Pack">
@@ -315,8 +326,15 @@
     </property>
     <addaction name="actionhowtoplay"/>
    </widget>
+   <widget class="QMenu" name="menuAbout">
+    <property name="title">
+     <string>About</string>
+    </property>
+    <addaction name="actionAbout"/>
+   </widget>
    <addaction name="menuLevel_Pack"/>
    <addaction name="menuHow_to_Play"/>
+   <addaction name="menuAbout"/>
   </widget>
   <action name="actionLevel">
    <property name="text">
@@ -328,6 +346,11 @@
     <string>How to play</string>
    </property>
   </action>
+  <action name="actionAbout">
+   <property name="text">
+    <string>About</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
@@ -339,6 +362,7 @@
    <slots>
     <signal>solved(int)</signal>
     <signal>updateMoves(int)</signal>
+    <signal>solved()</signal>
     <slot>undo()</slot>
    </slots>
   </customwidget>
@@ -399,7 +423,7 @@
    <sender>playwidget</sender>
    <signal>solved(int)</signal>
    <receiver>MainWindow</receiver>
-   <slot>loadNextLevel()</slot>
+   <slot>solved(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>177</x>
@@ -411,6 +435,102 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>prevLevel</sender>
+   <signal>clicked()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>loadPrevLevel()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>697</x>
+     <y>162</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>553</x>
+     <y>121</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>nextLevel</sender>
+   <signal>clicked()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>loadNextLevel()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>765</x>
+     <y>162</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>515</x>
+     <y>181</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>reload</sender>
+   <signal>clicked()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>loadLevel()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>731</x>
+     <y>162</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>584</x>
+     <y>153</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>undo</sender>
+   <signal>clicked()</signal>
+   <receiver>playwidget</receiver>
+   <slot>undo()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>765</x>
+     <y>194</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>321</x>
+     <y>192</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionAbout</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>about()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>388</x>
+     <y>239</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>solve</sender>
+   <signal>clicked()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>solve()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>705</x>
+     <y>310</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>610</x>
+     <y>286</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>loadNextLevel()</slot>
@@ -421,5 +541,8 @@
   <slot>openPreferences()</slot>
   <slot>howToPlay()</slot>
   <slot>reorient()</slot>
+  <slot>solved(int)</slot>
+  <slot>about()</slot>
+  <slot>solve()</slot>
  </slots>
 </ui>