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

List:       atlantik-devel
Subject:    [atlantik-devel] CVS: kdegames/atlantik/libatlantikui board.cpp,1.81,1.82 board.h,1.51,1.52 display_
From:       kde () office ! kde ! org
Date:       2002-07-01 8:43:45
[Download RAW message or body]

Update of /home/kde/kdegames/atlantik/libatlantikui
In directory office:/tmp/cvs-serv3377/libatlantikui

Modified Files:
	board.cpp board.h display_widget.cpp display_widget.h 
Log Message:
removed <br> from message window
added dialog buttons for 10%/200$ tax to boarddisplay

Index: board.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/board.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- board.cpp	2002/06/27 23:10:20	1.81
+++ board.cpp	2002/07/01 08:43:43	1.82
@@ -400,6 +400,12 @@
 //	QTimer::singleShot(3000, this, SLOT(displayCenter()));
 }
 
+void AtlantikBoard::displayButton(QString command, QString caption)
+{
+	if (BoardDisplay *display = dynamic_cast<BoardDisplay*>(m_center))
+		display->addButton(command, caption);
+}
+
 void AtlantikBoard::displayEstateDetails(Estate *estate)
 {
 	if (!estate)

Index: board.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/board.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- board.h	2002/06/27 23:10:20	1.51
+++ board.h	2002/07/01 08:43:43	1.52
@@ -56,6 +56,7 @@
 	void playerChanged();
 	void displayCenter();
 	void displayText(QString caption, QString body);
+	void displayButton(QString command, QString caption);
 	void displayEstateDetails(Estate *);
 
 signals:

Index: display_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/display_widget.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- display_widget.cpp	2002/06/27 23:10:20	1.8
+++ display_widget.cpp	2002/07/01 08:43:43	1.9
@@ -18,6 +18,7 @@
 
 #include <kdialog.h>
 #include <klocale.h>
+#include <kpushbutton.h>
  
 #include "display_widget.moc"
 
@@ -31,6 +32,27 @@
 
 	m_label = new QTextEdit(body, NULL, m_textGroupBox);
 	m_label->setReadOnly(true);
+
+	m_buttonBox = new QHBoxLayout(this, 0, KDialog::spacingHint());
+	m_mainLayout->addItem(m_buttonBox); 
+
+	m_buttonBox->addItem(new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum));
+}
+
+void BoardDisplay::addButton(QString command, QString caption)
+{
+	KPushButton *button = new KPushButton(caption, this);
+	m_buttonCommandMap[(QObject *)button] = command;
+	m_buttonBox->addWidget(button);
+
+	button->show();
+
+	connect(button, SIGNAL(pressed()), this, SLOT(buttonPressed()));
+}
+
+void BoardDisplay::buttonPressed()
+{
+	emit buttonCommand(m_buttonCommandMap[(QObject *)QObject::sender()]);
 }
 
 void BoardDisplay::slotClicked()

Index: display_widget.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/display_widget.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- display_widget.h	2002/06/27 23:10:20	1.9
+++ display_widget.h	2002/07/01 08:43:43	1.10
@@ -19,10 +19,12 @@
 
 #include <qwidget.h>
 #include <qlayout.h>
+#include <qmap.h>
 #include <qvgroupbox.h>
-#include <qpushbutton.h>
 #include <qtextedit.h>
 
+class KPushButton;
+
 class BoardDisplay : public QWidget
 {
 Q_OBJECT
@@ -30,13 +32,21 @@
 public:
 	BoardDisplay(const QString caption, const QString body, QWidget *parent, const char *name=0);
 
+	void addButton(const QString command, const QString caption);
+
 private slots:
+	void buttonPressed();
 	void slotClicked();
 
+signals:
+	void buttonCommand(QString);
+
 private:
 	QTextEdit *m_label;
 	QVBoxLayout *m_mainLayout;
+	QHBoxLayout *m_buttonBox;
 	QVGroupBox *m_textGroupBox;
+	QMap <QObject *, QString> m_buttonCommandMap;
 };
 
 #endif

_______________________________________________
atlantik-devel mailing list
atlantik-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-devel
[prev in list] [next in list] [prev in thread] [next in thread]