Changeset 13937

Timestamp:

Feb 2, 2013, 10:29:14 PM (8 years ago)

Author:

jordan

Message:

(qt) #4076 'free space indicator': try a different approach to the visible torrent count

Location:

trunk/qt

Files:

• filterbar.cc (modified) (14 diffs)
• filterbar.h (modified) (3 diffs)

trunk/qt/filterbar.cc

@@ -32 +32 @@
 enum
 {
-    TorrentCountRole = Qt::UserRole + 1,
-    ActivityRole,
-    TrackerRole
+  TorrentCountRole = Qt::UserRole + 1,
+  TorrentCountStringRole,
+  ActivityRole,
+  TrackerRole
 };
 
@@ -99 +100 @@
       boundingBox.setLeft (decorationRect.right () + hmargin);
 
-      QRect countRect  = rect (option, index, TorrentCountRole);
+      QRect countRect  = rect (option, index, TorrentCountStringRole);
       countRect = QStyle::alignedRect (Qt::LeftToRight,
                                        Qt::AlignRight|Qt::AlignVCenter,
@@ -111 +112 @@
       drawDecoration (painter, option, decorationRect, decoration (option2,index.data (Qt::DecorationRole)));
       drawDisplay (painter, option, displayRect, index.data (Qt::DisplayRole).toString ());
-      drawDisplay (painter, disabledOption, countRect, index.data (TorrentCountRole).toString ());
+      drawDisplay (painter, disabledOption, countRect, index.data (TorrentCountStringRole).toString ());
       drawFocus (painter, option, displayRect|countRect);
     }
@@ -133 +134 @@
       size.setHeight (qMax (size.height (), myCombo->iconSize ().height () + 6));
       size.rwidth () += s->pixelMetric (QStyle::PM_FocusFrameHMargin, 0, myCombo);
-      size.rwidth () += rect (option,index,TorrentCountRole).width ();
+      size.rwidth () += rect (option,index,TorrentCountStringRole).width ();
       size.rwidth () += hmargin * 4;
       return size;
@@ -146 +147 @@
   QComboBox (parent)
 {
+}
+
+int
+FilterBarComboBox :: currentCount () const
+{
+  int count = 0;
+
+  const QModelIndex modelIndex = model ()->index (currentIndex (), 0, rootModelIndex ());
+  if (modelIndex.isValid ())
+    count = modelIndex.data (TorrentCountRole).toInt ();
+
+  return count;
 }
 
@@ -186 +199 @@
 
       // draw the count
-      QString text = modelIndex.data (TorrentCountRole).toString ();
+      QString text = modelIndex.data (TorrentCountStringRole).toString ();
       if (!text.isEmpty ())
         {
@@ -210 +223 @@
 ****/
 
-QComboBox*
+FilterBarComboBox *
 FilterBar :: createActivityCombo ()
 {
-  QComboBox * c = new FilterBarComboBox (this);
+  FilterBarComboBox * c = new FilterBarComboBox (this);
   FilterBarComboBoxDelegate * delegate = new FilterBarComboBoxDelegate (0, c);
   c->setItemDelegate (delegate);
@@ -319 +332 @@
 
   // update the "All" row
-  myTrackerModel->setData (myTrackerModel->index (0,0), getCountString (myTorrents.rowCount ()), TorrentCountRole);
+  myTrackerModel->setData (myTrackerModel->index (0,0), myTorrents.rowCount (), TorrentCountRole);
+  myTrackerModel->setData (myTrackerModel->index (0,0), getCountString (myTorrents.rowCount ()), TorrentCountStringRole);
 
   // rows to update
@@ -326 +340 @@
       const QString name = readableHostName (host);
       QStandardItem * row = myTrackerModel->findItems (name).front ();
-      row->setData (getCountString (torrentsPerHost[name]), TorrentCountRole);
+      const int count = torrentsPerHost[name];
+      row->setData (count, TorrentCountRole);
+      row->setData (getCountString (count), TorrentCountStringRole);
       row->setData (favicons.findFromHost (host), Qt::DecorationRole);
     }
@@ -359 +375 @@
       // add the row
       QStandardItem * row = new QStandardItem (favicons.findFromHost (host), name);
-      row->setData (getCountString (torrentsPerHost[host]), TorrentCountRole);
+      const int count = torrentsPerHost[host];
+      row->setData (count, TorrentCountRole);
+      row->setData (getCountString (count), TorrentCountStringRole);
       row->setData (favicons.findFromHost (host), Qt::DecorationRole);
       row->setData (host, TrackerRole);
@@ -371 +389 @@
 
 
-QComboBox*
+FilterBarComboBox *
 FilterBar :: createTrackerCombo (QStandardItemModel * model)
 {
-  QComboBox * c = new FilterBarComboBox (this);
+  FilterBarComboBox * c = new FilterBarComboBox (this);
   FilterBarComboBoxDelegate * delegate = new FilterBarComboBoxDelegate (0, c);
   c->setItemDelegate (delegate);
@@ -380 +398 @@
   QStandardItem * row = new QStandardItem (tr ("All"));
   row->setData ("", TrackerRole);
-  row->setData (getCountString (myTorrents.rowCount ()), TorrentCountRole);
+  const int count = myTorrents.rowCount ();
+  row->setData (count, TorrentCountRole);
+  row->setData (getCountString (count), TorrentCountStringRole);
   model->appendRow (row);
 
@@ -572 +592 @@
       QModelIndex index = model->index (row, 0);
       const int mode = index.data (ActivityRole).toInt ();
-      model->setData (index, getCountString (torrentsPerMode[mode]), TorrentCountRole);
+      const int count = torrentsPerMode [mode];
+      model->setData (index, count, TorrentCountRole);
+      model->setData (index, getCountString (count), TorrentCountStringRole);
     }
 
   refreshTrackers ();
+  refreshCountLabel ();
 }
 
@@ -588 +611 @@
 {
   const int visibleCount = myFilter.rowCount ();
-  const int torrentCount = visibleCount + myFilter.hiddenRowCount ();
-
-  if (visibleCount == torrentCount)
+  const int trackerCount = myTrackerCombo->currentCount ();
+  const int activityCount = myActivityCombo->currentCount ();
+
+  if ((visibleCount == activityCount) || (visibleCount == trackerCount))
     myCountLabel->setText (tr("Show:"));
   else
-    myCountLabel->setText (tr("Show %Ln:", 0, visibleCount));
-}
+    myCountLabel->setText (tr("Show %Ln of:", 0, visibleCount));
+}

trunk/qt/filterbar.h

@@ -54 +54 @@
   public:
     FilterBarComboBox (QWidget * parent = 0);
+    int currentCount () const;
 
   protected:
@@ -69 +70 @@
 
   private:
-    QComboBox * createTrackerCombo (QStandardItemModel * );
-    QComboBox * createActivityCombo ();
+    FilterBarComboBox * createTrackerCombo (QStandardItemModel * );
+    FilterBarComboBox * createActivityCombo ();
     void recountSoon ();
     void refreshTrackers ();
@@ -79 +80 @@
     TorrentModel& myTorrents;
     TorrentFilter& myFilter;
-    QComboBox * myActivityCombo;
-    QComboBox * myTrackerCombo;
+    FilterBarComboBox * myActivityCombo;
+    FilterBarComboBox * myTrackerCombo;
     QLabel * myCountLabel;
     QStandardItemModel * myTrackerModel;