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

List:       kde-commits
Subject:    koffice/kexi/widget
From:       Adam Pigg <adam () piggz ! co ! uk>
Date:       2010-07-26 9:00:31
Message-ID: 20100726090031.27977AC867 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1154784 by piggz:

Implemented comments by jstaniek on the new Project Navigator

 M  +10 -10    KexiProjectModel.cpp  
 M  +1 -1      KexiProjectModel.h  
 M  +4 -4      KexiProjectModelItem.cpp  
 M  +3 -3      KexiProjectModelItem.h  
 M  +4 -3      KexiProjectNavigator.cpp  
 M  +1 -1      KexiProjectNavigator.h  


--- trunk/koffice/kexi/widget/KexiProjectModel.cpp #1154783:1154784
@@ -74,7 +74,7 @@
             }
             
             foreach(KexiPart::Item *item, *item_dict) {
-                KexiProjectModelItem *itm = addItem(item, info, groupItem);
+                KexiProjectModelItem *itm = addItem(*item, *info, groupItem);
                 if (itm) {
                     groupItem->appendChild(itm);
                 }
@@ -117,15 +117,15 @@
 
 QVariant KexiProjectModel::data(const QModelIndex& index, int role) const
 {
-     if (!index.isValid())
-         return QVariant();
-
     KexiProjectModelItem *item = \
                static_cast<KexiProjectModelItem*>(index.internalPointer());
-    if (role == Qt::DisplayRole) {
+    switch (role) {
+    case Qt::DisplayRole:
+    case Qt::EditRole:
+    case Qt::WhatsThisRole:
         return item->data(index.column());
-    }
-    else if (role == Qt::DecorationRole) {
+    case Qt::DecorationRole:
         return item->icon();
+    default:;
     }
 
     return QVariant();
@@ -207,7 +207,7 @@
         return false;
     
     QString txt = value.toString().trimmed();
-    bool ok = it->partItem()->name().toLower() != txt.toLower(); //the new name must \
be different +    bool ok = QString::compare(it->partItem()->name(), txt, \
Qt::CaseInsensitive); //make sure the new name is different  if (ok) {
         emit renameItem(it->partItem(), txt, ok);
     }
@@ -247,7 +247,7 @@
     if (!info.isVisibleInNavigator())
         return 0;
 
-    KexiProjectModelItem *item = new KexiProjectModelItem(&info, p);
+    KexiProjectModelItem *item = new KexiProjectModelItem(info, p);
     return item;
 }
 
@@ -259,7 +259,7 @@
 //    return addItem(item, parent, parent->partInfo());
 }
 
-KexiProjectModelItem* KexiProjectModel::addItem(KexiPart::Item *item, \
KexiPart::Info* info, KexiProjectModelItem *p) +KexiProjectModelItem* \
KexiProjectModel::addItem(KexiPart::Item &item, KexiPart::Info &info, \
KexiProjectModelItem *p)  {
     return new KexiProjectModelItem(info, item, p);;
 }
--- trunk/koffice/kexi/widget/KexiProjectModel.h #1154783:1154784
@@ -51,7 +51,7 @@
 
     KexiProjectModelItem* addGroup(KexiPart::Info& info, KexiProjectModelItem*);
     KexiProjectModelItem* addItem(KexiPart::Item& item, KexiProjectModelItem*);
-    KexiProjectModelItem* addItem(KexiPart::Item* item, KexiPart::Info* info, \
KexiProjectModelItem*); +    KexiProjectModelItem* addItem(KexiPart::Item& item, \
KexiPart::Info& info, KexiProjectModelItem*);  
     KexiProjectModelItem *m_rootItem;
 
--- trunk/koffice/kexi/widget/KexiProjectModelItem.cpp #1154783:1154784
@@ -32,16 +32,16 @@
     m_groupName = n;
 }
 
-KexiProjectModelItem::KexiProjectModelItem(KexiPart::Info *i, KexiProjectModelItem \
*p) : m_info(i), m_item(0), m_parentItem(p) \
+KexiProjectModelItem::KexiProjectModelItem(KexiPart::Info &i, KexiProjectModelItem \
*p) : m_info(&i), m_item(0), m_parentItem(p)  {
-    m_icon = SmallIcon(i->itemIcon());
+    m_icon = SmallIcon(i.itemIcon());
     initItem();
     m_fifoSorting = 1; //because this is top level item
 }
 
-KexiProjectModelItem::KexiProjectModelItem(KexiPart::Info *i, KexiPart::Item *item, \
KexiProjectModelItem *p) : m_info(i), m_item(item), m_parentItem(p) \
+KexiProjectModelItem::KexiProjectModelItem(KexiPart::Info &i, KexiPart::Item &item, \
KexiProjectModelItem *p) : m_info(&i), m_item(&item), m_parentItem(p)  {
-    m_icon = SmallIcon(i->itemIcon());
+    m_icon = SmallIcon(i.itemIcon());
     initItem();
 }
 
--- trunk/koffice/kexi/widget/KexiProjectModelItem.h #1154783:1154784
@@ -42,16 +42,16 @@
     KexiProjectModelItem(const QString& n, KexiProjectModelItem *parent = 0);
     
     //! Creates group item for part \a i
-    KexiProjectModelItem(KexiPart::Info *i, KexiProjectModelItem *parent = 0);
+    KexiProjectModelItem(KexiPart::Info &i, KexiProjectModelItem *parent = 0);
 
     //! Creates item for object \a item defined by part \a i for \a parent
-    KexiProjectModelItem(KexiPart::Info *i, KexiPart::Item *item, \
KexiProjectModelItem *parent = 0); +    KexiProjectModelItem(KexiPart::Info &i, \
KexiPart::Item &item, KexiProjectModelItem *parent = 0);  
     //! Creates item for object \a item defined by part \a i, without parent
     //! (used in a case when KexiBrowser::itemsPartClass() is not empty)
     //KexiProjectModelItem(KexiPart::Info *i, KexiPart::Item *item);
     
-    ~KexiProjectModelItem();
+    virtual ~KexiProjectModelItem();
 
     void clearChildren();
 
--- trunk/koffice/kexi/widget/KexiProjectNavigator.cpp #1154783:1154784
@@ -68,8 +68,8 @@
         , m_readOnly(false)
 {
     kDebug();
-    setObjectName("KexiNavigator");
-    setWindowTitle(i18n("Project Navigator 2"));
+    setObjectName("KexiProjectNavigator");
+    setWindowTitle(i18n("Project Navigator"));
     setWindowIcon(KexiMainWindowIface::global()->thisWidget()->windowIcon());
 
     m_model = new KexiProjectModel();
@@ -212,6 +212,7 @@
 {
     kDebug() << itemsPartClass << ".";
     m_model->setProject(prj, itemsPartClass, partManagerErrorMessages);
+    m_list->expandAll();
 }
 
 KexiProjectNavigator::~KexiProjectNavigator()
@@ -643,7 +644,7 @@
 m_list->setModel(0);
 }
 
-KexiProjectModel* KexiProjectNavigator::model()
+KexiProjectModel* KexiProjectNavigator::model() const
 {
 return m_model;
 }
--- trunk/koffice/kexi/widget/KexiProjectNavigator.h #1154783:1154784
@@ -87,7 +87,7 @@
 
     bool actionEnabled(const QString& actionName) const;
 
-    KexiProjectModel* model();
+    KexiProjectModel* model() const;
 
 public slots:
 


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