some changes..

diff --git a/bs/bsconf.cpp b/bs/bsconf.cpp
index 816fd09865f86a8cf362202f9b22441e3056f887..ea32b7e68314cff5e39762f7f7871326ba7ea818 100644 (file)
--- a/bs/bsconf.cpp
+++ b/bs/bsconf.cpp
@@ -32,9 +32,10 @@ using namespace std;
 BSConf::BSConf()
 {
        QSettings settings;
+       //settings.insertSearchPath(QSettings::Unix);
 
-       m_sRaceFilename = settings.readEntry("/hbs/RaceFilename", "/usr/share/hbs/race.conf");
-       m_sStatsFilename = settings.readEntry("/hbs/StatsFilename", "/usr/share/hbs/stats.conf");
+       m_sRaceFilename = settings.readEntry("/hbs/ConfFiles/RaceFilename", "/usr/share/hbs/race.conf");
+       m_sStatsFilename = settings.readEntry("/hbs/ConfFiles/StatsFilename", "/usr/share/hbs/stats.conf");
        
        loadRace();
        loadStats();

diff --git a/bs/bsdoc.h b/bs/bsdoc.h
index bcfcfd08e450123c32a0aa6322d0280f3e06698a..4cd0ee6d9a28cbb6a479e21ed0672472b2007404 100644 (file)
--- a/bs/bsdoc.h
+++ b/bs/bsdoc.h
@@ -76,6 +76,8 @@ class BSDoc : public QObject
        void removeFleet(QString battle, QString group, QString fleet);
 
        void runBattleSimulation();
+
+       void parseScan();
   signals:
     void documentChanged();
 

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index df3f558d97de534a8a5d37512581b9c1de3c2a4f..9212fb166c4295cad4be300ebe67186993f4a51b 100644 (file)
--- a/bs/bsview.cpp
+++ b/bs/bsview.cpp
@@ -85,7 +85,7 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
        //the right side
        //m_TickView = new TickView(m_RightSplit);
        m_FleetViews = new QWidgetStack(m_RightSplit);
-       //m_ScanView = new ScanView(m_RightSplit);
+       m_ScanView = new ScanView(m_RightSplit);
        
        Fleet fl1;
        //fl1.setRace(tr("Terran").latin1());
@@ -107,6 +107,7 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
        connect(m_NumberView, SIGNAL(selectionChanged(QListViewItem *)), SLOT(slotFleetSelection(QListViewItem *)));
        connect(m_FleetView, SIGNAL(fleetChanged(const Fleet*)), SLOT(slotFleetChanged(const Fleet*)));
        connect(m_GenericFleetView, SIGNAL(fleetChanged(const Fleet*)), SLOT(slotFleetChanged(const Fleet*)));
+       connect(m_ScanView, SIGNAL(scanUsed(int,QString, int)), SLOT(slotUseScan(int, QString, int)));
 }
 
 BSView::~BSView()
@@ -439,3 +440,12 @@ void BSView::slotResultModeChanged( int i)
        
        m_iResultMode = i;
 }
+
+//////////////////////////////////////////////////////////////////////////
+//
+void BSView::slotUseScan(int action, QString text, int fleets)
+{
+       cerr << "Action: " << action << endl;
+       cerr << "Text: " << text.latin1() << endl;
+       cerr << "Fleets: " << fleets << endl;
+}

diff --git a/bs/bsview.h b/bs/bsview.h
index 391a777658f67c7827bd95576d0d0926c1125629..b87c1c695e4c4cfb753b8a7c7f348ce97e52a57b 100644 (file)
--- a/bs/bsview.h
+++ b/bs/bsview.h
@@ -61,6 +61,7 @@ class BSView : public QSplitter
        void slotInfoRemove();
        void slotTickChanged(int min, int max);
        void slotResultModeChanged( int i);
+       void slotUseScan(int action, QString text, int fleets);
 
   protected:
 

diff --git a/bs/planet.cpp b/bs/planet.cpp
index fdeb78989e47e37cf2f7f09a34af04b139f57c31..c819323d76bde827bde8414b7b8c3b620ef2355c 100644 (file)
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -134,7 +134,7 @@ void Planet::takeRoids(std::string type, int number, int tick)
        m_Roids[type][tick] -= number;
 
        if (type != "uninit")
-               addPlanetScore(-3000*number, tick);
+               addPlanetScore(-1000*number, tick);
 }
 
 

diff --git a/bs/ui/bsappbase.ui b/bs/ui/bsappbase.ui
index 1c0c88f8035c0ea023453d76434e310ba9c47543..ed313f63a5184da2a039d751d82c294b30890d5d 100644 (file)
--- a/bs/ui/bsappbase.ui
+++ b/bs/ui/bsappbase.ui
@@ -25,7 +25,7 @@
             <x>0</x>
             <y>0</y>
             <width>700</width>
-            <height>24</height>
+            <height>23</height>
         </rect>
     </property>
     <item text="&amp;File" name="fileMenu">
@@ -95,7 +95,7 @@
             </item>
             <item>
                 <property name="text">
-                    <string>Survived unts</string>
+                    <string>Survived units</string>
                 </property>
             </item>
         </widget>

diff --git a/bs/ui/infoview.ui b/bs/ui/infoview.ui
index a8ed7ac42fcdcf35736b07b593c115cd4785b7cd..2a22c689d03c711ff7e878b431a489442e279bd9 100644 (file)
--- a/bs/ui/infoview.ui
+++ b/bs/ui/infoview.ui
@@ -10,8 +10,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>267</width>
-            <height>221</height>
+            <width>302</width>
+            <height>217</height>
         </rect>
     </property>
     <property name="sizePolicy">
@@ -36,10 +36,10 @@
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
-            <number>0</number>
+            <number>4</number>
         </property>
         <property name="spacing">
-            <number>0</number>
+            <number>5</number>
         </property>
         <widget class="QLabel" row="1" column="0">
             <property name="name">
@@ -101,7 +101,7 @@
                     <number>0</number>
                 </property>
                 <property name="spacing">
-                    <number>0</number>
+                    <number>5</number>
                 </property>
                 <widget class="QPushButton">
                     <property name="name">
@@ -330,5 +330,5 @@
     <slot returnType="int">stays()</slot>
     <slot>setStays( int ticks )</slot>
 </slots>
-<layoutdefaults spacing="0" margin="0"/>
+<layoutdefaults spacing="5" margin="4"/>
 </UI>

diff --git a/bs/ui/resourceview.ui b/bs/ui/resourceview.ui
index e1faa9887aff210e377e671a01ea975e07dc4200..7e2cb63ef89d67dd8add5226a9bb93e35febf9e4 100644 (file)
--- a/bs/ui/resourceview.ui
+++ b/bs/ui/resourceview.ui
@@ -10,7 +10,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>549</width>
+            <width>545</width>
             <height>110</height>
         </rect>
     </property>
@@ -39,10 +39,10 @@
             <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="2" rowspan="1" colspan="2">
             <property name="name">
@@ -194,5 +194,5 @@
     <slot>setLines( QString type, float i )</slot>
 </slots>
 <pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="5" margin="4"/>
 </UI>

diff --git a/bs/ui/roidseditview.ui b/bs/ui/roidseditview.ui
index f77d5b5a98b479d48893fa31341adc3f645bf657..124a69d7456dcb0916b3b8a7e686b2737ed016f5 100644 (file)
--- a/bs/ui/roidseditview.ui
+++ b/bs/ui/roidseditview.ui
@@ -33,10 +33,10 @@
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
-            <number>2</number>
+            <number>4</number>
         </property>
         <property name="spacing">
-            <number>2</number>
+            <number>5</number>
         </property>
         <widget class="QLabel" row="0" column="3">
             <property name="name">
@@ -258,5 +258,5 @@
     <slot>slotSetLost( QString type, float i )</slot>
 </slots>
 <pixmapinproject/>
-<layoutdefaults spacing="0" margin="2"/>
+<layoutdefaults spacing="5" margin="4"/>
 </UI>

diff --git a/bs/ui/scanviewbase.ui b/bs/ui/scanviewbase.ui
index 66275ef38dae5e58e766d068633c0dcfd162bfaf..87f63d81e44a8ece1a9097ccf0f7e7afd0e4190a 100644 (file)
--- 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>