Can now load the stats and race configurations..

[hbs.git] / bs / bsview.cpp

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index 1906dda16732358ee4452f3be5b00c6e0b99469f..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)
@@ -64,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);
@@ -105,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));
                }
        }
 }
@@ -129,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);
                
@@ -145,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);