The last commit before backup

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index 042adf7f3ceea322c518a0b92c9eb38ed1d784c0..76d812fa57567d6d061eb975344b80af325953be 100644 (file)
--- a/bs/bsview.cpp
+++ b/bs/bsview.cpp
@@ -21,6 +21,7 @@
 #include "scanview.h"
 #include "ui/infoview.h"
 #include "tickview.h"
+#include "ui/fleetviewbase.h"
 
 //QT includes
 #include <qlistview.h>
@@ -52,6 +53,8 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
        //the widget stack
        m_BattleSum = new BattleSum();
        m_FleetViews->addWidget(m_BattleSum, 0);
+       m_FleetView = new FleetViewBase();
+       m_FleetViews->addWidget(m_FleetView, 1);
 
        //m_FleetViews->raiseWidget(0);
        connect(m_NumberView, SIGNAL(selectionChanged(QListViewItem *)), SLOT(slotFleetSelection(QListViewItem *))); 

diff --git a/bs/bsview.h b/bs/bsview.h
index c90b2106be14142e9f772be7a8d4a3e39b0a5aaf..da4f562ed2a301affd152dac8d1cc61bb75a253f 100644 (file)
--- a/bs/bsview.h
+++ b/bs/bsview.h
@@ -28,6 +28,7 @@ class BattleSum;
 class ScanView;
 class InfoView;
 class TickView;
+class FleetViewBase;
 
 //QT forward declarations
 class QListView;
@@ -60,6 +61,7 @@ class BSView : public QSplitter
        InfoView                *m_InfoView;
        TickView                *m_TickView;
        QWidgetStack    *m_FleetViews;
+       FleetViewBase   *m_FleetView;
   
 public slots: // Public slots
   /** No descriptions */

diff --git a/bs/main.cpp b/bs/main.cpp
index e91959284000784b0cf6bdc33185a7863f00f5a5..d62cf3feb392f130ec9e23a7c2da2b77c514efd0 100644 (file)
--- a/bs/main.cpp
+++ b/bs/main.cpp
@@ -18,6 +18,8 @@
 #include <qapplication.h>
 #include <qfont.h>
 #include <qcdestyle.h>
+#include <qplatinumstyle.h>
+#include <qtranslator.h>
 
 #include "../config.h"
 #include "bs.h"
@@ -25,8 +27,12 @@
 int main(int argc, char *argv[])
 {
        QApplication a(argc, argv);
+       a.setStyle(new QPlatinumStyle);
        
        //QStyle* s = new QCDEStyle();
+       //QTranslator translator( 0 );
+       //translator.load( "se_SE.qm", "/home/whale/src/hbs" );
+       //a.installTranslator( &translator );
        
        a.setFont(QFont("times", 12));
        /* uncomment the following line, if you want a Windows 95 look*/

diff --git a/bs/ui/bsappbase.ui b/bs/ui/bsappbase.ui
index 0c34bec8dd27f97e8957fc3181ce438f36490828..f2714b5aa841fbb08669b31807f664ad02d05485 100644 (file)
--- a/bs/ui/bsappbase.ui
+++ b/bs/ui/bsappbase.ui
@@ -20,6 +20,14 @@
     <property name="name">
         <cstring>menubar</cstring>
     </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>726</width>
+            <height>30</height>
+        </rect>
+    </property>
     <item text="&amp;File" name="fileMenu">
         <action name="fileNewAction"/>
         <action name="fileOpenAction"/>
@@ -59,7 +67,6 @@
         <action name="fileNewAction"/>
         <action name="fileOpenAction"/>
         <action name="fileSaveAction"/>
-        <action name="fileSaveAsAction"/>
     </toolbar>
 </toolbars>
 <actions>

diff --git a/bs/ui/fleetviewbase.ui b/bs/ui/fleetviewbase.ui
index a736d64b576bc65833f424a6c2e14f53de2d4402..84fa863d6c971de7614fb33d2a85a1cd94a73e89 100644 (file)
--- a/bs/ui/fleetviewbase.ui
+++ b/bs/ui/fleetviewbase.ui
@@ -8,739 +8,530 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>600</width>
-            <height>480</height>
+            <width>605</width>
+            <height>332</height>
         </rect>
     </property>
     <property name="caption">
         <string>Form1</string>
     </property>
-    <widget class="QLayoutWidget">
+    <grid>
         <property name="name">
-            <cstring>Layout13</cstring>
+            <cstring>unnamed</cstring>
         </property>
-        <property name="geometry">
-            <rect>
-                <x>308</x>
-                <y>11</y>
-                <width>281</width>
-                <height>344</height>
-            </rect>
+        <property name="margin">
+            <number>11</number>
         </property>
-        <vbox>
+        <property name="spacing">
+            <number>6</number>
+        </property>
+        <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>unnamed</cstring>
-            </property>
-            <property name="margin">
-                <number>0</number>
+                <cstring>CaptureBox</cstring>
             </property>
-            <property name="spacing">
-                <number>6</number>
+            <property name="title">
+                <string>Captured roids</string>
             </property>
-            <widget class="QLayoutWidget">
-                <property name="name">
-                    <cstring>Layout12</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="QLayoutWidget">
-                        <property name="name">
-                            <cstring>Layout11</cstring>
-                        </property>
-                        <hbox>
-                            <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>TextLabel15</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Name</string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel">
-                                <property name="name">
-                                    <cstring>TextLabel16</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Total</string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel">
-                                <property name="name">
-                                    <cstring>TextLabel17</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>L/S</string>
-                                </property>
-                            </widget>
-                        </hbox>
-                    </widget>
-                    <widget class="QLayoutWidget">
-                        <property name="name">
-                            <cstring>Layout8</cstring>
-                        </property>
-                        <hbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <property name="margin">
-                                <number>0</number>
-                            </property>
-                            <property name="spacing">
-                                <number>6</number>
-                            </property>
-                            <widget class="QLayoutWidget">
-                                <property name="name">
-                                    <cstring>Layout2</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>SpiderLabel</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Spider</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>WraithLabel</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Wraith</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>BlackWidowLabel</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>BlackWidow</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>TextLabel9</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>TextLabel9</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>TextLabel10</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>TextLabel10</string>
-                                        </property>
-                                    </widget>
-                                </vbox>
-                            </widget>
-                            <widget class="QLayoutWidget">
-                                <property name="name">
-                                    <cstring>Layout7</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>LineEdit1_2</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit2_2</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit3_2</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit4_2</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit5_2</cstring>
-                                        </property>
-                                    </widget>
-                                </vbox>
-                            </widget>
-                            <widget class="QLayoutWidget">
-                                <property name="name">
-                                    <cstring>Layout6</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>LineEdit7_2</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit8_2</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit9_2</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit10_2</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit11_2</cstring>
-                                        </property>
-                                        <property name="readOnly">
-                                            <bool>true</bool>
-                                        </property>
-                                    </widget>
-                                </vbox>
-                            </widget>
-                        </hbox>
-                    </widget>
-                </vbox>
-            </widget>
-            <spacer>
+            <hbox>
                 <property name="name">
-                    <cstring>Spacer2</cstring>
+                    <cstring>unnamed</cstring>
                 </property>
-                <property name="orientation">
-                    <enum>Vertical</enum>
+                <property name="margin">
+                    <number>11</number>
                 </property>
-                <property name="sizeType">
-                    <enum>Expanding</enum>
+                <property name="spacing">
+                    <number>6</number>
                 </property>
-                <property name="sizeHint">
-                    <size>
-                        <width>20</width>
-                        <height>20</height>
-                    </size>
-                </property>
-            </spacer>
-        </vbox>
-    </widget>
-    <spacer>
-        <property name="name">
-            <cstring>Spacer1</cstring>
-        </property>
-        <property name="orientation">
-            <enum>Horizontal</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">
-        <property name="name">
-            <cstring>Layout15</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>11</x>
-                <y>11</y>
-                <width>284</width>
-                <height>305</height>
-            </rect>
-        </property>
-        <vbox>
+                <widget class="QLabel">
+                    <property name="name">
+                        <cstring>TextLabel18</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Metal</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit">
+                    <property name="name">
+                        <cstring>LineEdit23</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QLabel">
+                    <property name="name">
+                        <cstring>TextLabel19</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Crystal</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit">
+                    <property name="name">
+                        <cstring>LineEdit24</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QLabel">
+                    <property name="name">
+                        <cstring>TextLabel20</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Eonium</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit">
+                    <property name="name">
+                        <cstring>LineEdit25</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <spacer row="2" column="0">
             <property name="name">
-                <cstring>unnamed</cstring>
+                <cstring>Spacer4</cstring>
             </property>
-            <property name="margin">
-                <number>0</number>
+            <property name="orientation">
+                <enum>Vertical</enum>
             </property>
-            <property name="spacing">
-                <number>6</number>
+            <property name="sizeType">
+                <enum>Expanding</enum>
             </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="QLayoutWidget">
-                        <property name="name">
-                            <cstring>Layout9</cstring>
-                        </property>
-                        <hbox>
-                            <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>TextLabel12</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Name</string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel">
-                                <property name="name">
-                                    <cstring>TextLabel13</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Total</string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel">
-                                <property name="name">
-                                    <cstring>TextLabel14</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>L/S</string>
-                                </property>
-                            </widget>
-                        </hbox>
-                    </widget>
-                    <widget class="QLayoutWidget">
-                        <property name="name">
-                            <cstring>Layout5</cstring>
-                        </property>
-                        <hbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <property name="margin">
-                                <number>0</number>
-                            </property>
-                            <property name="spacing">
-                                <number>6</number>
-                            </property>
-                            <widget class="QLayoutWidget">
-                                <property name="name">
-                                    <cstring>Layout1</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>InterceptorLabel</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Interceptor</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>PheonixLabel</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Pheonix</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>WarfrigateLabel</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Warfrigate</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>DevistatorLabel</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Devistator</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>StarCruiserLabel</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>StarCruiser</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>DreadnaughLabel</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Dreadnaught</string>
-                                        </property>
-                                    </widget>
-                                </vbox>
-                            </widget>
-                            <widget class="QLayoutWidget">
-                                <property name="name">
-                                    <cstring>Layout3</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>LineEdit1</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit2</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>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit5</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit6</cstring>
-                                        </property>
-                                    </widget>
-                                </vbox>
-                            </widget>
-                            <widget class="QLayoutWidget">
-                                <property name="name">
-                                    <cstring>Layout4</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>LineEdit7</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit8</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit9</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit10</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit11</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLineEdit">
-                                        <property name="name">
-                                            <cstring>LineEdit12</cstring>
-                                        </property>
-                                    </widget>
-                                </vbox>
-                            </widget>
-                        </hbox>
-                    </widget>
-                </vbox>
-            </widget>
-            <spacer>
-                <property name="name">
-                    <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>
-        </vbox>
-    </widget>
-    <widget class="QGroupBox">
-        <property name="name">
-            <cstring>CaptureBox</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>11</x>
-                <y>361</y>
-                <width>578</width>
-                <height>51</height>
-            </rect>
-        </property>
-        <property name="title">
-            <string>Captured roids</string>
-        </property>
-        <hbox>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <spacer row="1" column="2" rowspan="2" colspan="1">
             <property name="name">
-                <cstring>unnamed</cstring>
+                <cstring>Spacer2</cstring>
             </property>
-            <property name="margin">
-                <number>11</number>
+            <property name="orientation">
+                <enum>Vertical</enum>
             </property>
-            <property name="spacing">
-                <number>6</number>
+            <property name="sizeType">
+                <enum>Expanding</enum>
             </property>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>TextLabel18</cstring>
-                </property>
-                <property name="text">
-                    <string>Metal</string>
-                </property>
-            </widget>
-            <widget class="QLineEdit">
-                <property name="name">
-                    <cstring>LineEdit23</cstring>
-                </property>
-                <property name="readOnly">
-                    <bool>true</bool>
-                </property>
-            </widget>
-            <widget class="QLabel">
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <widget class="QLayoutWidget" row="0" column="2">
+            <property name="name">
+                <cstring>Layout16</cstring>
+            </property>
+            <grid>
                 <property name="name">
-                    <cstring>TextLabel19</cstring>
+                    <cstring>unnamed</cstring>
                 </property>
-                <property name="text">
-                    <string>Crystal</string>
+                <property name="margin">
+                    <number>0</number>
                 </property>
-            </widget>
-            <widget class="QLineEdit">
-                <property name="name">
-                    <cstring>LineEdit24</cstring>
+                <property name="spacing">
+                    <number>6</number>
                 </property>
-                <property name="readOnly">
-                    <bool>true</bool>
-                </property>
-            </widget>
-            <widget class="QLabel">
+                <widget class="QLineEdit" row="3" column="2">
+                    <property name="name">
+                        <cstring>LineEdit9_2</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="3" column="1">
+                    <property name="name">
+                        <cstring>LineEdit3_2</cstring>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="1" column="1">
+                    <property name="name">
+                        <cstring>LineEdit1_2</cstring>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="3" column="0">
+                    <property name="name">
+                        <cstring>BlackWidowLabel</cstring>
+                    </property>
+                    <property name="text">
+                        <string>BlackWidow</string>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="1" column="0">
+                    <property name="name">
+                        <cstring>SpiderLabel</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Spider</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="4" column="2">
+                    <property name="name">
+                        <cstring>LineEdit10_2</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="4" column="1">
+                    <property name="name">
+                        <cstring>LineEdit4_2</cstring>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="2" column="0">
+                    <property name="name">
+                        <cstring>WraithLabel</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Wraith</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="1" column="2">
+                    <property name="name">
+                        <cstring>LineEdit7_2</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="0" column="2">
+                    <property name="name">
+                        <cstring>TextLabel17</cstring>
+                    </property>
+                    <property name="text">
+                        <string>L/S</string>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="0" column="0">
+                    <property name="name">
+                        <cstring>TextLabel15</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Name</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="2" column="1">
+                    <property name="name">
+                        <cstring>LineEdit2_2</cstring>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="5" column="0">
+                    <property name="name">
+                        <cstring>SpectreLabel</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Spectre</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="5" column="1">
+                    <property name="name">
+                        <cstring>LineEdit5_2</cstring>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="0" column="1">
+                    <property name="name">
+                        <cstring>TextLabel16</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Total</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="2" column="2">
+                    <property name="name">
+                        <cstring>LineEdit8_2</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="5" column="2">
+                    <property name="name">
+                        <cstring>LineEdit11_2</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="4" column="0">
+                    <property name="name">
+                        <cstring>TarantulaLabel</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Tarantula</string>
+                    </property>
+                </widget>
+            </grid>
+        </widget>
+        <widget class="QLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
+            <property name="name">
+                <cstring>Layout15</cstring>
+            </property>
+            <grid>
                 <property name="name">
-                    <cstring>TextLabel20</cstring>
-                </property>
-                <property name="text">
-                    <string>Eonium</string>
+                    <cstring>unnamed</cstring>
                 </property>
-            </widget>
-            <widget class="QLineEdit">
-                <property name="name">
-                    <cstring>LineEdit25</cstring>
+                <property name="margin">
+                    <number>0</number>
                 </property>
-                <property name="readOnly">
-                    <bool>true</bool>
+                <property name="spacing">
+                    <number>6</number>
                 </property>
-            </widget>
-        </hbox>
-    </widget>
-    <widget class="QGroupBox">
-        <property name="name">
-            <cstring>SalvageBox</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>11</x>
-                <y>418</y>
-                <width>578</width>
-                <height>51</height>
-            </rect>
-        </property>
-        <property name="title">
-            <string>Salvage</string>
-        </property>
-        <hbox>
+                <widget class="QLabel" row="0" column="1">
+                    <property name="name">
+                        <cstring>TextLabel13</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Total</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="3" column="1">
+                    <property name="name">
+                        <cstring>LineEdit3</cstring>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="0" column="0">
+                    <property name="name">
+                        <cstring>TextLabel12</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Name</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="6" column="2">
+                    <property name="name">
+                        <cstring>LineEdit12</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="6" column="1">
+                    <property name="name">
+                        <cstring>LineEdit6</cstring>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="2" column="1">
+                    <property name="name">
+                        <cstring>LineEdit2</cstring>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="0" column="2">
+                    <property name="name">
+                        <cstring>TextLabel14</cstring>
+                    </property>
+                    <property name="text">
+                        <string>L/S</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="2" column="2">
+                    <property name="name">
+                        <cstring>LineEdit8</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="3" column="0">
+                    <property name="name">
+                        <cstring>WarfrigateLabel</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Warfrigate</string>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="4" column="0">
+                    <property name="name">
+                        <cstring>DevistatorLabel</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Devistator</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="3" column="2">
+                    <property name="name">
+                        <cstring>LineEdit9</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="4" column="1">
+                    <property name="name">
+                        <cstring>LineEdit4</cstring>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="5" column="0">
+                    <property name="name">
+                        <cstring>StarCruiserLabel</cstring>
+                    </property>
+                    <property name="text">
+                        <string>StarCruiser</string>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="2" column="0">
+                    <property name="name">
+                        <cstring>PheonixLabel</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Pheonix</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="4" column="2">
+                    <property name="name">
+                        <cstring>LineEdit10</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="1" column="1">
+                    <property name="name">
+                        <cstring>LineEdit1</cstring>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="6" column="0">
+                    <property name="name">
+                        <cstring>DreadnaughLabel</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Dreadnaught</string>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="5" column="1">
+                    <property name="name">
+                        <cstring>LineEdit5</cstring>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="1" column="2">
+                    <property name="name">
+                        <cstring>LineEdit7</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QLineEdit" row="5" column="2">
+                    <property name="name">
+                        <cstring>LineEdit11</cstring>
+                    </property>
+                    <property name="focusPolicy">
+                        <enum>NoFocus</enum>
+                    </property>
+                    <property name="readOnly">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QLabel" row="1" column="0">
+                    <property name="name">
+                        <cstring>InterceptorLabel</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Interceptor</string>
+                    </property>
+                </widget>
+            </grid>
+        </widget>
+        <spacer row="0" column="1">
             <property name="name">
-                <cstring>unnamed</cstring>
+                <cstring>Spacer1</cstring>
             </property>
-            <property name="margin">
-                <number>11</number>
+            <property name="orientation">
+                <enum>Horizontal</enum>
             </property>
-            <property name="spacing">
-                <number>6</number>
+            <property name="sizeType">
+                <enum>Expanding</enum>
             </property>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>TextLabel18_2</cstring>
-                </property>
-                <property name="text">
-                    <string>Metal</string>
-                </property>
-            </widget>
-            <widget class="QLineEdit">
-                <property name="name">
-                    <cstring>LineEdit23_2</cstring>
-                </property>
-                <property name="readOnly">
-                    <bool>true</bool>
-                </property>
-            </widget>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>TextLabel19_2</cstring>
-                </property>
-                <property name="text">
-                    <string>Crystal</string>
-                </property>
-            </widget>
-            <widget class="QLineEdit">
-                <property name="name">
-                    <cstring>LineEdit24_2</cstring>
-                </property>
-                <property name="readOnly">
-                    <bool>true</bool>
-                </property>
-            </widget>
-            <widget class="QLabel">
-                <property name="name">
-                    <cstring>TextLabel20_2</cstring>
-                </property>
-                <property name="text">
-                    <string>Eonium</string>
-                </property>
-            </widget>
-            <widget class="QLineEdit">
-                <property name="name">
-                    <cstring>LineEdit25_2</cstring>
-                </property>
-                <property name="readOnly">
-                    <bool>true</bool>
-                </property>
-            </widget>
-        </hbox>
-    </widget>
-    <widget class="QPushButton">
-        <property name="name">
-            <cstring>PushButton1</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>170</x>
-                <y>330</y>
-                <width>80</width>
-                <height>25</height>
-            </rect>
-        </property>
-        <property name="text">
-            <string>PushButton1</string>
-        </property>
-        <property name="toggleButton">
-            <bool>true</bool>
-        </property>
-        <property name="toggleButton">
-            <bool>true</bool>
-        </property>
-    </widget>
+            <property name="sizeHint">
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+    </grid>
 </widget>
 <connections>
-    <connection>
-        <sender>PushButton1</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>FleetViewBase</receiver>
-        <slot>slotAttacker(bool)</slot>
-    </connection>
 </connections>
+<tabstops>
+    <tabstop>LineEdit1</tabstop>
+    <tabstop>LineEdit2</tabstop>
+    <tabstop>LineEdit3</tabstop>
+    <tabstop>LineEdit4</tabstop>
+    <tabstop>LineEdit5</tabstop>
+    <tabstop>LineEdit6</tabstop>
+    <tabstop>LineEdit1_2</tabstop>
+    <tabstop>LineEdit2_2</tabstop>
+    <tabstop>LineEdit3_2</tabstop>
+    <tabstop>LineEdit4_2</tabstop>
+    <tabstop>LineEdit5_2</tabstop>
+    <tabstop>LineEdit8</tabstop>
+    <tabstop>LineEdit23</tabstop>
+    <tabstop>LineEdit24</tabstop>
+    <tabstop>LineEdit25</tabstop>
+    <tabstop>LineEdit7</tabstop>
+    <tabstop>LineEdit9</tabstop>
+    <tabstop>LineEdit10</tabstop>
+    <tabstop>LineEdit11</tabstop>
+    <tabstop>LineEdit12</tabstop>
+    <tabstop>LineEdit7_2</tabstop>
+    <tabstop>LineEdit8_2</tabstop>
+    <tabstop>LineEdit9_2</tabstop>
+    <tabstop>LineEdit10_2</tabstop>
+    <tabstop>LineEdit11_2</tabstop>
+</tabstops>
 <includes>
     <include location="local" impldecl="in implementation">fleetviewbase.ui.h</include>
 </includes>
 <slots>
-    <slot>slotAttacker( bool b )</slot>
+    <slot>slotAttacker(bool b)</slot>
 </slots>
 <pixmapinproject/>
 <layoutdefaults spacing="6" margin="11"/>

diff --git a/bs/ui/fleetviewbase.ui.h b/bs/ui/fleetviewbase.ui.h
index 89d1385bcb9f3bc23877ba7b793c465b6e25fbba..05111a467a130b7f928706a257b42d327243951b 100644 (file)
--- a/bs/ui/fleetviewbase.ui.h
+++ b/bs/ui/fleetviewbase.ui.h
@@ -11,12 +11,10 @@ void FleetViewBase::slotAttacker(bool b)
 {
     if (b)
     {
-       CaptureBox->show();
-       SalvageBox->hide();
+       CaptureBox->setCaption("Captured roids");
     }
     else
     {
-       SalvageBox->show();
-       CaptureBox->hid();
+       CaptureBox->setCaption("Salvage");
     }
 }
\ No newline at end of file

diff --git a/hbs.kdevprj b/hbs.kdevprj
index 2f0679d17bd958759831447f78ca66342ab29280..2a0fbc81696a407af6bdc7204bc42efe1c5bc4c4 100644 (file)
--- a/hbs.kdevprj
+++ b/hbs.kdevprj
@@ -91,37 +91,37 @@ files=bs/bs.cpp,bs/bs.h,bs/bsdoc.cpp,bs/bsdoc.h,bs/bsview.cpp,bs/bsview.h,bs/mai
 sub_dirs=
 type=prog_main
 
-[bs/bs.cpp]
+[bs/battlesum.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bs/bs.h]
+[bs/battlesum.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bs/bsdoc.cpp]
+[bs/bs.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bs/bsdoc.h]
+[bs/bs.h]
 dist=true
 install=false
 install_location=
 type=HEADER
 
-[bs/battlesum.cpp]
+[bs/bsdoc.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[bs/battlesum.h]
+[bs/bsdoc.h]
 dist=true
 install=false
 install_location=

diff --git a/hbs.kdevses b/hbs.kdevses
index e0922eef705935fee8741759d7cbedc5a43dbe4d..7d79bcf82ad779e70ab06abf55ce2796ad55527d 100644 (file)
--- a/hbs.kdevses
+++ b/hbs.kdevses
@@ -2,7 +2,7 @@
  <Mainframe MaximizeMode="0" />
  <DocsAndViews NumberOfDocuments="1" >
   <Doc0 Type="CDocBrowser" NumberOfViews="1" FileName="file:/home/src/qt-3/doc/html/index.html" >
-   <View Top="0" Width="725" Attach="0" Height="390" Left="0" Focus="0" Type="KHTMLView" MinMaxMode="0" />
+   <View Top="0" Width="715" Attach="0" Height="387" Left="0" Focus="0" Type="KHTMLView" MinMaxMode="0" />
   </Doc0>
  </DocsAndViews>
 </KDevPrjSession>

diff --git a/hbs.pro b/hbs.pro
index 565dabcf0a74b419ee364266d3cf94dfe3b0ed6f..99b2154bcc9d5afae29e71180510a994acfe6d33 100644 (file)
--- a/hbs.pro
+++ b/hbs.pro
@@ -4,7 +4,8 @@ HEADERS += bs/bs.h bs/bsdoc.h bs/bsview.h bs/battlesum.h config.h bs/scanview.h
 TARGET = bs/bs
 IMAGEFILE      = images.cpp
 PROJECTNAME    = BS
-FORMS  = bs/ui/battlesumbase.ui bs/ui/scanviewbase.ui bs/ui/infoview.ui bs/ui/tickviewbase.ui bs/ui/bsappbase.ui 
+TRANSLATIONS = sv_SE.ts
+FORMS  = bs/ui/battlesumbase.ui bs/ui/scanviewbase.ui bs/ui/infoview.ui bs/ui/tickviewbase.ui bs/ui/bsappbase.ui bs/ui/fleetviewbase.ui 
 TEMPLATE       =app
 CONFIG += qt warn_on debug thread
 DBFILE = hbs.db