X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fbsview.cpp;h=9212fb166c4295cad4be300ebe67186993f4a51b;hb=e0be1e6e8f7a246acf49e1f315c8d5bc5a65bfa3;hp=54f7f4832edb1aec60a23ef2a35d376b889fd8c0;hpb=bb4169deef42f91b6afa4c4561f9339fba040f01;p=hbs.git

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index 54f7f48..9212fb1 100644
--- a/bs/bsview.cpp
+++ b/bs/bsview.cpp
@@ -107,6 +107,7 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 	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*)));
+	connect(m_ScanView, SIGNAL(scanUsed(int,QString, int)), SLOT(slotUseScan(int, QString, int)));
 }
 
 BSView::~BSView()
@@ -278,6 +279,7 @@ void BSView::slotInfoApply()
 	fl->setETA(m_InfoView->eta());
 	fl->setName(m_sFleet.latin1());
 	fl->setRace(m_InfoView->race().latin1());
+	fl->setStays(m_InfoView->stays());
 	
 	m_doc->newFleet(m_sBattle, m_sGroup, m_sFleet, fl);
 }
@@ -317,6 +319,7 @@ void BSView::slotInfoNew()
 	fl->setETA(m_InfoView->eta());
 	fl->setName(m_sFleet.latin1());
 	fl->setRace(m_InfoView->race().latin1());
+	fl->setStays(m_InfoView->stays());
 
 	m_doc->newFleet(m_sBattle, m_sGroup, m_sFleet, fl);
 
@@ -365,6 +368,7 @@ void BSView::updateInfoView()
 	m_InfoView->setEta(fl->ETA());
 	m_InfoView->setGroup(m_sGroup);
 	m_InfoView->setBattle(m_sBattle);
+	m_InfoView->setStays(fl->stays());
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -408,6 +412,7 @@ void BSView::updateFleetView()
 			m_FleetView = new FleetView(fl, friendly);
 			connect(m_FleetView, SIGNAL(fleetChanged(const Fleet*)), SLOT(slotFleetChanged(const Fleet*)));
 			m_FleetView->slotViewTickRange(m_iMinTick, m_iMaxTick);
+			m_FleetView->slotSetResultMode(m_iResultMode);
 			m_FleetViews->addWidget(m_FleetView, 1);
 		}
 		m_FleetViews->raiseWidget(2);
@@ -430,9 +435,17 @@ void BSView::slotTickChanged(int min, int max)
 //
 void BSView::slotResultModeChanged( int i)
 {
-	//FIXME
-	/*m_FleetView->slotSetResultMode(i);
+	m_FleetView->slotSetResultMode(i);
 	m_GenericFleetView->slotSetResultMode(i);
-	*/
+	
 	m_iResultMode = i;
 }
+
+//////////////////////////////////////////////////////////////////////////
+//
+void BSView::slotUseScan(int action, QString text, int fleets)
+{
+	cerr << "Action: " << action << endl;
+	cerr << "Text: " << text.latin1() << endl;
+	cerr << "Fleets: " << fleets << endl;
+}