Show project properties when creating new project, should fix:

http://www.kdenlive.org/mantis/view.php?id=239

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

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 282a7ec16e8fba7b96253e75ab19965388416cf4..4488872f6c4aad33012704a6c9a8d7881e3ebded 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -326,7 +326,7 @@ MainWindow::MainWindow(const QString &MltPath, QWidget *parent)
             else newFile();
         }
         else*/
-        newFile();
+        newFile(false);
     }
 
     activateShuttleDevice();
@@ -848,15 +848,18 @@ void MainWindow::readOptions() {
     }
 }
 
-void MainWindow::newFile() {
-    if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
+void MainWindow::newFile(bool showProjectSettings) {
     QString profileName;
     KUrl projectFolder;
     QPoint projectTracks(3, 2);
-    if (m_timelineArea->count() == 0) profileName = KdenliveSettings::default_profile();
+    if (!showProjectSettings && m_timelineArea->count() == 0) {
+       if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
+       profileName = KdenliveSettings::default_profile();
+    }
     else {
         ProjectSettings *w = new ProjectSettings;
         if (w->exec() != QDialog::Accepted) return;
+       if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
         profileName = w->selectedProfile();
         projectFolder = w->selectedFolder();
         projectTracks = w->tracks();
@@ -953,7 +956,7 @@ void MainWindow::openFile() {
 void MainWindow::openLastFile() {
     KSharedConfigPtr config = KGlobal::config();
     KUrl::List urls = m_fileOpenRecent->urls();
-    if (urls.isEmpty()) newFile();
+    if (urls.isEmpty()) newFile(false);
     else openFile(urls.last());
 }
 

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 783675cd151f5d024563439a8a9aac6328eb10d6..36f4d34d2879e94053c7162cd4d13d32aa498fa7 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -169,7 +169,7 @@ public slots:
     void slotGotProgressInfo(const QString &message, int progress);
 
 private slots:
-    void newFile();
+    void newFile(bool showProjectSettings = true);
     void queryQuit();
     void activateDocument();
     void connectDocument(TrackView*, KdenliveDoc*);