X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fbsview.cpp;h=9212fb166c4295cad4be300ebe67186993f4a51b;hb=e0be1e6e8f7a246acf49e1f315c8d5bc5a65bfa3;hp=7adc6db02ad18be3c2fbc297375a1480d57abb72;hpb=1c8c7800411f2491d9be16c0f1515a91525f2e56;p=hbs.git diff --git a/bs/bsview.cpp b/bs/bsview.cpp index 7adc6db..9212fb1 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()); @@ -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()); } ////////////////////////////////////////////////////////////////////////// @@ -436,3 +440,12 @@ void BSView::slotResultModeChanged( int 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; +}