[GNUnet-SVN] r4695 - gnunet-qt/src/plugins/fs

[gnunet]

Author: durner
Date: 2007-03-23 15:39:57 -0600 (Fri, 23 Mar 2007)
New Revision: 4695

Modified:
   gnunet-qt/src/plugins/fs/searchController.cc
   gnunet-qt/src/plugins/fs/searchItemDelegate.cc
Log:
don't display thumbnail in filesize column

Modified: gnunet-qt/src/plugins/fs/searchController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/searchController.cc        2007-03-23 21:13:00 UTC 
(rev 4694)
+++ gnunet-qt/src/plugins/fs/searchController.cc        2007-03-23 21:39:57 UTC 
(rev 4695)
@@ -136,13 +136,13 @@
   {
     QByteArray data((char *) thumb, thumbSize);
     
-    itemIdx = model->index(row, EXTRACTOR_THUMBNAIL_DATA, parent);
+    itemIdx = model->index(row, MODEL_IDX(EXTRACTOR_THUMBNAIL_DATA), parent);
     model->setData(itemIdx, QVariant(data));
     FREE(thumb);
   }
 
   // make directories expandable
-  itemIdx = model->index(row, EXTRACTOR_MIMETYPE, parent);
+  itemIdx = model->index(row, MODEL_IDX(EXTRACTOR_MIMETYPE), parent);
   if (model->data(itemIdx).toString() == "application/gnunet-directory")
   {
     int row;
@@ -312,7 +312,7 @@
   
   model = (QAbstractItemModel *) idx.model();
 
-  index = model->index(idx.row(), EXTRACTOR_MIMETYPE, idx.parent());
+  index = model->index(idx.row(), MODEL_IDX(EXTRACTOR_MIMETYPE), idx.parent());
   if (model->data(index).toString() == "application/gnunet-directory")
   {
     // remove dummy child

Modified: gnunet-qt/src/plugins/fs/searchItemDelegate.cc
===================================================================
--- gnunet-qt/src/plugins/fs/searchItemDelegate.cc      2007-03-23 21:13:00 UTC 
(rev 4694)
+++ gnunet-qt/src/plugins/fs/searchItemDelegate.cc      2007-03-23 21:39:57 UTC 
(rev 4695)
@@ -28,6 +28,7 @@
 #include <QPainter>
 #include <extractor.h>
 #include "searchItemDelegate.h"
+#include "fshelper.h"
 
 QSize GSearchItemDelegate::sizeHint(const QStyleOptionViewItem &option, const 
QModelIndex &index) const
 {
@@ -37,7 +38,7 @@
     return QSize(0, 0);
   
   var = index.model()->data(index);
-  if (index.column() == EXTRACTOR_THUMBNAIL_DATA && var.type() == 
QVariant::ByteArray)
+  if (index.column() == MODEL_IDX(EXTRACTOR_THUMBNAIL_DATA) && var.type() == 
QVariant::ByteArray)
   {
     QImage img;
     
@@ -55,7 +56,7 @@
   
   var = index.model()->data(index);
   
-  if (index.column() == EXTRACTOR_THUMBNAIL_DATA && var.type() == 
QVariant::ByteArray)
+  if (index.column() == MODEL_IDX(EXTRACTOR_THUMBNAIL_DATA) && var.type() == 
QVariant::ByteArray)
   {
     QImage img;
     int left;