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

List:       kde-commits
Subject:    extragear/sysadmin/muon/libmuon/HistoryView
From:       Jonathan Michael Thomas <echidnaman () kubuntu ! org>
Date:       2010-11-26 23:47:57
Message-ID: 20101126234757.7A10EAC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1201157 by jmthomas:

Fix filtering by history action


 M  +0 -4      HistoryProxyModel.cpp  
 M  +2 -2      HistoryProxyModel.h  
 M  +15 -0     HistoryView.cpp  


--- trunk/extragear/sysadmin/muon/libmuon/HistoryView/HistoryProxyModel.cpp \
#1201156:1201157 @@ -28,7 +28,6 @@
     : QSortFilterProxyModel(parent)
     , m_stateFilter((QApt::Package::State)0)
 {
-//     m_stateFilter = QApt::Package::ToUpgrade;
 }
 
 HistoryProxyModel::~HistoryProxyModel()
@@ -51,13 +50,10 @@
     QStandardItem *item = static_cast<QStandardItemModel \
*>(sourceModel())->itemFromIndex(sourceModel()->index(sourceRow, 0, sourceParent));  
     if (!item) {
-        kDebug() << "no item";
         return false;
     }
 
-    kDebug() << "m_stateFilter == " << m_stateFilter;
     if (!m_stateFilter == 0) {
-        kDebug() << item->data(HistoryActionRole).toInt();
         if ((bool)(item->data(HistoryActionRole).toInt() & m_stateFilter) == false) \
{  return false;
         }
--- trunk/extragear/sysadmin/muon/libmuon/HistoryView/HistoryProxyModel.h \
#1201156:1201157 @@ -30,8 +30,8 @@
     Q_OBJECT
 public:
     enum {
-        HistoryActionRole = Qt::UserRole,
-        HistoryDateRole = Qt::UserRole + 1
+        HistoryDateRole = Qt::UserRole + 1,
+        HistoryActionRole = Qt::UserRole + 2
     };
     HistoryProxyModel(QObject *parent);
     ~HistoryProxyModel();
--- trunk/extragear/sysadmin/muon/libmuon/HistoryView/HistoryView.cpp \
#1201156:1201157 @@ -86,6 +86,9 @@
             historyItem->setData(QApt::Package::ToInstall, \
HistoryProxyModel::HistoryActionRole);  
             parentItem->appendRow(historyItem);
+            int parentState = \
parentItem->data(HistoryProxyModel::HistoryActionRole).toInt(); +            \
parentState |= QApt::Package::ToInstall; +            \
parentItem->setData(parentState, HistoryProxyModel::HistoryActionRole);  }
 
         foreach (const QString &package, item->upgradedPackages()) {
@@ -101,6 +104,9 @@
             historyItem->setData(QApt::Package::ToUpgrade, \
HistoryProxyModel::HistoryActionRole);  
             parentItem->appendRow(historyItem);
+            int parentState = \
parentItem->data(HistoryProxyModel::HistoryActionRole).toInt(); +            \
parentState |= QApt::Package::ToUpgrade; +            \
parentItem->setData(parentState, HistoryProxyModel::HistoryActionRole);  }
 
         foreach (const QString &package, item->downgradedPackages()) {
@@ -116,6 +122,9 @@
             historyItem->setData(QApt::Package::ToDowngrade, \
HistoryProxyModel::HistoryActionRole);  
             parentItem->appendRow(historyItem);
+            int parentState = \
parentItem->data(HistoryProxyModel::HistoryActionRole).toInt(); +            \
parentState |= QApt::Package::ToDowngrade; +            \
parentItem->setData(parentState, HistoryProxyModel::HistoryActionRole);  }
 
         foreach (const QString &package, item->removedPackages()) {
@@ -131,6 +140,9 @@
             historyItem->setData(QApt::Package::ToRemove, \
HistoryProxyModel::HistoryActionRole);  
             parentItem->appendRow(historyItem);
+            int parentState = \
parentItem->data(HistoryProxyModel::HistoryActionRole).toInt(); +            \
parentState |= QApt::Package::ToRemove; +            parentItem->setData(parentState, \
HistoryProxyModel::HistoryActionRole);  }
 
         foreach (const QString &package, item->purgedPackages()) {
@@ -146,6 +158,9 @@
             historyItem->setData(QApt::Package::ToPurge, \
HistoryProxyModel::HistoryActionRole);  
             parentItem->appendRow(historyItem);
+            int parentState = \
parentItem->data(HistoryProxyModel::HistoryActionRole).toInt(); +            \
parentState |= QApt::Package::ToRemove; +            parentItem->setData(parentState, \
HistoryProxyModel::HistoryActionRole);  }
     }
 


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