Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 5a476e25 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

MISC: Add a way to get all the recognised audio and video formats

parent 33e8c4f8
Branches
Aucune étiquette associée trouvée
1 requête de fusion!6Add document views
Afficher les modifications d'espaces
En ligne Côte à côte
src/Lib/Utils.hh
+ 17
− 6
Voir le fichier @ 5a476e25
......@@ -37,8 +37,9 @@ concept PropertyConstViewable = requires(T element)
namespace Vivy::Utils
{
static const QStringList audioFileSuffix = { "wave", "wav", "ogg", "mp3", "m4a" };
static const QStringList videoFileSuffix = { "mkv", "mp4" };
static const QStringList audioFileSuffix = { "wave", "wav", "ogg", "mp3", "m4a",
"opus", "mp2", "aiff", "flac", "alac" };
static const QStringList videoFileSuffix = { "mkv", "mp4", "mov", "avi", "av1", "m4v", "flv" };
static const QStringList assFileSuffix = { "ass" };
static const QStringList vivyFileSuffix = { "vivy" };
......@@ -53,14 +54,24 @@ enum class DocumentType : quint64 {
OGG = (1 << 4),
MP3 = (1 << 5),
M4A = (1 << 6),
OPUS = (1 << 7),
MP2 = (1 << 8),
AIFF = (1 << 9),
FLAC = (1 << 10),
ALAC = (1 << 11),
/* Video */
MKV = (1 << 7),
MP4 = (1 << 8),
MKV = (1 << 12),
MP4 = (1 << 13),
MOV = (1 << 14),
AVI = (1 << 14),
AV1 = (1 << 15),
M4V = (1 << 16),
FLV = (1 << 17),
/* Meta-types */
Audio = (WAVE | OGG | MP3),
Video = (MKV | MP4),
Audio = (WAVE | OGG | MP3 | M4A | OPUS | MP2 | AIFF | FLAC | ALAC),
Video = (MKV | MP4 | MOV | AVI | AV1 | M4V | FLV),
};
template <typename E>
......
src/UI/DialogHelp.cc
+ 30
− 1
Voir le fichier @ 5a476e25
......@@ -8,6 +8,21 @@
using namespace Vivy;
// See https://doc.qt.io/qt-5/richtext-html-subset.html for the supported
// rich text subset.
static const char *aboutContentHeader =
"<body>"
"<h1>About Vivy</h1>"
"<p>Vivy is a replacement for Aegisub, writen in Qt5+and with less segfaults - hopefully.</p>"
"<p>The following libraries where used:</p>"
"<ul>"
" <li>Qt5</li>"
" <li>libavutils</li>"
" <li>libavcodec</li>"
" <li>libavformat</li>"
"</ul>";
static const char *aboutContentFooter = "</body>";
DialogHelp::DialogHelp(QWidget *parent) noexcept
: QMessageBox(parent)
{
......@@ -18,8 +33,22 @@ DialogHelp::DialogHelp(QWidget *parent) noexcept
setSizePolicy(sizePolicy);
setTextFormat(Qt::RichText);
setText(aboutContent);
setText(getAboutContent());
setTextInteractionFlags(Qt::NoTextInteraction);
adjustSize();
}
QString
DialogHelp::getAboutContent() const noexcept
{
QString ret;
ret = aboutContentHeader;
ret.append("<p>Vivy will handle the following most of the video and audio formats.");
ret.append("The audio formats are: " + Utils::audioFileSuffix.join(", "));
ret.append("The video formats are: " + Utils::videoFileSuffix.join(", ") + "</p>");
ret.append(aboutContentFooter);
return ret;
}
src/UI/DialogHelp.hh
+ 1
− 16
Voir le fichier @ 5a476e25
......@@ -18,22 +18,7 @@ public:
~DialogHelp() noexcept = default;
private:
/* See https://doc.qt.io/qt-5/richtext-html-subset.html for the supported
* rich text subset. */
// clang-format off
static inline const char *aboutContent =
"<body>"
"<h1>About Vivy</h1>"
"<p>Vivy is a replacement for Aegisub, writen in Qt5+and with less segfaults - hopefully.</p>"
"<p>The following libraries where used:</p>"
"<ul>"
" <li>Qt5</li>"
" <li>libavutils</li>"
" <li>libavcodec</li>"
" <li>libavformat</li>"
"</ul>"
"</body>";
// clang-format on
QString getAboutContent() const noexcept;
};
}
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter