From atlantik-devel Thu Jun 27 23:10:22 2002 From: kde () office ! kde ! org Date: Thu, 27 Jun 2002 23:10:22 +0000 To: atlantik-devel Subject: [atlantik-devel] CVS: kdegames/atlantik/libatlantikui board.cpp,1.80,1.81 board.h,1.50,1.51 display_ X-MARC-Message: https://marc.info/?l=atlantik-devel&m=102521953130445 Update of /home/kde/kdegames/atlantik/libatlantikui In directory office:/tmp/cvs-serv9261/libatlantikui Modified Files: board.cpp board.h display_widget.cpp display_widget.h Log Message: generalised BoardDisplay::displayCard into displayText so it can be used for other notifications Index: board.cpp =================================================================== RCS file: /home/kde/kdegames/atlantik/libatlantikui/board.cpp,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- board.cpp 2002/04/23 17:02:56 1.80 +++ board.cpp 2002/06/27 23:10:20 1.81 @@ -388,14 +388,12 @@ m_center->show(); } -void AtlantikBoard::displayCard(QString type, QString description) +void AtlantikBoard::displayText(QString caption, QString body) { - kdDebug() << "displayCard(" << type << ", " << description << ")" << endl; - if (m_center != 0) delete m_center; - m_center = new BoardDisplay(type, description, this); + m_center = new BoardDisplay(caption, body, this); m_gridLayout->addMultiCellWidget(m_center, 1, m_gridLayout->numRows()-2, 1, m_gridLayout->numCols()-2); m_center->show(); Index: board.h =================================================================== RCS file: /home/kde/kdegames/atlantik/libatlantikui/board.h,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- board.h 2002/04/23 17:02:56 1.50 +++ board.h 2002/06/27 23:10:20 1.51 @@ -55,7 +55,7 @@ private slots: void playerChanged(); void displayCenter(); - void displayCard(QString, QString); + void displayText(QString caption, QString body); void displayEstateDetails(Estate *); signals: Index: display_widget.cpp =================================================================== RCS file: /home/kde/kdegames/atlantik/libatlantikui/display_widget.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- display_widget.cpp 2002/04/23 17:02:56 1.7 +++ display_widget.cpp 2002/06/27 23:10:20 1.8 @@ -21,20 +21,19 @@ #include "display_widget.moc" -BoardDisplay::BoardDisplay(const QString type, const QString description, QWidget *parent, const char *name) : QWidget(parent, name) +BoardDisplay::BoardDisplay(const QString caption, const QString body, QWidget *parent, const char *name) : QWidget(parent, name) { m_mainLayout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); Q_CHECK_PTR(m_mainLayout); - // Player list. - m_playerGroupBox = new QVGroupBox(type, this, "groupBox"); - m_mainLayout->addWidget(m_playerGroupBox); + m_textGroupBox = new QVGroupBox(caption, this, "groupBox"); + m_mainLayout->addWidget(m_textGroupBox); - m_label = new QTextEdit(description, NULL, m_playerGroupBox); + m_label = new QTextEdit(body, NULL, m_textGroupBox); m_label->setReadOnly(true); } void BoardDisplay::slotClicked() { - m_playerGroupBox->setEnabled(true); + m_textGroupBox->setEnabled(true); } Index: display_widget.h =================================================================== RCS file: /home/kde/kdegames/atlantik/libatlantikui/display_widget.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- display_widget.h 2002/04/23 17:02:56 1.8 +++ display_widget.h 2002/06/27 23:10:20 1.9 @@ -28,7 +28,7 @@ Q_OBJECT public: - BoardDisplay(const QString type, const QString description, QWidget *parent, const char *name=0); + BoardDisplay(const QString caption, const QString body, QWidget *parent, const char *name=0); private slots: void slotClicked(); @@ -36,7 +36,7 @@ private: QTextEdit *m_label; QVBoxLayout *m_mainLayout; - QVGroupBox *m_playerGroupBox; + QVGroupBox *m_textGroupBox; }; #endif _______________________________________________ atlantik-devel mailing list atlantik-devel@mail.kde.org http://mail.kde.org/mailman/listinfo/atlantik-devel