[Tux4kids-commits] r1149 - in tux4kids-admin/trunk: . tux4kids-admin tux4kids-admin/plugins tux4kids-admin/plugins/dummy tux4kids-admin/plugins/tuxmathPlugin
Michał Świtakowski
swistakers-guest at alioth.debian.org
Mon Jul 6 18:20:21 UTC 2009
Author: swistakers-guest
Date: 2009-07-06 18:20:17 +0000 (Mon, 06 Jul 2009)
New Revision: 1149
Added:
tux4kids-admin/trunk/tux4kids-admin/
tux4kids-admin/trunk/tux4kids-admin/CMakeLists.txt
tux4kids-admin/trunk/tux4kids-admin/plugins/
tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.cpp
tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.h
tux4kids-admin/trunk/tux4kids-admin/plugins/pluginInterface.h
tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathMainWidget.cpp
tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathMainWidget.h
tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathMainWidget.ui
tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp
tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.h
tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.pro
tux4kids-admin/trunk/tux4kids-admin/src/
tux4kids-admin/trunk/tux4kids-admin/translations/
tux4kids-admin/trunk/tux4kids-admin/tux4kids-admin.pro
Removed:
tux4kids-admin/trunk/CMakeLists.txt
tux4kids-admin/trunk/plugins/
tux4kids-admin/trunk/src/
tux4kids-admin/trunk/translations/
tux4kids-admin/trunk/tux4kids-admin.pro
tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.cpp
tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.h
tux4kids-admin/trunk/tux4kids-admin/plugins/pluginInterface.h
tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp
tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.h
tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.pro
Log:
moved gui to separate dir
Deleted: tux4kids-admin/trunk/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/CMakeLists.txt 2009-07-06 17:18:26 UTC (rev 1148)
+++ tux4kids-admin/trunk/CMakeLists.txt 2009-07-06 18:20:17 UTC (rev 1149)
@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-add_subdirectory( src/ )
-add_subdirectory( plugins/dummy/ )
-add_subdirectory( plugins/tuxmathPlugin )
-
-find_package( Qt4 REQUIRED )
-
-SET(TS_FILES translations/tux4kids-admin_pl.ts )
-
-QT4_ADD_TRANSLATION(QM_FILES ${TS_FILES})
-
Copied: tux4kids-admin/trunk/tux4kids-admin/CMakeLists.txt (from rev 1147, tux4kids-admin/trunk/CMakeLists.txt)
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/CMakeLists.txt (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/CMakeLists.txt 2009-07-06 18:20:17 UTC (rev 1149)
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 2.6)
+
+add_subdirectory( src/ )
+add_subdirectory( plugins/dummy/ )
+add_subdirectory( plugins/tuxmathPlugin )
+
+find_package( Qt4 REQUIRED )
+
+SET(TS_FILES translations/tux4kids-admin_pl.ts )
+
+QT4_ADD_TRANSLATION(QM_FILES ${TS_FILES})
+
Deleted: tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.cpp
===================================================================
--- tux4kids-admin/trunk/plugins/dummy/dummy.cpp 2009-07-06 11:22:39 UTC (rev 1147)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.cpp 2009-07-06 18:20:17 UTC (rev 1149)
@@ -1,21 +0,0 @@
-#include "dummy.h"
-
-DummyPlugin::DummyPlugin(QObject *parent) : QObject(parent)
-{
-}
-
-DummyPlugin::~DummyPlugin()
-{
-}
-
-QString DummyPlugin::name() const
-{
- return tr("dummy plugin");
-}
-
-QString DummyPlugin::version() const
-{
- return "0.1";
-}
-
-Q_EXPORT_PLUGIN2(DummyPlugin, DummyPlugin);
Copied: tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.cpp (from rev 1148, tux4kids-admin/trunk/plugins/dummy/dummy.cpp)
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.cpp (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.cpp 2009-07-06 18:20:17 UTC (rev 1149)
@@ -0,0 +1,26 @@
+#include "dummy.h"
+
+DummyPlugin::DummyPlugin(QObject *parent) : QObject(parent)
+{
+}
+
+DummyPlugin::~DummyPlugin()
+{
+}
+
+QString DummyPlugin::name() const
+{
+ return tr("dummy plugin");
+}
+
+QString DummyPlugin::version() const
+{
+ return "0.1";
+}
+
+QWidget *DummyPlugin::mainWidget()
+{
+ return m_mainWidget;
+}
+
+Q_EXPORT_PLUGIN2(DummyPlugin, DummyPlugin);
Deleted: tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.h
===================================================================
--- tux4kids-admin/trunk/plugins/dummy/dummy.h 2009-07-06 11:22:39 UTC (rev 1147)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.h 2009-07-06 18:20:17 UTC (rev 1149)
@@ -1,22 +0,0 @@
-#ifndef DUMMY_PLUGIN_H
-#define DUMMY_PLUGIN_H
-
-#include <QObject>
-
-#include "pluginInterface.h"
-
-class DummyPlugin : public QObject, PluginInterface
-{
- Q_OBJECT
- Q_INTERFACES(PluginInterface)
-
-public:
- DummyPlugin(QObject *parent = 0);
- ~DummyPlugin();
-
- QString name() const;
- QString version() const;
-
-};
-
-#endif
Copied: tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.h (from rev 1148, tux4kids-admin/trunk/plugins/dummy/dummy.h)
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.h (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/dummy/dummy.h 2009-07-06 18:20:17 UTC (rev 1149)
@@ -0,0 +1,23 @@
+#ifndef DUMMY_PLUGIN_H
+#define DUMMY_PLUGIN_H
+
+#include <QObject>
+
+#include "pluginInterface.h"
+
+class DummyPlugin : public QObject, PluginInterface
+{
+ Q_OBJECT
+ Q_INTERFACES(PluginInterface)
+
+public:
+ DummyPlugin(QObject *parent = 0);
+ ~DummyPlugin();
+
+ QString name() const;
+ QString version() const;
+ QWidget *mainWidget();
+
+};
+
+#endif
Deleted: tux4kids-admin/trunk/tux4kids-admin/plugins/pluginInterface.h
===================================================================
--- tux4kids-admin/trunk/plugins/pluginInterface.h 2009-07-06 11:22:39 UTC (rev 1147)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/pluginInterface.h 2009-07-06 18:20:17 UTC (rev 1149)
@@ -1,20 +0,0 @@
-#ifndef PLUGIN_INTERFACE_H
-#define PLUGIN_INTERFACE_H
-
-#include <QString>
-#include <QtPlugin>
-
-class PluginInterface
-{
-public:
- virtual ~PluginInterface() {}
-
- virtual QString name() const = 0;
- virtual QString version() const = 0;
-
- //virtual QWidget *widget() = 0;
-};
-
-Q_DECLARE_INTERFACE(PluginInterface, "org.Tux4Kids.Tux4KidsPluginInterface/0.0.1");
-
-#endif
Copied: tux4kids-admin/trunk/tux4kids-admin/plugins/pluginInterface.h (from rev 1148, tux4kids-admin/trunk/plugins/pluginInterface.h)
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/pluginInterface.h (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/pluginInterface.h 2009-07-06 18:20:17 UTC (rev 1149)
@@ -0,0 +1,24 @@
+#ifndef PLUGIN_INTERFACE_H
+#define PLUGIN_INTERFACE_H
+
+#include <QString>
+#include <QtPlugin>
+
+class PluginInterface
+{
+public:
+ virtual ~PluginInterface() {}
+
+ virtual QString name() const = 0;
+ virtual QString version() const = 0;
+
+ virtual QWidget *mainWidget() = 0;
+
+protected:
+
+ QWidget *m_mainWidget = 0;
+};
+
+Q_DECLARE_INTERFACE(PluginInterface, "org.Tux4Kids.Tux4KidsPluginInterface/0.0.2");
+
+#endif
Copied: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathMainWidget.cpp (from rev 1148, tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.cpp)
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathMainWidget.cpp (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathMainWidget.cpp 2009-07-06 18:20:17 UTC (rev 1149)
@@ -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;
+}
Copied: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathMainWidget.h (from rev 1148, tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.h)
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathMainWidget.h (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathMainWidget.h 2009-07-06 18:20:17 UTC (rev 1149)
@@ -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
Copied: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathMainWidget.ui (from rev 1148, tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathMainWidget.ui)
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathMainWidget.ui (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathMainWidget.ui 2009-07-06 18:20:17 UTC (rev 1149)
@@ -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>
Deleted: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp
===================================================================
--- tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.cpp 2009-07-06 11:22:39 UTC (rev 1147)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp 2009-07-06 18:20:17 UTC (rev 1149)
@@ -1,21 +0,0 @@
-#include "tuxmathPlugin.h"
-
-TuxmathPlugin::TuxmathPlugin(QObject *parent) : QObject(parent)
-{
-}
-
-TuxmathPlugin::~TuxmathPlugin()
-{
-}
-
-QString TuxmathPlugin::name() const
-{
- return tr("tuxmath plugin");
-}
-
-QString TuxmathPlugin::version() const
-{
- return "0.0.1";
-}
-
-Q_EXPORT_PLUGIN2(TuxmathPlugin, TuxmathPlugin);
Copied: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp (from rev 1148, tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.cpp)
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.cpp 2009-07-06 18:20:17 UTC (rev 1149)
@@ -0,0 +1,26 @@
+#include "tuxmathPlugin.h"
+
+TuxmathPlugin::TuxmathPlugin(QObject *parent) : QObject(parent)
+{
+}
+
+TuxmathPlugin::~TuxmathPlugin()
+{
+}
+
+QString TuxmathPlugin::name() const
+{
+ return tr("tuxmath plugin");
+}
+
+QString TuxmathPlugin::version() const
+{
+ return "0.0.1";
+}
+
+QWidget *TuxmathPlugin::mainWidget()
+{
+ return m_mainWidget;
+}
+
+Q_EXPORT_PLUGIN2(TuxmathPlugin, TuxmathPlugin);
Deleted: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.h
===================================================================
--- tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.h 2009-07-06 11:22:39 UTC (rev 1147)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.h 2009-07-06 18:20:17 UTC (rev 1149)
@@ -1,23 +0,0 @@
-#ifndef TUXMATH_PLUGIN_H
-#define TUXMATH_PLUGIN_H
-
-#include <QObject>
-
-#include "pluginInterface.h"
-
-class TuxmathPlugin : public QObject, PluginInterface
-{
- Q_OBJECT
- Q_INTERFACES(PluginInterface)
-
-public:
- TuxmathPlugin(QObject *parent = 0);
- ~TuxmathPlugin();
-
- QString name() const;
- QString version() const;
-
-
-};
-
-#endif
Copied: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.h (from rev 1148, tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.h)
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.h (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.h 2009-07-06 18:20:17 UTC (rev 1149)
@@ -0,0 +1,24 @@
+#ifndef TUXMATH_PLUGIN_H
+#define TUXMATH_PLUGIN_H
+
+#include <QObject>
+
+#include "pluginInterface.h"
+
+class TuxmathPlugin : public QObject, PluginInterface
+{
+ Q_OBJECT
+ Q_INTERFACES(PluginInterface)
+
+public:
+ TuxmathPlugin(QObject *parent = 0);
+ ~TuxmathPlugin();
+
+ QString name() const;
+ QString version() const;
+ QWidget *mainWidget();
+
+
+};
+
+#endif
Deleted: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.pro
===================================================================
--- tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.pro 2009-07-06 11:22:39 UTC (rev 1147)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.pro 2009-07-06 18:20:17 UTC (rev 1149)
@@ -1,14 +0,0 @@
-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
-
Copied: tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.pro (from rev 1148, tux4kids-admin/trunk/plugins/tuxmathPlugin/tuxmathPlugin.pro)
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.pro (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/plugins/tuxmathPlugin/tuxmathPlugin.pro 2009-07-06 18:20:17 UTC (rev 1149)
@@ -0,0 +1,10 @@
+TEMPLATE = lib
+CONFIG += plugin
+INCLUDEPATH += ../
+HEADERS = tuxmathPlugin.h \
+ tuxmathMainWidget.h
+SOURCES = tuxmathPlugin.cpp \
+ tuxmathMainWidget.cpp
+TARGET = $$qtLibraryTarget(TuxmathPlugin)
+DESTDIR = ../
+FORMS += tuxmathMainWidget.ui
Copied: tux4kids-admin/trunk/tux4kids-admin/tux4kids-admin.pro (from rev 1147, tux4kids-admin/trunk/tux4kids-admin.pro)
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/tux4kids-admin.pro (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/tux4kids-admin.pro 2009-07-06 18:20:17 UTC (rev 1149)
@@ -0,0 +1,9 @@
+TEMPLATE = subdirs
+
+SUBDIRS = src \
+ plugins/dummy \
+ plugins/tuxmathPlugin
+
+TRANSLATIONS = translations/tux4kids-admin_pl.ts \
+
+
Deleted: tux4kids-admin/trunk/tux4kids-admin.pro
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin.pro 2009-07-06 17:18:26 UTC (rev 1148)
+++ tux4kids-admin/trunk/tux4kids-admin.pro 2009-07-06 18:20:17 UTC (rev 1149)
@@ -1,9 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS = src \
- plugins/dummy \
- plugins/tuxmathPlugin
-
-TRANSLATIONS = translations/tux4kids-admin_pl.ts \
-
-
More information about the Tux4kids-commits
mailing list