Don't crash when wrong sdl driver was selected by user (needs MLT patch):

[kdenlive] / src / kdenlivesettingsdialog.cpp

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 15b1420921195a5b0a8cce311fa0a01594d0db2f..2a1ccaa273666fa9a23532b041a4d6140d27720b 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -27,6 +27,7 @@
 #include <KConfigDialogManager>
 #include <kde_file.h>
 #include <KIO/NetAccess>
+#include <kdeversion.h>
 
 #include <QDir>
 #include <QTimer>
@@ -42,7 +43,8 @@
 
 
 KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent) :
-        KConfigDialog(parent, "settings", KdenliveSettings::self())
+        KConfigDialog(parent, "settings", KdenliveSettings::self()),
+        m_modified(false)
 {
 
     QWidget *p1 = new QWidget;
@@ -96,6 +98,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent) :
     m_page7 = addPage(p7, i18n("Transcode"), "edit-copy");
     connect(m_configTranscode.button_add, SIGNAL(clicked()), this, SLOT(slotAddTranscode()));
     connect(m_configTranscode.button_delete, SIGNAL(clicked()), this, SLOT(slotDeleteTranscode()));
+    connect(m_configTranscode.profiles_list, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotDialogModified()));
 
     QStringList actions;
     actions << i18n("Do nothing");
@@ -212,7 +215,7 @@ void KdenliveSettingsDialog::initDevices()
     m_configSdl.kcfg_audio_driver->addItem(i18n("ARTS daemon"), "artsc");
 
     if (!KdenliveSettings::audiodrivername().isEmpty())
-        for (int i = 1;i < m_configSdl.kcfg_audio_driver->count(); i++) {
+        for (int i = 1; i < m_configSdl.kcfg_audio_driver->count(); i++) {
             if (m_configSdl.kcfg_audio_driver->itemData(i).toString() == KdenliveSettings::audiodrivername()) {
                 m_configSdl.kcfg_audio_driver->setCurrentIndex(i);
                 KdenliveSettings::setAudio_driver((uint) i);
@@ -311,7 +314,14 @@ void KdenliveSettingsDialog::showPage(int page, int option)
     case 5:
         setCurrentPage(m_page5);
         break;
-
+    case 6:
+        setCurrentPage(m_page6);
+        break;
+    case 7:
+        setCurrentPage(m_page7);
+        break;
+    default:
+        setCurrentPage(m_page1);
     }
 }
 
@@ -391,7 +401,8 @@ void KdenliveSettingsDialog::rebuildVideo4Commands()
 
 void KdenliveSettingsDialog::updateSettings()
 {
-    kDebug() << "// // // KCONFIG UPDATE called";
+    //kDebug() << "// // // KCONFIG UPDATE called";
+
     m_defaultProfile = m_configMisc.kcfg_profiles_list->currentText();
     KdenliveSettings::setDefault_profile(m_defaultPath);
 
@@ -445,10 +456,17 @@ void KdenliveSettingsDialog::updateSettings()
         updatePreview = true;
     }
 
-    // TODO: only save profiles if modified
-    saveTranscodeProfiles();
+    if (m_modified) {
+        // The transcoding profiles were modified, save.
+        m_modified = false;
+        saveTranscodeProfiles();
+    }
+
+#if KDE_IS_VERSION(4,3,0)
+    KConfigDialog::settingsChangedSlot();
+#endif
 
-    KConfigDialog::updateSettings();
+    //KConfigDialog::updateSettings();
     if (resetProfile) emit doResetProfile();
     if (updatePreview) emit updatePreviewSettings();
 }
@@ -475,10 +493,10 @@ void KdenliveSettingsDialog::slotCheckAlsaDriver()
 
 void KdenliveSettingsDialog::loadTranscodeProfiles()
 {
-    KSharedConfigPtr config = KGlobal::config();
+    KSharedConfigPtr config = KSharedConfig::openConfig("kdenlivetranscodingrc");
     KConfigGroup transConfig(config, "Transcoding");
     // read the entries
-
+    m_configTranscode.profiles_list->blockSignals(true);
     QMap< QString, QString > profiles = transConfig.entryMap();
     QMapIterator<QString, QString> i(profiles);
     while (i.hasNext()) {
@@ -486,11 +504,13 @@ void KdenliveSettingsDialog::loadTranscodeProfiles()
         QTreeWidgetItem *item = new QTreeWidgetItem(m_configTranscode.profiles_list, QStringList() << i.key() << i.value());
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
     }
+    m_configTranscode.profiles_list->blockSignals(false);
 }
 
 void KdenliveSettingsDialog::saveTranscodeProfiles()
 {
-    KSharedConfigPtr config = KGlobal::config();
+    KSharedConfigPtr config = KSharedConfig::openConfig("kdenlivetranscodingrc");
+    //KSharedConfigPtr config = KGlobal::config();
     KConfigGroup transConfig(config, "Transcoding");
     // read the entries
     transConfig.deleteGroup();
@@ -506,7 +526,9 @@ void KdenliveSettingsDialog::slotAddTranscode()
 {
     QTreeWidgetItem *item = new QTreeWidgetItem(m_configTranscode.profiles_list, QStringList() << i18n("Name") << i18n("Parameters"));
     item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
+    m_configTranscode.profiles_list->setCurrentItem(item);
     m_configTranscode.profiles_list->editItem(item);
+    slotDialogModified();
 }
 
 void KdenliveSettingsDialog::slotDeleteTranscode()
@@ -514,8 +536,26 @@ void KdenliveSettingsDialog::slotDeleteTranscode()
     QTreeWidgetItem *item = m_configTranscode.profiles_list->currentItem();
     if (item == NULL) return;
     delete item;
+    slotDialogModified();
 }
 
+void KdenliveSettingsDialog::slotDialogModified()
+{
+    m_modified = true;
+#if KDE_IS_VERSION(4,3,0)
+    KConfigDialog::updateButtons();
+#endif
+}
+
+//virtual
+bool KdenliveSettingsDialog::hasChanged()
+{
+    if (m_modified) return true;
+    return KConfigDialog::hasChanged();
+}
+
+
+
 #include "kdenlivesettingsdialog.moc"