# HG changeset patch # User unc0rr # Date 1357314169 -14400 # Node ID 89a6b7cc6f95ef9178805ae375aa2a3943f0c6d5 # Parent 2831c1403666fdc36c1a55ef9e877536dc96eacd - Unbreak build with .pro file - Cosmetic fixes to video recording stuff diff -r 2831c1403666 -r 89a6b7cc6f95 QTfrontend/ui/page/pagevideos.cpp --- a/QTfrontend/ui/page/pagevideos.cpp Wed Jan 02 18:32:19 2013 +0100 +++ b/QTfrontend/ui/page/pagevideos.cpp Fri Jan 04 19:42:49 2013 +0400 @@ -177,8 +177,9 @@ Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard); labelDesc->setTextFormat(Qt::RichText); + labelDesc->setWordWrap(true); labelDesc->setOpenExternalLinks(true); - labelDesc->setMinimumSize(ThumbnailSize); + //labelDesc->setMinimumSize(ThumbnailSize); //pTopDescLayout->addWidget(labelDesc, 1); // buttons: play and delete @@ -195,12 +196,10 @@ btnToYouTube->setWhatsThis(QPushButton::tr("Upload this video to your Youtube account")); pBottomDescLayout->addWidget(btnToYouTube); - pDescLayout->addStretch(1); pDescLayout->addWidget(labelThumbnail, 0); + pDescLayout->addWidget(labelDesc, 0); + pDescLayout->addLayout(pBottomDescLayout, 0); pDescLayout->addStretch(1); - pDescLayout->addWidget(labelDesc, 0); - pDescLayout->addStretch(1); - pDescLayout->addLayout(pBottomDescLayout, 0); pPageLayout->addWidget(pDescGroup, 0, 0); } @@ -509,8 +508,8 @@ else { QString path = item->path(); - desc += tr("Date: ") + QFileInfo(path).created().toString(Qt::DefaultLocaleLongDate) + '\n'; - desc += tr("Size: ") + FileSizeStr(path) + '\n'; + desc += tr("Date: %1\n").arg(QFileInfo(path).created().toString(Qt::DefaultLocaleLongDate)); + desc += tr("Size: %1\n").arg(FileSizeStr(path)); if (item->desc.isEmpty()) { // Extract description from file; diff -r 2831c1403666 -r 89a6b7cc6f95 QTfrontend/util/LibavInteraction.cpp --- a/QTfrontend/util/LibavInteraction.cpp Wed Jan 02 18:32:19 2013 +0100 +++ b/QTfrontend/util/LibavInteraction.cpp Fri Jan 04 19:42:49 2013 +0400 @@ -302,7 +302,7 @@ else continue; AVCodec* pDecoder = avcodec_find_decoder(pCodec->codec_id); - desc += pDecoder? pDecoder->name : "unknown"; + desc += pDecoder? pDecoder->name : tr("unknown"); desc += "\n"; } AVDictionaryEntry* pComment = av_dict_get(pContext->metadata, "comment", NULL, 0); diff -r 2831c1403666 -r 89a6b7cc6f95 project_files/hedgewars.pro --- a/project_files/hedgewars.pro Wed Jan 02 18:32:19 2013 +0100 +++ b/project_files/hedgewars.pro Fri Jan 04 19:42:49 2013 +0400 @@ -26,7 +26,6 @@ ../QTfrontend/ui/page/pagetraining.h \ ../QTfrontend/ui/page/pageselectweapon.h \ ../QTfrontend/ui/page/pagesingleplayer.h \ - ../QTfrontend/ui/page/pagenettype.h \ ../QTfrontend/ui/page/pageingame.h \ ../QTfrontend/ui/page/pageadmin.h \ ../QTfrontend/ui/page/pagescheme.h \ @@ -108,7 +107,8 @@ ../QTfrontend/model/playerslistmodel.h \ ../QTfrontend/util/LibavInteraction.h \ ../QTfrontend/util/FileEngine.h \ - ../QTfrontend/ui/dialog/bandialog.h + ../QTfrontend/ui/dialog/bandialog.h \ + ../QTfrontend/ui/widget/keybinder.h SOURCES += ../QTfrontend/model/ammoSchemeModel.cpp \ @@ -121,7 +121,6 @@ ../QTfrontend/ui/page/pageroomslist.cpp \ ../QTfrontend/ui/page/pagemultiplayer.cpp \ ../QTfrontend/ui/page/pagegamestats.cpp \ - ../QTfrontend/ui/page/pagenettype.cpp \ ../QTfrontend/ui/page/pageeditteam.cpp \ ../QTfrontend/ui/page/pagenetgame.cpp \ ../QTfrontend/ui/page/pagedata.cpp \ @@ -200,7 +199,8 @@ ../QTfrontend/model/playerslistmodel.cpp \ ../QTfrontend/util/LibavInteraction.cpp \ ../QTfrontend/util/FileEngine.cpp \ - ../QTfrontend/ui/dialog/bandialog.cpp + ../QTfrontend/ui/dialog/bandialog.cpp \ + ../QTfrontend/ui/widget/keybinder.cpp TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_ar.ts \