Make PictureViewer useful

-Implement add and replace files
-use QList<QVariant> (typedef'd) for shoveling data around
-more code shuffling
-new artwork

1 files changed, 13 insertions, 7 deletions

diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp
index c126c2c..3bcc404 100644
--- a/pictureviewer2.cpp
+++ b/pictureviewer2.cpp
@@ -13,13 +13,19 @@
 #include <QWheelEvent>
 
 #include "pictureviewer2.h"
+#include "pictureswidget.h"
 
 PictureViewer2::PictureViewer2(QWidget *parent) : QGraphicsView(parent), mCur(0), mCurPos(0), mDefaultFile(":/picgone.png") {
     //behave like QDialog, but don't be one...
     setWindowFlags(QFlags<Qt::WindowType>(0x1|0x2|0x1000|0x2000|0x10000|0x8000000));
 
     //initial file list
-    mFiles = QStringList() << mDefaultFile;
+    PicData initialData;
+    for(int i = 0; i < PicFilesModel::NumFields; ++i){
+        initialData << QVariant();
+    }
+    initialData[PicFilesModel::FullPath] = mDefaultFile;
+    mFiles << initialData;
 
     //setup gui
     mScene = new QGraphicsScene(this);
@@ -33,22 +39,22 @@ PictureViewer2::PictureViewer2(QWidget *parent) : QGraphicsView(parent), mCur(0)
     showFile(mFiles.at(mCurPos));
 }
 
-void PictureViewer2::addFiles(const QStringList &files, bool clear){
+void PictureViewer2::addFiles(const PicDataList &files, bool clear){
     if(clear){
         mFiles.clear();
         mFiles = files;
         mCurPos = 0;
         return;
     }
-    foreach(const QString &f, files){
+    foreach(const PicData &f, files){
         if(!mFiles.contains(f)){
             mFiles.append(f);
         }
     }
 }
 
-void PictureViewer2::setFile(const QString &file){
-    addFiles(QStringList() << file, true);
+void PictureViewer2::setFile(const PicData &file){
+    addFiles(PicDataList() << file, true);
     showFile(mFiles.at(mCurPos));
 }
 
@@ -81,8 +87,8 @@ void PictureViewer2::wheelEvent(QWheelEvent *event){
     }
 }
 
-void PictureViewer2::showFile(const QString file){
-    QPixmap pixmap(file);
+void PictureViewer2::showFile(const PicData &file){
+    QPixmap pixmap(file.at(PicFilesModel::FullPath).toString());
     if(pixmap.isNull()){
         return;
     }