X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Fui%2Fscanviewbase.ui;fp=bs%2Fui%2Fscanviewbase.ui;h=87f63d81e44a8ece1a9097ccf0f7e7afd0e4190a;hp=66275ef38dae5e58e766d068633c0dcfd162bfaf;hb=e0be1e6e8f7a246acf49e1f315c8d5bc5a65bfa3;hpb=5b3a1459c35efe60c4255a5c50a1d74fdbe8e8eb

diff --git a/bs/ui/scanviewbase.ui b/bs/ui/scanviewbase.ui
index 66275ef..87f63d8 100644
--- a/bs/ui/scanviewbase.ui
+++ b/bs/ui/scanviewbase.ui
@@ -1,6 +1,5 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>ScanViewBase</class>
-<layoutdefaults spacing="0" margin="0"/>
 <widget class="QWidget">
     <property name="name">
         <cstring>ScanViewBase</cstring>
@@ -9,24 +8,24 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>613</width>
-            <height>236</height>
+            <width>719</width>
+            <height>320</height>
         </rect>
     </property>
     <property name="caption">
         <string>Form1</string>
     </property>
-    <grid>
+    <hbox>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
-            <number>1</number>
+            <number>5</number>
         </property>
         <property name="spacing">
-            <number>1</number>
+            <number>4</number>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="QGroupBox">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -38,14 +37,17 @@
                     <cstring>unnamed</cstring>
                 </property>
                 <property name="margin">
-                    <number>11</number>
+                    <number>5</number>
                 </property>
                 <property name="spacing">
-                    <number>6</number>
+                    <number>4</number>
                 </property>
                 <widget class="QTextEdit">
                     <property name="name">
-                        <cstring>TextEdit1</cstring>
+                        <cstring>ScanEdit</cstring>
+                    </property>
+                    <property name="textFormat">
+                        <enum>PlainText</enum>
                     </property>
                 </widget>
                 <widget class="QButtonGroup">
@@ -58,19 +60,19 @@
                     <property name="title">
                         <string>Paste Type</string>
                     </property>
-                    <vbox>
+                    <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <property name="margin">
-                            <number>11</number>
+                            <number>5</number>
                         </property>
                         <property name="spacing">
-                            <number>6</number>
+                            <number>4</number>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
                             <property name="name">
-                                <cstring>RadioButton1</cstring>
+                                <cstring>NormalRadio</cstring>
                             </property>
                             <property name="text">
                                 <string>overview/unit-/pdsscan</string>
@@ -79,23 +81,74 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
                             <property name="name">
-                                <cstring>RadioButton3</cstring>
+                                <cstring>MilitaryRadio</cstring>
                             </property>
                             <property name="text">
                                 <string>Military scan</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2">
                             <property name="name">
-                                <cstring>RadioButton3_2</cstring>
+                                <cstring>GalstatusRadio</cstring>
                             </property>
                             <property name="text">
                                 <string>Galaxy status</string>
                             </property>
                         </widget>
-                    </vbox>
+                        <widget class="QPushButton" row="6" column="0">
+                            <property name="name">
+                                <cstring>ReplaceButton</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Replace</string>
+                            </property>
+                        </widget>
+                        <widget class="QPushButton" row="6" column="1">
+                            <property name="name">
+                                <cstring>ReplaceAllButton</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Replace all</string>
+                            </property>
+                        </widget>
+                        <spacer row="3" column="0">
+                            <property name="name">
+                                <cstring>Spacer1</cstring>
+                            </property>
+                            <property name="orientation">
+                                <enum>Vertical</enum>
+                            </property>
+                            <property name="sizeType">
+                                <enum>Expanding</enum>
+                            </property>
+                        </spacer>
+                        <widget class="QPushButton" row="4" column="0">
+                            <property name="name">
+                                <cstring>AddButton</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Add</string>
+                            </property>
+                        </widget>
+                        <widget class="QPushButton" row="5" column="0">
+                            <property name="name">
+                                <cstring>NewButton</cstring>
+                            </property>
+                            <property name="text">
+                                <string>New</string>
+                            </property>
+                        </widget>
+                        <widget class="QPushButton" row="5" column="1">
+                            <property name="name">
+                                <cstring>NewInfoButton</cstring>
+                            </property>
+                            <property name="text">
+                                <string>New (use info)</string>
+                            </property>
+                        </widget>
+                    </grid>
                 </widget>
                 <widget class="QButtonGroup">
                     <property name="name">
@@ -112,14 +165,14 @@
                             <cstring>unnamed</cstring>
                         </property>
                         <property name="margin">
-                            <number>11</number>
+                            <number>5</number>
                         </property>
                         <property name="spacing">
-                            <number>6</number>
+                            <number>4</number>
                         </property>
                         <widget class="QCheckBox">
                             <property name="name">
-                                <cstring>CheckBox4</cstring>
+                                <cstring>BaseCheck</cstring>
                             </property>
                             <property name="text">
                                 <string>Base fleet</string>
@@ -127,7 +180,7 @@
                         </widget>
                         <widget class="QCheckBox">
                             <property name="name">
-                                <cstring>CheckBox1</cstring>
+                                <cstring>Fleet1Check</cstring>
                             </property>
                             <property name="text">
                                 <string>Fleet 1</string>
@@ -135,7 +188,7 @@
                         </widget>
                         <widget class="QCheckBox">
                             <property name="name">
-                                <cstring>CheckBox3</cstring>
+                                <cstring>Fleet2Check</cstring>
                             </property>
                             <property name="text">
                                 <string>Fleet 2</string>
@@ -143,7 +196,7 @@
                         </widget>
                         <widget class="QCheckBox">
                             <property name="name">
-                                <cstring>CheckBox2</cstring>
+                                <cstring>Fleet3Check</cstring>
                             </property>
                             <property name="text">
                                 <string>Fleet 3</string>
@@ -153,23 +206,80 @@
                 </widget>
             </hbox>
         </widget>
-    </grid>
+    </hbox>
 </widget>
 <connections>
-    <connection language="C++">
-        <sender>RadioButton3</sender>
+    <connection>
+        <sender>MilitaryRadio</sender>
         <signal>toggled(bool)</signal>
         <receiver>FleetGroup</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
-    <slot access="protected" language="C++" returnType="void">destroy()</slot>
-    <slot access="protected" language="C++" returnType="void">init()</slot>
+    <connection>
+        <sender>AddButton</sender>
+        <signal>clicked()</signal>
+        <receiver>ScanViewBase</receiver>
+        <slot>slotButtonClicked()</slot>
+    </connection>
+    <connection>
+        <sender>NewButton</sender>
+        <signal>clicked()</signal>
+        <receiver>ScanViewBase</receiver>
+        <slot>slotButtonClicked()</slot>
+    </connection>
+    <connection>
+        <sender>NewInfoButton</sender>
+        <signal>clicked()</signal>
+        <receiver>ScanViewBase</receiver>
+        <slot>slotButtonClicked()</slot>
+    </connection>
+    <connection>
+        <sender>ReplaceAllButton</sender>
+        <signal>clicked()</signal>
+        <receiver>ScanViewBase</receiver>
+        <slot>slotButtonClicked()</slot>
+    </connection>
+    <connection>
+        <sender>ReplaceButton</sender>
+        <signal>clicked()</signal>
+        <receiver>ScanViewBase</receiver>
+        <slot>slotButtonClicked()</slot>
+    </connection>
+    <connection>
+        <sender>GalstatusRadio</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>AddButton</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>GalstatusRadio</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>NewInfoButton</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>GalstatusRadio</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>ReplaceButton</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>GalstatusRadio</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>ReplaceAllButton</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
 </connections>
-<functions>
-    <function name="destroy()" >{
-}</function>
-    <function name="init()" >{
-
-}</function>
-</functions>
+<includes>
+    <include location="local" impldecl="in implementation">scanviewbase.ui.h</include>
+</includes>
+<signals>
+    <signal>scanUsed(int, QString, int)</signal>
+</signals>
+<slots>
+    <slot access="protected">destroy()</slot>
+    <slot access="protected">init()</slot>
+    <slot>slotButtonClicked()</slot>
+</slots>
+<layoutdefaults spacing="4" margin="5"/>
 </UI>