X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fui%2Finfoview.ui;h=bb57b75002469dc7b26c71ed8fcc2639fcdc425e;hb=7311d423f454c500dbc60dd822007da3981b0d56;hp=b34ef8a5428debf100bce165bbef7a9f41b1db2e;hpb=33b6dc7ca95a05c26a78879413395c1588066b77;p=hbs.git

diff --git a/bs/ui/infoview.ui b/bs/ui/infoview.ui
index b34ef8a..bb57b75 100644
--- a/bs/ui/infoview.ui
+++ b/bs/ui/infoview.ui
@@ -9,9 +9,9 @@
     <property name="geometry">
         <rect>
             <x>0</x>
-            <y>0</y>
+            <y>4</y>
             <width>267</width>
-            <height>198</height>
+            <height>221</height>
         </rect>
     </property>
     <property name="sizePolicy">
@@ -25,7 +25,7 @@
     <property name="maximumSize">
         <size>
             <width>32767</width>
-            <height>200</height>
+            <height>221</height>
         </size>
     </property>
     <property name="caption">
@@ -36,10 +36,10 @@
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
-            <number>3</number>
+            <number>0</number>
         </property>
         <property name="spacing">
-            <number>2</number>
+            <number>0</number>
         </property>
         <widget class="QLabel" row="1" column="0">
             <property name="name">
@@ -77,78 +77,19 @@
             <property name="name">
                 <cstring>GroupCombo</cstring>
             </property>
+            <property name="insertionPolicy">
+                <enum>NoInsertion</enum>
+            </property>
         </widget>
         <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>BattleCombo</cstring>
             </property>
-        </widget>
-        <widget class="QLabel" row="5" column="0">
-            <property name="name">
-                <cstring>RaceLabel</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Race</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>RaceCombo</cstring>
-            </property>
-        </widget>
-        <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>NameLine</cstring>
-            </property>
-        </widget>
-        <widget class="QLabel" row="3" column="0">
-            <property name="name">
-                <cstring>NameLabel</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Name</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>NameLine</cstring>
+            <property name="insertionPolicy">
+                <enum>NoInsertion</enum>
             </property>
         </widget>
-        <widget class="QComboBox" row="5" column="1" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>RaceCombo</cstring>
-            </property>
-        </widget>
-        <widget class="QLabel" row="4" column="0">
-            <property name="name">
-                <cstring>EtaLabel</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Eta</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>EtaSpin</cstring>
-            </property>
-        </widget>
-        <widget class="QSpinBox" row="4" column="1" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>EtaSpin</cstring>
-            </property>
-        </widget>
-        <spacer row="2" column="2">
-            <property name="name" stdset="0">
-                <cstring>Spacer3</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QLayoutWidget" row="7" column="0" rowspan="1" colspan="3">
+        <widget class="QLayoutWidget" row="8" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>Layout13</cstring>
             </property>
@@ -179,7 +120,7 @@
                     </property>
                 </widget>
                 <spacer>
-                    <property name="name" stdset="0">
+                    <property name="name">
                         <cstring>Spacer1</cstring>
                     </property>
                     <property name="orientation">
@@ -188,12 +129,6 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
                 </spacer>
                 <widget class="QPushButton">
                     <property name="name">
@@ -214,13 +149,13 @@
                         <bool>false</bool>
                     </property>
                     <property name="text">
-                        <string>&amp;Remove</string>
+                        <string>Remo&amp;ve</string>
                     </property>
                 </widget>
             </hbox>
         </widget>
-        <spacer row="6" column="1">
-            <property name="name" stdset="0">
+        <spacer row="7" column="1">
+            <property name="name">
                 <cstring>Spacer4</cstring>
             </property>
             <property name="orientation">
@@ -229,13 +164,88 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
+        </spacer>
+        <widget class="QLabel" row="6" column="0">
+            <property name="name">
+                <cstring>RaceLabel</cstring>
+            </property>
+            <property name="text">
+                <string>&amp;Race</string>
+            </property>
+            <property name="buddy" stdset="0">
+                <cstring>RaceCombo</cstring>
+            </property>
+        </widget>
+        <widget class="QComboBox" row="6" column="1" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>RaceCombo</cstring>
+            </property>
+        </widget>
+        <spacer row="2" column="2">
+            <property name="name">
+                <cstring>Spacer3</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
             </property>
         </spacer>
+        <widget class="QLabel" row="3" column="0">
+            <property name="name">
+                <cstring>NameLabel</cstring>
+            </property>
+            <property name="text">
+                <string>Na&amp;me</string>
+            </property>
+            <property name="buddy" stdset="0">
+                <cstring>NameLine</cstring>
+            </property>
+        </widget>
+        <widget class="QLabel" row="4" column="0">
+            <property name="name">
+                <cstring>EtaLabel</cstring>
+            </property>
+            <property name="text">
+                <string>E&amp;ta</string>
+            </property>
+            <property name="buddy" stdset="0">
+                <cstring>EtaSpin</cstring>
+            </property>
+        </widget>
+        <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>NameLine</cstring>
+            </property>
+        </widget>
+        <widget class="QSpinBox" row="4" column="1" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>EtaSpin</cstring>
+            </property>
+        </widget>
+        <widget class="QLabel" row="5" column="0">
+            <property name="name">
+                <cstring>StayLabel</cstring>
+            </property>
+            <property name="text">
+                <string>Stays</string>
+            </property>
+            <property name="buddy" stdset="0">
+                <cstring>StaySpin</cstring>
+            </property>
+            <property name="toolTip" stdset="0">
+                <string>Sets the number of ticks the fleet stays at the target, usually 3 for hostile and 6 for friendly. The fleet is disabled if stays is 0, and it stays the whole battle if it's -1</string>
+            </property>
+        </widget>
+        <widget class="QSpinBox" row="5" column="1" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>StaySpin</cstring>
+            </property>
+            <property name="minValue">
+                <number>-1</number>
+            </property>
+        </widget>
     </grid>
 </widget>
 <connections>
@@ -257,6 +267,18 @@
         <receiver>InfoView</receiver>
         <slot>RemoveButton_clicked()</slot>
     </connection>
+    <connection>
+        <sender>ApplyButton</sender>
+        <signal>clicked()</signal>
+        <receiver>InfoView</receiver>
+        <slot>ApplyButton_clicked()</slot>
+    </connection>
+    <connection>
+        <sender>NameLine</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>InfoView</receiver>
+        <slot>slotNameChanged(const QString&amp;)</slot>
+    </connection>
 </connections>
 <tabstops>
     <tabstop>NameLine</tabstop>
@@ -271,6 +293,11 @@
     <include location="global" impldecl="in declaration">vector</include>
     <include location="local" impldecl="in implementation">infoview.ui.h</include>
 </includes>
+<variables>
+    <variable>QString m_Name;</variable>
+    <variable>QString m_Battle;</variable>
+    <variable>QString m_Group;</variable>
+</variables>
 <signals>
     <signal>remove()</signal>
     <signal>cancel()</signal>
@@ -278,8 +305,8 @@
     <signal>add()</signal>
 </signals>
 <slots>
-    <slot access="protected">init()</slot>
-    <slot access="protected">destroy()</slot>
+    <slot>init()</slot>
+    <slot>destroy()</slot>
     <slot>setRaces( std::vector&lt;QString&gt; races )</slot>
     <slot>setEta( int eta )</slot>
     <slot>setFleetName( QString name )</slot>
@@ -291,6 +318,17 @@
     <slot>setGroup( QString s )</slot>
     <slot>setBattles( std::vector&lt;QString&gt; battles )</slot>
     <slot>setBattle( QString s )</slot>
+    <slot>enableNameChange( bool b )</slot>
+    <slot>enableRemove( bool b )</slot>
+    <slot>ApplyButton_clicked()</slot>
+    <slot returnType="QString">battle()</slot>
+    <slot returnType="int">eta()</slot>
+    <slot returnType="QString">fleetName()</slot>
+    <slot returnType="QString">group()</slot>
+    <slot returnType="QString">race()</slot>
+    <slot>slotNameChanged( const QString &amp; s )</slot>
+    <slot returnType="int">stays()</slot>
+    <slot>setStays( int ticks )</slot>
 </slots>
 <layoutdefaults spacing="0" margin="0"/>
 </UI>