Remove Alpha Transparency transition as suggested by Dan. Instead we use Composite...

[kdenlive] / src / projectsettings.cpp

diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp
index 9e05027f85a9752c2ccc3b86cc3163047fd3161a..0d37b990d74354622a02645a208dd1fd0fbf3c44 100644 (file)
--- a/src/projectsettings.cpp
+++ b/src/projectsettings.cpp
@@ -17,16 +17,16 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QDir>
+#include "projectsettings.h"
+#include "kdenlivesettings.h"
+#include "profilesdialog.h"
 
 #include <KStandardDirs>
 #include <KDebug>
 
-#include "kdenlivesettings.h"
-#include "profilesdialog.h"
-#include "projectsettings.h"
+#include <QDir>
 
-ProjectSettings::ProjectSettings(int videotracks, int audiotracks, bool readOnlyTracks, QWidget * parent): QDialog(parent), m_isCustomProfile(false) {
+ProjectSettings::ProjectSettings(int videotracks, int audiotracks, const QString projectPath, bool readOnlyTracks, QWidget * parent): QDialog(parent), m_isCustomProfile(false) {
     m_view.setupUi(this);
 
     QMap <QString, QString> profilesInfo = ProfilesDialog::getProfilesInfo();
@@ -36,6 +36,7 @@ ProjectSettings::ProjectSettings(int videotracks, int audiotracks, bool readOnly
         m_view.profiles_list->addItem(i.key(), i.value());
     }
     m_view.project_folder->setMode(KFile::Directory);
+    m_view.project_folder->setPath(projectPath);
     QString currentProf = KdenliveSettings::current_profile();
 
     for (int i = 0; i < m_view.profiles_list->count(); i++) {
@@ -64,10 +65,10 @@ ProjectSettings::ProjectSettings(int videotracks, int audiotracks, bool readOnly
 void ProjectSettings::slotUpdateDisplay() {
     QString currentProfile = m_view.profiles_list->itemData(m_view.profiles_list->currentIndex()).toString();
     QMap< QString, QString > values = ProfilesDialog::getSettingsFromFile(currentProfile);
-    m_view.p_size->setText(values.value("width") + "x" + values.value("height"));
-    m_view.p_fps->setText(values.value("frame_rate_num") + "/" + values.value("frame_rate_den"));
-    m_view.p_aspect->setText(values.value("sample_aspect_num") + "/" + values.value("sample_aspect_den"));
-    m_view.p_display->setText(values.value("display_aspect_num") + "/" + values.value("display_aspect_den"));
+    m_view.p_size->setText(values.value("width") + 'x' + values.value("height"));
+    m_view.p_fps->setText(values.value("frame_rate_num") + '/' + values.value("frame_rate_den"));
+    m_view.p_aspect->setText(values.value("sample_aspect_num") + '/' + values.value("sample_aspect_den"));
+    m_view.p_display->setText(values.value("display_aspect_num") + '/' + values.value("display_aspect_den"));
     if (values.value("progressive").toInt() == 0) m_view.p_progressive->setText(i18n("Interlaced"));
     else m_view.p_progressive->setText(i18n("Progressive"));
 }