]> ruin.nu Git - hbs.git/commitdiff
Some changes
authorMichael Andreen <harv@ruin.nu>
Tue, 20 Nov 2001 18:23:25 +0000 (18:23 +0000)
committerMichael Andreen <harv@ruin.nu>
Tue, 20 Nov 2001 18:23:25 +0000 (18:23 +0000)
bs/bsview.cpp
bs/main.cpp
bs/ui/fleetviewbase.ui
bs/ui/fleetviewbase.ui.h
bs/ui/tickviewbase.ui
bs/ui/tickviewbase.ui.h
hbs.kdevses

index 76d812fa57567d6d061eb975344b80af325953be..5da0e0654c36b0b323b6a9aa23678453da303336 100644 (file)
@@ -27,6 +27,9 @@
 #include <qlistview.h>
 #include <qwidgetstack.h>
 
 #include <qlistview.h>
 #include <qwidgetstack.h>
 
+#include <iostream>
+using namespace std;
+
 BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 {
   /** connect doc with the view*/
 BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 {
   /** connect doc with the view*/
@@ -66,9 +69,10 @@ BSView::~BSView()
 
 void BSView::addBattle(QString name)
 {
 
 void BSView::addBattle(QString name)
 {
-       QListViewItem *battle = new QListViewItem(m_NumberView, name);
-       (void) new QListViewItem(battle, "Defenders");
-       (void) new QListViewItem(battle, "Attackers");
+       QListViewItem* battle = new QListViewItem(m_NumberView, name);
+       QListViewItem* def = new QListViewItem(battle, tr("Defenders"),"", "","1");
+       (void) new QListViewItem(battle, tr("Attackers"),"", "","2");
+       (void) new QListViewItem(def, tr("Home Planet"), "","","1");
 }
 
 void BSView::slotDocumentChanged()
 }
 
 void BSView::slotDocumentChanged()
@@ -77,14 +81,50 @@ void BSView::slotDocumentChanged()
 
 }
 /** No descriptions */
 
 }
 /** No descriptions */
-void BSView::slotFleetSelection(QListViewItem *lvi){
+void BSView::slotFleetSelection(QListViewItem *lvi)
+{
+       //cout << lvi->parent()->text(2).toLocal8bit() << endl;
+//     for (int i = 0; i < 5; i++)
+//             cout << lvi->text(i).local8Bit() << endl;
+       
+
        if (lvi->parent() == '\0')
        {
                m_FleetViews->raiseWidget(0);
        }
        else if (lvi->parent()->parent() == '\0')
        {
        if (lvi->parent() == '\0')
        {
                m_FleetViews->raiseWidget(0);
        }
        else if (lvi->parent()->parent() == '\0')
        {
+                       m_FleetView->slotHomePlanet(false);
+               if (lvi->text(3) == "1")
+               {
+                       m_FleetView->slotAttacker(false);
+               }
+               else
+               {
+                       m_FleetView->slotAttacker(true);
+               }
                m_FleetViews->raiseWidget(1);
                m_FleetViews->raiseWidget(1);
+               
        }
        }
+       else
+       {
+               if (lvi->parent()->text(3) == "1")
+               {
+                       m_FleetView->slotAttacker(false);
+                       m_FleetView->slotHomePlanet(false);
+                       if (lvi->text(3) == "1")
+                       {
+                               m_FleetView->slotHomePlanet(true);
+                       }
+               }
+               else
+               {
+                       m_FleetView->slotAttacker(true);
+                       m_FleetView->slotHomePlanet(false);
+               }
+               m_FleetViews->raiseWidget(1);
+                               
+       }
+
        
 }
        
 }
index d62cf3feb392f130ec9e23a7c2da2b77c514efd0..387e302169dc2394fb5bc6158e6a0a6b49acdae3 100644 (file)
@@ -18,7 +18,6 @@
 #include <qapplication.h>
 #include <qfont.h>
 #include <qcdestyle.h>
 #include <qapplication.h>
 #include <qfont.h>
 #include <qcdestyle.h>
-#include <qplatinumstyle.h>
 #include <qtranslator.h>
 
 #include "../config.h"
 #include <qtranslator.h>
 
 #include "../config.h"
 int main(int argc, char *argv[])
 {
        QApplication a(argc, argv);
 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 );
        
        
        //QStyle* s = new QCDEStyle();
        //QTranslator translator( 0 );
        //translator.load( "se_SE.qm", "/home/whale/src/hbs" );
        //a.installTranslator( &translator );
        
-       a.setFont(QFont("times", 12));
+       //a.setFont(QFont("times", 12));
        /* uncomment the following line, if you want a Windows 95 look*/
        // a.setStyle(WindowsStyle);
        //a.setStyle(s);
        /* uncomment the following line, if you want a Windows 95 look*/
        // a.setStyle(WindowsStyle);
        //a.setStyle(s);
index 84fa863d6c971de7614fb33d2a85a1cd94a73e89..eb940f0a85cb4bf119223cfcd6ea6e2f454e8538 100644 (file)
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>605</width>
-            <height>332</height>
+            <width>627</width>
+            <height>414</height>
         </rect>
     </property>
     <property name="caption">
         </rect>
     </property>
     <property name="caption">
         <property name="spacing">
             <number>6</number>
         </property>
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="3">
+        <widget class="QGroupBox" row="2" column="0">
             <property name="name">
             <property name="name">
-                <cstring>CaptureBox</cstring>
+                <cstring>RoidsGroup</cstring>
             </property>
             <property name="title">
             </property>
             <property name="title">
-                <string>Captured roids</string>
+                <string>Roids</string>
             </property>
             </property>
-            <hbox>
+            <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <property name="spacing">
                     <number>6</number>
                 </property>
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="QLabel" row="0" column="1">
                     <property name="name">
                     <property name="name">
-                        <cstring>TextLabel18</cstring>
+                        <cstring>TextLabel1</cstring>
                     </property>
                     <property name="text">
                         <string>Metal</string>
                     </property>
                 </widget>
                     </property>
                     <property name="text">
                         <string>Metal</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="QLineEdit" row="2" column="1">
                     <property name="name">
                     <property name="name">
-                        <cstring>LineEdit23</cstring>
-                    </property>
-                    <property name="focusPolicy">
-                        <enum>NoFocus</enum>
+                        <cstring>LineEdit27</cstring>
                     </property>
                     <property name="readOnly">
                         <bool>true</bool>
                     </property>
                 </widget>
                     </property>
                     <property name="readOnly">
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="QLineEdit" row="1" column="2">
                     <property name="name">
                     <property name="name">
-                        <cstring>TextLabel19</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Crystal</string>
+                        <cstring>LineEdit29</cstring>
                     </property>
                 </widget>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="QLineEdit" row="2" column="2">
                     <property name="name">
                     <property name="name">
-                        <cstring>LineEdit24</cstring>
-                    </property>
-                    <property name="focusPolicy">
-                        <enum>NoFocus</enum>
+                        <cstring>LineEdit28</cstring>
                     </property>
                     <property name="readOnly">
                         <bool>true</bool>
                     </property>
                 </widget>
                     </property>
                     <property name="readOnly">
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="QLabel" row="0" column="2">
                     <property name="name">
                     <property name="name">
-                        <cstring>TextLabel20</cstring>
+                        <cstring>TextLabel2</cstring>
                     </property>
                     <property name="text">
                     </property>
                     <property name="text">
-                        <string>Eonium</string>
+                        <string>Crystal</string>
                     </property>
                 </widget>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="QLineEdit" row="1" column="3">
                     <property name="name">
                     <property name="name">
-                        <cstring>LineEdit25</cstring>
-                    </property>
-                    <property name="focusPolicy">
-                        <enum>NoFocus</enum>
-                    </property>
-                    <property name="readOnly">
-                        <bool>true</bool>
+                        <cstring>LineEdit31</cstring>
                     </property>
                 </widget>
                     </property>
                 </widget>
-            </hbox>
-        </widget>
-        <spacer row="2" column="0">
-            <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>
-        <spacer row="1" column="2" rowspan="2" colspan="1">
-            <property name="name">
-                <cstring>Spacer2</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QLayoutWidget" row="0" column="2">
-            <property name="name">
-                <cstring>Layout16</cstring>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>0</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLineEdit" row="3" column="2">
+                <widget class="QLineEdit" row="2" column="3">
                     <property name="name">
                     <property name="name">
-                        <cstring>LineEdit9_2</cstring>
-                    </property>
-                    <property name="focusPolicy">
-                        <enum>NoFocus</enum>
+                        <cstring>LineEdit30</cstring>
                     </property>
                     <property name="readOnly">
                         <bool>true</bool>
                     </property>
                 </widget>
                     </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">
+                <widget class="QLabel" row="0" column="3">
                     <property name="name">
                     <property name="name">
-                        <cstring>BlackWidowLabel</cstring>
+                        <cstring>TextLabel3</cstring>
                     </property>
                     <property name="text">
                     </property>
                     <property name="text">
-                        <string>BlackWidow</string>
+                        <string>Eonium</string>
                     </property>
                 </widget>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="QLabel" row="0" column="4">
                     <property name="name">
                     <property name="name">
-                        <cstring>SpiderLabel</cstring>
+                        <cstring>TextLabel4</cstring>
                     </property>
                     <property name="text">
                     </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>
+                        <string>Uninit</string>
                     </property>
                 </widget>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="QLineEdit" row="1" column="4">
                     <property name="name">
                     <property name="name">
-                        <cstring>WraithLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Wraith</string>
+                        <cstring>LineEdit32</cstring>
                     </property>
                 </widget>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="2">
+                <widget class="QLineEdit" row="2" column="4">
                     <property name="name">
                     <property name="name">
-                        <cstring>LineEdit7_2</cstring>
-                    </property>
-                    <property name="focusPolicy">
-                        <enum>NoFocus</enum>
+                        <cstring>LineEdit33</cstring>
                     </property>
                     <property name="readOnly">
                         <bool>true</bool>
                     </property>
                 </widget>
                     </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">
+                <widget class="QLabel" row="1" column="0">
                     <property name="name">
                     <property name="name">
-                        <cstring>TextLabel16</cstring>
+                        <cstring>TextLabel5</cstring>
                     </property>
                     <property name="text">
                         <string>Total</string>
                     </property>
                 </widget>
                     </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">
+                <widget class="QLabel" row="2" column="0">
                     <property name="name">
                     <property name="name">
-                        <cstring>LineEdit11_2</cstring>
-                    </property>
-                    <property name="focusPolicy">
-                        <enum>NoFocus</enum>
+                        <cstring>TextLabel6</cstring>
                     </property>
                     </property>
-                    <property name="readOnly">
-                        <bool>true</bool>
+                    <property name="text">
+                        <string>Lost</string>
                     </property>
                 </widget>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="QLineEdit" row="1" column="1">
                     <property name="name">
                     <property name="name">
-                        <cstring>TarantulaLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Tarantula</string>
+                        <cstring>LineEdit26</cstring>
                     </property>
                 </widget>
             </grid>
         </widget>
                     </property>
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
+        <widget class="QGroupBox" row="3" column="0">
             <property name="name">
             <property name="name">
-                <cstring>Layout15</cstring>
+                <cstring>CaptureBox</cstring>
             </property>
             </property>
-            <grid>
+            <property name="title">
+                <string>Captured roids</string>
+            </property>
+            <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <property name="margin">
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <property name="margin">
-                    <number>0</number>
+                    <number>11</number>
                 </property>
                 <property name="spacing">
                     <number>6</number>
                 </property>
                 </property>
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <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">
+                <widget class="QLabel">
                     <property name="name">
                     <property name="name">
-                        <cstring>TextLabel14</cstring>
+                        <cstring>TextLabel18</cstring>
                     </property>
                     <property name="text">
                     </property>
                     <property name="text">
-                        <string>L/S</string>
+                        <string>Metal</string>
                     </property>
                 </widget>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="2">
+                <widget class="QLineEdit">
                     <property name="name">
                     <property name="name">
-                        <cstring>LineEdit8</cstring>
+                        <cstring>MetalLine</cstring>
                     </property>
                     <property name="focusPolicy">
                         <enum>NoFocus</enum>
                     </property>
                     <property name="focusPolicy">
                         <enum>NoFocus</enum>
                         <bool>true</bool>
                     </property>
                 </widget>
                         <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">
+                <widget class="QLabel">
                     <property name="name">
                     <property name="name">
-                        <cstring>DevistatorLabel</cstring>
+                        <cstring>TextLabel19</cstring>
                     </property>
                     <property name="text">
                     </property>
                     <property name="text">
-                        <string>Devistator</string>
+                        <string>Crystal</string>
                     </property>
                 </widget>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="3" column="2">
+                <widget class="QLineEdit">
                     <property name="name">
                     <property name="name">
-                        <cstring>LineEdit9</cstring>
+                        <cstring>CrystalLine</cstring>
                     </property>
                     <property name="focusPolicy">
                         <enum>NoFocus</enum>
                     </property>
                     <property name="focusPolicy">
                         <enum>NoFocus</enum>
                         <bool>true</bool>
                     </property>
                 </widget>
                         <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">
+                <widget class="QLabel">
                     <property name="name">
                     <property name="name">
-                        <cstring>PheonixLabel</cstring>
+                        <cstring>TextLabel20</cstring>
                     </property>
                     <property name="text">
                     </property>
                     <property name="text">
-                        <string>Pheonix</string>
+                        <string>Eonium</string>
                     </property>
                 </widget>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="4" column="2">
+                <widget class="QLineEdit">
                     <property name="name">
                     <property name="name">
-                        <cstring>LineEdit10</cstring>
+                        <cstring>EoniumLine</cstring>
                     </property>
                     <property name="focusPolicy">
                         <enum>NoFocus</enum>
                     </property>
                     <property name="focusPolicy">
                         <enum>NoFocus</enum>
                         <bool>true</bool>
                     </property>
                 </widget>
                         <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">
+                <widget class="QLabel">
                     <property name="name">
                     <property name="name">
-                        <cstring>DreadnaughLabel</cstring>
+                        <cstring>TextLabel7</cstring>
                     </property>
                     <property name="text">
                     </property>
                     <property name="text">
-                        <string>Dreadnaught</string>
+                        <string>Uninit</string>
                     </property>
                 </widget>
                     </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">
+                <widget class="QLineEdit">
                     <property name="name">
                     <property name="name">
-                        <cstring>LineEdit11</cstring>
-                    </property>
-                    <property name="focusPolicy">
-                        <enum>NoFocus</enum>
+                        <cstring>UninitLine</cstring>
                     </property>
                     <property name="readOnly">
                         <bool>true</bool>
                     </property>
                 </widget>
                     </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>
+            </hbox>
         </widget>
         </widget>
-        <spacer row="0" column="1">
-            <property name="name">
-                <cstring>Spacer1</cstring>
+        <spacer row="1" column="0">
+            <property name="name" stdset="0">
+                <cstring>Spacer4</cstring>
             </property>
             <property name="orientation">
             </property>
             <property name="orientation">
-                <enum>Horizontal</enum>
+                <enum>Vertical</enum>
             </property>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
             <property name="sizeType">
                 <enum>Expanding</enum>
                 </size>
             </property>
         </spacer>
                 </size>
             </property>
         </spacer>
+        <widget class="QLayoutWidget" row="0" column="0">
+            <property name="name">
+                <cstring>Layout6</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>Layout15</cstring>
+                    </property>
+                    <grid>
+                        <property name="name">
+                            <cstring>unnamed</cstring>
+                        </property>
+                        <property name="margin">
+                            <number>0</number>
+                        </property>
+                        <property name="spacing">
+                            <number>6</number>
+                        </property>
+                        <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>
+                    <property name="name" stdset="0">
+                        <cstring>Spacer5</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>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="QLayoutWidget">
+                            <property name="name">
+                                <cstring>Layout16</cstring>
+                            </property>
+                            <grid>
+                                <property name="name">
+                                    <cstring>unnamed</cstring>
+                                </property>
+                                <property name="margin">
+                                    <number>0</number>
+                                </property>
+                                <property name="spacing">
+                                    <number>6</number>
+                                </property>
+                                <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>
+                        <spacer>
+                            <property name="name" stdset="0">
+                                <cstring>Spacer2</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>
+            </hbox>
+        </widget>
     </grid>
 </widget>
 <connections>
     </grid>
 </widget>
 <connections>
     <tabstop>LineEdit4_2</tabstop>
     <tabstop>LineEdit5_2</tabstop>
     <tabstop>LineEdit8</tabstop>
     <tabstop>LineEdit4_2</tabstop>
     <tabstop>LineEdit5_2</tabstop>
     <tabstop>LineEdit8</tabstop>
-    <tabstop>LineEdit23</tabstop>
-    <tabstop>LineEdit24</tabstop>
-    <tabstop>LineEdit25</tabstop>
+    <tabstop>MetalLine</tabstop>
+    <tabstop>CrystalLine</tabstop>
+    <tabstop>EoniumLine</tabstop>
     <tabstop>LineEdit7</tabstop>
     <tabstop>LineEdit9</tabstop>
     <tabstop>LineEdit10</tabstop>
     <tabstop>LineEdit7</tabstop>
     <tabstop>LineEdit9</tabstop>
     <tabstop>LineEdit10</tabstop>
     <include location="local" impldecl="in implementation">fleetviewbase.ui.h</include>
 </includes>
 <slots>
     <include location="local" impldecl="in implementation">fleetviewbase.ui.h</include>
 </includes>
 <slots>
-    <slot>slotAttacker(bool b)</slot>
+    <slot>slotAttacker( bool b )</slot>
+    <slot>slotHomePlanet( bool b )</slot>
 </slots>
 <pixmapinproject/>
 <layoutdefaults spacing="6" margin="11"/>
 </slots>
 <pixmapinproject/>
 <layoutdefaults spacing="6" margin="11"/>
index 05111a467a130b7f928706a257b42d327243951b..5d3e4dc34329e1b6ce85824e916b519613f560fe 100644 (file)
@@ -11,10 +11,22 @@ void FleetViewBase::slotAttacker(bool b)
 {
     if (b)
     {
 {
     if (b)
     {
-       CaptureBox->setCaption("Captured roids");
+       CaptureBox->setTitle(tr("Captured roids"));
     }
     else
     {
     }
     else
     {
-       CaptureBox->setCaption("Salvage");
+       CaptureBox->setTitle(tr("Salvage"));
+    }
+}
+
+void FleetViewBase::slotHomePlanet( bool b )
+{
+    if (b)
+    {
+       RoidsGroup->show();
+    }
+    else
+    {
+       RoidsGroup->hide();
     }
 }
\ No newline at end of file
     }
 }
\ No newline at end of file
index 2ea6579e36885d7d76b17127a1605efb017f1a7b..387d7bd1ee3035d6220354be990eaca533ef0abd 100644 (file)
@@ -1,8 +1,5 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>CTickViewBase</class>
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>CTickViewBase</class>
-<include location="local" implDecl="in declaration">tickviewbase.ui.h</include>
-<pixmapinproject/>
-<layoutdefaults spacing="3" margin="6"/>
 <widget class="QWidget">
     <property name="name">
         <cstring>CTickViewBase</cstring>
 <widget class="QWidget">
     <property name="name">
         <cstring>CTickViewBase</cstring>
         <rect>
             <x>0</x>
             <y>0</y>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>371</width>
-            <height>34</height>
+            <width>478</width>
+            <height>37</height>
         </rect>
     </property>
     <property name="caption">
         <string>Form1</string>
     </property>
         </rect>
     </property>
     <property name="caption">
         <string>Form1</string>
     </property>
-    <grid>
+    <hbox>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
         <property name="spacing">
             <number>3</number>
         </property>
         <property name="spacing">
             <number>3</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="QLabel">
+            <property name="name">
+                <cstring>TextLabel45</cstring>
+            </property>
+            <property name="text">
+                <string>Show result from tick:</string>
+            </property>
+        </widget>
+        <widget class="QSpinBox">
+            <property name="name">
+                <cstring>minTickSpin</cstring>
+            </property>
+            <property name="maxValue">
+                <number>1</number>
+            </property>
+            <property name="minValue">
+                <number>1</number>
+            </property>
+        </widget>
+        <widget class="QLabel">
+            <property name="name">
+                <cstring>TextLabel47</cstring>
+            </property>
+            <property name="text">
+                <string>to:</string>
+            </property>
+        </widget>
+        <widget class="QSpinBox">
             <property name="name">
             <property name="name">
-                <cstring>Layout26</cstring>
+                <cstring>maxTickSpin</cstring>
+            </property>
+            <property name="minValue">
+                <number>1</number>
             </property>
             </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>TextLabel45</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Show result from tick:</string>
-                    </property>
-                </widget>
-                <widget class="QSpinBox">
-                    <property name="name">
-                        <cstring>minTickSpin</cstring>
-                    </property>
-                    <property name="maxValue">
-                        <number>1</number>
-                    </property>
-                    <property name="minValue">
-                        <number>1</number>
-                    </property>
-                </widget>
-                <widget class="QLabel">
-                    <property name="name">
-                        <cstring>TextLabel47</cstring>
-                    </property>
-                    <property name="text">
-                        <string>to:</string>
-                    </property>
-                </widget>
-                <widget class="QSpinBox">
-                    <property name="name">
-                        <cstring>maxTickSpin</cstring>
-                    </property>
-                    <property name="minValue">
-                        <number>1</number>
-                    </property>
-                </widget>
-            </hbox>
         </widget>
         </widget>
-    </grid>
+        <widget class="QCheckBox">
+            <property name="name">
+                <cstring>oneTickCheck</cstring>
+            </property>
+            <property name="text">
+                <string>one tick</string>
+            </property>
+            <property name="toolTip" stdset="0">
+                <string>Check this option if you only want the result from for one tick.</string>
+            </property>
+        </widget>
+    </hbox>
 </widget>
 <connections>
 </widget>
 <connections>
-    <connection language="C++">
-        <sender>minTickSpin</sender>
+    <connection>
+        <sender>maxTickSpin</sender>
         <signal>valueChanged(int)</signal>
         <receiver>CTickViewBase</receiver>
         <signal>valueChanged(int)</signal>
         <receiver>CTickViewBase</receiver>
-        <slot>slotMinTick(int)</slot>
+        <slot>slotMaxTick(int)</slot>
     </connection>
     </connection>
-    <connection language="C++">
+    <connection>
         <sender>maxTickSpin</sender>
         <signal>valueChanged(int)</signal>
         <receiver>CTickViewBase</receiver>
         <sender>maxTickSpin</sender>
         <signal>valueChanged(int)</signal>
         <receiver>CTickViewBase</receiver>
-        <slot>slotMaxTick(int)</slot>
+        <slot>slotTickChanged(int)</slot>
+    </connection>
+    <connection>
+        <sender>minTickSpin</sender>
+        <signal>valueChanged(int)</signal>
+        <receiver>CTickViewBase</receiver>
+        <slot>slotTickChanged(int)</slot>
+    </connection>
+    <connection>
+        <sender>minTickSpin</sender>
+        <signal>valueChanged(int)</signal>
+        <receiver>CTickViewBase</receiver>
+        <slot>slotMinTick(int)</slot>
+    </connection>
+    <connection>
+        <sender>oneTickCheck</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>CTickViewBase</receiver>
+        <slot>slotOneTick(bool)</slot>
     </connection>
     </connection>
-    <slot access="public" language="C++" returnType="void">slotMaxTick( int i )</slot>
-    <slot access="public" language="C++" returnType="void">slotMinTick( int i )</slot>
 </connections>
 </connections>
+<includes>
+    <include location="local" impldecl="in implementation">tickviewbase.ui.h</include>
+</includes>
+<slots>
+    <slot access="protected">slotMaxTick( int i )</slot>
+    <slot access="protected">slotMinTick( int i )</slot>
+    <slot access="protected">slotTickChanged( int i )</slot>
+    <slot access="protected">slotOneTick( bool b )</slot>
+</slots>
+<pixmapinproject/>
+<layoutdefaults spacing="3" margin="6"/>
 </UI>
 </UI>
index 4b8f126982f5290d95ce6289399d7e859f6192e4..741e407ae7fe199838f4dbb3c05d3a8615d2d8ac 100644 (file)
 *****************************************************************************/
 
 
 *****************************************************************************/
 
 
-void CTickViewBase::slotMaxTick( int i )
+void CTickViewBase::slotMaxTick(int i)
 {
 {
-    minTickSpin->setMaxValue(i);
+     if ( !oneTickCheck->isChecked())
+        minTickSpin->setMaxValue(i);
 }
 
 void CTickViewBase::slotMinTick( int i )
 {
 }
 
 void CTickViewBase::slotMinTick( int i )
 {
-    maxTickSpin->setMinValue(i);
+     if ( !oneTickCheck->isChecked())
+        maxTickSpin->setMinValue(i);
+}
+
+void CTickViewBase::slotTickChanged(int i)
+{
+   if ( oneTickCheck->isChecked())
+    {
+       maxTickSpin->setValue(i);
+       minTickSpin->setValue(i);
+    }
+}
+
+void CTickViewBase::slotOneTick( bool b )
+{
+    if(b)
+    {
+       maxTickSpin->setMinValue(0);
+       minTickSpin->setMaxValue(99);
+    }
+    else
+    {
+       maxTickSpin->setMinValue( minTickSpin->value());
+       minTickSpin->setMaxValue( maxTickSpin->value());
+    }
 }
\ No newline at end of file
 }
\ No newline at end of file
index 7d79bcf82ad779e70ab06abf55ce2796ad55527d..cd5c715ccb376d860ef7779fce1c8da2252140b1 100644 (file)
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE KDevPrjSession ><KDevPrjSession>
  <Mainframe MaximizeMode="0" />
 <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE KDevPrjSession ><KDevPrjSession>
  <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="715" Attach="0" Height="387" Left="0" Focus="0" Type="KHTMLView" MinMaxMode="0" />
+ <DocsAndViews NumberOfDocuments="3" >
+  <Doc0 CursorPosLine="13" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/whale/src/hbs/bs/bsdoc.h" >
+   <View0 Top="0" Width="683" Attach="0" Height="354" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" />
   </Doc0>
   </Doc0>
+  <Doc1 CursorPosLine="4" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/whale/src/hbs/bs/battlesum.h" >
+   <View0 Top="0" Width="683" Attach="0" Height="354" Left="0" Focus="1" Type="KWriteView" MinMaxMode="0" />
+  </Doc1>
+  <Doc2 Type="CDocBrowser" NumberOfViews="1" FileName="file:/home/src/qt-3/doc/html/index.html" >
+   <View Top="0" Width="683" Attach="0" Height="354" Left="0" Focus="0" Type="KHTMLView" MinMaxMode="0" />
+  </Doc2>
  </DocsAndViews>
 </KDevPrjSession>
  </DocsAndViews>
 </KDevPrjSession>