settings dialog fixes

svn path=/branches/KDE4/; revision=1884

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index f640a811c11c34bf2941dd56774b061e30a4fe59..3bbfc601a7c64970ec965558aaaceac1bf93678c 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -29,42 +29,47 @@
 KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(parent, "settings", KdenliveSettings::self())
 {
 
-  QWidget *page1 = new QWidget;
-  m_configMisc = new Ui::ConfigMisc_UI( );
-  m_configMisc->setupUi(page1);
-  addPage( page1, i18n("Misc"), "misc" );
+  QWidget *p1 = new QWidget;
+  m_configMisc.setupUi(p1);
+  page1 = addPage( p1, i18n("Misc"), "misc" );
 
-  QWidget *page2 = new QWidget;
-  m_configEnv = new Ui::ConfigEnv_UI( );
-  m_configEnv->setupUi(page2);
-  m_configEnv->kcfg_mltpath->setMode(KFile::Directory);
-
-  //WARNING: the 2 lines below should not be necessary, but does not work without it...
-  m_configEnv->kcfg_mltpath->setPath(KdenliveSettings::mltpath());
-  m_configEnv->kcfg_rendererpath->setPath(KdenliveSettings::rendererpath());
-  addPage( page2, i18n("Environnement"), "env" );
+  QWidget *p2 = new QWidget;
+  m_configEnv.setupUi(p2);
+  m_configEnv.mltpathurl->setMode(KFile::Directory);
+  m_configEnv.mltpathurl->lineEdit()->setObjectName("kcfg_mltpath");
+  m_configEnv.rendererpathurl->lineEdit()->setObjectName("kcfg_rendererpath");
+  page2 = addPage( p2, i18n("Environnement"), "env" );
 
   QStringList profilesNames = ProfilesDialog::getProfileNames();
-  m_configMisc->profiles_list->addItems(profilesNames);
-
-  //User edited the configuration - update your local copies of the
-  //configuration data
+  m_configMisc.profiles_list->addItems(profilesNames);
+  m_defaulfProfile = ProfilesDialog::getSettingsFromFile(KdenliveSettings::default_profile()).value("description");
+  if (profilesNames.contains(m_defaulfProfile)) m_configMisc.profiles_list->setCurrentItem(m_defaulfProfile);
 
   slotUpdateDisplay();
-  connect(m_configMisc->profiles_list, SIGNAL(currentIndexChanged( int )), this, SLOT(slotUpdateDisplay()));
+  connect(m_configMisc.profiles_list, SIGNAL(currentIndexChanged( int )), this, SLOT(slotUpdateDisplay()));
 }
 
+KdenliveSettingsDialog::~KdenliveSettingsDialog()
+{}
+
+
+bool KdenliveSettingsDialog::hasChanged()
+{
+  kDebug()<<"// // // KCONFIG hasChanged called";
+  if (m_configMisc.profiles_list->currentText() != m_defaulfProfile) return true;
+  return KConfigDialog::hasChanged();
+}
 
 void KdenliveSettingsDialog::slotUpdateDisplay()
 {
-  QString currentProfile = m_configMisc->profiles_list->currentText();
+  QString currentProfile = m_configMisc.profiles_list->currentText();
   QMap< QString, QString > values = ProfilesDialog::getSettingsForProfile(currentProfile);
-  m_configMisc->p_size->setText(values.value("width") + "x" + values.value("height"));
-  m_configMisc->p_fps->setText(values.value("frame_rate_num") + "/" + values.value("frame_rate_den"));
-  m_configMisc->p_aspect->setText(values.value("sample_aspect_num") + "/" + values.value("sample_aspect_den"));
-  m_configMisc->p_display->setText(values.value("display_aspect_num") + "/" + values.value("display_aspect_den"));
-  if (values.value("progressive").toInt() == 0) m_configMisc->p_progressive->setText(i18n("Interlaced"));
-  else m_configMisc->p_progressive->setText(i18n("Progressive"));
+  m_configMisc.p_size->setText(values.value("width") + "x" + values.value("height"));
+  m_configMisc.p_fps->setText(values.value("frame_rate_num") + "/" + values.value("frame_rate_den"));
+  m_configMisc.p_aspect->setText(values.value("sample_aspect_num") + "/" + values.value("sample_aspect_den"));
+  m_configMisc.p_display->setText(values.value("display_aspect_num") + "/" + values.value("display_aspect_den"));
+  if (values.value("progressive").toInt() == 0) m_configMisc.p_progressive->setText(i18n("Interlaced"));
+  else m_configMisc.p_progressive->setText(i18n("Progressive"));
 }
 
 

diff --git a/src/kdenlivesettingsdialog.h b/src/kdenlivesettingsdialog.h
index ae684c615b2368faa3fd2b7d7d8a371954d20ae7..5a5147b71ce23ac180f64ee4cf6385fc45243abc 100644 (file)
--- a/src/kdenlivesettingsdialog.h
+++ b/src/kdenlivesettingsdialog.h
@@ -34,16 +34,27 @@ class KdenliveSettingsDialog : public KConfigDialog
   
   public:
     KdenliveSettingsDialog(QWidget * parent = 0);
+    ~KdenliveSettingsDialog();
+
+  protected:
+    virtual bool hasChanged();
 
   private slots:
     void slotUpdateDisplay();
 
   private:
-    Ui::ConfigEnv_UI* m_configEnv;
-    Ui::ConfigMisc_UI* m_configMisc;
+    KPageWidgetItem *page1;
+    KPageWidgetItem *page2;
+    Ui::ConfigEnv_UI m_configEnv;
+    Ui::ConfigMisc_UI m_configMisc;
     QStringList m_mltProfilesList;
     QStringList m_customProfilesList;
     bool m_isCustomProfile;
+    QString m_defaulfProfile;
+
+  signals:
+    void customChanged();
+
 };
 
 

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a5559672f9cf602810ce611060e8140306ac360a..6859fe65631c904633b45895a325b531bfbe3638 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -481,8 +481,7 @@ void MainWindow::slotPreferences()
   // KConfigDialog didn't find an instance of this dialog, so lets
   // create it :
   KdenliveSettingsDialog* dialog = new KdenliveSettingsDialog(this);
-  connect( dialog, SIGNAL(settingsChanged()), this, SLOT(updateConfiguration()) );
-
+  //connect( dialog, SIGNAL(settingsChanged()), this, SLOT(updateConfiguration()) );
   dialog->show();
 }
 

diff --git a/src/profilesdialog.cpp b/src/profilesdialog.cpp
index a6dc395935476bf2743df18694872240450d9d3e..0a471c08492a7ead44ab7bbe864a1be144c1132d 100644 (file)
--- a/src/profilesdialog.cpp
+++ b/src/profilesdialog.cpp
@@ -82,7 +82,38 @@ QStringList ProfilesDialog::getProfileNames()
 }
 
 // static
-QMap< QString, QString > ProfilesDialog::getSettingsForProfile(const QString path)
+QMap< QString, QString > ProfilesDialog::getSettingsFromFile(const QString path)
+{
+  QStringList profilesNames;
+  QStringList profilesFiles;
+  QStringList profilesFilter;
+  profilesFilter<<"*";
+
+  // List the Mlt profiles
+  profilesFiles = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
+  for (int i = 0; i < profilesFiles.size(); ++i) {
+    if (profilesFiles.at(i) == path) {
+      KConfig confFile(KdenliveSettings::mltpath() + "/" + profilesFiles.at(i));
+      return confFile.entryMap();
+    }
+  }
+
+  // List custom profiles
+  QStringList customProfiles = KGlobal::dirs()->findDirs("appdata", "profiles");
+  for (int i = 0; i < customProfiles.size(); ++i) {
+    QStringList profiles = QDir(customProfiles.at(i)).entryList(profilesFilter, QDir::Files);
+    for (int i = 0; i < profiles.size(); ++i) {
+      if (profiles.at(i) == path) {
+       KConfig confFile(customProfiles.at(i) + "/" + profiles.at(i));
+       return confFile.entryMap();
+      }
+    }
+  }
+  return QMap< QString, QString >();
+}
+
+// static
+QMap< QString, QString > ProfilesDialog::getSettingsForProfile(const QString profileName)
 {
   QStringList profilesNames;
   QStringList profilesFiles;
@@ -94,7 +125,7 @@ QMap< QString, QString > ProfilesDialog::getSettingsForProfile(const QString pat
   for (int i = 0; i < profilesFiles.size(); ++i) {
     KConfig confFile(KdenliveSettings::mltpath() + "/" + profilesFiles.at(i));
     QMap< QString, QString > values = confFile.entryMap();
-    if (values.value("description") == path) return values;
+    if (values.value("description") == profileName) return values;
   }
 
   // List custom profiles
@@ -104,7 +135,7 @@ QMap< QString, QString > ProfilesDialog::getSettingsForProfile(const QString pat
     for (int i = 0; i < profiles.size(); ++i) {
       KConfig confFile(customProfiles.at(i) + "/" + profiles.at(i));
       QMap< QString, QString > values = confFile.entryMap();
-      if (values.value("description") == path) return values;
+      if (values.value("description") == profileName) return values;
     }
   }
   return QMap< QString, QString >();

diff --git a/src/profilesdialog.h b/src/profilesdialog.h
index 2466cd51d78549e049d338dc9ee2bf921abbc2e3..8c5c67218b9b8757d85456175c55a58702b85e6e 100644 (file)
--- a/src/profilesdialog.h
+++ b/src/profilesdialog.h
@@ -33,7 +33,8 @@ class ProfilesDialog : public QDialog
     ProfilesDialog(QWidget * parent = 0);
 
   static QStringList getProfileNames();
-  static QMap< QString, QString > getSettingsForProfile(const QString path);
+  static QMap< QString, QString > getSettingsForProfile(const QString profileName);
+  static QMap< QString, QString > getSettingsFromFile(const QString path);
 
   private slots:
     void slotUpdateDisplay();

diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp
index 0015ded61ff8c95b107bfdca29eed08f63da41aa..261633cdf60deb401754402767d1574e07fcb528 100644 (file)
--- a/src/projectsettings.cpp
+++ b/src/projectsettings.cpp
@@ -22,7 +22,7 @@
 #include <KStandardDirs>
 #include <KDebug>
 
-
+#include "kdenlivesettings.h"
 #include "profilesdialog.h"
 #include "projectsettings.h"
 
@@ -32,6 +32,8 @@ ProjectSettings::ProjectSettings(QWidget * parent): QDialog(parent), m_isCustomP
 
   QStringList profilesNames = ProfilesDialog::getProfileNames();
   m_view.profiles_list->addItems(profilesNames);
+  QString defaulfProf = ProfilesDialog::getSettingsFromFile(KdenliveSettings::current_profile()).value("description");
+  if (profilesNames.contains(defaulfProf)) m_view.profiles_list->setCurrentItem(defaulfProf);
 
   slotUpdateDisplay();
   connect(m_view.profiles_list, SIGNAL(currentIndexChanged( int )), this, SLOT(slotUpdateDisplay()));

diff --git a/src/widgets/configenv_ui.ui b/src/widgets/configenv_ui.ui
index be532b9a378c796d1c614e2f15fc47a9b8f8d6f6..a4ec594fba665a6871f2667aa83f92997060b712 100644 (file)
--- a/src/widgets/configenv_ui.ui
+++ b/src/widgets/configenv_ui.ui
@@ -24,7 +24,7 @@
        </widget>
       </item>
       <item row="0" column="1" >
-       <widget class="KUrlRequester" name="kcfg_mltpath" />
+       <widget class="KUrlRequester" name="mltpathurl" />
       </item>
       <item row="1" column="0" >
        <widget class="QLabel" name="label_2" >
@@ -34,7 +34,7 @@
        </widget>
       </item>
       <item row="1" column="1" >
-       <widget class="KUrlRequester" name="kcfg_rendererpath" />
+       <widget class="KUrlRequester" name="rendererpathurl" />
       </item>
      </layout>
     </widget>