- Update auto split button when setting was changed in settings dialog

- Don't ask to save an empty project on closing kdenlive:
http://kdenlive.org/mantis/view.php?id=1634

svn path=/trunk/kdenlive/; revision=4491

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 28eeca5c08ab8a6bc4c6fc47230ff0bc5f39ff05..571e20ba50ee61b58a390b18c5a659aae6e954d5 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -450,7 +450,10 @@ bool MainWindow::queryClose()
     }
     saveOptions();
     if (m_monitorManager) m_monitorManager->stopActiveMonitor();
-    if (m_activeDocument && m_activeDocument->isModified()) {
+    // warn the user to save if document is modified and we have clips in our project list
+    if (m_activeDocument && m_activeDocument->isModified() 
+        && (m_projectList->documentClipList().isEmpty() && !m_activeDocument->url().isEmpty()
+        || !m_projectList->documentClipList().isEmpty())) {
         switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) {
         case KMessageBox::Yes :
             // save document here. If saving fails, return false;
@@ -2188,6 +2191,7 @@ void MainWindow::updateConfiguration()
     }
     m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
     m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
+    m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio());
 
     // Update list of transcoding profiles
     loadTranscoders();

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 9704fea3152bdbf1ac6e51016e8b281a0e3c2bfe..8fc9f6bad403de654733bedfe39b41bba3c68342 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -268,6 +268,7 @@ private slots:
     * @return Whether we had success. */
     bool saveFileAs(const QString &outputFileName);
     void slotPreferences(int page = -1, int option = -1);
+    /** @brief Reflects setting changes to the GUI. */
     void updateConfiguration();
     void slotConnectMonitors();
     void slotRaiseMonitor(bool clipMonitor);