Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

9 files changed, 338 insertions, 0 deletions

diff --git a/kolf/objects/Makefile.am b/kolf/objects/Makefile.am
new file mode 100644
index 00000000..6410a006
--- /dev/null
+++ b/kolf/objects/Makefile.am
@@ -0,0 +1 @@
+# SUBDIRS = test poolball
diff --git a/kolf/objects/poolball/Makefile.am b/kolf/objects/poolball/Makefile.am
new file mode 100644
index 00000000..0388f4dd
--- /dev/null
+++ b/kolf/objects/poolball/Makefile.am
@@ -0,0 +1,13 @@
+INCLUDES= $(all_includes)
+lib_LTLIBRARIES = libkolfpoolball.la
+
+libkolfpoolball_la_SOURCES = poolball.cpp
+
+libkolfpoolball_la_LDFLAGS = $(all_libraries) $(LIB_KIO) -lkolf -module -avoid-version
+
+libkolfpoolball_la_METASOURCES = AUTO
+
+noinst_HEADERS = poolball.h
+
+kolf_DATA = poolball.plugin
+kolfdir = $(kde_datadir)/kolf
diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp
new file mode 100644
index 00000000..a5ca80ec
--- /dev/null
+++ b/kolf/objects/poolball/poolball.cpp
@@ -0,0 +1,86 @@
+#include <qbrush.h>
+#include <qcolor.h>
+#include <qcanvas.h>
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qpainter.h>
+
+#include <klocale.h>
+#include <klibloader.h>
+#include <kapplication.h>
+#include <kdebug.h>
+#include <knuminput.h>
+#include <kconfig.h>
+
+#include <kolf/statedb.h>
+#include <kolf/canvasitem.h>
+#include "poolball.h"
+
+K_EXPORT_COMPONENT_FACTORY(libkolfpoolball, PoolBallFactory)
+QObject *PoolBallFactory::createObject (QObject *, const char *, const char *, const QStringList &) { return new PoolBallObj; }
+
+PoolBall::PoolBall(QCanvas *canvas)
+	: Ball(canvas)
+{
+	setBrush(black);
+	m_number = 1;
+}
+
+void PoolBall::save(KConfig *cfg)
+{
+	cfg->writeEntry("number", number());
+}
+
+void PoolBall::saveState(StateDB *db)
+{
+	db->setPoint(QPoint(x(), y()));
+}
+
+void PoolBall::load(KConfig *cfg)
+{
+	setNumber(cfg->readNumEntry("number", 1));
+}
+
+void PoolBall::loadState(StateDB *db)
+{
+	move(db->point().x(), db->point().y());
+	setVelocity(0, 0);
+	setState(Stopped);
+}
+
+void PoolBall::draw(QPainter &p)
+{
+	// we should draw the number here
+	Ball::draw(p);
+}
+
+PoolBallConfig::PoolBallConfig(PoolBall *poolBall, QWidget *parent)
+	: Config(parent), m_poolBall(poolBall)
+{
+	QVBoxLayout *layout = new QVBoxLayout(this, marginHint(), spacingHint());
+
+	layout->addStretch();
+
+	QLabel *num = new QLabel(i18n("Number:"), this);
+	layout->addWidget(num);
+	KIntNumInput *slider = new KIntNumInput(m_poolBall->number(), this);
+	slider->setRange(1, 15);
+	layout->addWidget(slider);
+
+	layout->addStretch();
+
+	connect(slider, SIGNAL(valueChanged(int)), this, SLOT(numberChanged(int)));
+}
+
+void PoolBallConfig::numberChanged(int newNumber)
+{
+	m_poolBall->setNumber(newNumber);
+	changed();
+}
+
+Config *PoolBall::config(QWidget *parent)
+{
+	return new PoolBallConfig(this, parent);
+}
+
+#include "poolball.moc"
diff --git a/kolf/objects/poolball/poolball.h b/kolf/objects/poolball/poolball.h
new file mode 100644
index 00000000..eeb851b2
--- /dev/null
+++ b/kolf/objects/poolball/poolball.h
@@ -0,0 +1,63 @@
+#ifndef KOLFPOOLBALL_H
+#define KOLFPOOLBALL_H
+
+#include <qcanvas.h>
+#include <qobject.h>
+#include <qpainter.h>
+
+#include <klibloader.h>
+
+#include <kolf/ball.h>
+#include <kolf/canvasitem.h>
+#include <kolf/config.h>
+#include <kolf/object.h>
+
+class StateDB;
+class KConfig;
+
+class PoolBallFactory : KLibFactory { Q_OBJECT public: QObject *createObject(QObject *, const char *, const char *, const QStringList & = QStringList()); };
+
+class PoolBall : public Ball
+{
+public:
+	PoolBall(QCanvas *canvas);
+
+	virtual bool deleteable() const { return true; }
+
+	virtual Config *config(QWidget *parent);
+	virtual void saveState(StateDB *);
+	virtual void save(KConfig *cfg);
+	virtual void loadState(StateDB *);
+	virtual void load(KConfig *cfg);
+	virtual void draw(QPainter &);
+	virtual bool fastAdvance() const { return true; }
+
+	int number() const { return m_number; }
+	void setNumber(int newNumber) { m_number = newNumber; update(); }
+
+private:
+	int m_number;
+};
+
+class PoolBallConfig : public Config
+{
+	Q_OBJECT
+
+public:
+	PoolBallConfig(PoolBall *poolBall, QWidget *parent);
+
+private slots:
+	void numberChanged(int);
+
+private:
+	PoolBall *m_poolBall;
+};
+
+class PoolBallObj : public Object
+{
+public:
+	PoolBallObj() { m_name = i18n("Pool Ball"); m__name = "poolball"; m_author = "Jason Katz-Brown"; }
+	virtual QCanvasItem *newObject(QCanvas *canvas) { return new PoolBall(canvas); }
+};
+
+#endif
diff --git a/kolf/objects/poolball/poolball.plugin b/kolf/objects/poolball/poolball.plugin
new file mode 100644
index 00000000..c305251f
--- /dev/null
+++ b/kolf/objects/poolball/poolball.plugin
@@ -0,0 +1 @@
+Filename=libkolfpoolball
diff --git a/kolf/objects/test/Makefile.am b/kolf/objects/test/Makefile.am
new file mode 100644
index 00000000..4e9bb33f
--- /dev/null
+++ b/kolf/objects/test/Makefile.am
@@ -0,0 +1,13 @@
+INCLUDES= $(all_includes)
+lib_LTLIBRARIES = libkolftest.la
+
+libkolftest_la_SOURCES = test.cpp
+
+libkolftest_la_LDFLAGS = $(all_libraries) $(LIB_KIO) -lkolf -module -avoid-version
+
+libkolftest_la_METASOURCES = AUTO
+
+noinst_HEADERS = test.h
+
+kolf_DATA = test.plugin
+kolfdir = $(kde_datadir)/kolf
diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp
new file mode 100644
index 00000000..2c3d564f
--- /dev/null
+++ b/kolf/objects/test/test.cpp
@@ -0,0 +1,104 @@
+#include <qbrush.h>
+#include <qcolor.h>
+#include <qcanvas.h>
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qslider.h>
+
+#include <klocale.h>
+#include <klibloader.h>
+#include <kapplication.h>
+#include <kdebug.h>
+#include <kconfig.h>
+
+#include "test.h"
+
+K_EXPORT_COMPONENT_FACTORY(libkolftest, TestFactory)
+QObject *TestFactory::createObject (QObject * /*parent*/, const char * /*name*/, const char * /*classname*/, const QStringList & /*args*/)
+{ return new TestObj; }
+
+Test::Test(QCanvas *canvas)
+	: QCanvasEllipse(60, 40, canvas), count(0), m_switchEvery(20)
+{
+	// force to the bottom of other objects
+	setZ(-100000);
+
+	// we want calls to advance() even though we have no velocity
+	setAnimated(true);
+}
+
+void Test::advance(int phase)
+{
+	QCanvasEllipse::advance(phase);
+
+	// phase is either 0 or 1, only calls with 1 should be handled
+	if (phase == 1)
+	{
+		// this makes it so the body is called every
+		// m_switchEvery times
+		if (count % m_switchEvery == 0)
+		{
+			// random color
+			const QColor myColor((QRgb)(kapp->random() % 0x01000000));
+
+			// set the brush, so our shape is drawn
+			// with the random color
+			setBrush(QBrush(myColor));
+
+			count = 0;
+		}
+
+		count++;
+	}
+}
+
+void Test::save(KConfig *cfg)
+{
+	// save our option from the course
+	// (courses are represented as KConfig files)
+	cfg->writeEntry("switchEvery", switchEvery());
+}
+
+void Test::load(KConfig *cfg)
+{
+	// load our option
+	setSwitchEvery(cfg->readNumEntry("switchEvery", 50));
+}
+
+TestConfig::TestConfig(Test *test, QWidget *parent)
+	: Config(parent), m_test(test)
+{
+	QVBoxLayout *layout = new QVBoxLayout(this, marginHint(), spacingHint());
+
+	layout->addStretch();
+
+	layout->addWidget(new QLabel(i18n("Flash speed"), this));
+
+	QHBoxLayout *hlayout = new QHBoxLayout(layout, spacingHint());
+	QLabel *slow = new QLabel(i18n("Slow"), this);
+	hlayout->addWidget(slow);
+	QSlider *slider = new QSlider(1, 100, 5, 101 - m_test->switchEvery(), Qt::Horizontal, this);
+	hlayout->addWidget(slider);
+	QLabel *fast = new QLabel(i18n("Fast"), this);
+	hlayout->addWidget(fast);
+
+	layout->addStretch();
+
+	connect(slider, SIGNAL(valueChanged(int)), this, SLOT(switchEveryChanged(int)));
+}
+
+void TestConfig::switchEveryChanged(int news)
+{
+	// update our object
+	m_test->setSwitchEvery((101 - news));
+
+	// tells Kolf the hole was modified
+	changed();
+}
+
+Config *Test::config(QWidget *parent)
+{
+	return new TestConfig(this, parent);
+}
+
+#include "test.moc"
diff --git a/kolf/objects/test/test.h b/kolf/objects/test/test.h
new file mode 100644
index 00000000..3086a578
--- /dev/null
+++ b/kolf/objects/test/test.h
@@ -0,0 +1,56 @@
+#ifndef KOLFTEST_H
+#define KOLFTEST_H
+
+#include <qcanvas.h>
+#include <qobject.h>
+
+#include <klibloader.h>
+
+#include <kolf/canvasitem.h>
+#include <kolf/object.h>
+
+class KConfig;
+
+class TestFactory : KLibFactory { Q_OBJECT public: QObject *createObject(QObject *, const char *, const char *, const QStringList & = QStringList()); };
+
+class Test : public QCanvasEllipse, public CanvasItem
+{
+public:
+	Test(QCanvas *canvas);
+
+	virtual Config *config(QWidget *parent);
+	virtual void save(KConfig *cfg);
+	virtual void load(KConfig *cfg);
+
+	virtual void advance(int phase);
+
+	int switchEvery() const { return m_switchEvery / 2; }
+	void setSwitchEvery(int news) { m_switchEvery = news * 2; }
+
+private:
+	int count;
+	int m_switchEvery;
+};
+
+class TestConfig : public Config
+{
+	Q_OBJECT
+
+public:
+	TestConfig(Test *test, QWidget *parent);
+
+private slots:
+	void switchEveryChanged(int news);
+
+private:
+	Test *m_test;
+};
+
+class TestObj : public Object
+{
+public:
+	TestObj() { m_name = i18n("Flash"); m__name = "flash"; m_author = "Jason Katz-Brown"; }
+	virtual QCanvasItem *newObject(QCanvas *canvas) { return new Test(canvas); }
+};
+
+#endif
diff --git a/kolf/objects/test/test.plugin b/kolf/objects/test/test.plugin
new file mode 100644
index 00000000..c58bec40
--- /dev/null
+++ b/kolf/objects/test/test.plugin
@@ -0,0 +1 @@
+Filename=libkolftest