Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Unbreak build with .pro file
authorunc0rr
Fri, 04 Jan 2013 19:42:49 +0400
changeset 8362 89a6b7cc6f95
parent 8361 2831c1403666
child 8363 0b4ac686fc44
child 8364 fbc9bcc6c39d
child 8365 fbd799a1e95b
- Unbreak build with .pro file - Cosmetic fixes to video recording stuff
QTfrontend/ui/page/pagevideos.cpp file | annotate | diff | comparison | revisions
QTfrontend/util/LibavInteraction.cpp file | annotate | diff | comparison | revisions
project_files/hedgewars.pro file | annotate | diff | comparison | revisions 
--- 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;
--- 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);
--- 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 \
sheepy-clone