custom style delegate for icon view

project/footage.cpp

@@ -77,17 +77,3 @@ FootageStream* Footage::get_stream_from_file_index(bool video, int index) {
   }
   return nullptr;
 }
-
-void FootageStream::make_square_thumb() {
-  // generate square version for QListView?
-  int square_size = qMax(video_preview.width(), video_preview.height());
-  QPixmap pixmap(square_size, square_size);
-  pixmap.fill(Qt::transparent);
-  QPainter p(&pixmap);
-  int diff = (video_preview.width() - video_preview.height())>>1;
-  int sqx = (diff < 0) ? -diff : 0;
-  int sqy = (diff > 0) ? diff : 0;
-  p.drawImage(sqx, sqy, video_preview);
-  p.end();
-  video_preview_square = QIcon(pixmap);
-}

project/footage.h

@@ -62,9 +62,7 @@ struct FootageStream {
   // preview thumbnail/waveform
   bool preview_done;
   QImage video_preview;
-  QIcon video_preview_square;
   QVector<char> audio_preview;
-  void make_square_thumb();
 };
 
 struct Footage {

project/media.cpp

@@ -284,6 +284,24 @@ int Media::columnCount() const {
   return 3;
 }
 
+QString Media::GetStringDuration() {
+  if (get_type() == MEDIA_TYPE_SEQUENCE) {
+    Sequence* s = to_sequence().get();
+    return frame_to_timecode(s->getEndFrame(), olive::CurrentConfig.timecode_view, s->frame_rate);
+  }
+  if (get_type() == MEDIA_TYPE_FOOTAGE) {
+    Footage* f = to_footage();
+    double r = 30;
+
+    if (f->video_tracks.size() > 0 && !qIsNull(f->video_tracks.at(0).video_frame_rate))
+      r = f->video_tracks.at(0).video_frame_rate * f->speed;
+
+    long len = f->get_length_in_frames(r);
+    if (len > 0) return frame_to_timecode(len, olive::CurrentConfig.timecode_view, r);
+  }
+  return QString();
+}
+
 QVariant Media::data(int column, int role) {
   switch (role) {
   case Qt::DecorationRole:
@@ -292,7 +310,7 @@ QVariant Media::data(int column, int role) {
         Footage* f = to_footage();
         if (f->video_tracks.size() > 0
             && f->video_tracks.at(0).preview_done) {
-          return f->video_tracks.at(0).video_preview_square;
+          return QIcon(QPixmap::fromImage(f->video_tracks.at(0).video_preview));
         }
       }
 
@@ -304,20 +322,7 @@ QVariant Media::data(int column, int role) {
     case 0: return (root) ? QCoreApplication::translate("Media", "Name") : get_name();
     case 1:
       if (root) return QCoreApplication::translate("Media", "Duration");
-      if (get_type() == MEDIA_TYPE_SEQUENCE) {
-        Sequence* s = to_sequence().get();
-        return frame_to_timecode(s->getEndFrame(), olive::CurrentConfig.timecode_view, s->frame_rate);
-      }
-      if (get_type() == MEDIA_TYPE_FOOTAGE) {
-        Footage* f = to_footage();
-        double r = 30;
-
-        if (f->video_tracks.size() > 0 && !qIsNull(f->video_tracks.at(0).video_frame_rate))
-          r = f->video_tracks.at(0).video_frame_rate * f->speed;
-
-        long len = f->get_length_in_frames(r);
-        if (len > 0) return frame_to_timecode(len, olive::CurrentConfig.timecode_view, r);
-      }
+      return GetStringDuration();
       break;
     case 2:
       if (root) return QCoreApplication::translate("Media", "Rate");
@@ -336,6 +341,10 @@ QVariant Media::data(int column, int role) {
     break;
   case Qt::ToolTipRole:
     return tooltip;
+
+  case Qt::UserRole:
+    // User role returns the duration
+    return GetStringDuration();
   }
   return QVariant();
 }

project/media.h

@@ -87,6 +87,8 @@ private:
   int type;
   VoidPtr object;
 
+  QString GetStringDuration();
+
   // item functions
   QList<MediaPtr> children;
   Media* parent;

project/previewgenerator.cpp

@@ -153,8 +153,6 @@ bool PreviewGenerator::retrieve_preview(const QString& hash) {
     QString thumb_path = get_thumbnail_path(hash, ms);
     QFile f(thumb_path);
     if (f.exists() && ms.video_preview.load(thumb_path)) {
-      //dout << "loaded thumb" << ms->file_index << "from" << thumb_path;
-      ms.make_square_thumb();
       ms.preview_done = true;
     } else {
       found = false;
@@ -364,8 +362,6 @@ void PreviewGenerator::generate_waveform() {
                         &data,
                         linesize);
 
-              s->make_square_thumb();
-
               // is video interlaced?
               s->video_auto_interlacing = (temp_frame->interlaced_frame) ? ((temp_frame->top_field_first) ? VIDEO_TOP_FIELD_FIRST : VIDEO_BOTTOM_FIELD_FIRST) : VIDEO_PROGRESSIVE;
               s->video_interlacing = s->video_auto_interlacing;

project/sourcescommon.h

@@ -46,6 +46,8 @@ public:
   void dropEvent(QWidget *parent, QDropEvent* e, const QModelIndex& drop_item, const QModelIndexList &items);
 
   void item_click(Media* m, const QModelIndex &index);
+public slots:
+  void stop_rename_timer();
 private slots:
   void create_seq_from_selected();
   void reveal_in_browser();
@@ -62,7 +64,6 @@ private:
   QModelIndex editing_index;
   QModelIndexList selected_items;
   Project* project_parent;
-  void stop_rename_timer();
   QTimer rename_timer;
 
   // we cache the selected footage items for open_create_proxy_dialog()