[Tux4kids-commits] r1148 - in tux4kids-admin/trunk/plugins: . dummy tuxmathPlugin
Michał Świtakowski
swistakers-guest at alioth.debian.org
Mon Jul 6 17:18:27 UTC 2009
Author: swistakers-guest
Date: 2009-07-06 17:18:26 +0000 (Mon, 06 Jul 2009)
New Revision: 1148
Added:
tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.cpp
tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.h
tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.ui
Modified:
tux4kids-admin/trunk/plugins/dummy/dummy.cpp
tux4kids-admin/trunk/plugins/dummy/dummy.h
tux4kids-admin/trunk/plugins/pluginInterface.h
tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.cpp
tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.h
tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.pro
Log:
plugins provide widgets
Modified: tux4kids-admin/trunk/plugins/dummy/dummy.cpp
===================================================================
--- tux4kids-admin/trunk/plugins/dummy/dummy.cpp 2009-07-06 11:22:39 UTC (rev 1147)
+++ tux4kids-admin/trunk/plugins/dummy/dummy.cpp 2009-07-06 17:18:26 UTC (rev 1148)
@@ -18,4 +18,9 @@
return "0.1";
}
+QWidget *DummyPlugin::mainWidget()
+{
+ return m_mainWidget;
+}
+
Q_EXPORT_PLUGIN2(DummyPlugin, DummyPlugin);
Modified: tux4kids-admin/trunk/plugins/dummy/dummy.h
===================================================================
--- tux4kids-admin/trunk/plugins/dummy/dummy.h 2009-07-06 11:22:39 UTC (rev 1147)
+++ tux4kids-admin/trunk/plugins/dummy/dummy.h 2009-07-06 17:18:26 UTC (rev 1148)
@@ -16,6 +16,7 @@
QString name() const;
QString version() const;
+ QWidget *mainWidget();
};
Modified: tux4kids-admin/trunk/plugins/pluginInterface.h
===================================================================
--- tux4kids-admin/trunk/plugins/pluginInterface.h 2009-07-06 11:22:39 UTC (rev 1147)
+++ tux4kids-admin/trunk/plugins/pluginInterface.h 2009-07-06 17:18:26 UTC (rev 1148)
@@ -12,9 +12,13 @@
virtual QString name() const = 0;
virtual QString version() const = 0;
- //virtual QWidget *widget() = 0;
+ virtual QWidget *mainWidget() = 0;
+
+protected:
+
+ QWidget *m_mainWidget = 0;
};
-Q_DECLARE_INTERFACE(PluginInterface, "org.Tux4Kids.Tux4KidsPluginInterface/0.0.1");
+Q_DECLARE_INTERFACE(PluginInterface, "org.Tux4Kids.Tux4KidsPluginInterface/0.0.2");
#endif
Added: tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.cpp
===================================================================
--- tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.cpp (rev 0)
+++ tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.cpp 2009-07-06 17:18:26 UTC (rev 1148)
@@ -0,0 +1,14 @@
+#include "tuxmathMainWidget.h"
+#include "ui_tuxmathMainWidget.h"
+
+TuxmathMainWidget::TuxmathMainWidget(QWidget *parent) :
+ QWidget(parent),
+ m_ui(new Ui::TuxmathMainWidget)
+{
+ m_ui->setupUi(this);
+}
+
+TuxmathMainWidget::~TuxmathMainWidget()
+{
+ delete m_ui;
+}
Added: tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.h
===================================================================
--- tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.h (rev 0)
+++ tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.h 2009-07-06 17:18:26 UTC (rev 1148)
@@ -0,0 +1,22 @@
+#ifndef TUXMATHMAINWIDGET_H
+#define TUXMATHMAINWIDGET_H
+
+#include <QtGui/QWidget>
+
+namespace Ui {
+ class TuxmathMainWidget;
+}
+
+class TuxmathMainWidget : public QWidget {
+ Q_OBJECT
+ Q_DISABLE_COPY(TuxmathMainWidget)
+public:
+ explicit TuxmathMainWidget(QWidget *parent = 0);
+ virtual ~TuxmathMainWidget();
+
+private:
+
+ Ui::TuxmathMainWidget *m_ui;
+};
+
+#endif // TUXMATHMAINWIDGET_H
Added: tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.ui
===================================================================
--- tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.ui (rev 0)
+++ tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.ui 2009-07-06 17:18:26 UTC (rev 1148)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TuxmathMainWidget</class>
+ <widget class="QWidget" name="TuxmathMainWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>300</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <widget class="QLabel" name="label">
+ <property name="geometry">
+ <rect>
+ <x>70</x>
+ <y>50</y>
+ <width>57</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>tuxmath</string>
+ </property>
+ </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
Modified: tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.cpp
===================================================================
--- tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.cpp 2009-07-06 11:22:39 UTC (rev 1147)
+++ tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.cpp 2009-07-06 17:18:26 UTC (rev 1148)
@@ -18,4 +18,9 @@
return "0.0.1";
}
+QWidget *TuxmathPlugin::mainWidget()
+{
+ return m_mainWidget;
+}
+
Q_EXPORT_PLUGIN2(TuxmathPlugin, TuxmathPlugin);
Modified: tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.h
===================================================================
--- tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.h 2009-07-06 11:22:39 UTC (rev 1147)
+++ tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.h 2009-07-06 17:18:26 UTC (rev 1148)
@@ -16,6 +16,7 @@
QString name() const;
QString version() const;
+ QWidget *mainWidget();
};
Modified: tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.pro
===================================================================
--- tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.pro 2009-07-06 11:22:39 UTC (rev 1147)
+++ tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.pro 2009-07-06 17:18:26 UTC (rev 1148)
@@ -1,14 +1,10 @@
-TEMPLATE = lib
-CONFIG += plugin
-INCLUDEPATH += ../
-
-HEADERS = tuxmathPlugin.h \
-
-SOURCES = tuxmathPlugin.cpp \
-
-TARGET = $$qtLibraryTarget(TuxmathPlugin)
-DESTDIR = ../
-
-# Uncomment to use GCOV
-# QMAKE_CXXFLAGS+=-fprofile-arcs -ftest-coverage
-
+TEMPLATE = lib
+CONFIG += plugin
+INCLUDEPATH += ../
+HEADERS = tuxmathPlugin.h \
+ tuxmathMainWidget.h
+SOURCES = tuxmathPlugin.cpp \
+ tuxmathMainWidget.cpp
+TARGET = $$qtLibraryTarget(TuxmathPlugin)
+DESTDIR = ../
+FORMS += tuxmathMainWidget.ui
More information about the Tux4kids-commits
mailing list