From: Shamus Hammons Date: Fri, 12 Feb 2010 22:18:49 +0000 (+0000) Subject: Moving towards a better file picker... :-) X-Git-Tag: 2.0.0~34^2~38 X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25cc16d819c81e08d2e21b57720dd4ea08ae9e25;p=virtualjaguar Moving towards a better file picker... :-) --- diff --git a/src/gui/filelistmodel.cpp b/src/gui/filelistmodel.cpp index 2730a45..a975b82 100644 --- a/src/gui/filelistmodel.cpp +++ b/src/gui/filelistmodel.cpp @@ -26,13 +26,15 @@ FileListModel::FileListModel(QObject * parent/*= 0*/): QAbstractListModel(parent int FileListModel::rowCount(const QModelIndex & parent/*= QModelIndex()*/) const { - return pixList.size(); +// return pixList.size(); + return dbIndex.size(); } QVariant FileListModel::data(const QModelIndex & index, int role) const { // return QVariant(); - return pixList.at(index.row()); +// return pixList.at(index.row()); + return (uint)dbIndex.at(index.row()); } QVariant FileListModel::headerData(int section, Qt::Orientation orientation, int role/*= Qt::DisplayRole*/) const @@ -62,6 +64,12 @@ void FileListModel::AddData(QIcon pix) reset(); } +void FileListModel::AddData(unsigned long index) +{ + dbIndex.push_back(index); + reset(); +} + #if 0 diff --git a/src/gui/filelistmodel.h b/src/gui/filelistmodel.h index 4828d38..1599ca5 100644 --- a/src/gui/filelistmodel.h +++ b/src/gui/filelistmodel.h @@ -21,9 +21,11 @@ class FileListModel: public QAbstractListModel QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; void AddData(QIcon pix); + void AddData(unsigned long); private: std::vector pixList; + std::vector dbIndex; }; #endif // __FILELISTMODEL_H__ diff --git a/src/gui/filepicker.cpp b/src/gui/filepicker.cpp index 5211736..a841d88 100644 --- a/src/gui/filepicker.cpp +++ b/src/gui/filepicker.cpp @@ -14,87 +14,12 @@ #include "filepicker.h" -#include "crc32.h" #include "filelistmodel.h" #include "filethread.h" #include "imagedelegate.h" #include "settings.h" #include "types.h" -struct RomIdentifier -{ - const uint32 crc32; - const char name[128]; - const char file[128]; -}; - -RomIdentifier romList2[] = { - { 0x0509C85E, "Raiden (World)", "" }, - { 0x08F15576, "Iron Soldier (World) (v1.04)", "" }, - { 0x0957A072, "Kasumi Ninja (World)", "" }, - { 0x0AC83D77, "NBA Jam T.E. (World)", "" }, - { 0x0EC5369D, "Evolution - Dino Dudes (World)", "" }, - { 0x0F6A1C2C, "Ultra Vortek (World)", "" }, - { 0x14915F20, "White Men Can't Jump (World)", "" }, - { 0x1660F070, "Power Drive Rally (World)", "" }, - { 0x1E451446, "Trevor McFur in the Crescent Galaxy (World)", "" }, - { 0x27594C6A, "Defender 2000 (World)", "" }, - { 0x2E17D5DA, "Bubsy in Fractured Furry Tales (World)", "" }, - { 0x348E6449, "Double Dragon V - The Shadow Falls (World)", "" }, - { 0x3615AF6A, "Fever Pitch Soccer (World) (En,Fr,De,Es,It)", "" }, - { 0x38A130ED, "Troy Aikman NFL Football (World)", "" }, - { 0x3C044941, "Skyhammer (World)", "" }, - { 0x42A13EC5, "Soccer Kid (World)", "" }, - { 0x47EBC158, "Theme Park (World)", "" }, - { 0x4899628F, "Hover Strike (World)", "" }, - { 0x53DF6440, "Space War 2000 (World)", "" }, - { 0x55A0669C, "[BIOS] Atari Jaguar Developer CD (World)", "" }, - { 0x58272540, "Syndicate (World)", "" }, - { 0x5A101212, "Sensible Soccer - International Edition (World)", "" }, - { 0x5B6BB205, "Ruiner Pinball (World)", "" }, - { 0x5CFF14AB, "Pinball Fantasies (World)", "" }, - { 0x5E2CDBC0, "Doom (World)", "" }, - { 0x61C7EEC0, "Zero 5 (World)", "" }, - { 0x67F9AB3A, "Battle Sphere Gold (World)", "" }, - { 0x687068D5, "[BIOS] Atari Jaguar CD (World)", "" }, - { 0x6B2B95AD, "Tempest 2000 (World)", "" }, - { 0x6EB774EB, "Worms (World)", "" }, - { 0x6F8B2547, "Super Burnout (World)", "" }, - { 0x817A2273, "Pitfall - The Mayan Adventure (World)", "" }, - { 0x8975F48B, "Zool 2 (World)", "" }, - { 0x8D15DBC6, "[BIOS] Atari Jaguar Stubulator '94 (World)", "" }, - { 0x8FEA5AB0, "Dragon - The Bruce Lee Story (World)", "" }, - { 0x97EB4651, "I-War (World)", "" }, - { 0xA27823D8, "Ultra Vortek (World) (v0.94) (Beta)", "" }, - { 0xA56D0798, "Protector - Special Edition (World)", "" }, - { 0xA9F8A00E, "Rayman (World)", "" }, - { 0xB14C4753, "Fight for Life (World)", "" }, - { 0xBCB1A4BF, "Brutal Sports Football (World)", "" }, - { 0xBDA405C6, "Cannon Fodder (World)", "" }, - { 0xBDE67498, "Cybermorph (World) (Rev 1)", "" }, - { 0xC5562581, "Zoop! (World)", "" }, - { 0xC654681B, "Total Carnage (World)", "" }, - { 0xC6C7BA62, "Fight for Life (World) (Alt)", "" }, - { 0xC9608717, "Val d'Isere Skiing and Snowboarding (World)", "" }, - { 0xCBFD822A, "Air Cars (World)", "" }, - { 0xCD5BF827, "Attack of the Mutant Penguins (World)", "" }, - { 0xD6C19E34, "Iron Soldier 2 (World)", "" }, - { 0xDA9C4162, "Missile Command 3D (World)", "" }, - { 0xDC187F82, "Alien vs Predator (World)", "" }, - { 0xDE55DCC7, "Flashback - The Quest for Identity (World) (En,Fr)", "" }, - { 0xE28756DE, "Atari Karts (World)", "" }, - { 0xE60277BB, "[BIOS] Atari Jaguar Stubulator '93 (World)", "" }, - { 0xE91BD644, "Wolfenstein 3D (World)", "" }, - { 0xEC22F572, "SuperCross 3D (World)", "" }, - { 0xECF854E7, "Cybermorph (World) (Rev 2)", "" }, - { 0xEEE8D61D, "Club Drive (World)", "" }, - { 0xF0360DB3, "Hyper Force (World)", "" }, - { 0xFA7775AE, "Checkered Flag (World)", "" }, - { 0xFAE31DD0, "Flip Out! (World)", "" }, - { 0xFB731AAA, "[BIOS] Atari Jaguar (World)", "" }, - { 0xFFFFFFFF, "***END***", "" } -}; - /* Our strategy here is like so: Look at the files in the directory pointed to by ROMPath. @@ -108,90 +33,42 @@ put that in the list. User picks from a graphical image of the cart. Ideally, the label will go into the archive along with the ROM image, but that's for the future... 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. */ -//FilePickerWindow::FilePickerWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)//could use Window as well... +//could use Window as well... +//FilePickerWindow::FilePickerWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog) FilePickerWindow::FilePickerWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Window) { setWindowTitle("Insert Cartridge..."); -#if 0 - fileList2 = new QListWidget(this); -// addWidget(fileList); - - QVBoxLayout * layout = new QVBoxLayout(); -// layout->setSizeConstraint(QLayout::SetFixedSize); - setLayout(layout); - - layout->addWidget(fileList2); - -// PopulateList(); - fileThread = new FileThread(this); - - /*bool b =*/ connect(fileThread, SIGNAL(FoundAFile(unsigned long)), this, SLOT(AddFileToList(unsigned long))); -//printf("FilePickerWindow: Connection to FileThread %s...\n", (b ? "succeeded" : "failed")); - - fileThread->Go(fileList2); -#else -//is there any reason why this must be cast as a QAbstractListModel? +//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(); + model = new FileListModel; + fileList = new QListView; fileList->setModel(model); - ImageDelegate * delegate = new ImageDelegate(this); - fileList->setItemDelegate(delegate); + fileList->setItemDelegate(new ImageDelegate(this)); QVBoxLayout * layout = new QVBoxLayout; setLayout(layout); - layout->addWidget(fileList); - ((FileListModel *)model)->AddData(QIcon(":/res/generic.png")); - ((FileListModel *)model)->AddData(QIcon(":/res/generic.png")); -#endif -} - -// Need a slot here to pickup stuff from the thread... -void FilePickerWindow::AddFileToList(unsigned long index) -{ - printf("--> Found CRC: %08X...\n", romList2[index].crc32); + fileThread = new FileThread(this); + connect(fileThread, SIGNAL(FoundAFile(unsigned long)), this, SLOT(AddFileToList(unsigned long))); + fileThread->Go(); } - -/* -void FilePickerWindow::PopulateList(void) +// +// This slot gets called by the FileThread's run() function when it finds a +// match in the filesystem to a ROM on our CRC list. +// +void FilePickerWindow::AddFileToList(unsigned long index) { - QDir romDir(vjs.ROMPath); - QFileInfoList list = romDir.entryInfoList(); - - for(int i=0; i Found CRC: %08X...\n", romList2[index].crc32); + // NOTE: The model *ignores* what you send it, so this is crap. !!! FIX !!! +// model->AddData(QIcon(":/res/generic.png")); + model->AddData(index); } -*/ diff --git a/src/gui/filepicker.h b/src/gui/filepicker.h index 543de0e..f0b5143 100644 --- a/src/gui/filepicker.h +++ b/src/gui/filepicker.h @@ -8,7 +8,7 @@ // Forward declarations class QListWidget; class FileThread; -//class FileListModel; +class FileListModel; class QListView; class FilePickerWindow: public QWidget @@ -28,6 +28,7 @@ class FilePickerWindow: public QWidget private: QListWidget * fileList2; FileThread * fileThread; - QAbstractItemModel * model; +// QAbstractItemModel * model; + FileListModel * model; QListView * fileList; }; diff --git a/src/gui/filethread.cpp b/src/gui/filethread.cpp index 7ecb453..a6ecd3f 100644 --- a/src/gui/filethread.cpp +++ b/src/gui/filethread.cpp @@ -18,12 +18,14 @@ #include "settings.h" //#include "types.h" +#if 0 struct RomIdentifier { const uint32 crc32; const char name[128]; const char file[128]; }; +#endif RomIdentifier romList[] = { { 0x0509C85E, "Raiden (World)", "" }, @@ -107,7 +109,7 @@ for the future... Maybe box art, screenshots will go as well... */ -FileThread::FileThread(QObject * parent/*= 0*/): QThread(parent), listWidget(NULL), abort(false) +FileThread::FileThread(QObject * parent/*= 0*/): QThread(parent), /*listWidget(NULL),*/ abort(false) { } @@ -121,13 +123,17 @@ FileThread::~FileThread() wait(); } -void FileThread::Go(QListWidget * lw) +//void FileThread::Go(QListWidget * lw) +void FileThread::Go(void) { QMutexLocker locker(&mutex); - this->listWidget = lw; +// this->listWidget = lw; start(); } +// +// Here's the thread's actual execution path... +// void FileThread::run(void) { QDir romDir(vjs.ROMPath); @@ -165,8 +171,8 @@ printf("FileThread: Aborting!!!\n"); if (index != 0xFFFFFFFF) { -printf("FileThread: Found match [%s]...\n", romList[index].name); - new QListWidgetItem(QIcon(":/res/generic.png"), romList[index].name, listWidget); +//printf("FileThread: Found match [%s]...\n", romList[index].name); +// new QListWidgetItem(QIcon(":/res/generic.png"), romList[index].name, listWidget); // emit FoundAFile(romList[index].crc32); emit FoundAFile(index); } diff --git a/src/gui/filethread.h b/src/gui/filethread.h index 12c316f..6690dc6 100644 --- a/src/gui/filethread.h +++ b/src/gui/filethread.h @@ -9,7 +9,7 @@ #include "types.h" // Forward declarations -class QListWidget; +//class QListWidget; class FileThread: public QThread { @@ -18,7 +18,8 @@ class FileThread: public QThread public: FileThread(QObject * parent = 0); ~FileThread(); - void Go(QListWidget * lw); +// void Go(QListWidget * lw); + void Go(void); signals: void FoundAFile(unsigned long index); @@ -28,10 +29,19 @@ class FileThread: public QThread uint32 FindCRCIndexInFileList(uint32); private: - QListWidget * listWidget; +// QListWidget * listWidget; QMutex mutex; QWaitCondition condition; bool abort; }; +struct RomIdentifier +{ + const uint32 crc32; + const char name[128]; + const char file[128]; +}; + +extern RomIdentifier romList[]; + #endif // __FILETHREAD_H__ diff --git a/src/gui/imagedelegate.cpp b/src/gui/imagedelegate.cpp index 76e690b..7087915 100644 --- a/src/gui/imagedelegate.cpp +++ b/src/gui/imagedelegate.cpp @@ -15,6 +15,8 @@ // class utilized in FilePicker. #include "imagedelegate.h" +#warning "Move ROM database to its own file... !!! FIX !!!" +#include "filethread.h" ImageDelegate::ImageDelegate(QObject * parent): QAbstractItemDelegate(parent), pixelSize(12) @@ -71,7 +73,11 @@ The foreground of the item (the circle representing a pixel) must be rendered us #else // painter->drawPixmap(option.rect.x()+8, option.rect.y()+8, 200, 94, QPixmap(":/res/labels/rayman.jpg")); painter->drawPixmap(option.rect.x(), option.rect.y(), 488/2, 395/2, QPixmap(":/res/cart-blank.png")); - painter->drawPixmap(option.rect.x()+13, option.rect.y()+51, 433/2, 203/2, QPixmap(":/res/labels/rayman.jpg")); +// painter->drawPixmap(option.rect.x()+13, option.rect.y()+51, 433/2, 203/2, QPixmap(":/res/labels/rayman.jpg")); + painter->drawPixmap(option.rect.x()+14, option.rect.y()+50, 433/2, 203/2, QPixmap(":/res/label-blank.png")); +//Need to query the model for the data we're supposed to draw here... + unsigned long i = index.model()->data(index, Qt::DisplayRole).toUInt(); + painter->drawText(17, 73, QString(romList[i].name)); //26x100 #endif painter->restore(); diff --git a/src/gui/vj.qrc b/src/gui/vj.qrc index f55a393..4f7e92a 100644 --- a/src/gui/vj.qrc +++ b/src/gui/vj.qrc @@ -7,6 +7,7 @@ ../../res/zoom300.png ../../res/generic.png ../../res/cart-blank.png + ../../res/label-blank.png ../../res/vj_title_small.png ../../res/labels/rayman.jpg