Changeset 14000

Timestamp:

Feb 9, 2013, 8:51:17 PM (10 years ago)

Author:

jordan

Message:

(qt) #5285 'Qt client's file tree should have a size column like the GTK+ client's': done.

Location:

trunk/qt

Files:

• file-tree.cc (modified) (12 diffs)
• file-tree.h (modified) (1 diff)
• freespace-label.cc (modified) (1 diff)
• options.cc (modified) (1 diff)

trunk/qt/file-tree.cc

@@ -33 +33 @@
   COL_NAME,
   FIRST_VISIBLE_COLUMN = COL_NAME,
+  COL_SIZE,
   COL_PROGRESS,
   COL_WANTED,
@@ -122 +123 @@
   if (column == COL_FILE_INDEX)
     {
-      return myFileIndex;
+      value.setValue (myFileIndex);
     }
   else if (role == Qt::EditRole)
@@ -128 +129 @@
       if (column == 0)
         value.setValue (name());
+    }
+  else if ((role == Qt::TextAlignmentRole) && column == COL_SIZE)
+    {
+      value = Qt::AlignRight + Qt::AlignVCenter;
     }
   else if (role == Qt::DisplayRole)
@@ -134 +139 @@
        {
          case COL_NAME:
-           value.setValue (fileSizeName());
+           value.setValue (name());
+           break;
+
+         case COL_SIZE:
+           value.setValue (sizeString() + "  ");
            break;
 
@@ -181 +190 @@
 
 QString
-FileTreeItem :: fileSizeName () const
-{
-  uint64_t have = 0;
-  uint64_t total = 0;
+FileTreeItem :: sizeString () const
+{
+  QString str; 
 
   if (myChildren.isEmpty())
-    total = myTotalSize;
+    {
+      str = Formatter::sizeToString (myTotalSize);
+    }
   else
-    getSubtreeWantedSize (have, total);
-
-  return QString("%1 (%2)").arg(name()).arg(Formatter::sizeToString(total));
+    {
+      uint64_t have = 0;
+      uint64_t total = 0;
+      getSubtreeWantedSize (have, total);
+      str = Formatter::sizeToString (total);
+    }
+
+  return str;
 }
 
@@ -202 +217 @@
 {
   int changed_count = 0;
-  int changed_columns[3];
+  int changed_columns[4];
 
   if (myName != name)
@@ -213 +228 @@
     }
 
+  if (myHaveSize != haveSize)
+    {
+      myHaveSize = haveSize;
+      changed_columns[changed_count++] = COL_PROGRESS;
+    }
+
   if (fileIndex() != -1)
     {
-      if (myHaveSize != haveSize)
-        myHaveSize = haveSize;
-
       if (updateFields)
         {
@@ -448 +466 @@
           case COL_NAME:
             data.setValue (tr("File"));
+            break;
+
+          case COL_SIZE:
+            data.setValue (tr("Size"));
             break;
 
@@ -695 +717 @@
 
       // this changes the name column's parenthetical size-wanted string too...
-      QModelIndex nameSibling = index.sibling (index.row(), COL_NAME);
+      QModelIndex nameSibling = index.sibling (index.row(), COL_SIZE);
       dataChanged (nameSibling, nameSibling);
-      parentsChanged (nameSibling, COL_NAME);
+      parentsChanged (nameSibling, COL_SIZE);
 
       dataChanged (index, index);
@@ -733 +755 @@
         {
           const QFontMetrics fm(item.font);
-          const QString text = index.data().toString();
           const int iconSize = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
           size.rwidth() = HIG::PAD_SMALL + iconSize;
@@ -863 +884 @@
   installEventFilter (this);
 
-  for (int i=0; i<FIRST_VISIBLE_COLUMN; ++i)
-    hideColumn (i);
-  for (int i=LAST_VISIBLE_COLUMN+1; i<NUM_COLUMNS; ++i)
-    hideColumn (i);
-
-  for (int i=FIRST_VISIBLE_COLUMN; i<=LAST_VISIBLE_COLUMN; ++i)
-    header()->setResizeMode(i, QHeaderView::Interactive);
+  for (int i=0; i<NUM_COLUMNS; ++i)
+    {
+      setColumnHidden (i, (i<FIRST_VISIBLE_COLUMN) || (LAST_VISIBLE_COLUMN<i));
+      header()->setResizeMode(i, QHeaderView::Interactive);
+    }
 
   connect (this, SIGNAL(clicked(const QModelIndex&)),
@@ -914 +933 @@
             continue;
 
-          const QString header = myModel.headerData (column, Qt::Horizontal).toString() + "    ";
+          QString header;
+          if (column == COL_SIZE)
+            header = "999.9 KiB";
+          else
+            header = myModel.headerData (column, Qt::Horizontal).toString();
+          header += "    ";
           const int width = fontMetrics.size (0, header).width();
           setColumnWidth (column, width);

trunk/qt/file-tree.h

@@ -74 +74 @@
     void setSubtreeWanted (bool, QSet<int>& fileIds);
     QString priorityString () const;
+    QString sizeString () const;
     void getSubtreeWantedSize (uint64_t& have, uint64_t& total) const;
-    QString fileSizeName () const;
     double progress () const;
     int priority () const;

trunk/qt/freespace-label.cc

@@ -83 +83 @@
   tr_variantDictFindInt (arguments, TR_KEY_size_bytes, &bytes);
   if (bytes < 0)
-    str = tr("Error: %1").arg(result);
+    str = tr("<i>Error: %1</i>").arg(result);
   else
     str = tr("%1 free").arg(Formatter::sizeToString (bytes));
-  setText (QString("<i>%1</i>").arg(str));
+  setText (str);
 
   // update the tooltip

trunk/qt/options.cc

@@ -147 +147 @@
     l = myFreespaceLabel;
     layout->addWidget (l, ++row, 0, 1, 2, Qt::Alignment (Qt::AlignRight | Qt::AlignTop));
-    layout->setRowMinimumHeight (row, l->height() + HIG::PAD);
+    layout->setRowMinimumHeight (row, l->height() + HIG::PAD_SMALL);
 
     myTree = new FileTreeView (0, false);
     layout->addWidget( myTree, ++row, 0, 1, 2 );
     if( !session.isLocal( ) )
-        myTree->hideColumn( 1 ); // hide the % done, since we've no way of knowing
+        myTree->hideColumn( 2 ); // hide the % done, since we've no way of knowing
 
     QComboBox * m = new QComboBox;