X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fbsview.cpp;h=6f0bf311fd01af1d5b219282107a996d38f1faf8;hb=33b6dc7ca95a05c26a78879413395c1588066b77;hp=2dfe3f37f45263381c262a25b30c8dfc1f8169ca;hpb=5940cfda3be2c7b4ecbd64c814948b29139177c0;p=hbs.git

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index 2dfe3f3..6f0bf31 100644
--- a/bs/bsview.cpp
+++ b/bs/bsview.cpp
@@ -89,7 +89,9 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 	m_GenericFleetView = new FleetView(&fl2, true);
 	m_FleetViews->addWidget(m_GenericFleetView, 2);
 	//m_FleetViews->raiseWidget(0);
-	connect(m_NumberView, SIGNAL(selectionChanged(QListViewItem *)), SLOT(slotFleetSelection(QListViewItem *))); 
+	connect(m_NumberView, SIGNAL(selectionChanged(QListViewItem *)), SLOT(slotFleetSelection(QListViewItem *)));
+	connect(m_FleetView, SIGNAL(fleetChanged(const Fleet*)), SLOT(slotFleetChanged(const Fleet*)));
+	connect(m_GenericFleetView, SIGNAL(fleetChanged(const Fleet*)), SLOT(slotFleetChanged(const Fleet*)));
 }
 
 BSView::~BSView()
@@ -117,9 +119,12 @@ void BSView::slotDocumentChanged()
 	
 	const BattleList& battles = m_doc->battles();	
 
+	vector<QString> battlenames;
+
 	for (BattleList::const_iterator i = battles.begin(); i != battles.end(); ++i)
 	{
 		QString b = (*i).first;
+		battlenames.push_back(i->first);
 		QListViewItem* battle = new QListViewItem(m_NumberView, b);
 		battle->setOpen(m_TreeExpanded[b]["--"]);
 			
@@ -138,12 +143,17 @@ void BSView::slotDocumentChanged()
 				unsigned score = k->second->score();
 				groupShips += ships;
 				groupScore += score;
-				(void) new QListViewItem(group, (*k).first, QString("%1").arg(ships), QString("%1").arg(k->second->ETA()), QString("%1").arg(score));
+				//if(k->first == tr("Home Planet"))
+					(void) new QListViewItem(group, (*k).first, QString("%1").arg(ships), QString("%1").arg(k->second->ETA()), QString("%1").arg(score));
+				/*else
+					(void) new QCheckListItem(group, (*k).first, QString("%1").arg(ships), QString("%1").arg(k->second->ETA()), QString("%1").arg(score), QCheckListItem::CheckBox);*/
+
 			}
 			group->setText(1, QString("%1").arg(groupShips));
 			group->setText(3, QString("%1").arg(groupScore));
 		}
 	}
+	m_InfoView->setBattles(battlenames);
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -177,19 +187,25 @@ void BSView::slotFleetSelection(QListViewItem *lvi)
 	{
 		bool friendly = false;
 		bool home	= false;
-		QString fleet = lvi->text(0);
-		QString group = lvi->parent()->text(0);
-		QString battle = lvi->parent()->parent()->text(0);
-		if ( group == tr("Friendly"))
+		m_sFleet = lvi->text(0);
+		m_sGroup = lvi->parent()->text(0);
+		m_sBattle = lvi->parent()->parent()->text(0);
+
+		if ( m_sGroup == tr("Friendly"))
 		{
 			friendly = true;
-			if(fleet == tr("Home Planet"))
+			if(m_sFleet == tr("Home Planet"))
 				home=true;
 		}
-		const Fleet* fl = m_doc->specificFleet(battle, group, fleet);
+
+		const Fleet* fl = m_doc->specificFleet(m_sBattle, m_sGroup, m_sFleet);
+
 		m_InfoView->setRace(fl->race().c_str());
-		m_InfoView->setFleetName(fleet);
+		m_InfoView->setFleetName(m_sFleet);
 		m_InfoView->setEta(fl->ETA());
+		m_InfoView->setGroup(m_sGroup);
+		m_InfoView->setBattle(m_sBattle);
+
 		if (fl->race() == tr("Generic").latin1())
 		{
 			m_GenericFleetView->viewFleet(fl, friendly);
@@ -206,7 +222,9 @@ void BSView::slotFleetSelection(QListViewItem *lvi)
 			else
 			{
 				m_FleetViews->removeWidget(m_FleetView);
+				delete m_FleetView;
 				m_FleetView = new FleetView(fl, friendly);
+				connect(m_FleetView, SIGNAL(fleetChanged(const Fleet*)), SLOT(slotFleetChanged(const Fleet*)));
 				m_FleetViews->addWidget(m_FleetView, 1);
 			}
 			m_FleetViews->raiseWidget(1);
@@ -242,3 +260,10 @@ void BSView::slotItemCollapsed(QListViewItem *lvi)
 	}
 }
 
+//////////////////////////////////////////////////////////////////////////
+//
+void BSView::slotFleetChanged(const Fleet* fleet)
+{
+	m_doc->changeFleet(m_sBattle, m_sGroup, m_sFleet, fleet);
+}
+