[prev in list] [next in list] [prev in thread] [next in thread]
List: atlantik-devel
Subject: [atlantik-cvs] CVS: kdegames/atlantik/libatlantikui board.cpp,1.89,1.90 board.h,1.55,1.56 display_wi
From: kde () office ! kde ! org
Date: 2002-07-17 22:39:25
[Download RAW message or body]
Update of /home/kde/kdegames/atlantik/libatlantikui
In directory office:/tmp/cvs-serv24826/libatlantikui
Modified Files:
board.cpp board.h display_widget.cpp display_widget.h
estatedetails.cpp estatedetails.h
Log Message:
preparing network object for reinit, displayButton fixes
Index: board.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/board.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- board.cpp 2002/07/17 07:42:23 1.89
+++ board.cpp 2002/07/17 22:39:21 1.90
@@ -411,7 +411,6 @@
if (m_center != 0)
delete m_center;
-
BoardDisplay *display = new BoardDisplay(caption, body, this);
m_center = display;
m_gridLayout->addMultiCellWidget(m_center, 1, m_gridLayout->numRows()-2, 1, m_gridLayout->numCols()-2);
@@ -422,10 +421,12 @@
// QTimer::singleShot(3000, this, SLOT(displayDefault()));
}
-void AtlantikBoard::displayButton(QString command, QString caption)
+void AtlantikBoard::displayButton(QString command, QString caption, bool enabled)
{
if (BoardDisplay *display = dynamic_cast<BoardDisplay*>(m_center))
- display->addButton(command, caption);
+ display->addButton(command, caption, enabled);
+ else if (EstateDetails *display = dynamic_cast<EstateDetails*>(m_center))
+ display->addButton(command, caption, enabled);
}
void AtlantikBoard::displayEstateDetails(Estate *estate)
@@ -437,7 +438,10 @@
if (m_center != 0)
delete m_center;
- m_center = new EstateDetails(estate, this);
- m_gridLayout->addMultiCellWidget(m_center, 1, m_gridLayout->numRows()-2, 1, m_gridLayout->numCols()-2);
- m_center->show();
+ EstateDetails *display = new EstateDetails(estate, this);
+ m_center = display;
+ m_gridLayout->addMultiCellWidget(display, 1, m_gridLayout->numRows()-2, 1, m_gridLayout->numCols()-2);
+ display->show();
+
+ connect(display, SIGNAL(buttonCommand(QString)), this, SIGNAL(buttonCommand(QString)));
}
Index: board.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/board.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- board.h 2002/07/07 02:35:59 1.55
+++ board.h 2002/07/17 22:39:21 1.56
@@ -56,7 +56,7 @@
void playerChanged();
void displayDefault();
void displayText(QString caption, QString body);
- void displayButton(QString command, QString caption);
+ void displayButton(QString command, QString caption, bool enabled);
void displayEstateDetails(Estate *);
signals:
Index: display_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/display_widget.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- display_widget.cpp 2002/07/07 02:35:59 1.11
+++ display_widget.cpp 2002/07/17 22:39:21 1.12
@@ -37,12 +37,13 @@
m_buttonBox->addItem(new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum));
}
-void BoardDisplay::addButton(QString command, QString caption)
+void BoardDisplay::addButton(QString command, QString caption, bool enabled)
{
KPushButton *button = new KPushButton(caption, this);
m_buttonCommandMap[(QObject *)button] = command;
m_buttonBox->addWidget(button);
+ button->setEnabled(enabled);
button->show();
connect(button, SIGNAL(pressed()), this, SLOT(buttonPressed()));
Index: display_widget.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/display_widget.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- display_widget.h 2002/07/01 08:43:43 1.10
+++ display_widget.h 2002/07/17 22:39:21 1.11
@@ -32,7 +32,7 @@
public:
BoardDisplay(const QString caption, const QString body, QWidget *parent, const char *name=0);
- void addButton(const QString command, const QString caption);
+ void addButton(const QString command, const QString caption, bool enabled);
private slots:
void buttonPressed();
Index: estatedetails.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/estatedetails.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- estatedetails.cpp 2002/06/30 23:32:29 1.5
+++ estatedetails.cpp 2002/07/17 22:39:21 1.6
@@ -16,11 +16,14 @@
#include <qpainter.h>
#include <qpixmap.h>
+#include <qlayout.h>
+#include <qvgroupbox.h>
#include <kdialog.h>
#include <kglobalsettings.h>
#include <klocale.h>
#include <kpixmap.h>
+#include <kpushbutton.h>
#include <estate.h>
#include <estategroup.h>
@@ -38,6 +41,16 @@
m_quartzBlocks = 0;
m_recreateQuartz = true;
+
+ m_mainLayout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ Q_CHECK_PTR(m_mainLayout);
+
+ m_mainLayout->addItem(new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding));
+
+ 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 EstateDetails::paintEvent(QPaintEvent *)
@@ -183,4 +196,21 @@
{
m_recreateQuartz = true;
b_recreate = true;
+}
+
+void EstateDetails::addButton(QString command, QString caption, bool enabled)
+{
+ KPushButton *button = new KPushButton(caption, this);
+ m_buttonCommandMap[(QObject *)button] = command;
+ m_buttonBox->addWidget(button);
+
+ button->setEnabled(enabled);
+ button->show();
+
+ connect(button, SIGNAL(pressed()), this, SLOT(buttonPressed()));
+}
+
+void EstateDetails::buttonPressed()
+{
+ emit buttonCommand(QString(m_buttonCommandMap[(QObject *)QObject::sender()]));
}
Index: estatedetails.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/estatedetails.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- estatedetails.h 2002/04/23 17:02:56 1.3
+++ estatedetails.h 2002/07/17 22:39:22 1.4
@@ -20,6 +20,9 @@
#include <qwidget.h>
class QPixmap;
+class QHBoxLayout;
+class QVBoxLayout;
+class QVGroupBox;
class KPixmap;
@@ -30,19 +33,31 @@
{
Q_OBJECT
- public:
- EstateDetails(Estate *estate, QWidget *parent, const char *name = 0);
- Estate *estate() { return m_estate; }
+public:
+ EstateDetails(Estate *estate, QWidget *parent, const char *name = 0);
+ Estate *estate() { return m_estate; }
- protected:
- void paintEvent(QPaintEvent *);
- void resizeEvent(QResizeEvent *);
+ void addButton(const QString command, const QString caption, bool enabled);
- private:
- Estate *m_estate;
- QPixmap *m_pixmap;
- KPixmap *m_quartzBlocks;
- bool b_recreate, m_recreateQuartz;
+protected:
+ void paintEvent(QPaintEvent *);
+ void resizeEvent(QResizeEvent *);
+
+private slots:
+ void buttonPressed();
+
+signals:
+ void buttonCommand(QString);
+
+private:
+ Estate *m_estate;
+ QPixmap *m_pixmap;
+ KPixmap *m_quartzBlocks;
+ bool b_recreate, m_recreateQuartz;
+ QVBoxLayout *m_mainLayout;
+ QHBoxLayout *m_buttonBox;
+ QVGroupBox *m_textGroupBox;
+ QMap <QObject *, QString> m_buttonCommandMap;
};
#endif
_______________________________________________
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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic