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

diff --git a/bs/ui/infoview.ui b/bs/ui/infoview.ui
index e9e7ffa..b34ef8a 100644
--- a/bs/ui/infoview.ui
+++ b/bs/ui/infoview.ui
@@ -1,6 +1,7 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>InfoView</class>
-<layoutdefaults spacing="0" margin="0"/>
+<comment>A nice little widget who don't know much about the rest of the world.. ;)</comment>
+<author>Michael Andree</author>
 <widget class="QWidget">
     <property name="name">
         <cstring>InfoView</cstring>
@@ -9,10 +10,24 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>192</width>
-            <height>144</height>
+            <width>267</width>
+            <height>198</height>
         </rect>
     </property>
+    <property name="sizePolicy">
+        <sizepolicy>
+            <hsizetype>5</hsizetype>
+            <vsizetype>4</vsizetype>
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+        </sizepolicy>
+    </property>
+    <property name="maximumSize">
+        <size>
+            <width>32767</width>
+            <height>200</height>
+        </size>
+    </property>
     <property name="caption">
         <string>Form2</string>
     </property>
@@ -21,99 +36,119 @@
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
-            <number>1</number>
+            <number>3</number>
         </property>
         <property name="spacing">
-            <number>1</number>
+            <number>2</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="QLabel" row="1" column="0">
             <property name="name">
-                <cstring>Layout11</cstring>
+                <cstring>GroupLabel</cstring>
             </property>
-            <hbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>0</number>
+            <property name="text">
+                <string>&amp;Group</string>
+            </property>
+            <property name="buddy" stdset="0">
+                <cstring>GroupCombo</cstring>
+            </property>
+        </widget>
+        <widget class="QLabel" row="0" column="0">
+            <property name="name">
+                <cstring>BattleLabel</cstring>
+            </property>
+            <property name="text">
+                <string>&amp;Battle</string>
+            </property>
+            <property name="buddy" stdset="0">
+                <cstring>BattleCombo</cstring>
+            </property>
+        </widget>
+        <widget class="QComboBox" row="1" column="1" rowspan="1" colspan="2">
+            <item>
+                <property name="text">
+                    <string>Friendly</string>
                 </property>
-                <property name="spacing">
-                    <number>6</number>
+            </item>
+            <item>
+                <property name="text">
+                    <string>Hostile</string>
                 </property>
-                <widget class="QLayoutWidget">
-                    <property name="name">
-                        <cstring>Layout10</cstring>
-                    </property>
-                    <vbox>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLabel">
-                            <property name="name">
-                                <cstring>TextLabel3</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Name</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Eta</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Planet score</string>
-                            </property>
-                        </widget>
-                    </vbox>
-                </widget>
-                <widget class="QLayoutWidget">
-                    <property name="name">
-                        <cstring>Layout9</cstring>
-                    </property>
-                    <vbox>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLineEdit">
-                            <property name="name">
-                                <cstring>LineEdit5</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit">
-                            <property name="name">
-                                <cstring>LineEdit3</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit">
-                            <property name="name">
-                                <cstring>LineEdit4</cstring>
-                            </property>
-                        </widget>
-                    </vbox>
-                </widget>
-            </hbox>
+            </item>
+            <property name="name">
+                <cstring>GroupCombo</cstring>
+            </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>
+        </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>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <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">
             <property name="name">
                 <cstring>Layout13</cstring>
             </property>
@@ -129,22 +164,22 @@
                 </property>
                 <widget class="QPushButton">
                     <property name="name">
-                        <cstring>PushButton1</cstring>
+                        <cstring>ApplyButton</cstring>
                     </property>
                     <property name="text">
-                        <string>Apply</string>
+                        <string>&amp;Apply</string>
                     </property>
                 </widget>
                 <widget class="QPushButton">
                     <property name="name">
-                        <cstring>PushButton2</cstring>
+                        <cstring>CancelButton</cstring>
                     </property>
                     <property name="text">
-                        <string>Cancel</string>
+                        <string>&amp;Cancel</string>
                     </property>
                 </widget>
                 <spacer>
-                    <property name="name">
+                    <property name="name" stdset="0">
                         <cstring>Spacer1</cstring>
                     </property>
                     <property name="orientation">
@@ -162,40 +197,100 @@
                 </spacer>
                 <widget class="QPushButton">
                     <property name="name">
-                        <cstring>PushButton3</cstring>
+                        <cstring>NewButton</cstring>
                     </property>
                     <property name="enabled">
                         <bool>false</bool>
                     </property>
                     <property name="text">
-                        <string>New</string>
+                        <string>&amp;New</string>
                     </property>
                 </widget>
                 <widget class="QPushButton">
                     <property name="name">
-                        <cstring>PushButton4</cstring>
+                        <cstring>RemoveButton</cstring>
                     </property>
                     <property name="enabled">
                         <bool>false</bool>
                     </property>
                     <property name="text">
-                        <string>Remove</string>
+                        <string>&amp;Remove</string>
                     </property>
                 </widget>
             </hbox>
         </widget>
+        <spacer row="6" column="1">
+            <property name="name" stdset="0">
+                <cstring>Spacer4</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>
     </grid>
 </widget>
 <connections>
-    <slot access="protected" language="C++" returnType="void">init()</slot>
-    <slot access="protected" language="C++" returnType="void">destroy()</slot>
+    <connection>
+        <sender>CancelButton</sender>
+        <signal>clicked()</signal>
+        <receiver>InfoView</receiver>
+        <slot>CancelButton_clicked()</slot>
+    </connection>
+    <connection>
+        <sender>NewButton</sender>
+        <signal>clicked()</signal>
+        <receiver>InfoView</receiver>
+        <slot>NewButton_clicked()</slot>
+    </connection>
+    <connection>
+        <sender>RemoveButton</sender>
+        <signal>clicked()</signal>
+        <receiver>InfoView</receiver>
+        <slot>RemoveButton_clicked()</slot>
+    </connection>
 </connections>
-<functions>
-    <function name="init()" >{
-
-}</function>
-    <function name="destroy()" >{
-
-}</function>
-</functions>
+<tabstops>
+    <tabstop>NameLine</tabstop>
+    <tabstop>EtaSpin</tabstop>
+    <tabstop>RaceCombo</tabstop>
+    <tabstop>ApplyButton</tabstop>
+    <tabstop>CancelButton</tabstop>
+    <tabstop>NewButton</tabstop>
+    <tabstop>RemoveButton</tabstop>
+</tabstops>
+<includes>
+    <include location="global" impldecl="in declaration">vector</include>
+    <include location="local" impldecl="in implementation">infoview.ui.h</include>
+</includes>
+<signals>
+    <signal>remove()</signal>
+    <signal>cancel()</signal>
+    <signal>apply()</signal>
+    <signal>add()</signal>
+</signals>
+<slots>
+    <slot access="protected">init()</slot>
+    <slot access="protected">destroy()</slot>
+    <slot>setRaces( std::vector&lt;QString&gt; races )</slot>
+    <slot>setEta( int eta )</slot>
+    <slot>setFleetName( QString name )</slot>
+    <slot>setRace( QString name )</slot>
+    <slot>InfoView_destroyed( QObject * )</slot>
+    <slot>CancelButton_clicked()</slot>
+    <slot>NewButton_clicked()</slot>
+    <slot>RemoveButton_clicked()</slot>
+    <slot>setGroup( QString s )</slot>
+    <slot>setBattles( std::vector&lt;QString&gt; battles )</slot>
+    <slot>setBattle( QString s )</slot>
+</slots>
+<layoutdefaults spacing="0" margin="0"/>
 </UI>