[Tux4kids-commits] r1202 - in tux4kids-admin/trunk: libtux4kidsadmin libtux4kidsadmin_tuxmath tux4kids-admin/src
Michał Świtakowski
swistakers-guest at alioth.debian.org
Tue Jul 14 15:00:52 UTC 2009
Author: swistakers-guest
Date: 2009-07-14 15:00:45 +0000 (Tue, 14 Jul 2009)
New Revision: 1202
Added:
tux4kids-admin/trunk/tux4kids-admin/src/addStudentDialog.cpp
tux4kids-admin/trunk/tux4kids-admin/src/addStudentDialog.h
tux4kids-admin/trunk/tux4kids-admin/src/addStudentDialog.ui
tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.cpp
tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.h
tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.ui
tux4kids-admin/trunk/tux4kids-admin/src/studentTableModel.cpp
tux4kids-admin/trunk/tux4kids-admin/src/studentTableModel.h
Modified:
tux4kids-admin/trunk/libtux4kidsadmin/libtux4kidsadmin.pro
tux4kids-admin/trunk/libtux4kidsadmin/schoolData_p.h
tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/libtux4kidsadmin_tuxmath.pro
tux4kids-admin/trunk/tux4kids-admin/src/mainWindow.cpp
tux4kids-admin/trunk/tux4kids-admin/src/mainWindow.h
tux4kids-admin/trunk/tux4kids-admin/src/mainWindow.ui
tux4kids-admin/trunk/tux4kids-admin/src/src.pro
Log:
some classes in GUI, not included in cmake for now
Modified: tux4kids-admin/trunk/libtux4kidsadmin/libtux4kidsadmin.pro
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/libtux4kidsadmin.pro 2009-07-14 12:51:25 UTC (rev 1201)
+++ tux4kids-admin/trunk/libtux4kidsadmin/libtux4kidsadmin.pro 2009-07-14 15:00:45 UTC (rev 1202)
@@ -4,12 +4,10 @@
DEFINES += LIBTUX4KIDSADMIN_LIBRARY
SOURCES += libtux4kidsadmin.cpp \
profileDir.cpp \
- profileDirPrivate.cpp \
- schoolData.cpp \
- schoolDataPrivate.cpp
+ schoolData.cpp
HEADERS += libtux4kidsadmin.h \
libtux4kidsadmin_global.h \
profileDir.h \
- profileDirPrivate_p.h \
schoolData.h \
- schoolDataPrivate_p.h
+ schoolData_p.h \
+ profileDir_p.h
Modified: tux4kids-admin/trunk/libtux4kidsadmin/schoolData_p.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/schoolData_p.h 2009-07-14 12:51:25 UTC (rev 1201)
+++ tux4kids-admin/trunk/libtux4kidsadmin/schoolData_p.h 2009-07-14 15:00:45 UTC (rev 1202)
@@ -3,8 +3,13 @@
#include <QtGlobal>
#include <QDir>
+#include <QList>
+#include <QPointer>
+
#include "schoolData.h"
+
class QString;
+class ProfileDir;
class SchoolDataPrivate
{
@@ -17,8 +22,8 @@
SchoolData *q_ptr;
QDir mainDir;
-
SchoolData::Status status;
+ QList< QPointer<ProfileDir> > profiles;
};
#endif // SCHOOLDATAPRIVATE_P_H
Modified: tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/libtux4kidsadmin_tuxmath.pro
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/libtux4kidsadmin_tuxmath.pro 2009-07-14 12:51:25 UTC (rev 1201)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxmath/libtux4kidsadmin_tuxmath.pro 2009-07-14 15:00:45 UTC (rev 1202)
@@ -3,12 +3,11 @@
TEMPLATE = lib
DEFINES += LIBTUX4KIDSADMIN_TUXMATH_LIBRARY
SOURCES += libtux4kidsadmin_tuxmath.cpp \
- profileDirTuxmathPrivate.cpp \
profileDirTuxmath.cpp
HEADERS += libtux4kidsadmin_tuxmath.h \
libtux4kidsadmin_tuxmath_global.h \
- profileDirTuxmathPrivate_p.h \
- profileDirTuxmath.h
+ profileDirTuxmath.h \
+ profileDirTuxmath_p.h
INCLUDEPATH += ../libtux4kidsadmin
LIBS += -ltux4kidsadmin \
-L../libtux4kidsadmin
Added: tux4kids-admin/trunk/tux4kids-admin/src/addStudentDialog.cpp
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/addStudentDialog.cpp (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/src/addStudentDialog.cpp 2009-07-14 15:00:45 UTC (rev 1202)
@@ -0,0 +1,29 @@
+#include "addStudentDialog.h"
+#include "ui_addStudentDialog.h"
+
+#include <QListWidgetItem>
+
+AddStudentDialog::AddStudentDialog(QWidget *parent) :
+ QDialog(parent),
+ m_ui(new Ui::AddStudentDialog)
+{
+ m_ui->setupUi(this);
+
+ QListWidgetItem *testListWidgetItem = new QListWidgetItem("haha");
+ testListWidgetItem->setFlags(testListWidgetItem->flags() | Qt::ItemIsUserCheckable);
+
+ m_ui->applicationList->addItem(testListWidgetItem);
+ testListWidgetItem->setFlags(testListWidgetItem->flags() | Qt::ItemIsUserCheckable);
+ testListWidgetItem->setCheckState(Qt::Unchecked);
+
+ QListWidgetItem *testListWidgetItem2 = new QListWidgetItem("haha2");
+ testListWidgetItem2->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
+
+ m_ui->applicationList->addItem(testListWidgetItem2);
+ testListWidgetItem2->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
+}
+
+AddStudentDialog::~AddStudentDialog()
+{
+ delete m_ui;
+}
Added: tux4kids-admin/trunk/tux4kids-admin/src/addStudentDialog.h
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/addStudentDialog.h (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/src/addStudentDialog.h 2009-07-14 15:00:45 UTC (rev 1202)
@@ -0,0 +1,21 @@
+#ifndef ADDSTUDENTDIALOG_H
+#define ADDSTUDENTDIALOG_H
+
+#include <QtGui/QDialog>
+
+namespace Ui {
+ class AddStudentDialog;
+}
+
+class AddStudentDialog : public QDialog
+{
+ Q_OBJECT
+public:
+ AddStudentDialog(QWidget *parent = 0);
+ ~AddStudentDialog();
+
+private:
+ Ui::AddStudentDialog *m_ui;
+};
+
+#endif // ADDSTUDENTDIALOG_H
Added: tux4kids-admin/trunk/tux4kids-admin/src/addStudentDialog.ui
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/addStudentDialog.ui (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/src/addStudentDialog.ui 2009-07-14 15:00:45 UTC (rev 1202)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AddStudentDialog</class>
+ <widget class="QDialog" name="AddStudentDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>447</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Add student</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>First name:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Last name:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="firstNameEdit"/>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="lastNameEdit"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QListWidget" name="applicationList"/>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
Modified: tux4kids-admin/trunk/tux4kids-admin/src/mainWindow.cpp
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/mainWindow.cpp 2009-07-14 12:51:25 UTC (rev 1201)
+++ tux4kids-admin/trunk/tux4kids-admin/src/mainWindow.cpp 2009-07-14 15:00:45 UTC (rev 1202)
@@ -1,19 +1,21 @@
#include "mainWindow.h"
#include "ui_mainWindow.h"
#include "pluginManagerDialog.h"
+#include "manageStudentsWidget.h"
-MainWindow::MainWindow(MainController *controller, QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
+MainWindow::MainWindow(MainController *controller, QWidget *parent) : QMainWindow(parent), m_ui(new Ui::MainWindow)
{
- ui->setupUi(this);
+ m_ui->setupUi(this);
mainController = controller;
+ //m_ui->tabWidget->insertTab(1, new ManageStudentsWidget(this), tr("Students"));
- connect(ui->actionPlugins, SIGNAL(triggered()), this, SLOT(pluginsManagerClicked()));
+ connect(m_ui->actionPlugins, SIGNAL(triggered()), this, SLOT(pluginsManagerClicked()));
}
MainWindow::~MainWindow()
{
- delete ui;
+ delete m_ui;
}
void MainWindow::pluginsManagerClicked()
Modified: tux4kids-admin/trunk/tux4kids-admin/src/mainWindow.h
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/mainWindow.h 2009-07-14 12:51:25 UTC (rev 1201)
+++ tux4kids-admin/trunk/tux4kids-admin/src/mainWindow.h 2009-07-14 15:00:45 UTC (rev 1202)
@@ -19,7 +19,7 @@
~MainWindow();
private:
- Ui::MainWindow *ui;
+ Ui::MainWindow *m_ui;
MainController *mainController;
Modified: tux4kids-admin/trunk/tux4kids-admin/src/mainWindow.ui
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/mainWindow.ui 2009-07-14 12:51:25 UTC (rev 1201)
+++ tux4kids-admin/trunk/tux4kids-admin/src/mainWindow.ui 2009-07-14 15:00:45 UTC (rev 1202)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow" >
- <property name="geometry" >
+ <widget class="QMainWindow" name="MainWindow">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,43 +10,74 @@
<height>400</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>MainWindow</string>
</property>
- <widget class="QWidget" name="centralWidget" />
- <widget class="QMenuBar" name="menuBar" >
- <property name="geometry" >
+ <widget class="QWidget" name="centralWidget">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QTabWidget" name="tabWidget">
+ <widget class="ManageStudentsWidget" name="tab">
+ <attribute name="title">
+ <string>Students</string>
+ </attribute>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QMenuBar" name="menuBar">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>600</width>
- <height>30</height>
+ <height>26</height>
</rect>
</property>
- <widget class="QMenu" name="menuSettings" >
- <property name="title" >
+ <widget class="QMenu" name="menuSettings">
+ <property name="title">
<string>Settings</string>
</property>
- <addaction name="actionPlugins" />
+ <addaction name="actionPlugins"/>
</widget>
- <addaction name="menuSettings" />
+ <addaction name="menuSettings"/>
</widget>
- <widget class="QToolBar" name="mainToolBar" >
- <attribute name="toolBarArea" >
+ <widget class="QToolBar" name="mainToolBar">
+ <attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
- <attribute name="toolBarBreak" >
+ <attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
</widget>
- <widget class="QStatusBar" name="statusBar" />
- <action name="actionPlugins" >
- <property name="text" >
+ <widget class="QStatusBar" name="statusBar"/>
+ <widget class="QToolBar" name="toolBar">
+ <property name="windowTitle">
+ <string>toolBar</string>
+ </property>
+ <attribute name="toolBarArea">
+ <enum>TopToolBarArea</enum>
+ </attribute>
+ <attribute name="toolBarBreak">
+ <bool>false</bool>
+ </attribute>
+ </widget>
+ <action name="actionPlugins">
+ <property name="text">
<string>Plugins...</string>
</property>
</action>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
+ <customwidgets>
+ <customwidget>
+ <class>ManageStudentsWidget</class>
+ <extends>QWidget</extends>
+ <header>manageStudentsWidget.h</header>
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
<resources/>
<connections/>
</ui>
Added: tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.cpp
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.cpp (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.cpp 2009-07-14 15:00:45 UTC (rev 1202)
@@ -0,0 +1,26 @@
+#include "manageStudentsWidget.h"
+#include "ui_manageStudentsWidget.h"
+#include "addStudentDialog.h"
+
+ManageStudentsWidget::ManageStudentsWidget(QWidget *parent) :
+ QWidget(parent),
+ m_ui(new Ui::ManageStudentsWidget),
+ addStudentDialog(0)
+{
+ m_ui->setupUi(this);
+
+ connect(m_ui->addStudentButton, SIGNAL(clicked()), this, SLOT(addStudentClicked()));
+}
+
+ManageStudentsWidget::~ManageStudentsWidget()
+{
+ delete m_ui;
+}
+
+void ManageStudentsWidget::addStudentClicked()
+{
+ if (addStudentDialog == 0) {
+ addStudentDialog = new AddStudentDialog();
+ }
+ addStudentDialog->showNormal();
+}
Added: tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.h
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.h (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.h 2009-07-14 15:00:45 UTC (rev 1202)
@@ -0,0 +1,29 @@
+#ifndef MANAGESTUDENTSWIDGET_H
+#define MANAGESTUDENTSWIDGET_H
+
+#include <QtGui/QWidget>
+#include <QPointer>
+
+class AddStudentDialog;
+
+namespace Ui {
+ class ManageStudentsWidget;
+}
+
+class ManageStudentsWidget : public QWidget
+{
+ Q_OBJECT
+public:
+ ManageStudentsWidget(QWidget *parent = 0);
+ ~ManageStudentsWidget();
+
+private:
+ Ui::ManageStudentsWidget *m_ui;
+ QPointer<AddStudentDialog> addStudentDialog;
+
+private slots:
+
+ void addStudentClicked();
+};
+
+#endif // MANAGESTUDENTSWIDGET_H
Added: tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.ui
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.ui (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.ui 2009-07-14 15:00:45 UTC (rev 1202)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ManageStudentsWidget</class>
+ <widget class="QWidget" name="ManageStudentsWidget">
+ <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>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QTableView" name="studentsTable"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="addStudentButton">
+ <property name="text">
+ <string>Add</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
Modified: tux4kids-admin/trunk/tux4kids-admin/src/src.pro
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/src.pro 2009-07-14 12:51:25 UTC (rev 1201)
+++ tux4kids-admin/trunk/tux4kids-admin/src/src.pro 2009-07-14 15:00:45 UTC (rev 1202)
@@ -1,23 +1,27 @@
TARGET = ../tux4kids-admin
TEMPLATE = app
-INCLUDEPATH += ../plugins/
-
+INCLUDEPATH += ../plugins/ \
+ ../../libtux4kidsadmin/
SOURCES += main.cpp \
mainWindow.cpp \
mainController.cpp \
pluginManager.cpp \
pluginManagerDialog.cpp \
applicationInfo.cpp \
- errorLog.cpp
+ errorLog.cpp \
+ manageStudentsWidget.cpp \
+ addStudentDialog.cpp \
+ studentTableModel.cpp
HEADERS += mainWindow.h \
mainController.h \
pluginManager.h \
pluginManagerDialog.h \
applicationInfo.h \
- errorLog.h
+ errorLog.h \
+ manageStudentsWidget.h \
+ addStudentDialog.h \
+ studentTableModel.h
FORMS += mainWindow.ui \
- pluginManagerDialog.ui
-
-
-
-
+ pluginManagerDialog.ui \
+ manageStudentsWidget.ui \
+ addStudentDialog.ui
Added: tux4kids-admin/trunk/tux4kids-admin/src/studentTableModel.cpp
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/studentTableModel.cpp (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/src/studentTableModel.cpp 2009-07-14 15:00:45 UTC (rev 1202)
@@ -0,0 +1,12 @@
+#include "studentTableModel.h"
+#include "schoolData.h"
+
+StudentTableModel::StudentTableModel(SchoolData *schoolData, QObject *parent)
+ : QAbstractTableModel(parent),
+ m_schoolData(schoolData)
+{
+}
+
+StudentTableModel::~StudentTableModel()
+{
+}
Added: tux4kids-admin/trunk/tux4kids-admin/src/studentTableModel.h
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/studentTableModel.h (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/src/studentTableModel.h 2009-07-14 15:00:45 UTC (rev 1202)
@@ -0,0 +1,21 @@
+#ifndef STUDENTTABLEMODEL_H
+#define STUDENTTABLEMODEL_H
+
+#include <QAbstractTableModel>
+#include <QPointer>
+
+class SchoolData;
+
+class StudentTableModel : public QAbstractTableModel
+{
+ Q_OBJECT
+public:
+ StudentTableModel(SchoolData *schoolData, QObject *parent = 0);
+ ~StudentTableModel();
+
+protected:
+
+ QPointer<SchoolData> m_schoolData;
+};
+
+#endif // STUDENTTABLEMODEL_H
More information about the Tux4kids-commits
mailing list