X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Ffilepicker.cpp;h=eeec7f4937448dbf613d0ded7376c0cbb7dc1978;hb=7a92a3a54da8634b6765fafd8e5a5724838941b1;hp=e01f365bb2d7bb8da210dc4b81a6a1eedec7decd;hpb=81f36e3d736289426541785b6d945126f074e10f;p=virtualjaguar

diff --git a/src/gui/filepicker.cpp b/src/gui/filepicker.cpp
index e01f365..eeec7f4 100644
--- a/src/gui/filepicker.cpp
+++ b/src/gui/filepicker.cpp
@@ -86,29 +86,31 @@ printf("VSB size: %u, %u\n", sbSize3.width(), sbSize3.height());
 	// 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);
+//	printf("VSB size width: %u\n", sbWidth);
 	int sbWidth2 = vsb->sizeHint().width();
-	printf("VSB sizeHint width: %u\n", sbWidth2);
+//	printf("VSB sizeHint width: %u\n", sbWidth2);
 	int sbWidth3 = vsb->minimumSize().width();
-	printf("VSB minimum width: %u\n", sbWidth3);
+//	printf("VSB minimum width: %u\n", sbWidth3);
 	int sbWidth4 = vsb->frameSize().width();
-	printf("VSB frame width: %u\n", sbWidth4);
+//	printf("VSB frame width: %u\n", sbWidth4);
 	delete vsb;
 
 //	fileList->setFixedWidth((488/4) + 4);
 	int sbWidth5 = fileList->frameWidth();
-	printf("List frame width: %u, (diff=%d)\n", sbWidth5, sbWidth5 - ((488/4) + 4));
+//	printf("List frame width: %u, (diff=%d)\n", sbWidth5, sbWidth5 - ((488/4) + 4));
 	int sbWidth6 = fileList->sizeHint().width();
-	printf("List sizeHint width: %u\n", sbWidth6);
+//	printf("List sizeHint width: %u\n", sbWidth6);
 	int sbWidth7 = fileList->minimumSize().width();
-	printf("List minimum width: %u\n", sbWidth7);
+//	printf("List minimum width: %u\n", sbWidth7);
 	int sbWidth8 = fileList->minimumSizeHint().width();
-	printf("List minimum hint width: %u\n", sbWidth8);
-//	fileList->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
-//	fileList->verticalScrollBar()->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+//	printf("List minimum hint width: %u\n", sbWidth8);
+////	fileList->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+////	fileList->verticalScrollBar()->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
 	// (488/4) + 4 is the width of the object in the filelistmodel. Dunno why the QListView
 	// isn't picking that up. :-(
-	fileList->setFixedWidth((488/4) + 4 + sbWidth);//ick
+	// 488/4 + 4 = 126
+	// 126 + 17 + 4 = 147 <-- correct width
+	fileList->setFixedWidth((488/4) + 4 + sbWidth2 + sbWidth5 + 1);//ick
 //	fileList->setFixedWidth((488/4) + 4 + 17 + 4);//sbWidth);//ick
 
 //	fileList->setSpacing(4);
@@ -153,9 +155,9 @@ printf("VSB size: %u, %u\n", sbSize3.width(), sbSize3.height());
 	dataLayout->addWidget(labels);
 	data = new QLabel(QString(tr(
 		"?MB Cartridge<br>"
-		"????????<br>"
-		"???<br>"
-		"???"
+		"00000000<br>"
+		"?<br>"
+		"?"
 	)));
 	data->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 	dataLayout->addWidget(data);
@@ -209,7 +211,10 @@ New sizes: 373x172 (label), 420x340 (cart)
 void FilePickerWindow::keyPressEvent(QKeyEvent * e)
 {
 	if (e->key() == Qt::Key_Escape)
+	{
 		hide();
+		emit(FilePickerHiding());
+	}
 	else if (e->key() == Qt::Key_Return)
 		LoadButtonPressed();
 }
@@ -420,7 +425,7 @@ void FilePickerWindow::UpdateSelection(const QModelIndex & current, const QModel
 		else
 			fileTypeString = QString(tr("%1MB Alpine ROM"));
 
-		fileTypeString = fileTypeString.arg(fileSize / 1048576);
+		fileTypeString = fileTypeString.arg((fileSize + 8192) / 1048576);
 	}
 	else if (haveUnknown && (fileType == JST_ABS_TYPE1 || fileType == JST_ABS_TYPE2))
 		fileTypeString = QString(tr("ABS/COF Executable (%1 bytes)")).arg(fileSize);