hedgewars: comparison QTfrontend/ui/page/pagevideos.cpp

equal deleted inserted replaced

-:0135e64c6c66
+:c4fd2813b127
 #include "igbox.h"
 #include "LibavInteraction.h"
 #include "gameuiconfig.h"
 #include "recorder.h"
 #include "ask_quit.h"
+#include "util/MessageDialog.h"
 static const QSize ThumbnailSize(350, 350*3/5);
 // columns in table with list of video files
 enum VideosColumns
 filesTable->setColumnCount(vcNumColumns);
 filesTable->setHorizontalHeaderLabels(columns);
 filesTable->setSelectionBehavior(QAbstractItemView::SelectRows);
 filesTable->setSelectionMode(QAbstractItemView::SingleSelection);
 filesTable->setEditTriggers(QAbstractItemView::SelectedClicked);
+filesTable->setShowGrid(false);
+filesTable->setAlternatingRowColors(true);
 filesTable->verticalHeader()->hide();
 filesTable->setMinimumWidth(400);
-QHeaderView * header = filesTable->horizontalHeader();
+QHeaderView * header = new QHeaderView(Qt::Horizontal, filesTable);
+filesTable->setHorizontalHeader(header);
+header = filesTable->horizontalHeader();
+header->setStretchLastSection(true);
+header->setSectionsClickable(false);
 header->setSectionResizeMode(vcName, QHeaderView::ResizeToContents);
 header->setSectionResizeMode(vcSize, QHeaderView::Fixed);
 header->resizeSection(vcSize, 100);
-header->setStretchLastSection(true);
 btnOpenDir = new QPushButton(QPushButton::tr("Open videos directory"), pTableGroup);
 btnOpenDir->setWhatsThis(QPushButton::tr("Open the video directory in your system"));
 QVBoxLayout *box = new QVBoxLayout(pTableGroup);
 labelDesc->setAlignment(Qt::AlignLeft | Qt::AlignTop);
 labelDesc->setTextInteractionFlags(Qt::TextSelectableByMouse |
 Qt::TextSelectableByKeyboard |
 Qt::LinksAccessibleByMouse |
 Qt::LinksAccessibleByKeyboard);
-labelDesc->setTextFormat(Qt::RichText);
+labelDesc->setTextFormat(Qt::PlainText);
 labelDesc->setWordWrap(true);
-labelDesc->setOpenExternalLinks(true);
+labelDesc->setOpenExternalLinks(false);
 // buttons: play and delete
 btnPlay = new QPushButton(QPushButton::tr("Play"), pDescGroup);
 btnPlay->setEnabled(false);
 btnPlay->setWhatsThis(QPushButton::tr("Play this video"));
 PageVideos::PageVideos(QWidget* parent) : AbstractPage(parent),
 config(0)
 {
 nameChangedFromCode = false;
 numRecorders = 0;
+// Clear VideoTemp at launch in case some garbage remained in here after a crash
+clearTemp();
 initPage();
 }
 void PageVideos::init(GameUIConfig * config)
 {
 if (row == -1)
 row = appendRow(name);
 VideoItem * item = nameItem(row);
 item->seen = true;
 item->desc = "";
+setName(item, item->name);
 updateSize(row);
 }
 // remove all non seen files
 for (int i = 0; i < filesTable->rowCount();)
 progressBar->setMinimum(0);
 progressBar->setMaximum(10000);
 progressBar->setValue(0);
 connect(pRecorder, SIGNAL(onProgress(float)), this, SLOT(updateProgress(float)));
 connect(pRecorder, SIGNAL(encodingFinished(bool)), this, SLOT(encodingFinished(bool)));
+connect(pRecorder, SIGNAL(ErrorMessage(const QString &)), this, SLOT(ShowFatalErrorMessage(const QString &)), Qt::QueuedConnection);
 filesTable->setCellWidget(row, vcProgress, progressBar);
 numRecorders++;
 }
 return;
 // user has edited filename, so we should rename the file
 VideoItem * item = nameItem(row);
 QString oldName = item->name;
+int pointPos = oldName.lastIndexOf('.');
+QString oldPrefix = item->name;
+oldPrefix.truncate(pointPos);
 QString newName = item->text();
 if (!newName.contains('.')) // user forgot an extension
 {
 // restore old extension
-int pt = oldName.lastIndexOf('.');
+pointPos = oldName.lastIndexOf('.');
-if (pt != -1)
+if (pointPos != -1)
 {
-newName += oldName.right(oldName.length() - pt);
+newName += oldName.right(oldName.length() - pointPos);
 setName(item, newName);
+}
+}
+QString newPrefix;
+if (newName.contains('.'))
+{
+pointPos = newName.lastIndexOf('.');
+if (pointPos != -1)
+{
+newPrefix = newName;
+newPrefix.truncate(pointPos);
+}
+}
+else
+newPrefix = newName;
+for (int i = 0; i < filesTable->rowCount(); i++)
+{
+// don't allow rename if duplicate prefix
+VideoItem * iterateItem = nameItem(i);
+if ((i != row) && (newPrefix == iterateItem->prefix))
+{
+setName(item, oldName);
+return;
 }
 }
 #ifdef Q_OS_WIN
 // there is a bug in qt, QDir::rename() doesn't fail on such names but damages files
 if (newName.contains(QRegExp("[\"*:<>?\\/|]")))
 // unable to rename for some reason (maybe user entered incorrect name),
 // therefore restore old name in cell
 setName(item, oldName);
 return;
 }
+if (item->ready())
+{
+cfgdir->rename("VideoThumbnails/" + oldPrefix + ".png", "VideoThumbnails/" + newPrefix + ".png");
+cfgdir->rename("VideoThumbnails/" + oldPrefix + ".bmp", "VideoThumbnails/" + newPrefix + ".bmp");
+}
 item->name = newName;
+item->prefix = newPrefix;
 updateDescription();
 }
 void PageVideos::setName(VideoItem * item, const QString & newName)
 {
 nameChangedFromCode = true;
 item->setText(newName);
 nameChangedFromCode = false;
 item->name = newName;
+// try to extract prefix
+if (item->ready())
+item->prefix = item->name;
+else
+item->prefix = item->pRecorder->name;
+// remove extension
+int pt = item->prefix.lastIndexOf('.');
+if (pt != -1)
+item->prefix.truncate(pt);
 }
 int PageVideos::appendRow(const QString & name)
 {
 int row = filesTable->rowCount();
 }
 }
 desc += item->desc + '\n';
 }
-if (item->prefix.isEmpty())
+if (item->prefix.isNull() || item->prefix.isEmpty())
 {
 // try to extract prefix from file name instead
 if (item->ready())
 item->prefix = item->name;
 else
 int pt = item->prefix.lastIndexOf('.');
 if (pt != -1)
 item->prefix.truncate(pt);
 }
-desc.replace("\n", "<br/>");
 labelDesc->setText(desc);
 if (!item->prefix.isEmpty())
 {
-QString thumbName = cfgdir->absoluteFilePath("VideoTemp/" + item->prefix);
+QString thumbName = cfgdir->absoluteFilePath("VideoThumbnails/" + item->prefix);
 QPixmap pic;
 if (pic.load(thumbName + ".png") || pic.load(thumbName + ".bmp"))
 {
 if (pic.height()*ThumbnailSize.width() > pic.width()*ThumbnailSize.height())
 pic = pic.scaledToWidth(ThumbnailSize.width());
 // ask user if (s)he is serious
 QMessageBox reallyDeleteMsg(this);
 reallyDeleteMsg.setIcon(QMessageBox::Question);
 reallyDeleteMsg.setWindowTitle(QMessageBox::tr("Videos - Are you sure?"));
 reallyDeleteMsg.setText(QMessageBox::tr("Do you really want to delete the video '%1'?").arg(item->name));
+reallyDeleteMsg.setTextFormat(Qt::PlainText);
 reallyDeleteMsg.setWindowModality(Qt::WindowModal);
 reallyDeleteMsg.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
 if (reallyDeleteMsg.exec() != QMessageBox::Ok)
 return;
-// remove
+// abort / remove
 if (!item->ready())
-item->pRecorder->deleteLater();
+item->pRecorder->abort();
 else
 {
 cfgdir->remove("Videos/" + item->name);
 // we have no idea whether screenshot is going to be bmp or png so let's delete both
-cfgdir->remove("VideoTemp/" + item->prefix + ".png");
+cfgdir->remove("VideoThumbnails/" + item->prefix + ".png");
-cfgdir->remove("VideoTemp/" + item->prefix + ".bmp");
+cfgdir->remove("VideoThumbnails/" + item->prefix + ".bmp");
 }
 // this code is for removing several files when multiple selection is enabled
 #if 0
 QList<QTableWidgetItem*> items = filesTable->selectedItems();
 {
 QString path = QDir::toNativeSeparators(cfgdir->absolutePath() + "/Videos");
 QDesktopServices::openUrl(QUrl("file:///" + path));
 }
-// clear VideoTemp directory (except for thumbnails)
+// clear VideoTemp directory
 void PageVideos::clearTemp()
 {
+qDebug("Clearing VideoTemp directory ...");
 QDir temp(cfgdir->absolutePath() + "/VideoTemp");
 QStringList files = temp.entryList(QDir::Files);
 foreach (const QString& file, files)
 {
-if (!file.endsWith(".bmp") && !file.endsWith(".png"))
+// Legacy support: Move thumbnails to correct dir
+if (file.endsWith(".bmp") || file.endsWith(".png"))
+{
+qDebug("Moving video thumbnail '%s' to VideoThumbnails directory", qPrintable(file));
+cfgdir->rename("VideoTemp/" + file, "VideoThumbnails/" + file);
+}
+else
 temp.remove(file);
 }
 }
 bool PageVideos::tryQuit(HWForm * form)
 }
 addRecorder(pRecorder);
 }
 }
+void PageVideos::ShowFatalErrorMessage(const QString & msg)
+{
+MessageDialog::ShowFatalMessage(msg, this);
+}

branch	ui-scaling
changeset 15283	c4fd2813b127
parent 15250	8dd3602a4500