Can now load the stats and race configurations..

[hbs.git] / bs / bsview.cpp

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index 9af428df1fed72e90c88ebc4599c2e6521c7de81..ac969a3506c38bac22a96ac137fc45ed5bd4dc69 100644 (file)
--- a/bs/bsview.cpp
+++ b/bs/bsview.cpp
@@ -33,7 +33,7 @@ using namespace std;
 #include "scanview.h"
 #include "ui/infoview.h"
 #include "tickview.h"
-#include "ui/fleetviewbase.h"
+#include "fleetview.h"
 #include "fleet.h"
 
 BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
@@ -48,10 +48,11 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 
        //setting up the listview
        m_NumberView = new QListView(m_LeftSplit);
+       m_NumberView->setRootIsDecorated(true);  
        m_NumberView->addColumn("Name");
        m_NumberView->addColumn("Number");
        m_NumberView->addColumn("ETA");
-       addBattle("test");
+       //addBattle("NO BATTLES");
 
        m_InfoView = new InfoView(m_LeftSplit);
        
@@ -63,7 +64,7 @@ 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_FleetView = new FleetView();
        m_FleetViews->addWidget(m_FleetView, 1);
 
        //m_FleetViews->raiseWidget(0);
@@ -79,8 +80,8 @@ BSView::~BSView()
 void BSView::addBattle(QString name)
 {
        QListViewItem* battle = new QListViewItem(m_NumberView, name);
-       QListViewItem* def = new QListViewItem(battle, tr("Defenders"),"", "","1");
-       (void) new QListViewItem(battle, tr("Attackers"),"", "","2");
+       QListViewItem* def = new QListViewItem(battle, tr("Friendly"),"", "","1");
+       (void) new QListViewItem(battle, tr("Hostile"),"", "","2");
        (void) new QListViewItem(def, tr("Home Planet"), "","","1");
 }
 
@@ -104,11 +105,15 @@ void BSView::slotDocumentChanged()
                {
                        QString g = (*j).first;
                        QListViewItem* group = new QListViewItem(battle, g);
+                       int groupShips = 0;
 
                        for (map<QString, Fleet>::iterator k = battles[b][g].begin(); k != battles[b][g].end(); k++)
-                       {                               
-                               (void) new QListViewItem(group, (*k).first);
+                       {       
+                               int ships = battles[b][g][(*k).first].NumberOfShips();
+                               groupShips += ships;
+                               (void) new QListViewItem(group, (*k).first, QString("%1").arg(ships), QString("%1").arg(battles[b][g][(*k).first].ETA()));
                        }
+                       group->setText(1, QString("%1").arg(groupShips));
                }
        }
 }
@@ -128,14 +133,14 @@ void BSView::slotFleetSelection(QListViewItem *lvi)
        }
        else if (lvi->parent()->parent() == '\0')
        {
-                       m_FleetView->slotHomePlanet(false);
+//                     m_FleetView->slotHomePlanet(false);
                if (lvi->text(0) == tr("Friendly"))
                {
-                       m_FleetView->slotAttacker(false);
+//                     m_FleetView->slotAttacker(false);
                }
                else
                {
-                       m_FleetView->slotAttacker(true);
+//                     m_FleetView->slotAttacker(true);
                }
                m_FleetViews->raiseWidget(1);
                
@@ -144,17 +149,17 @@ void BSView::slotFleetSelection(QListViewItem *lvi)
        {
                if (lvi->parent()->text(0) == tr("Friendly"))
                {
-                       m_FleetView->slotAttacker(false);
-                       m_FleetView->slotHomePlanet(false);
+//                     m_FleetView->slotAttacker(false);
+//                     m_FleetView->slotHomePlanet(false);
                        if (lvi->text(0) == tr("Home Planet"))
                        {
-                               m_FleetView->slotHomePlanet(true);
+//                             m_FleetView->slotHomePlanet(true);
                        }
                }
                else
                {
-                       m_FleetView->slotAttacker(true);
-                       m_FleetView->slotHomePlanet(false);
+//                     m_FleetView->slotAttacker(true);
+//                     m_FleetView->slotHomePlanet(false);
                }
                m_FleetViews->raiseWidget(1);