X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Ffilepicker.cpp;h=e8a44d1bad7ea9d88d32fb99bd71fa06170afdff;hb=09adab3161f986d5cc8dbeffe15cb6545afa138f;hp=9146bdf446722c949c11d54f755514945fbe0063;hpb=3e68f33188872d5754d3765ff140811bcb696c6f;p=virtualjaguar

diff --git a/src/gui/filepicker.cpp b/src/gui/filepicker.cpp
index 9146bdf..e8a44d1 100644
--- a/src/gui/filepicker.cpp
+++ b/src/gui/filepicker.cpp
@@ -14,6 +14,8 @@
 #include "filepicker.h"
 
 #include "crc32.h"
+#include "filelistmodel.h"
+#include "filethread.h"
 #include "settings.h"
 #include "types.h"
 
@@ -24,7 +26,7 @@ struct RomIdentifier
 	const char file[128];
 };
 
-RomIdentifier romList[] = {
+RomIdentifier romList2[] = {
 	{ 0x0509C85E, "Raiden (World)", "" },
 	{ 0x08F15576, "Iron Soldier (World) (v1.04)", "" },
 	{ 0x0957A072, "Kasumi Ninja (World)", "" },
@@ -111,18 +113,43 @@ FilePickerWindow::FilePickerWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt:
 {
 	setWindowTitle("Insert Cartridge...");
 
-	fileList = new QListWidget(this);
+#if 1
+	fileList2 = new QListWidget(this);
 //	addWidget(fileList);
 
 	QVBoxLayout * layout = new QVBoxLayout();
 //	layout->setSizeConstraint(QLayout::SetFixedSize);
 	setLayout(layout);
 
-	layout->addWidget(fileList);
+	layout->addWidget(fileList2);
 
-	PopulateList();
+//	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
+QStringList numbers;
+numbers << "One" << "Two" << "Three" << "Four" << "Five";
+
+QAbstractItemModel * model = new StringListModel(numbers);
+QListView * view = new QListView;
+view->setModel(model);
+
+#endif
+}
+
+// Need a slot here to pickup stuff from the thread...
+
+void FilePickerWindow::AddFileToList(unsigned long index)
+{
+	printf("--> Found CRC: %08X...\n", (uint32)index);
 }
 
+
+/*
 void FilePickerWindow::PopulateList(void)
 {
 	QDir romDir(vjs.ROMPath);
@@ -144,12 +171,12 @@ void FilePickerWindow::PopulateList(void)
 			file.close();
 //printf("FilePickerWindow: File crc == %08X...\n", crc);
 
-			for(int j=0; romList[j].crc32 != 0xFFFFFFFF; j++)
+			for(int j=0; romList2[j].crc32 != 0xFFFFFFFF; j++)
 			{
-				if (romList[j].crc32 == crc)
+				if (romList2[j].crc32 == crc)
 				{
-printf("FilePickerWindow: Found match [%s]...\n", romList[j].name);
-					new QListWidgetItem(QIcon(":/res/generic.png"), romList[j].name, fileList);
+printf("FilePickerWindow: Found match [%s]...\n", romList2[j].name);
+					new QListWidgetItem(QIcon(":/res/generic.png"), romList2[j].name, fileList);
 					break;
 				}
 			}
@@ -158,4 +185,4 @@ printf("FilePickerWindow: Found match [%s]...\n", romList[j].name);
 		delete[] buffer;
 	}
 }
-
+*/