[prev in list] [next in list] [prev in thread] [next in thread] 

List:       atlantik-devel
Subject:    [atlantik-cvs] CVS: kdegames/atlantik/client atlantik.cpp,1.114,1.115 atlantik.h,1.48,1.49
From:       kde () office ! kde ! org
Date:       2002-07-29 3:42:31
[Download RAW message or body]

Update of /home/kde/kdegames/atlantik/client
In directory office:/tmp/cvs-serv22122/client

Modified Files:
	atlantik.cpp atlantik.h 
Log Message:
fix toolbar

Index: atlantik.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- atlantik.cpp	2002/07/28 01:11:43	1.114
+++ atlantik.cpp	2002/07/29 03:42:28	1.115
@@ -70,22 +70,20 @@
 
 	connect(m_atlanticCore, SIGNAL(removeGUI(Trade *)), this, SLOT(removeGUI(Trade \
*)));  
-	initNetworkObject();
-
 	// Menu,toolbar: Move
-	m_roll = KStdGameAction::roll(m_atlantikNetwork, SLOT(rollDice()), \
actionCollection()); +	m_roll = KStdGameAction::roll(this, SIGNAL(rollDice()), \
actionCollection());  m_roll->setEnabled(false);
-	m_buyEstate = new KAction(i18n("&Buy"), "atlantik_buy_estate", CTRL+Key_B, \
m_atlantikNetwork, SLOT(buyEstate()), actionCollection(), "buy_estate"); \
+	m_buyEstate = new KAction(i18n("&Buy"), "atlantik_buy_estate", CTRL+Key_B, this, \
SIGNAL(buyEstate()), actionCollection(), "buy_estate");  \
                m_buyEstate->setEnabled(false);
-	m_auctionEstate = new KAction(i18n("&Auction"), "auction", CTRL+Key_A, \
m_atlantikNetwork, SLOT(auctionEstate()), actionCollection(), "auction"); \
+	m_auctionEstate = new KAction(i18n("&Auction"), "auction", CTRL+Key_A, this, \
SIGNAL(auctionEstate()), actionCollection(), "auction");  \
                m_auctionEstate->setEnabled(false);
-	m_endTurn = KStdGameAction::endTurn(m_atlantikNetwork, SLOT(endTurn()), \
actionCollection()); +	m_endTurn = KStdGameAction::endTurn(this, SIGNAL(endTurn()), \
actionCollection());  m_endTurn->setEnabled(false);
-	m_jailCard = new KAction(i18n("Use Card to Leave Jail"), "atlantik_move_jail_card", \
0, m_atlantikNetwork, SLOT(jailCard()), actionCollection(), "move_jailcard"); \
+	m_jailCard = new KAction(i18n("Use Card to Leave Jail"), "atlantik_move_jail_card", \
0, this, SIGNAL(jailCard()), actionCollection(), "move_jailcard");  \
                m_jailCard->setEnabled(false);
-	m_jailPay = new KAction(i18n("&Pay to Leave Jail"), "jail_pay", CTRL+Key_P, \
m_atlantikNetwork, SLOT(jailPay()), actionCollection(), "move_jailpay"); +	m_jailPay \
= new KAction(i18n("&Pay to Leave Jail"), "jail_pay", CTRL+Key_P, this, \
SIGNAL(jailPay()), actionCollection(), "move_jailpay");  \
                m_jailPay->setEnabled(false);
-	m_jailRoll = new KAction(i18n("Roll to Leave &Jail"), "atlantik_move_jail_roll", \
CTRL+Key_J, m_atlantikNetwork, SLOT(jailRoll()), actionCollection(), \
"move_jailroll"); +	m_jailRoll = new KAction(i18n("Roll to Leave &Jail"), \
"atlantik_move_jail_roll", CTRL+Key_J, this, SIGNAL(jailRoll()), actionCollection(), \
"move_jailroll");  m_jailRoll->setEnabled(false);
 
 	// Mix code and XML into GUI
@@ -133,7 +131,10 @@
 	QCString host = args->getOption("host");	
 	QCString port = args->getOption("port");	
 	if (!host.isNull() && !port.isNull())
+	{
+		initNetworkObject();
 		m_atlantikNetwork->serverConnect(host, port.toInt());
+	}
 	else
 		showSelectServer();
 }
@@ -493,6 +494,14 @@
 	connect(m_atlantikNetwork, SIGNAL(newTrade(Trade *)), this, SLOT(newTrade(Trade \
*)));  connect(m_atlantikNetwork, SIGNAL(newAuction(Auction *)), this, \
SLOT(newAuction(Auction *)));  
+	connect(this, SIGNAL(rollDice()), m_atlantikNetwork, SLOT(rollDice()));
+	connect(this, SIGNAL(buyEstate()), m_atlantikNetwork, SLOT(buyEstate()));
+	connect(this, SIGNAL(auctionEstate()), m_atlantikNetwork, SLOT(auctionEstate()));
+	connect(this, SIGNAL(endTurn()), m_atlantikNetwork, SLOT(endTurn()));
+	connect(this, SIGNAL(jailCard()), m_atlantikNetwork, SLOT(jailCard()));
+	connect(this, SIGNAL(jailPay()), m_atlantikNetwork, SLOT(jailPay()));
+	connect(this, SIGNAL(jailRoll()), m_atlantikNetwork, SLOT(jailRoll()));
+	
 	if (m_selectServer)
 	{
 		connect(m_selectServer, SIGNAL(serverConnect(const QString, int)), \
m_atlantikNetwork, SLOT(serverConnect(const QString, int)));

Index: atlantik.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- atlantik.h	2002/07/28 01:11:43	1.48
+++ atlantik.h	2002/07/29 03:42:28	1.49
@@ -176,6 +176,15 @@
 
 	void playerChanged();
 
+signals:
+	void rollDice();
+	void buyEstate();
+	void auctionEstate();
+	void endTurn();
+	void jailCard();
+	void jailPay();
+	void jailRoll();
+
 private:
 	void initNetworkObject();
 

_______________________________________________
atlantik-cvs mailing list
atlantik-cvs@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-cvs


[prev in list] [next in list] [prev in thread] [next in thread]