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

equal deleted inserted replaced

-:8f675ab05802
+:e82a076df09b
 #include <QHeaderView>
 #include <QKeyEvent>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QFileSystemWatcher>
+#include <QDateTime>
+#include <QRegExp>
 #include "hwconsts.h"
 #include "pagevideos.h"
 #include "igbox.h"
 #include "libav_iteraction.h"
 #include "gameuiconfig.h"
 #include "recorder.h"
 #include "ask_quit.h"
-const int ThumbnailSize = 400;
+const QSize ThumbnailSize(350, 350*3/5);
 // columns in table with list of video files
 enum VideosColumns
 {
 vcName,
 pPageLayout->setColumnStretch(0, 1);
 pPageLayout->setColumnStretch(1, 2);
 pPageLayout->setRowStretch(0, 1);
 pPageLayout->setRowStretch(1, 1);
+// options
 {
 IconedGroupBox* pOptionsGroup = new IconedGroupBox(this);
-pOptionsGroup->setIcon(QIcon(":/res/graphicsicon.png"));
+pOptionsGroup->setIcon(QIcon(":/res/Settings.png"));
 pOptionsGroup->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 pOptionsGroup->setTitle(QGroupBox::tr("Video recording options"));
 QGridLayout * pOptLayout = new QGridLayout(pOptionsGroup);
 // label for format
 pOptLayout->addWidget(btnDefaults, 7, 0, 1, 5);
 pPageLayout->addWidget(pOptionsGroup, 1, 0);
 }
+// list of videos
 {
 IconedGroupBox* pTableGroup = new IconedGroupBox(this);
 pTableGroup->setIcon(QIcon(":/res/graphicsicon.png"));
 pTableGroup->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 pTableGroup->setTitle(QGroupBox::tr("Videos"));
 filesTable->setColumnCount(vcNumColumns);
 filesTable->setHorizontalHeaderLabels(columns);
 filesTable->setSelectionBehavior(QAbstractItemView::SelectRows);
 filesTable->setEditTriggers(QAbstractItemView::SelectedClicked);
 filesTable->verticalHeader()->hide();
+filesTable->setMinimumWidth(400);
 QHeaderView * header = filesTable->horizontalHeader();
 header->setResizeMode(vcName, QHeaderView::ResizeToContents);
 header->setResizeMode(vcSize, QHeaderView::Fixed);
 header->resizeSection(vcSize, 100);
 box->addWidget(btnOpenDir);
 pPageLayout->addWidget(pTableGroup, 0, 1, 2, 1);
 }
+// description
 {
 IconedGroupBox* pDescGroup = new IconedGroupBox(this);
 pDescGroup->setIcon(QIcon(":/res/graphicsicon.png"));
 pDescGroup->setTitle(QGroupBox::tr("Description"));
 QHBoxLayout* pBottomDescLayout = new QHBoxLayout(0); // buttons
 // label with thumbnail picture
 labelThumbnail = new QLabel(pDescGroup);
 labelThumbnail->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+labelThumbnail->setMaximumSize(ThumbnailSize);
 labelThumbnail->setStyleSheet(
 "QFrame {"
 "border: solid;"
 "border-width: 3px;"
 "border-color: #ffcc00;"
 "border-radius: 4px;"
 "}" );
-pTopDescLayout->addWidget(labelThumbnail);
+clearThumbnail();
+pTopDescLayout->addWidget(labelThumbnail, 2);
 // label with file description
 labelDesc = new QLabel(pDescGroup);
 labelDesc->setAlignment(Qt::AlignLeft | Qt::AlignTop);
-pTopDescLayout->addWidget(labelDesc);
+pTopDescLayout->addWidget(labelDesc, 1);
 // buttons: play and delete
 btnPlay = new QPushButton(QPushButton::tr("Play"), pDescGroup);
+btnPlay->setEnabled(false);
 pBottomDescLayout->addWidget(btnPlay);
 btnDelete = new QPushButton(QPushButton::tr("Delete"), pDescGroup);
+btnDelete->setEnabled(false);
 pBottomDescLayout->addWidget(btnDelete);
 pDescLayout->addStretch(1);
 pDescLayout->addLayout(pTopDescLayout, 0);
 pDescLayout->addStretch(1);
 // user has edited filename, so we should rename the file
 VideoItem * item = nameItem(row);
 QString oldName = item->name;
 QString newName = item->text();
-if (!newName.contains('.'))
+if (!newName.contains('.')) // user forgot an extension
 {
-// user forgot an extension
 int pt = oldName.lastIndexOf('.');
 if (pt != -1)
+{
 newName += oldName.right(oldName.length() - pt);
+setName(item, newName);
+}
+}
+#ifdef Q_WS_WIN
+// there is a bug in qt, QDir::rename() doesn't fail on such names but damages files
+if (newName.contains(QRegExp("[\"*:<>?\/|]")))
+{
+setName(item, oldName);
+return;
+}
+#endif
+if (item->ready() && !cfgdir->rename("Videos/" + oldName, "Videos/" + newName))
+{
+// unable to rename for some reason (maybe user entered incorrect name),
+// therefore restore old name in cell
+setName(item, oldName);
+return;
 }
 item->name = newName;
-if (item->ready())
-{
-if(cfgdir->rename("Videos/" + oldName, "Videos/" + newName))
-updateDescription();
-else
-{
-// unable to rename for some reason (maybe user entered incorrect name),
-// therefore restore old name in cell
-setName(item, oldName);
-}
-}
 updateDescription();
 }
 void PageVideos::setName(VideoItem * item, const QString & newName)
 {
 VideoItem* PageVideos::nameItem(int row)
 {
 return (VideoItem*)filesTable->item(row, vcName);
 }
+void PageVideos::clearThumbnail()
+{
+// add empty image for proper sizing
+QPixmap pic(ThumbnailSize);
+pic.fill(QColor(0,0,0,0));
+labelThumbnail->setPixmap(pic);
+}
 void PageVideos::updateDescription()
 {
 VideoItem * item = nameItem(filesTable->currentRow());
 if (!item)
 {
 labelDesc->clear();
-labelThumbnail->clear();
+clearThumbnail();
-return;
+btnPlay->setEnabled(false);
-}
+btnDelete->setEnabled(false);
+return;
-QString desc = "";
+}
-desc += item->name + "\n";
+btnPlay->setEnabled(item->ready());
+btnDelete->setEnabled(true);
+QString desc = item->name + "\n\n";
 QString thumbName = "";
 if (item->ready())
 {
 QString path = item->path();
-desc += tr("\nSize: ") + FileSizeStr(path) + "\n";
+desc += tr("Date: ") + QFileInfo(path).created().toString(Qt::DefaultLocaleLongDate) + "\n";
+desc += tr("Size: ") + FileSizeStr(path) + "\n";
 if (item->desc == "")
 item->desc = LibavIteraction::instance().getFileInfo(path);
 desc += item->desc;
 // extract thumbnail name fron description
 }
 if (!thumbName.isEmpty())
 {
 thumbName = cfgdir->absoluteFilePath("VideoTemp/" + thumbName);
-if (picThumbnail.load(thumbName + ".png") || picThumbnail.load(thumbName + ".bmp"))
+QPixmap pic;
+if (pic.load(thumbName + ".png") || pic.load(thumbName + ".bmp"))
 {
-if (picThumbnail.width() > picThumbnail.height())
+if (pic.height()*ThumbnailSize.width() > pic.width()*ThumbnailSize.height())
-picThumbnail = picThumbnail.scaledToWidth(ThumbnailSize);
+pic = pic.scaledToWidth(ThumbnailSize.width());
 else
-picThumbnail = picThumbnail.scaledToHeight(ThumbnailSize);
+pic = pic.scaledToHeight(ThumbnailSize.height());
-labelThumbnail->setMaximumSize(picThumbnail.size());
+labelThumbnail->setPixmap(pic);
-labelThumbnail->setPixmap(picThumbnail);
 }
 else
-labelThumbnail->clear();
+clearThumbnail();
 }
 labelDesc->setText(desc);
 }
 // user selected another cell, so we should change description
 // open video file in external media player
 void PageVideos::play(int row)
 {
 VideoItem * item = nameItem(row);
 if (item->ready())
-QDesktopServices::openUrl(QUrl("file:///" + item->path()));
+QDesktopServices::openUrl(QUrl("file:///" + QDir::toNativeSeparators(item->path())));
 }
 void PageVideos::playSelectedFile()
 {
 int index = filesTable->currentRow();
 AbstractPage::keyPressEvent(pEvent);
 }
 void PageVideos::openVideosDirectory()
 {
-QDesktopServices::openUrl(QUrl("file:///"+cfgdir->absolutePath() + "/Videos"));
+QString path = QDir::toNativeSeparators(cfgdir->absolutePath() + "/Videos");
+QDesktopServices::openUrl(QUrl("file:///" + path));
+}
+// clear VideoTemp directory (except for thumbnails)
+void PageVideos::clearTemp()
+{
+QDir temp(cfgdir->absolutePath() + "/VideoTemp");
+QStringList files = temp.entryList(QDir::Files);
+foreach (const QString& file, files)
+{
+if (!file.endsWith(".bmp") && !file.endsWith(".png"))
+temp.remove(file);
+}
 }
 bool PageVideos::tryQuit(HWForm * form)
 {
-if (numRecorders == 0)
+bool quit = true;
-return true;
+if (numRecorders != 0)
+{
 // ask user what to do - abort or wait
 HWAskQuitDialog * askd = new HWAskQuitDialog(this, form);
-bool answer = askd->exec();
+quit = askd->exec();
 delete askd;
-return answer;
+}
+if (quit)
+clearTemp();
+return quit;
 }
 // returns multi-line string with list of videos in progress
 QString PageVideos::getVideosInProgress()
 {

changeset 7386	e82a076df09b
parent 7353	0e55228e1303
child 7392	bc3306c59a08