[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kexi
From: Adam Pigg <adam () piggz ! co ! uk>
Date: 2010-08-16 21:45:15
Message-ID: 20100816214515.48029AC855 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1164491 by piggz:
Moved the slot for removeItem from the navigator to the model, and started a skeleton \
implementation for addItem
M +2 -1 main/KexiMainWindow.cpp
M +5 -2 widget/KexiProjectModel.cpp
M +4 -2 widget/KexiProjectModel.h
M +0 -5 widget/KexiProjectNavigator.cpp
M +0 -1 widget/KexiProjectNavigator.h
--- trunk/koffice/kexi/main/KexiMainWindow.cpp #1164490:1164491
@@ -2178,7 +2178,7 @@
this, SLOT(slotPartItemSelectedInNavigator(KexiPart::Item*)));
if (d->prj) {//connect to the project
connect(d->prj, SIGNAL(itemRemoved(const KexiPart::Item&)),
- d->nav2, SLOT(slotRemoveItem(const KexiPart::Item&)));
+ d->nav2->model(), SLOT(slotRemoveItem(const KexiPart::Item&)));
}
@@ -2195,6 +2195,7 @@
}
connect(d->prj, SIGNAL(newItemStored(KexiPart::Item&)), d->nav, \
SLOT(addItem(KexiPart::Item&))); + connect(d->prj, \
SIGNAL(newItemStored(KexiPart::Item&)), d->nav2, SLOT(slotAddItem(KexiPart::Item&))); \
//TODO new navigator d->nav->setFocus();
if (d->forceShowProjectNavigatorOnCreation) {
--- trunk/koffice/kexi/widget/KexiProjectModel.cpp #1164490:1164491
@@ -249,8 +249,11 @@
return item;
}
-KexiProjectModelItem* KexiProjectModel::addItem(KexiPart::Item& item, \
KexiProjectModelItem *p) +KexiProjectModelItem* \
KexiProjectModel::slotAddItem(KexiPart::Item& item) {
+
+// KexiProjectModelItem *parent = modelItemFromItem(item.partClass());
+
//part object for this item
// KexiProjectModelItem *parent = item.partClass().isEmpty()
// ? 0 : m_baseItems.value(item.partClass().toLower());
@@ -263,7 +266,7 @@
return new KexiProjectModelItem(info, item, p);;
}
-void KexiProjectModel::removeItem(const KexiPart::Item& item)
+void KexiProjectModel::slotRemoveItem(const KexiPart::Item& item)
{
QModelIndex idx;
KexiProjectModelItem *mitm = modelItemFromItem(item);
--- trunk/koffice/kexi/widget/KexiProjectModel.h #1164490:1164491
@@ -33,8 +33,8 @@
void setProject(KexiProject* prj, const QString& itemsPartClass, QString* \
partManagerErrorMessages); QString itemsPartClass() const;
- void removeItem(const KexiPart::Item &item);
+
virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) \
const;
virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
@@ -44,6 +44,9 @@
virtual bool setData(const QModelIndex& index, const QVariant& value, int role = \
Qt::EditRole); virtual Qt::ItemFlags flags(const QModelIndex& index) const;
+public slots:
+ KexiProjectModelItem* slotAddItem(KexiPart::Item& item);
+ void slotRemoveItem(const KexiPart::Item &item);
private:
void clear();
@@ -55,7 +58,6 @@
QString m_itemsPartClass;
KexiProjectModelItem* addGroup(KexiPart::Info& info, KexiProjectModelItem*);
- KexiProjectModelItem* addItem(KexiPart::Item& item, KexiProjectModelItem*);
KexiProjectModelItem* addItem(KexiPart::Item& item, KexiPart::Info& info, \
KexiProjectModelItem*);
KexiProjectModelItem *m_rootItem;
--- trunk/koffice/kexi/widget/KexiProjectNavigator.cpp #1164490:1164491
@@ -232,11 +232,6 @@
return action;
}
-void KexiProjectNavigator::slotRemoveItem(const KexiPart::Item &item)
-{
- m_model->removeItem(item);
-}
-
void KexiProjectNavigator::contextMenuEvent(QContextMenuEvent* event)
{
if (!m_list->currentIndex().isValid() || !(m_features & ContextMenus))
--- trunk/koffice/kexi/widget/KexiProjectNavigator.h #1164490:1164491
@@ -91,7 +91,6 @@
public slots:
- void slotRemoveItem(const KexiPart::Item &item);
virtual void setFocus();
void updateItemName(KexiPart::Item& item, bool dirty);
void selectItem(KexiPart::Item& item);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic