X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Fbsview.cpp;h=df3f558d97de534a8a5d37512581b9c1de3c2a4f;hp=54f7f4832edb1aec60a23ef2a35d376b889fd8c0;hb=7311d423f454c500dbc60dd822007da3981b0d56;hpb=bb4169deef42f91b6afa4c4561f9339fba040f01 diff --git a/bs/bsview.cpp b/bs/bsview.cpp index 54f7f48..df3f558 100644 --- a/bs/bsview.cpp +++ b/bs/bsview.cpp @@ -85,7 +85,7 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent) //the right side //m_TickView = new TickView(m_RightSplit); m_FleetViews = new QWidgetStack(m_RightSplit); - m_ScanView = new ScanView(m_RightSplit); + //m_ScanView = new ScanView(m_RightSplit); Fleet fl1; //fl1.setRace(tr("Terran").latin1()); @@ -278,6 +278,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 +318,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 +367,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 +411,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 +434,8 @@ 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; }