[Tux4kids-commits] r1354 - tux4kids-admin/trunk/tux4kids-admin/src
Michał Świtakowski
swistakers-guest at alioth.debian.org
Tue Aug 4 11:18:30 UTC 2009
Author: swistakers-guest
Date: 2009-08-04 11:18:30 +0000 (Tue, 04 Aug 2009)
New Revision: 1354
Added:
tux4kids-admin/trunk/tux4kids-admin/src/selectStudentWidget.cpp
tux4kids-admin/trunk/tux4kids-admin/src/selectStudentWidget.h
tux4kids-admin/trunk/tux4kids-admin/src/selectStudentWidget.ui
Modified:
tux4kids-admin/trunk/tux4kids-admin/src/CMakeLists.txt
tux4kids-admin/trunk/tux4kids-admin/src/editClassDialog.cpp
tux4kids-admin/trunk/tux4kids-admin/src/editClassDialog.h
tux4kids-admin/trunk/tux4kids-admin/src/editClassDialog.ui
tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.cpp
tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.h
tux4kids-admin/trunk/tux4kids-admin/src/src.pro
Log:
implemented SearchStudentWidget
Modified: tux4kids-admin/trunk/tux4kids-admin/src/CMakeLists.txt
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/CMakeLists.txt 2009-08-04 10:59:58 UTC (rev 1353)
+++ tux4kids-admin/trunk/tux4kids-admin/src/CMakeLists.txt 2009-08-04 11:18:30 UTC (rev 1354)
@@ -20,7 +20,8 @@
classTableProxyModel.cpp
teacherTableProxyModel.cpp
editClassDialog.cpp
- editTeacherDialog.cpp )
+ editTeacherDialog.cpp
+ selectStudentWidget.cpp )
SET(TUX4KIDS-ADMIN_MOC_HEADERS
mainWindow.h
@@ -38,7 +39,8 @@
classTableProxyModel.h
teacherTableProxyModel.h
editClassDialog.h
- editTeacherDialog.h )
+ editTeacherDialog.h
+ selectStudentWidget.h )
SET(TUX4KIDS-ADMIN_UIS
mainWindow.ui
@@ -48,7 +50,8 @@
manageClassesWidget.ui
manageTeachersWidget.ui
editClassDialog.ui
- editTeacherDialog.ui )
+ editTeacherDialog.ui
+ selectStudentWidget.ui )
# enable warnings
ADD_DEFINITIONS( -Wall )
Modified: tux4kids-admin/trunk/tux4kids-admin/src/editClassDialog.cpp
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/editClassDialog.cpp 2009-08-04 10:59:58 UTC (rev 1353)
+++ tux4kids-admin/trunk/tux4kids-admin/src/editClassDialog.cpp 2009-08-04 11:18:30 UTC (rev 1354)
@@ -1,5 +1,6 @@
#include "editClassDialog.h"
#include "ui_editClassDialog.h"
+#include "selectStudentWidget.h"
#include <QPushButton>
@@ -9,6 +10,8 @@
{
m_ui->setupUi(this);
+ m_ui->verticalLayout->insertWidget(1, new SelectStudentWidget(this));
+
connect(m_ui->nameEdit, SIGNAL(textEdited(QString)), this, SLOT(validate()));
connect(m_ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(accept()));
connect(m_ui->buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(reject()));
Modified: tux4kids-admin/trunk/tux4kids-admin/src/editClassDialog.h
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/editClassDialog.h 2009-08-04 10:59:58 UTC (rev 1353)
+++ tux4kids-admin/trunk/tux4kids-admin/src/editClassDialog.h 2009-08-04 11:18:30 UTC (rev 1354)
@@ -3,6 +3,9 @@
#include <QtGui/QDialog>
+#include "studentTableModel.h"
+
+
namespace Ui {
class EditClassDialog;
}
@@ -25,3 +28,4 @@
};
#endif // EDITCLASSDIALOG_H
+
Modified: tux4kids-admin/trunk/tux4kids-admin/src/editClassDialog.ui
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/editClassDialog.ui 2009-08-04 10:59:58 UTC (rev 1353)
+++ tux4kids-admin/trunk/tux4kids-admin/src/editClassDialog.ui 2009-08-04 11:18:30 UTC (rev 1354)
@@ -6,48 +6,40 @@
<rect>
<x>0</x>
<y>0</y>
- <width>400</width>
- <height>300</height>
+ <width>445</width>
+ <height>515</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
- <widget class="QWidget" name="formLayoutWidget">
- <property name="geometry">
- <rect>
- <x>90</x>
- <y>40</y>
- <width>160</width>
- <height>80</height>
- </rect>
- </property>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Name:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="nameEdit"/>
- </item>
- </layout>
- </widget>
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="geometry">
- <rect>
- <x>190</x>
- <y>250</y>
- <width>163</width>
- <height>26</height>
- </rect>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
- </property>
- </widget>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <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>Name:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="nameEdit"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
<resources/>
<connections/>
Modified: tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.cpp
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.cpp 2009-08-04 10:59:58 UTC (rev 1353)
+++ tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.cpp 2009-08-04 11:18:30 UTC (rev 1354)
@@ -19,6 +19,8 @@
m_mainController = mainController;
connect(m_ui->addStudentButton, SIGNAL(clicked()), this, SLOT(addStudentClicked()));
+ connect(m_ui->editStudentButton, SIGNAL(clicked()), this, SLOT(editStudentClicked()));
+ connect(m_ui->deleteStudentButton, SIGNAL(clicked()), this, SLOT(deleteStudentClicked()));
connect(m_ui->studentsTable->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(setEditButtons()));
setEditButtons();
@@ -40,6 +42,16 @@
m_addStudentDialog->showNormal();
}
+void ManageStudentsWidget::editStudentClicked()
+{
+
+}
+
+void ManageStudentsWidget::deleteStudentClicked()
+{
+
+}
+
void ManageStudentsWidget::addStudent()
{
StudentDir *studentDir = m_mainController->schoolData()->addStudent();
Modified: tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.h
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.h 2009-08-04 10:59:58 UTC (rev 1353)
+++ tux4kids-admin/trunk/tux4kids-admin/src/manageStudentsWidget.h 2009-08-04 11:18:30 UTC (rev 1354)
@@ -33,6 +33,8 @@
void addStudentClicked();
void addStudent();
+ void editStudentClicked();
+ void deleteStudentClicked();
void setEditButtons();
};
Added: tux4kids-admin/trunk/tux4kids-admin/src/selectStudentWidget.cpp
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/selectStudentWidget.cpp (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/src/selectStudentWidget.cpp 2009-08-04 11:18:30 UTC (rev 1354)
@@ -0,0 +1,36 @@
+#include "selectStudentWidget.h"
+#include "ui_selectStudentWidget.h"
+
+SelectStudentWidget::SelectStudentWidget(QWidget *parent) :
+ QWidget(parent),
+ m_ui(new Ui::SelectStudentWidget)
+{
+ m_ui->setupUi(this);
+
+ m_studentTableProxyModel.setSourceModel(&m_studentTableModel);
+ m_ui->studentTable->setModel(&m_studentTableProxyModel);
+ connect(m_ui->clearButton, SIGNAL(clicked()), m_ui->searchEdit, SLOT(clear()));
+ connect(m_ui->searchEdit, SIGNAL(textEdited(QString)), this, SLOT(searchEdited()));
+ connect(&m_searchTimer, SIGNAL(timeout()), this, SLOT(updateFilter()));
+}
+
+SelectStudentWidget::~SelectStudentWidget()
+{
+ delete m_ui;
+}
+
+StudentTableModel *SelectStudentWidget::studentTableModel()
+{
+ return &m_studentTableModel;
+}
+
+void SelectStudentWidget::searchEdited()
+{
+ m_searchTimer.start(250);
+}
+
+void SelectStudentWidget::updateFilter()
+{
+ m_studentTableProxyModel.setFilterRegExp(m_ui->searchEdit->text());
+}
+
Added: tux4kids-admin/trunk/tux4kids-admin/src/selectStudentWidget.h
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/selectStudentWidget.h (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/src/selectStudentWidget.h 2009-08-04 11:18:30 UTC (rev 1354)
@@ -0,0 +1,36 @@
+#ifndef SELECTSTUDENTWIDGET_H
+#define SELECTSTUDENTWIDGET_H
+
+#include <QtGui/QWidget>
+#include <QTimer>
+
+#include "studentTableModel.h"
+#include "studentTableProxyModel.h"
+
+namespace Ui {
+ class SelectStudentWidget;
+}
+
+class SelectStudentWidget : public QWidget
+{
+ Q_OBJECT
+public:
+ SelectStudentWidget(QWidget *parent = 0);
+ ~SelectStudentWidget();
+
+ StudentTableModel *studentTableModel();
+
+private:
+ Ui::SelectStudentWidget *m_ui;
+
+ StudentTableModel m_studentTableModel;
+ StudentTableProxyModel m_studentTableProxyModel;
+ QTimer m_searchTimer;
+
+private slots:
+ void searchEdited();
+ void updateFilter();
+
+};
+
+#endif // SELECTSTUDENTWIDGET_H
Added: tux4kids-admin/trunk/tux4kids-admin/src/selectStudentWidget.ui
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/selectStudentWidget.ui (rev 0)
+++ tux4kids-admin/trunk/tux4kids-admin/src/selectStudentWidget.ui 2009-08-04 11:18:30 UTC (rev 1354)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SelectStudentWidget</class>
+ <widget class="QWidget" name="SelectStudentWidget">
+ <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>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="clearButton">
+ <property name="text">
+ <string>Clear</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="searchEdit"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QTableView" name="studentTable"/>
+ </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-08-04 10:59:58 UTC (rev 1353)
+++ tux4kids-admin/trunk/tux4kids-admin/src/src.pro 2009-08-04 11:18:30 UTC (rev 1354)
@@ -21,7 +21,8 @@
classTableProxyModel.cpp \
teacherTableProxyModel.cpp \
editTeacherDialog.cpp \
- editClassDialog.cpp
+ editClassDialog.cpp \
+ selectStudentWidget.cpp
HEADERS += mainWindow.h \
mainController.h \
pluginManager.h \
@@ -39,7 +40,8 @@
classTableProxyModel.h \
teacherTableProxyModel.h \
editTeacherDialog.h \
- editClassDialog.h
+ editClassDialog.h \
+ selectStudentWidget.h
FORMS += mainWindow.ui \
pluginManagerDialog.ui \
manageStudentsWidget.ui \
@@ -47,6 +49,7 @@
manageClassesWidget.ui \
manageTeachersWidget.ui \
editTeacherDialog.ui \
- editClassDialog.ui
+ editClassDialog.ui \
+ selectStudentWidget.ui
LIBS += -ltux4kidsadmin \
-L../../libtux4kidsadmin
More information about the Tux4kids-commits
mailing list