X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fui%2Fresourceview.ui;h=7e2cb63ef89d67dd8add5226a9bb93e35febf9e4;hb=e0be1e6e8f7a246acf49e1f315c8d5bc5a65bfa3;hp=43438bd0f2cc5826f3a1d624c586ebf7a9bfc455;hpb=0ffaa1b7fc0af8df728154f0b6e8bf1b77555514;p=hbs.git

diff --git a/bs/ui/resourceview.ui b/bs/ui/resourceview.ui
index 43438bd..7e2cb63 100644
--- a/bs/ui/resourceview.ui
+++ b/bs/ui/resourceview.ui
@@ -10,8 +10,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>222</width>
-            <height>105</height>
+            <width>545</width>
+            <height>110</height>
         </rect>
     </property>
     <property name="sizePolicy">
@@ -25,26 +25,26 @@
     <property name="minimumSize">
         <size>
             <width>0</width>
-            <height>105</height>
+            <height>110</height>
         </size>
     </property>
     <property name="caption">
         <string>QGroupBoxForm</string>
     </property>
     <property name="title">
-        <string>Resources and Score</string>
+        <string>Roids/Salvage and Score</string>
     </property>
     <grid>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
-            <number>11</number>
+            <number>4</number>
         </property>
         <property name="spacing">
-            <number>6</number>
+            <number>5</number>
         </property>
-        <widget class="QLabel" row="0" column="1">
+        <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>crystalLabel</cstring>
             </property>
@@ -52,7 +52,7 @@
                 <string>Crystal</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="2">
+        <widget class="QLabel" row="0" column="4" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>eoniumLabel</cstring>
             </property>
@@ -60,9 +60,9 @@
                 <string>Eonium</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="3">
+        <widget class="QLineEdit" row="1" column="6" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>EoniumEdit</cstring>
+                <cstring>UninitEdit</cstring>
             </property>
             <property name="focusPolicy">
                 <enum>NoFocus</enum>
@@ -71,7 +71,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="1">
+        <widget class="QLineEdit" row="1" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>CrystalEdit</cstring>
             </property>
@@ -82,7 +82,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>metalLabel</cstring>
             </property>
@@ -90,9 +90,9 @@
                 <string>Metal</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="2">
+        <widget class="QLineEdit" row="1" column="4" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>UninitEdit</cstring>
+                <cstring>EoniumEdit</cstring>
             </property>
             <property name="focusPolicy">
                 <enum>NoFocus</enum>
@@ -101,9 +101,9 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLineEdit" row="2" column="1">
+        <widget class="QLineEdit" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>ScoreEdit</cstring>
+                <cstring>MetalEdit</cstring>
             </property>
             <property name="focusPolicy">
                 <enum>NoFocus</enum>
@@ -112,9 +112,17 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="0">
+        <widget class="QLabel" row="2" column="0">
             <property name="name">
-                <cstring>MetalEdit</cstring>
+                <cstring>ScoreLabel</cstring>
+            </property>
+            <property name="text">
+                <string>Score:</string>
+            </property>
+        </widget>
+        <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>ScoreEdit</cstring>
             </property>
             <property name="focusPolicy">
                 <enum>NoFocus</enum>
@@ -123,7 +131,18 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="3">
+        <widget class="QLabel" row="2" column="3">
+            <property name="name">
+                <cstring>ScoreLostLabel</cstring>
+            </property>
+            <property name="text">
+                <string>Difference</string>
+            </property>
+            <property name="toolTip" stdset="0">
+                <string>Shows the difference in score between the selected ticks.</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="0" column="6" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>uninitLabel</cstring>
             </property>
@@ -131,25 +150,31 @@
                 <string>Uninit</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="QLineEdit" row="2" column="4">
             <property name="name">
-                <cstring>ScoreLabel</cstring>
+                <cstring>ScoreLostEdit</cstring>
             </property>
-            <property name="text">
-                <string>Score:</string>
+            <property name="focusPolicy">
+                <enum>NoFocus</enum>
+            </property>
+            <property name="readOnly">
+                <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="2">
+        <widget class="QLabel" row="2" column="5" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>ScoreLostLabel</cstring>
+                <cstring>CostLabel</cstring>
             </property>
             <property name="text">
-                <string>Lost</string>
+                <string>Cost</string>
+            </property>
+            <property name="toolTip" stdset="0">
+                <string>The cost in k score / init roid</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="2" column="3">
+        <widget class="QLineEdit" row="2" column="7">
             <property name="name">
-                <cstring>ScoreLostEdit</cstring>
+                <cstring>CostEdit</cstring>
             </property>
             <property name="focusPolicy">
                 <enum>NoFocus</enum>
@@ -166,8 +191,8 @@
     <include location="local" impldecl="in implementation">resourceview.ui.h</include>
 </includes>
 <slots>
-    <slot>setLines( QString type, int i )</slot>
+    <slot>setLines( QString type, float i )</slot>
 </slots>
 <pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="5" margin="4"/>
 </UI>