Improve Subtitle function

parent 8a79d79a
......@@ -401,13 +401,23 @@ QStringList FFmpegInterface::Private::getOptionList(const ConversionParameters &
}
}
// begining insert subtitle
if (subtitulo_srt.exists() && o.insert_subtitle) {
//TODO make insert subtitle happends
list << "-vf subtitles='"+subtitulosrt+"':force_style='Fontsize=24':charenc=cp1256";
if (o.insert_subtitle)
{
QString command;
if (subtitulo_srt.exists())
{
command = QString("-vf subtitles='%1':force_style='Fontsize=24':charenc=cp1256").arg(subtitulosrt);
}
else if (subtitulo_ssa.exists())
{
command = QString("-vf subtitles='%1':force_style='Fontsize=24':charenc=cp1256").arg(subtitulossa);
}
if (!command.isEmpty())
{
list << command;
}
else if (!subtitulo_srt.exists() && subtitulo_ssa.exists() && o.insert_subtitle) {
//TODO make insert subtitle happends
list << "-vf subtitles='"+subtitulossa+"':force_style='Fontsize=24':charenc=cp1256";
}
// finishing insert subtitle
......@@ -607,6 +617,7 @@ void FFmpegInterface::fillParameterList(const ConversionParameters &param, QStri
void FFmpegInterface::parseProcessOutput(const QString &data)
{
//Show qDebug Message
//qDebug() << data;
// split incoming data by [end of line] or [carriage return]
......
......@@ -175,13 +175,15 @@ p, li { white-space: pre-wrap; }
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Fira Sans&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;; font-weight:600;&quot;&gt;Version 0.4.0 (2019-12-15)&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;; font-weight:600;&quot;&gt;Version 0.4.0 (2019-12-10)&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Added French language Pack&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Changed the application icon&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Fixed: Adding Debian based distros build deps&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Fixed: Avoid pass crop parameters to ffmpeg when not changed the crop on configuration&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Changed logo to SVG format&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Feature: Replace the preview system with qtmultimedia&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Fixed: Remove more mplayer references.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Fixed: some bugs on cut &amp;amp; crop dialogs.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Fira Sans&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;; font-weight:600;&quot;&gt;Version 0.3.2 (2019-12-06)&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt;- Added new Video Cut Editor&lt;/span&gt;&lt;/p&gt;
......@@ -299,7 +301,7 @@ p, li { white-space: pre-wrap; }
<location filename="../ui/aboutdialog.cpp" line="139"/>
<source>French (France)</source>
<extracomment>French Language (France)</extracomment>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../ui/aboutdialog.cpp" line="130"/>
......@@ -565,9 +567,8 @@ p, li { white-space: pre-wrap; }
<translation>Video</translation>
</message>
<message>
<location filename="../ui/conversionparameterdialog.ui" line="209"/>
<source>Insert Subtitle if Available (Experimental)</source>
<translation>Untertitel einfügen, falls verfügbar (Experimentell)</translation>
<translation type="vanished">Untertitel einfügen, falls verfügbar (Experimentell)</translation>
</message>
<message>
<location filename="../ui/conversionparameterdialog.ui" line="216"/>
......@@ -625,6 +626,11 @@ p, li { white-space: pre-wrap; }
<source>Deinterlace</source>
<translation>Deinterlace</translation>
</message>
<message>
<location filename="../ui/conversionparameterdialog.ui" line="209"/>
<source>Insert Subtitle if Available</source>
<translation>Untertitel einfügen, falls verfügbar</translation>
</message>
<message>
<location filename="../ui/conversionparameterdialog.ui" line="485"/>
<source>Time</source>
......@@ -1432,7 +1438,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>MediaPlayerWidget</name>
<message>
<location filename="../ui/mediaplayerwidget.ui" line="92"/>
<location filename="../ui/mediaplayerwidget.ui" line="98"/>
<source>...</source>
<translation>...</translation>
</message>
......
......@@ -175,13 +175,15 @@ p, li { white-space: pre-wrap; }
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Fira Sans&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;; font-weight:600;&quot;&gt;Version 0.4.0 (2019-12-15)&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;; font-weight:600;&quot;&gt;Version 0.4.0 (2019-12-10)&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Added French language Pack&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Changed the application icon&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Fixed: Adding Debian based distros build deps&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Fixed: Avoid pass crop parameters to ffmpeg when not changed the crop on configuration&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Changed logo to SVG format&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Feature: Replace the preview system with qtmultimedia&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Fixed: Remove more mplayer references.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Fixed: some bugs on cut &amp;amp; crop dialogs.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Fira Sans&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;; font-weight:600;&quot;&gt;Version 0.3.2 (2019-12-06)&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt;- Added new Video Cut Editor&lt;/span&gt;&lt;/p&gt;
......@@ -1962,9 +1964,8 @@ p, li { white-space: pre-wrap; }
<translation>Video</translation>
</message>
<message>
<location filename="../ui/conversionparameterdialog.ui" line="209"/>
<source>Insert Subtitle if Available (Experimental)</source>
<translation>Insertar Subtítulo si Está Disponible (Experimental)</translation>
<translation type="vanished">Insertar Subtítulo si Está Disponible (Experimental)</translation>
</message>
<message>
<location filename="../ui/conversionparameterdialog.ui" line="216"/>
......@@ -2022,6 +2023,11 @@ p, li { white-space: pre-wrap; }
<source>Deinterlace</source>
<translation>Desentrelazar</translation>
</message>
<message>
<location filename="../ui/conversionparameterdialog.ui" line="209"/>
<source>Insert Subtitle if Available</source>
<translation>Insertar Subtítulo si está disponible</translation>
</message>
<message>
<location filename="../ui/conversionparameterdialog.ui" line="485"/>
<source>Time</source>
......@@ -2841,7 +2847,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>MediaPlayerWidget</name>
<message>
<location filename="../ui/mediaplayerwidget.ui" line="92"/>
<location filename="../ui/mediaplayerwidget.ui" line="98"/>
<source>...</source>
<translation>...</translation>
</message>
......
......@@ -315,13 +315,15 @@ p, li { white-space: pre-wrap; }
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Fira Sans&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;; font-weight:600;&quot;&gt;Version 0.4.0 (2019-12-15)&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;; font-weight:600;&quot;&gt;Version 0.4.0 (2019-12-10)&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Added French language Pack&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Changed the application icon&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Fixed: Adding Debian based distros build deps&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Fixed: Avoid pass crop parameters to ffmpeg when not changed the crop on configuration&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Changed logo to SVG format&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Feature: Replace the preview system with qtmultimedia&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Fixed: Remove more mplayer references.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt; - Fixed: some bugs on cut &amp;amp; crop dialogs.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Fira Sans&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;; font-weight:600;&quot;&gt;Version 0.3.2 (2019-12-06)&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Fira Sans&apos;;&quot;&gt;- Added new Video Cut Editor&lt;/span&gt;&lt;/p&gt;
......@@ -641,12 +643,16 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<source>Insert Subtitle if Available (Experimental)</source>
<translation>Insérer un sous-titre si disponible (expérimental)</translation>
<translation type="vanished">Insérer un sous-titre si disponible (expérimental)</translation>
</message>
<message>
<source>qrc:/qml/main.qml</source>
<translation>qrc:/qml/main.qml</translation>
</message>
<message>
<source>Insert Subtitle if Available</source>
<translation>Insérer un sous-titre si disponible</translation>
</message>
</context>
<context>
<name>ConvertList</name>
......
......@@ -272,14 +272,12 @@ void ConversionParameterDialog::audio_tab_update_enabled_widgets()
void ConversionParameterDialog::video_tab_update_enabled_widgets()
{
bool disable_video= ui->chkDisableVideo->isChecked();
bool insert_subtitle= ui->chkInsertSubtitle->isChecked();
bool copy_video = ui->chkCopyVideo->isChecked();
ui->chkDisableVideo->setEnabled(true); // always enabled
//ui->chkInsertSubtitle->setEnabled(true); // always enabled
ui->chkInsertSubtitle->setEnabled(true); // always enabled
ui->chkCopyVideo->setEnabled(!disable_video);
ui->chkInsertSubtitle->setWindowModified(!insert_subtitle);
ui->chkInsertSubtitle->setDisabled(disable_video || copy_video);
ui->chkInsertSubtitle->setDisabled(disable_video);
ui->groupVideoOptions->setEnabled(!disable_video && !copy_video);
}
......
......@@ -206,7 +206,7 @@
<item>
<widget class="QCheckBox" name="chkInsertSubtitle">
<property name="text">
<string>Insert Subtitle if Available (Experimental)</string>
<string>Insert Subtitle if Available</string>
</property>
</widget>
</item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment