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

List:       atlantik-devel
Subject:    [atlantik-cvs] CVS: kdegames/atlantik/client
From:       kde () office ! kde ! org
Date:       2003-06-03 21:07:01
[Download RAW message or body]

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

Modified Files:
	selectconfiguration_widget.cpp 
Log Message:
by albert: qlayout warning fix, token select fix

Index: selectconfiguration_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectconfiguration_widget.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- selectconfiguration_widget.cpp	18 May 2003 19:56:00 -0000	1.35
+++ selectconfiguration_widget.cpp	3 Jun 2003 21:06:58 -0000	1.36
@@ -28,7 +28,7 @@
 
 #include <player.h>
 
-#include "tokenwidget.h" 
+#include "tokenwidget.h"
 #include "selectconfiguration_widget.moc"
 
 SelectConfiguration::SelectConfiguration(QWidget *parent, const char *name) : QWidget(parent, name)
@@ -40,10 +40,11 @@
 
 	// Game configuration.
 	m_configBox = new QVGroupBox(i18n("Game Configuration"), this, "configBox");
-	m_mainLayout->addWidget(m_configBox); 
+	m_mainLayout->addWidget(m_configBox);
 
 	// Player buttons.
-	QHBoxLayout *playerButtons = new QHBoxLayout(this, 0, KDialog::spacingHint());
+	QHBoxLayout *playerButtons = new QHBoxLayout(m_mainLayout, KDialog::spacingHint());
+	playerButtons->setMargin(0);
 	m_mainLayout->addItem(playerButtons);
 
 	playerButtons->addItem(new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum));
@@ -57,7 +58,8 @@
 	m_mainLayout->addItem(new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding));
 
 	// Server buttons.
-	QHBoxLayout *serverButtons = new QHBoxLayout(this, 0, KDialog::spacingHint());
+	QHBoxLayout *serverButtons = new QHBoxLayout(m_mainLayout, KDialog::spacingHint());
+	serverButtons->setMargin(0);
 	m_mainLayout->addItem(serverButtons);
 
 	m_backButton = new KPushButton(SmallIcon("back"), i18n("Leave Game"), this);
@@ -92,7 +94,10 @@
 void SelectConfiguration::slotTokenButtonClicked()
 {
 	if (m_tokenWidget)
+	{
+		m_tokenWidget->show();
 		return;
+	}
 
 	m_tokenWidget = new TokenWidget(0);
 	m_tokenWidget->show();

_______________________________________________
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]