X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fui%2Fbsappbase.ui;h=ed313f63a5184da2a039d751d82c294b30890d5d;hb=e0be1e6e8f7a246acf49e1f315c8d5bc5a65bfa3;hp=f2714b5aa841fbb08669b31807f664ad02d05485;hpb=b69214d555a2a06a004f92cf8c52160ee52b82dc;p=hbs.git

diff --git a/bs/ui/bsappbase.ui b/bs/ui/bsappbase.ui
index f2714b5..ed313f6 100644
--- a/bs/ui/bsappbase.ui
+++ b/bs/ui/bsappbase.ui
@@ -8,12 +8,12 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>726</width>
-            <height>519</height>
+            <width>700</width>
+            <height>534</height>
         </rect>
     </property>
     <property name="caption">
-        <string>Form1</string>
+        <string>Harvalen's Battlesystem</string>
     </property>
 </widget>
 <menubar>
@@ -24,8 +24,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>726</width>
-            <height>30</height>
+            <width>700</width>
+            <height>23</height>
         </rect>
     </property>
     <item text="&amp;File" name="fileMenu">
@@ -33,7 +33,6 @@
         <action name="fileOpenAction"/>
         <action name="fileSaveAction"/>
         <action name="fileSaveAsAction"/>
-        <action name="KulSak"/>
         <separator/>
         <action name="filePrintAction"/>
         <separator/>
@@ -49,6 +48,10 @@
         <separator/>
         <action name="editFindAction"/>
     </item>
+    <item text="Battle" name="PopupMenu">
+        <action name="battleNewAction"/>
+        <action name="battleSimulateAction"/>
+    </item>
     <item text="&amp;Help" name="helpMenu">
         <action name="helpContentsAction"/>
         <action name="helpIndexAction"/>
@@ -67,6 +70,73 @@
         <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>Unit difference</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>Blocked units</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>Survived units</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>
@@ -84,7 +154,7 @@
             <string>&amp;New</string>
         </property>
         <property name="accel">
-            <number>4194382</number>
+            <number>0</number>
         </property>
     </action>
     <action>
@@ -312,13 +382,30 @@
     </action>
     <action>
         <property name="name">
-            <cstring>KulSak</cstring>
+            <cstring>battleNewAction</cstring>
         </property>
         <property name="text">
-            <string>Kul sak</string>
+            <string>New</string>
+        </property>
+        <property name="toolTip">
+            <string>Create what's needed to add fleets to a battle</string>
+        </property>
+        <property name="statusTip">
+            <string>Create a new battle with initial groups and home planet</string>
         </property>
         <property name="accel">
-            <number>0</number>
+            <number>4194382</number>
+        </property>
+    </action>
+    <action>
+        <property name="name">
+            <cstring>battleSimulateAction</cstring>
+        </property>
+        <property name="text">
+            <string>Run Simulate Battle</string>
+        </property>
+        <property name="accel">
+            <number>4194386</number>
         </property>
     </action>
 </actions>
@@ -409,12 +496,6 @@
         <receiver>BSAppBase</receiver>
         <slot>editCut()</slot>
     </connection>
-    <connection>
-        <sender>editCopyAction</sender>
-        <signal>activated()</signal>
-        <receiver>BSAppBase</receiver>
-        <slot>editCopy()</slot>
-    </connection>
     <connection>
         <sender>editPasteAction</sender>
         <signal>activated()</signal>
@@ -445,10 +526,77 @@
         <receiver>BSAppBase</receiver>
         <slot>helpAbout()</slot>
     </connection>
+    <connection>
+        <sender>battleNewAction</sender>
+        <signal>activated()</signal>
+        <receiver>BSAppBase</receiver>
+        <slot>battleNew()</slot>
+    </connection>
+    <connection>
+        <sender>battleSimulateAction</sender>
+        <signal>activated()</signal>
+        <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>
+    <include location="local" impldecl="in implementation">../bsdoc.h</include>
+    <include location="local" impldecl="in implementation">../bsview.h</include>
+    <include location="global" impldecl="in implementation">qinputdialog.h</include>
+    <include location="local" impldecl="in implementation">../bsconf.h</include>
     <include location="local" impldecl="in implementation">bsappbase.ui.h</include>
 </includes>
+<forwards>
+    <forward>class BSConf</forward>
+    <forward>class BSView</forward>
+    <forward>class BSDoc</forward>
+</forwards>
+<variables>
+    <variable>BSConf* conf</variable>
+    <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>
@@ -459,12 +607,19 @@
     <slot>editUndo()</slot>
     <slot>editRedo()</slot>
     <slot>editCut()</slot>
-    <slot>editCopy()</slot>
+    <slot>init()</slot>
     <slot>editPaste()</slot>
     <slot>editFind()</slot>
     <slot>helpIndex()</slot>
     <slot>helpContents()</slot>
     <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>