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

diff --git a/bs/ui/bsappbase.ui b/bs/ui/bsappbase.ui
index f2714b5..ed97f11 100644
--- a/bs/ui/bsappbase.ui
+++ b/bs/ui/bsappbase.ui
@@ -13,7 +13,7 @@
         </rect>
     </property>
     <property name="caption">
-        <string>Form1</string>
+        <string>Harvalen's Battlesystem</string>
     </property>
 </widget>
 <menubar>
@@ -25,7 +25,7 @@
             <x>0</x>
             <y>0</y>
             <width>726</width>
-            <height>30</height>
+            <height>26</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"/>
@@ -84,7 +87,7 @@
             <string>&amp;New</string>
         </property>
         <property name="accel">
-            <number>4194382</number>
+            <number>0</number>
         </property>
     </action>
     <action>
@@ -312,13 +315,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 +429,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 +459,37 @@
         <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>
 </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>
 <slots>
     <slot>fileNew()</slot>
     <slot>fileOpen()</slot>
@@ -459,12 +500,14 @@
     <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>
 </slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>