X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Fbsview.cpp;h=5158fe40a5c44264e71f1af7e96a42147cf49fc7;hp=2dfe3f37f45263381c262a25b30c8dfc1f8169ca;hb=07acf9a898e295587b9034bee6b8682e11a97086;hpb=0fcfaff680c6974a9b3f2a63704a8eb788d3fe94 diff --git a/bs/bsview.cpp b/bs/bsview.cpp index 2dfe3f3..5158fe4 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() @@ -177,18 +179,18 @@ 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()); if (fl->race() == tr("Generic").latin1()) { @@ -206,7 +208,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 +246,10 @@ void BSView::slotItemCollapsed(QListViewItem *lvi) } } +////////////////////////////////////////////////////////////////////////// +// +void BSView::slotFleetChanged(const Fleet* fleet) +{ + m_doc->changeFleet(m_sBattle, m_sGroup, m_sFleet, fleet); +} +