X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fbsview.cpp;h=f5e74bc82324a8f93440976d6b9bddad7cc388b9;hb=6a5c3106cf6dc30d4624df99473e18df2b1d50ed;hp=5158fe40a5c44264e71f1af7e96a42147cf49fc7;hpb=07acf9a898e295587b9034bee6b8682e11a97086;p=hbs.git

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index 5158fe4..f5e74bc 100644
--- a/bs/bsview.cpp
+++ b/bs/bsview.cpp
@@ -62,6 +62,11 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 	
 	m_InfoView = new InfoView(m_LeftSplit);
 
+	connect(m_InfoView,SIGNAL(add()),SLOT(slotInfoNew()));
+	connect(m_InfoView,SIGNAL(apply()),SLOT(slotInfoApply()));
+	connect(m_InfoView,SIGNAL(cancel()),SLOT(slotInfoCancel()));
+	connect(m_InfoView,SIGNAL(remove()),SLOT(slotInfoRemove()));
+
 	vector<QString> raceNames;
 	const map<string, vector<int> >& races = Fleet::Races();
 	for(map<string, vector<int> >::const_iterator i = races.begin(); i != races.end(); ++i)
@@ -119,9 +124,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]["--"]);
 			
@@ -140,22 +148,25 @@ 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);
+	updateInfoView();
+	updateFleetView();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 //
 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')
 	{
@@ -163,7 +174,6 @@ void BSView::slotFleetSelection(QListViewItem *lvi)
 	}
 	else if (lvi->parent()->parent() == '\0')
 	{
-//			m_FleetView->slotHomePlanet(false);
 		if (lvi->text(0) == tr("Friendly"))
 		{
 //			m_FleetView->slotAttacker(false);
@@ -177,44 +187,12 @@ void BSView::slotFleetSelection(QListViewItem *lvi)
 	}
 	else
 	{
-		bool friendly = false;
-		bool home	= false;
 		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(m_sFleet == tr("Home Planet"))
-				home=true;
-		}
-		const Fleet* fl = m_doc->specificFleet(m_sBattle, m_sGroup, m_sFleet);
-		m_InfoView->setRace(fl->race().c_str());
-		m_InfoView->setFleetName(m_sFleet);
-		m_InfoView->setEta(fl->ETA());
-		if (fl->race() == tr("Generic").latin1())
-		{
-			m_GenericFleetView->viewFleet(fl, friendly);
-			m_FleetViews->raiseWidget(2);
 
-		}
-		else 
-		{
-			if (fl->race() == m_FleetView->fleet()->race() &&
-			m_FleetView->isHome() == home)
-			{
-				m_FleetView->viewFleet(fl, friendly);
-			}
-			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);
-		}
+		updateInfoView();
+		updateFleetView();
 	}
 }
 
@@ -253,3 +231,121 @@ void BSView::slotFleetChanged(const Fleet* fleet)
 	m_doc->changeFleet(m_sBattle, m_sGroup, m_sFleet, fleet);
 }
 
+//////////////////////////////////////////////////////////////////////////
+//
+void BSView::slotInfoApply()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void BSView::slotInfoCancel()
+{
+	updateInfoView();
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void BSView::slotInfoNew()
+{
+	Fleet* fl = new Fleet();
+
+	m_sBattle = m_InfoView->battle();
+	m_sGroup = m_InfoView->group();
+	m_sFleet = m_InfoView->fleetName();
+
+	fl->setETA(m_InfoView->eta());
+	fl->setName(m_sFleet.latin1());
+	fl->setRace(m_InfoView->race().latin1());
+
+	m_doc->newFleet(m_sBattle, m_sGroup, m_sFleet, fl);
+
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void BSView::slotInfoRemove()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void BSView::updateInfoView()
+{
+	const Fleet* fl = m_doc->specificFleet(m_sBattle, m_sGroup, m_sFleet);
+
+	if(!fl)
+	{
+		m_InfoView->setRace("");
+		m_InfoView->setFleetName("");
+		m_InfoView->setEta(0);
+		m_InfoView->setGroup("");
+		m_InfoView->setBattle("");		
+		m_InfoView->enableNameChange(true);
+		m_InfoView->enableRemove(false);
+		return;
+	}
+
+	if(m_sFleet == tr("Home Planet"))
+	{
+		m_InfoView->enableNameChange(false);
+		m_InfoView->enableRemove(false);
+	}
+	else
+	{
+		m_InfoView->enableNameChange(true);
+		m_InfoView->enableRemove(true);
+	}
+
+	m_InfoView->setRace(fl->race().c_str());
+	m_InfoView->setFleetName(m_sFleet);
+	m_InfoView->setEta(fl->ETA());
+	m_InfoView->setGroup(m_sGroup);
+	m_InfoView->setBattle(m_sBattle);
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void BSView::updateFleetView()
+{
+	bool friendly = false;
+	bool home	= false;
+
+	const Fleet* fl = m_doc->specificFleet(m_sBattle, m_sGroup, m_sFleet);
+
+	if (!fl)
+	{
+		m_FleetViews->raiseWidget(2);
+		return;
+	}
+
+	if ( m_sGroup == tr("Friendly"))
+	{
+			friendly = true;
+			if(m_sFleet == tr("Home Planet"))
+				home=true;
+	}
+	if (fl->race() == tr("Generic").latin1())
+	{
+		m_GenericFleetView->viewFleet(fl, friendly);
+		m_FleetViews->raiseWidget(2);
+
+	}
+	else 
+	{
+		if (fl->race() == m_FleetView->fleet()->race() &&
+		m_FleetView->isHome() == home)
+		{
+			m_FleetView->viewFleet(fl, friendly);
+		}
+		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);
+	}
+}