Add *.ts extension to mpeg instead of adding *.mts twice...

[kdenlive] / src / wizard.cpp

diff --git a/src/wizard.cpp b/src/wizard.cpp
index 74c6c98b145826dc4dd428bafbc7b3de5ec1462e..2a45f6db4d61f3ee287786bfd8a115ddaed483c6 100644 (file)
--- a/src/wizard.cpp
+++ b/src/wizard.cpp
@@ -36,7 +36,7 @@ Wizard::Wizard(QWidget *parent): QWizard(parent) {
     setPixmap(QWizard::WatermarkPixmap, QPixmap(KStandardDirs::locate("appdata", "banner.png")));
 
     QWizardPage *page1 = new QWizardPage;
-    page1->setTitle("Welcome");
+    page1->setTitle(i18n("Welcome"));
     QLabel *label = new QLabel(i18n("This is the first time you run Kdenlive. This wizard will let you adjust some basic settings, you will be ready to edit your first movie in a few seconds..."));
     label->setWordWrap(true);
     m_startLayout = new QVBoxLayout;
@@ -147,22 +147,26 @@ void Wizard::slotCheckStandard() {
         if (m_standard.button_dv->isChecked()) {
             profiles << "dv_pal" << "dv_pal_wide";
         } else {
-            profiles << "hdv_720_25p" << "hdv_1080_50i";
+            profiles << "hdv_720_25p" << "hdv_720_50p" << "hdv_1080_50i" << "hdv_1080_25p" << "atsc_1080p_24" << "atsc_1080p_25";
         }
     } else {
         // NTSC standard
         if (m_standard.button_dv->isChecked()) {
             profiles << "dv_ntsc" << "dv_ntsc_wide";
         } else {
-            profiles << "hdv_720_30p" << "hdv_1080_60i" << "atsc_720p_30" << "atsc_1080i_60";
+            profiles << "hdv_720_30p" << "hdv_720_60p" << "hdv_1080_30p" << "hdv_1080_60i" << "atsc_720p_30" << "atsc_1080i_60";
         }
     }
     m_standard.profiles_list->clear();
     QStringList profilesDescription;
     foreach(const QString &prof, profiles) {
-        QListWidgetItem *item = new QListWidgetItem(ProfilesDialog::getProfileDescription(prof), m_standard.profiles_list);
-        item->setData(Qt::UserRole, prof);
+        QString desc = ProfilesDialog::getProfileDescription(prof);
+        if (!desc.isEmpty()) {
+            QListWidgetItem *item = new QListWidgetItem(desc, m_standard.profiles_list);
+            item->setData(Qt::UserRole, prof);
+        }
     }
+    m_standard.profiles_list->setSortingEnabled(true);
     m_standard.profiles_list->setCurrentRow(0);
 }
 
@@ -175,7 +179,7 @@ void Wizard::slotCheckSelectedItem() {
 void Wizard::adjustSettings() {
     if (m_extra.installmimes->isChecked()) {
         QStringList globs;
-        globs << "*.mts" << "*.m2t";
+        globs << "*.mts" << "*.m2t" << "*.mod" << "*.ts";
         installExtraMimes("video/mpeg", globs);
         globs.clear();
         globs << "*.dv";
@@ -198,22 +202,22 @@ void Wizard::slotCheckMlt() {
     QProcess checkProcess;
     checkProcess.start(KdenliveSettings::rendererpath(), QStringList() << "-query" << "producer");
     if (!checkProcess.waitForStarted())
-        errorMessage.append("Error starting MLT's command line player (inigo).\n");
+        errorMessage.append(i18n("Error starting MLT's command line player (inigo)") + ".\n");
 
     checkProcess.waitForFinished();
 
     QByteArray result = checkProcess.readAllStandardError();
-    if (!result.contains("avformat")) errorMessage.append(i18n("MLT's avformat (FFMPEG) module not found. Please check your FFMPEG and MLT install. Kdenlive will not work until this issue is fixed.\n"));
+    if (!result.contains("- avformat")) errorMessage.append(i18n("MLT's avformat (FFMPEG) module not found. Please check your FFMPEG and MLT install. Kdenlive will not work until this issue is fixed.") + "\n");
 
     QProcess checkProcess2;
     checkProcess2.start(KdenliveSettings::rendererpath(), QStringList() << "-query" << "consumer");
     if (!checkProcess2.waitForStarted())
-        errorMessage.append("Error starting MLT's command line player (inigo).\n");
+        errorMessage.append(i18n("Error starting MLT's command line player (inigo).") + "\n");
 
     checkProcess2.waitForFinished();
 
     result = checkProcess2.readAllStandardError();
-    if (!result.contains("sdl") || !result.contains("sdl_preview")) errorMessage.append(i18n("MLT's SDL module not found. Please check your MLT install. Kdenlive will not work until this issue is fixed.\n"));
+    if (!result.contains("sdl") || !result.contains("sdl_preview")) errorMessage.append(i18n("MLT's SDL module not found. Please check your MLT install. Kdenlive will not work until this issue is fixed.") + "\n");
 
     if (!errorMessage.isEmpty()) {
         errorMessage.prepend(QString("<b>%1</b><br>").arg(i18n("Fatal Error")));