X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Fbsview.cpp;h=5da0e0654c36b0b323b6a9aa23678453da303336;hp=042adf7f3ceea322c518a0b92c9eb38ed1d784c0;hb=071b5f2d6ca710d048a58ee40e32bc623033c46e;hpb=1bb3da557a983d00ec3ff37ff94152e6f109ee4a

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index 042adf7..5da0e06 100644
--- a/bs/bsview.cpp
+++ b/bs/bsview.cpp
@@ -21,11 +21,15 @@
 #include "scanview.h"
 #include "ui/infoview.h"
 #include "tickview.h"
+#include "ui/fleetviewbase.h"
 
 //QT includes
 #include <qlistview.h>
 #include <qwidgetstack.h>
 
+#include <iostream>
+using namespace std;
+
 BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 {
   /** connect doc with the view*/
@@ -52,6 +56,8 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 	//the widget stack
 	m_BattleSum = new BattleSum();
 	m_FleetViews->addWidget(m_BattleSum, 0);
+	m_FleetView = new FleetViewBase();
+	m_FleetViews->addWidget(m_FleetView, 1);
 
 	//m_FleetViews->raiseWidget(0);
 	connect(m_NumberView, SIGNAL(selectionChanged(QListViewItem *)), SLOT(slotFleetSelection(QListViewItem *))); 
@@ -63,9 +69,10 @@ BSView::~BSView()
 
 void BSView::addBattle(QString name)
 {
-	QListViewItem *battle = new QListViewItem(m_NumberView, name);
-	(void) new QListViewItem(battle, "Defenders");
-	(void) new QListViewItem(battle, "Attackers");
+	QListViewItem* battle = new QListViewItem(m_NumberView, name);
+	QListViewItem* def = new QListViewItem(battle, tr("Defenders"),"", "","1");
+	(void) new QListViewItem(battle, tr("Attackers"),"", "","2");
+	(void) new QListViewItem(def, tr("Home Planet"), "","","1");
 }
 
 void BSView::slotDocumentChanged()
@@ -74,14 +81,50 @@ void BSView::slotDocumentChanged()
 
 }
 /** No descriptions */
-void BSView::slotFleetSelection(QListViewItem *lvi){
+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')
 	{
 		m_FleetViews->raiseWidget(0);
 	}
 	else if (lvi->parent()->parent() == '\0')
 	{
+			m_FleetView->slotHomePlanet(false);
+		if (lvi->text(3) == "1")
+		{
+			m_FleetView->slotAttacker(false);
+		}
+		else
+		{
+			m_FleetView->slotAttacker(true);
+		}
 		m_FleetViews->raiseWidget(1);
+		
 	}
+	else
+	{
+		if (lvi->parent()->text(3) == "1")
+		{
+			m_FleetView->slotAttacker(false);
+			m_FleetView->slotHomePlanet(false);
+			if (lvi->text(3) == "1")
+			{
+				m_FleetView->slotHomePlanet(true);
+			}
+		}
+		else
+		{
+			m_FleetView->slotAttacker(true);
+			m_FleetView->slotHomePlanet(false);
+		}
+		m_FleetViews->raiseWidget(1);
+				
+	}
+
 	
 }