moving the tick changing to the toolbar instead of CTickView. adding a combobox to...

[hbs.git] / bs / ui / bsappbase.ui

diff --git a/bs/ui/bsappbase.ui b/bs/ui/bsappbase.ui
index ed97f11419cc03ac1adc535d6e9c8ced7c193dc2..651e4d3f81dd794845c04700f79ce1614bc5c6db 100644 (file)
--- a/bs/ui/bsappbase.ui
+++ b/bs/ui/bsappbase.ui
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>726</width>
-            <height>519</height>
+            <width>700</width>
+            <height>534</height>
         </rect>
     </property>
     <property name="caption">
@@ -24,8 +24,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>726</width>
-            <height>26</height>
+            <width>700</width>
+            <height>24</height>
         </rect>
     </property>
     <item text="&amp;File" name="fileMenu">
@@ -70,6 +70,78 @@
         <action name="fileNewAction"/>
         <action name="fileOpenAction"/>
         <action name="fileSaveAction"/>
+        <separator/>
+        <widget class="QLabel">
+            <property name="name">
+                <cstring>TextLabel3</cstring>
+            </property>
+            <property name="text">
+                <string>Show result as:</string>
+            </property>
+        </widget>
+        <widget class="QComboBox">
+            <property name="name">
+                <cstring>resultModeCombo</cstring>
+            </property>
+            <item>
+                <property name="text">
+                    <string>Killed units</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>Blocked units</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>Survived unts</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>New (stolen) untis</string>
+                </property>
+            </item>
+        </widget>
+        <separator/>
+        <widget class="QLabel">
+            <property name="name">
+                <cstring>TextLabel1</cstring>
+            </property>
+            <property name="text">
+                <string>From tick:</string>
+            </property>
+        </widget>
+        <widget class="QSpinBox">
+            <property name="name">
+                <cstring>minTickSpin</cstring>
+            </property>
+            <property name="maxValue">
+                <number>0</number>
+            </property>
+        </widget>
+        <widget class="QLabel">
+            <property name="name">
+                <cstring>TextLabel2</cstring>
+            </property>
+            <property name="text">
+                <string>to:</string>
+            </property>
+        </widget>
+        <widget class="QSpinBox">
+            <property name="name">
+                <cstring>maxTickSpin</cstring>
+            </property>
+        </widget>
+        <widget class="QCheckBox">
+            <property name="name">
+                <cstring>oneTickCheck</cstring>
+            </property>
+            <property name="text">
+                <string>One tick only</string>
+            </property>
+        </widget>
     </toolbar>
 </toolbars>
 <actions>
@@ -471,6 +543,42 @@
         <receiver>BSAppBase</receiver>
         <slot>battleSimulate()</slot>
     </connection>
+    <connection>
+        <sender>oneTickCheck</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>BSAppBase</receiver>
+        <slot>oneTickCheck_toggled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>resultModeCombo</sender>
+        <signal>activated(int)</signal>
+        <receiver>BSAppBase</receiver>
+        <slot>resultModeCombo_activated(int)</slot>
+    </connection>
+    <connection>
+        <sender>minTickSpin</sender>
+        <signal>valueChanged(int)</signal>
+        <receiver>BSAppBase</receiver>
+        <slot>slotTicksChanged(int)</slot>
+    </connection>
+    <connection>
+        <sender>minTickSpin</sender>
+        <signal>valueChanged(int)</signal>
+        <receiver>BSAppBase</receiver>
+        <slot>minTickSpin_valueChanged(int)</slot>
+    </connection>
+    <connection>
+        <sender>maxTickSpin</sender>
+        <signal>valueChanged(int)</signal>
+        <receiver>BSAppBase</receiver>
+        <slot>slotTicksChanged(int)</slot>
+    </connection>
+    <connection>
+        <sender>maxTickSpin</sender>
+        <signal>valueChanged(int)</signal>
+        <receiver>BSAppBase</receiver>
+        <slot>maxTickSpin_valueChanged(int)</slot>
+    </connection>
 </connections>
 <includes>
     <include location="global" impldecl="in implementation">qapplication.h</include>
@@ -490,6 +598,10 @@
     <variable>BSView* view</variable>
     <variable>BSDoc* doc</variable>
 </variables>
+<signals>
+    <signal>ticksChanged(int, int);</signal>
+    <signal>resultModeChanged(int);</signal>
+</signals>
 <slots>
     <slot>fileNew()</slot>
     <slot>fileOpen()</slot>
@@ -508,6 +620,11 @@
     <slot>helpAbout()</slot>
     <slot>battleNew()</slot>
     <slot>battleSimulate()</slot>
+    <slot>oneTickCheck_toggled( bool b )</slot>
+    <slot>minTickSpin_valueChanged( int i )</slot>
+    <slot>maxTickSpin_valueChanged( int i )</slot>
+    <slot>slotTicksChanged( int i )</slot>
+    <slot>resultModeCombo_activated( int i )</slot>
 </slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>