X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fgui%2Ffilepicker.cpp;h=5733de6ace1a29b635579e80d9a9ff3c317b95dd;hb=refs%2Ftags%2F2.1.2;hp=67eb5fd75804f4737613ad3c91b570706cd3c5c8;hpb=f30bf746981a99079e766b0d4e9de5391a4175ff;p=virtualjaguar
diff --git a/src/gui/filepicker.cpp b/src/gui/filepicker.cpp
index 67eb5fd..5733de6 100644
--- a/src/gui/filepicker.cpp
+++ b/src/gui/filepicker.cpp
@@ -85,24 +85,24 @@ printf("VSB size: %u, %u\n", sbSize3.width(), sbSize3.height());
#else
// This sets it to the "too large size" as the minimum!
QScrollBar * vsb = new QScrollBar(Qt::Vertical, this);
- int sbWidth = vsb->size().width();
+// int sbWidth = vsb->size().width();
// printf("VSB size width: %u\n", sbWidth);
int sbWidth2 = vsb->sizeHint().width();
// printf("VSB sizeHint width: %u\n", sbWidth2);
- int sbWidth3 = vsb->minimumSize().width();
+// int sbWidth3 = vsb->minimumSize().width();
// printf("VSB minimum width: %u\n", sbWidth3);
- int sbWidth4 = vsb->frameSize().width();
+// int sbWidth4 = vsb->frameSize().width();
// 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));
- int sbWidth6 = fileList->sizeHint().width();
+// int sbWidth6 = fileList->sizeHint().width();
// printf("List sizeHint width: %u\n", sbWidth6);
- int sbWidth7 = fileList->minimumSize().width();
+// int sbWidth7 = fileList->minimumSize().width();
// printf("List minimum width: %u\n", sbWidth7);
- int sbWidth8 = fileList->minimumSizeHint().width();
+// 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);
@@ -138,9 +138,13 @@ printf("VSB size: %u, %u\n", sbSize3.width(), sbSize3.height());
title = new QLabel(QString(tr("
...
")));
title->setMargin(6);
title->setAlignment(Qt::AlignCenter);
+//no.
+//title->setFixedWidth(cartImage->width());
+//title->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+//YESH!!!!
+ title->setFixedWidth(cartImage->sizeHint().width());
vLayout->addWidget(title);
-#if 1
QHBoxLayout * dataLayout = new QHBoxLayout;
vLayout->addLayout(dataLayout);
@@ -169,17 +173,6 @@ printf("VSB size: %u, %u\n", sbSize3.width(), sbSize3.height());
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)));
@@ -206,6 +199,8 @@ New sizes: 373x172 (label), 420x340 (cart)
// connect(fileList, SIGNAL(doubleClicked()), this, SLOT(LoadButtonPressed()));
// This returns:
// Object::connect: No such signal QListView::QAbstractItemView::doubleClicked() in src/gui/filepicker.cpp:203
+//can't do this, nothing's rendered yet...
+//setFixedWidth(width());
}
void FilePickerWindow::keyPressEvent(QKeyEvent * e)
@@ -305,7 +300,7 @@ void FilePickerWindow::UpdateSelection(const QModelIndex & current, const QModel
unsigned long fileSize = current.model()->data(current, FLM_FILESIZE).toUInt();
bool haveUniversalHeader = current.model()->data(current, FLM_UNIVERSALHDR).toBool();
unsigned long fileType = current.model()->data(current, FLM_FILETYPE).toUInt();
- uint32 crc = (uint32)current.model()->data(current, FLM_CRC).toUInt();
+ uint32_t crc = (uint32_t)current.model()->data(current, FLM_CRC).toUInt();
// printf("FPW: %s\n", s.toAscii().data());
bool haveUnknown = (i == 0xFFFFFFFF ? true : false);
#endif
@@ -375,7 +370,7 @@ void FilePickerWindow::UpdateSelection(const QModelIndex & current, const QModel
cart = QImage(":/res/alpine-file.png");
}
else if (haveUnknown && (fileType == JST_ABS_TYPE1 || fileType == JST_ABS_TYPE2
- || fileType == JST_JAGSERVER))
+ || fileType == JST_JAGSERVER) || fileType == JST_WTFOMGBBQ)
{
cart = QImage(":/res/homebrew-file.png");
}
@@ -396,7 +391,15 @@ void FilePickerWindow::UpdateSelection(const QModelIndex & current, const QModel
prettyFilename = "\"" + currentFile.mid(lastSlashPos + 1) + "\"";
}
+ // Ensure that the title isn't longer than the width of the dialog...
+#if 1
title->setText(QString("%1
").arg(prettyFilename));
+#else
+ // This doesn't work...
+ QFontMetrics metrics(title->font());
+ QString elidedText = metrics.elidedText(QString("%1
").arg(prettyFilename), Qt::ElideRight, title->sizeHint().width());
+ title->setText(elidedText);
+#endif
//Kludge for now, we'll have to fix this later...
// So let's fix it now!