[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/raptormenu
From:       Lukas Appelhans <l.appelhans () gmx ! de>
Date:       2008-05-19 17:30:52
Message-ID: 1211218252.140637.15317.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 809874 by lappelhans:

Yes, now the Model loads correctly and shows Items =)


 M  +1 -0      libtom/abstractitem.h  
 M  +1 -0      libtom/taskgroup.h  
 M  +1 -0      libtom/taskitem.h  
 M  +1 -0      libtom/tom.h  
 M  +3 -0      tomedit/tomedit.cpp  
 M  +18 -6     tomedit/tomeditmodel.cpp  


--- trunk/playground/base/raptormenu/libtom/abstractitem.h #809873:809874
@@ -33,6 +33,7 @@
 {
 class RAPTOR_EXPORT AbstractItem : public QObject
 {
+    Q_OBJECT
     public:
         long ID; // unique for every object
         AbstractItem(QObject *parent);
--- trunk/playground/base/raptormenu/libtom/taskgroup.h #809873:809874
@@ -32,6 +32,7 @@
 {
 class RAPTOR_EXPORT TaskGroup : public AbstractItem
 {
+    Q_OBJECT
     public:
         TaskGroup(QObject *parent);
         ~TaskGroup();
--- trunk/playground/base/raptormenu/libtom/taskitem.h #809873:809874
@@ -31,6 +31,7 @@
 {
 class RAPTOR_EXPORT TaskItem : public AbstractItem
 {
+    Q_OBJECT
     public:
         TaskItem(QObject *parent);
         ~TaskItem();
--- trunk/playground/base/raptormenu/libtom/tom.h #809873:809874
@@ -33,6 +33,7 @@
 {
 class RAPTOR_EXPORT Tom : public QObject
 {
+    Q_OBJECT
     public:
         Tom(QObject *parent = 0);
         ~Tom();
--- trunk/playground/base/raptormenu/tomedit/tomedit.cpp #809873:809874
@@ -23,6 +23,9 @@
 {
     setupUi(this);
     m_tom = new Tom::Tom(this);
+    Tom::TaskGroup *group = new Tom::TaskGroup(m_tom);
+    group->setName("Bla");
+    m_tom->addTaskGroup(group);
     QFile file(KStandardDirs::locateLocal("appdata", "tom.xml"));
     QDomDocument doc;
     if(doc.setContent(&file))
--- trunk/playground/base/raptormenu/tomedit/tomeditmodel.cpp #809873:809874
@@ -11,13 +11,15 @@
 #include "tomeditmodel.h"
 
 #include <KIcon>
-
+#include <KDebug>
 #include <RaptorTom>
 
 TomEditModel::TomEditModel(Tom::Tom * tom, QObject *parent)
   : QAbstractItemModel(parent),
     m_tom(tom)
 {
+     kDebug() << "jooooooo";
+     reset();
 }
 
 TomEditModel::~TomEditModel()
@@ -26,6 +28,7 @@
 
 QVariant TomEditModel::data(const QModelIndex &index, int role) const
 {
+    kDebug() << "joooo^2";
     Tom::AbstractItem *item = \
static_cast<Tom::AbstractItem*>(index.internalPointer());  if (role == \
Qt::DisplayRole)  return item->name();
@@ -44,14 +47,17 @@
 
 QModelIndex TomEditModel::index(int row, int column, const QModelIndex &parent) \
const  {
-    if (!hasIndex(row, column, parent))
-        return QModelIndex();
-
+    kDebug() << "Next fuck " + QString::number(row);
+    //if (!hasIndex(row, column, parent))
+    //    return QModelIndex();
+    kDebug() << "No index??";
     if (!parent.isValid())
     {
-        if (m_tom->taskGroups().count() <= row)
+        kDebug() << "Parent not valide xD";
+        if (m_tom->taskGroups().count() >= row)
             return createIndex(row, column, m_tom->taskGroups().at(row));
         else
+            kDebug() << "Too bad";
             return QModelIndex();
     }
     Tom::AbstractItem *item = \
static_cast<Tom::AbstractItem*>(parent.internalPointer()); @@ -67,8 +73,10 @@
     Tom::AbstractItem *item = \
static_cast<Tom::AbstractItem*>(index.internalPointer());  if (item)
     {
+        if (m_tom->taskGroups().contains(qobject_cast<Tom::TaskGroup*>(item)))
+            return QModelIndex();
         if (item->isGroup())
-            return createIndex(index.row() - \
static_cast<Tom::TaskGroup*>(item)->children().count(), 0, item); +            return \
createIndex(index.row() - qobject_cast<Tom::TaskGroup*>(item)->children().count(), 0, \
item);  else
             return createIndex(index.row() - 1, 0, item);
     }
@@ -77,9 +85,13 @@
 
 int TomEditModel::rowCount(const QModelIndex &parent) const
 {
+    kDebug() << "Mmh yes";
     Tom::AbstractItem *item = \
static_cast<Tom::AbstractItem*>(parent.internalPointer());  if (item && \
item->isGroup())  return static_cast<Tom::TaskGroup*>(item)->children().count();
+    if (!parent.isValid())
+        return m_tom->taskGroups().count();
+    kDebug() << "Too bad";
     return 0;
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]