[Tux4kids-commits] r1233 - in tux4kids-admin/trunk: libtux4kidsadmin libtux4kidsadmin_tuxtype tux4kids-admin/src
Michał Świtakowski
swistakers-guest at alioth.debian.org
Sun Jul 19 19:15:47 UTC 2009
Author: swistakers-guest
Date: 2009-07-19 19:15:45 +0000 (Sun, 19 Jul 2009)
New Revision: 1233
Modified:
tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp
tux4kids-admin/trunk/libtux4kidsadmin/profileDir.h
tux4kids-admin/trunk/libtux4kidsadmin/studentDir.cpp
tux4kids-admin/trunk/libtux4kidsadmin/studentDir.h
tux4kids-admin/trunk/libtux4kidsadmin/studentDir_p.h
tux4kids-admin/trunk/libtux4kidsadmin_tuxtype/libtux4kidsadmin_tuxtype.h
tux4kids-admin/trunk/tux4kids-admin/src/mainController.cpp
Log:
added some functions
Modified: tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp 2009-07-19 13:33:04 UTC (rev 1232)
+++ tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp 2009-07-19 19:15:45 UTC (rev 1233)
@@ -40,7 +40,8 @@
/****************** ProfileDir *******************/
ProfileDir::ProfileDir(QString path, QObject *parent) :
- QObject(parent), d_ptr(new ProfileDirPrivate(path))
+ QObject(parent),
+ d_ptr(new ProfileDirPrivate(path))
{
Q_D(ProfileDir);
d->q_ptr = this;
@@ -63,3 +64,15 @@
return d->status;
}
+QString ProfileDir::profileType(QString path)
+{
+ QSettings tmp(path + "/attributes.ini");
+ return tmp.value("profile_tmp", "unknown").toString();
+}
+
+QString ProfileDir::type() const
+{
+ Q_D(const ProfileDir);
+ //d->attributes
+}
+
Modified: tux4kids-admin/trunk/libtux4kidsadmin/profileDir.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/profileDir.h 2009-07-19 13:33:04 UTC (rev 1232)
+++ tux4kids-admin/trunk/libtux4kidsadmin/profileDir.h 2009-07-19 19:15:45 UTC (rev 1233)
@@ -20,6 +20,8 @@
};
Status status() const;
+ static QString profileType(QString dirPath);
+ QString type() const;
protected:
ProfileDirPrivate * const d_ptr;
Modified: tux4kids-admin/trunk/libtux4kidsadmin/studentDir.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/studentDir.cpp 2009-07-19 13:33:04 UTC (rev 1232)
+++ tux4kids-admin/trunk/libtux4kidsadmin/studentDir.cpp 2009-07-19 19:15:45 UTC (rev 1233)
@@ -1,6 +1,7 @@
#include "studentDir.h"
#include "studentDir_p.h"
#include "profileDir.h"
+#include "profileDirFactory.h"
#include <QString>
#include <QDebug>
@@ -31,6 +32,29 @@
delete attributes;
}
+void StudentDirPrivate::loadProfileDirs()
+{
+ Q_Q(StudentDir);
+
+ foreach(QString dirName,
+ mainDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name)) {
+
+ QString path = mainDir.filePath(dirName);
+ QString profileType = ProfileDir::profileType(path);
+ profiles.append(ProfileDirFactory::instance().create(profileType, path, q));
+ }
+}
+
+ProfileDir *StudentDirPrivate::findProfileDir(QString profileType)
+{
+ foreach (ProfileDir *profileDir, profiles) {
+ if (profileDir->type() == profileType)
+ return profileDir;
+ }
+
+ return 0;
+}
+
/****************** StudentDir *******************/
StudentDir::StudentDir(QString path, QObject *parent) :
@@ -85,6 +109,19 @@
void StudentDir::addProfileDir(ProfileDir *profileDir)
{
Q_D(StudentDir);
+ profileDir->setParent(this);
d->profiles.append(profileDir);
}
+ProfileDir *StudentDir::addProfileDir(QString profileType)
+{
+ Q_D(StudentDir);
+
+
+ ProfileDir *tmp = ProfileDirFactory::instance().create(profileType, profileType, this);
+ if (tmp != 0) {
+ d->profiles.append(tmp);
+ }
+}
+
+
Modified: tux4kids-admin/trunk/libtux4kidsadmin/studentDir.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/studentDir.h 2009-07-19 13:33:04 UTC (rev 1232)
+++ tux4kids-admin/trunk/libtux4kidsadmin/studentDir.h 2009-07-19 19:15:45 UTC (rev 1233)
@@ -28,6 +28,7 @@
void setFirstName(const QString &firstName);
void setLastName(const QString &lastName);
void addProfileDir(ProfileDir *profileDir);
+ ProfileDir *addProfileDir(QString profileType);
protected:
StudentDirPrivate * const d_ptr;
Modified: tux4kids-admin/trunk/libtux4kidsadmin/studentDir_p.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/studentDir_p.h 2009-07-19 13:33:04 UTC (rev 1232)
+++ tux4kids-admin/trunk/libtux4kidsadmin/studentDir_p.h 2009-07-19 19:15:45 UTC (rev 1233)
@@ -19,6 +19,9 @@
StudentDirPrivate(QString path);
virtual ~StudentDirPrivate();
+ void loadProfileDirs();
+ ProfileDir *findProfileDir(QString profileType);
+
StudentDir *q_ptr;
StudentDir::Status status;
Modified: tux4kids-admin/trunk/libtux4kidsadmin_tuxtype/libtux4kidsadmin_tuxtype.h
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin_tuxtype/libtux4kidsadmin_tuxtype.h 2009-07-19 13:33:04 UTC (rev 1232)
+++ tux4kids-admin/trunk/libtux4kidsadmin_tuxtype/libtux4kidsadmin_tuxtype.h 2009-07-19 19:15:45 UTC (rev 1233)
@@ -5,7 +5,7 @@
class LIBTUX4KIDSADMIN_TUXTYPE_SHARED_EXPORT Libtux4kidsadminTuxtype {
public:
- Libtux4kidsadminTuxtype();
+ Libtux4kidsadminTuxtype();
};
#endif // LIBTUX4KIDSADMIN_TUXTYPE_H
Modified: tux4kids-admin/trunk/tux4kids-admin/src/mainController.cpp
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/mainController.cpp 2009-07-19 13:33:04 UTC (rev 1232)
+++ tux4kids-admin/trunk/tux4kids-admin/src/mainController.cpp 2009-07-19 19:15:45 UTC (rev 1233)
@@ -18,8 +18,6 @@
m_schoolData = new SchoolData(QDir::homePath() + "/school_data");
m_studentTableModel.setSchoolData(m_schoolData);
- //ProfileDirFactory::instance().create("tuxmath", "/home/swistak/lala");
- //ProfileDirFactory::instance().create("tuxtype", "/home/swistak/lala2");
}
MainController::~MainController()
More information about the Tux4kids-commits
mailing list