X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fgui%2Ffilepicker.cpp;h=d7f1507293885e82c4910a6b6967b0bd6390f2ec;hb=f548beede257a2252a2639e3fe03c7cda99433ed;hp=1129d17ca905e165ec5672e9a39e70ad922a6967;hpb=8cecfa4150ad7bc9d2a95f9753e2666456f98243;p=virtualjaguar
diff --git a/src/gui/filepicker.cpp b/src/gui/filepicker.cpp
index 1129d17..d7f1507 100644
--- a/src/gui/filepicker.cpp
+++ b/src/gui/filepicker.cpp
@@ -10,6 +10,7 @@
// --- ---------- -------------------------------------------------------------
// JLH 01/22/2010 Created this file
// JLH 02/06/2010 Modified to use Qt model/view framework
+// JLH 03/08/2010 Added large cart view and info text
//
#include "filepicker.h"
@@ -37,28 +38,145 @@ Maybe box art, screenshots will go as well...
I'm thinking compatibility info should be displayed as well... Just to stop the
inevitable stupid questions from people too lazy to do basic research for themselves.
+
+
+Data strategy:
+
+- Should keep a QImage of the blank cart with blank label
+- Should keep a QImage of the blank cart? (For overpainting the ROMs label)
+- Should we have a special Alpine image? Floppy image (for COF/ABS)?
+
+- Need some way of keeping track of cart size and compatibility info
+ [compat info needs to be BAD DUMP or % of what works]
+- Need to properly scale the thumbnails images in the list
*/
//could use Window as well...
//FilePickerWindow::FilePickerWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
-FilePickerWindow::FilePickerWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Window)
+FilePickerWindow::FilePickerWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Window),
+ currentFile("")
{
- setWindowTitle("Insert Cartridge...");
+ setWindowTitle(tr("Insert Cartridge..."));
//is there any reason why this must be cast as a QAbstractListModel? No
//Also, need to think about data structure for the model...
model = new FileListModel;
fileList = new QListView;
fileList->setModel(model);
- fileList->setItemDelegate(new ImageDelegate(this));
+// fileList->setItemDelegate(new ImageDelegate(this));
+ fileList->setItemDelegate(new ImageDelegate());
+#if 0
+ //nope.
+// fileList->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+// fileList->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+//small problem with this is that it doesn't take scrollbar into account...
+QSize sbSize = fileList->verticalScrollBar()->minimumSizeHint();
+printf("VSB minimumSizeHint: %u, %u\n", sbSize.width(), sbSize.height());
+QSize sbSize2 = fileList->verticalScrollBar()->sizeHint();
+printf("VSB sizeHint: %u, %u\n", sbSize2.width(), sbSize2.height());
+QRect sbRect = fileList->verticalScrollBar()->normalGeometry();
+printf("VSB normalGeometry: %u, %u\n", sbRect.width(), sbRect.height());
+QSize sbSize3 = fileList->verticalScrollBar()->size();
+printf("VSB size: %u, %u\n", sbSize3.width(), sbSize3.height());
+// int sbWidth = fileList->verticalScrollBar()->width();
+ int sbWidth = fileList->verticalScrollBar()->size().width();
+ fileList->setFixedWidth((488/4) + 4 + sbWidth);//ick
+#else
+ // This sets it to the "too large size" as the minimum!
+ QScrollBar * vsb = new QScrollBar(Qt::Vertical, this);
+ int sbWidth = vsb->size().width();
+ printf("VSB size width: %u\n", sbWidth);
+ int sbWidth2 = vsb->sizeHint().width();
+ printf("VSB sizeHint width: %u\n", sbWidth2);
+ delete vsb;
+
+// fileList->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+// fileList->verticalScrollBar()->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+ fileList->setFixedWidth((488/4) + 4 + sbWidth);//ick
+#endif
- QVBoxLayout * layout = new QVBoxLayout;
+// QVBoxLayout * layout = new QVBoxLayout;
+ QHBoxLayout * layout = new QHBoxLayout;
setLayout(layout);
layout->addWidget(fileList);
+ // Weird note: This layout has to be added *before* putting anything into it...
+ QVBoxLayout * vLayout = new QVBoxLayout;
+ layout->addLayout(vLayout);
+
+ cartImage = new QLabel;
+ QImage cartImg(":/res/cart-blank.png");
+ QPainter painter(&cartImg);
+ painter.drawPixmap(23, 87, QPixmap(":/res/label-blank.png"));
+ painter.end();
+ cartImage->setPixmap(QPixmap::fromImage(cartImg));
+ cartImage->setMargin(4);
+ vLayout->addWidget(cartImage);
+
+ title = new QLabel(QString(tr("
...
")));
+ title->setMargin(6);
+ title->setAlignment(Qt::AlignCenter);
+ vLayout->addWidget(title);
+
+#if 1
+ QHBoxLayout * dataLayout = new QHBoxLayout;
+ vLayout->addLayout(dataLayout);
+
+ QLabel * labels = new QLabel(QString(tr(
+ "Type:
"
+ "CRC32:
"
+ "Compatibility:
"
+ "Notes:"
+ )));
+ labels->setAlignment(Qt::AlignRight);
+ labels->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+ dataLayout->addWidget(labels);
+ data = new QLabel(QString(tr(
+ "4MB Cartridge
"
+ "FEDCBA98
"
+ "DOES NOT WORK
"
+ "Universal Header detected; Requires DSP"
+ )));
+ data->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+ dataLayout->addWidget(data);
+
+//#warning "!!! Icon size for pushbutton is tiny !!!"
+ insertCart = new QPushButton(this);
+ insertCart->setIconSize(QSize(40, 40));
+ insertCart->setIcon(QIcon(":/res/insert.png"));
+ insertCart->setDefault(true); // We want this button to be the default
+ insertCart->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+ dataLayout->addWidget(insertCart);
+#else
+ QLabel * text2 = new QLabel(QString(tr(
+ ""
+ "Type: | 4MB Cartridge |
"
+ "CRC32: | FEDCBA98 |
"
+ "Compatibility: | DOES NOT WORK |
"
+ "Notes: | Universal Header detected; Requires DSP |
"
+ "
"
+ )));
+ vLayout->addWidget(text2);
+#endif
+
fileThread = new FileThread(this);
- connect(fileThread, SIGNAL(FoundAFile(unsigned long)), this, SLOT(AddFileToList(unsigned long)));
+// connect(fileThread, SIGNAL(FoundAFile(unsigned long)), this, SLOT(AddFileToList(unsigned long)));
+ connect(fileThread, SIGNAL(FoundAFile2(unsigned long, QString, QImage *, unsigned long)), this, SLOT(AddFileToList2(unsigned long, QString, QImage *, unsigned long)));
fileThread->Go();
+/*
+New sizes: 373x172 (label), 420x340 (cart)
+*/
+
+// QItemSelectionModel * ism = fileList->selectionModel();
+// connect(ism, SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(UpdateSelection(const QModelIndex &, const QModelIndex &)));
+ connect(fileList->selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(UpdateSelection(const QModelIndex &, const QModelIndex &)));
+
+ connect(insertCart, SIGNAL(clicked()), this, SLOT(LoadButtonPressed()));
+}
+
+QString FilePickerWindow::GetSelectedPrettyName(void)
+{
+ return prettyFilename;
}
//
@@ -68,7 +186,134 @@ FilePickerWindow::FilePickerWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt:
void FilePickerWindow::AddFileToList(unsigned long index)
{
printf("FilePickerWindow: Found match [%s]...\n", romList[index].name);
- // NOTE: The model *ignores* what you send it, so this is crap. !!! FIX !!!
+ // NOTE: The model *ignores* what you send it, so this is crap. !!! FIX !!! [DONE, somewhat]
// model->AddData(QIcon(":/res/generic.png"));
- model->AddData(index);
+// model->AddData(index);
+}
+
+void FilePickerWindow::AddFileToList2(unsigned long index, QString str, QImage * img, unsigned long size)
+{
+printf("FilePickerWindow(2): Found match [%s]...\n", romList[index].name);
+ if (img)
+ {
+ model->AddData(index, str, *img, size);
+//It would be better to pass the pointer into the model though...
+ delete img;
+ }
+ else
+ model->AddData(index, str, QImage(), size);
+}
+
+void FilePickerWindow::LoadButtonPressed(void)
+{
+ // TODO: Get the text of the current selection, call the MainWin slot for loading
+ emit(RequestLoad(currentFile));
+ this->hide();
}
+
+//
+// This slot gets called when the QListView gets clicked on. Updates
+// the cart graphic and accompanying text.
+//
+void FilePickerWindow::UpdateSelection(const QModelIndex & current, const QModelIndex &/*previous*/)
+{
+#if 0
+ QString s = current.model()->data(current, Qt::EditRole).toString();
+ unsigned long i = current.model()->data(current, Qt::DisplayRole).toUInt();
+ QImage label = current.model()->data(current, Qt::DecorationRole).value();
+// printf("FPW: %s\n", s.toAscii().data());
+ unsigned long fileSize = current.model()->data(current, Qt::WhatsThisRole).toUInt();
+#else
+// QString s = current.model()->data(current, FLM_FILENAME).toString();
+ currentFile = current.model()->data(current, FLM_FILENAME).toString();
+ unsigned long i = current.model()->data(current, FLM_INDEX).toUInt();
+ QImage label = current.model()->data(current, FLM_LABEL).value();
+ unsigned long fileSize = current.model()->data(current, FLM_FILESIZE).toUInt();
+// printf("FPW: %s\n", s.toAscii().data());
+#endif
+
+//hm.
+//currentFile = s;
+
+//373x172 is label size...
+//365x168 now...
+ if (!label.isNull())
+ {
+/*
+ QImage cartImg(":/res/cart-blank.png");
+ QPainter painter(&cartImg);
+ painter.drawPixmap(23, 87, QPixmap(":/res/label-blank.png"));
+ painter.end();
+ cartSmall = cartImg.scaled(488/4, 395/4, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+*/
+ QImage cart(":/res/cart-blank.png");
+ QPainter painter(&cart);
+//Though this should probably be done when this is loaded, instead of every time here...
+//QImage scaledImg = label.scaled(373, 172, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+//painter.drawPixmap(23, 87, QPixmap::fromImage(scaledImg));
+ // Now, looks like it is...
+// painter.drawPixmap(23, 87, QPixmap::fromImage(label));
+ painter.drawPixmap(27, 89, QPixmap::fromImage(label));
+// painter.drawPixmap(23, 87, 373, 172, QPixmap::fromImage(label));
+
+// Well, heck. This should be done to the label *before* we get here.
+ painter.drawPixmap(27, 89, QPixmap::fromImage(QImage(":/res/upper-left.png")));
+ painter.drawPixmap(27+355, 89, QPixmap::fromImage(QImage(":/res/upper-right.png")));
+
+ painter.end();
+ cartImage->setPixmap(QPixmap::fromImage(cart));
+ }
+ else
+ {
+ // We should try to be intelligent with our updates here, and only redraw when
+ // we're going from a selection with a label to a selection without. Now, we
+ // redraw regardless.
+ QImage cart(":/res/cart-blank.png");
+ QPainter painter(&cart);
+// painter.drawPixmap(23, 87, QPixmap::fromImage(QImage(":/res/label-blank.png")));
+ painter.drawPixmap(27, 89, QPixmap::fromImage(QImage(":/res/label-blank.png")));
+ painter.end();
+ cartImage->setPixmap(QPixmap::fromImage(cart));
+ }
+
+//1048576
+//2097152
+//4194304
+ prettyFilename = romList[i].name;
+ title->setText(QString("%1
").arg(romList[i].name));
+//Kludge for now, we'll have to fix this later...
+ QString fileType = QString(romList[i].flags & FF_ROM ? "%1MB Cartridge" : "%1*** UNKNOWN ***")
+ .arg(fileSize / 1048576);
+ QString crcString = QString("%1").arg(romList[i].crc32, 8, 16, QChar('0')).toUpper();
+ QString notes =
+/* (romList[i].flags & FF_ROM ? "Jaguar ROM " : "")*/
+ QString(romList[i].flags & FF_BAD_DUMP ? "BAD DUMP" : "");
+ data->setText(QString("%1
%2
%3
%4").arg(fileType).arg(crcString).arg("???%").arg(notes));
+}
+
+/*
+ Super Duper Awesome Guy (World)
+
+ Type: 4MB Cartridge
+ CRC32: FEDCBA98
+Compatibility: DOES NOT WORK
+ Notes: Universal Header detected; Requires DSP
+
+
+ Stupid Homebrew Game That Sux
+
+ Type: ABS/COF Executable (43853 bytes)
+ CRC32: 76543210
+Compatibility: Unknown
+ Notes: $4000 Load, $4000 Run
+
+
+ Action Hopscotch Plus (Prototype)
+
+ Type: 2MB Alpine ROM
+ CRC32: 44889921
+Compatibility: 80% (or ****)
+ Notes: EEPROM available
+
+
+*/