[Traverso-commit] traverso/src core/AudioClip.cpp traverso/dialog...

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    07/05/17 08:39:23

Modified files:
        src/core       : AudioClip.cpp 
        src/traverso/dialogs/settings: Pages.cpp 
        src/traverso/ui: BehaviorConfigPage.ui 

Log message:
        Locking of AudioClips can be switched off in the Preferences dialog

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/BehaviorConfigPage.ui?cvsroot=traverso&r1=1.3&r2=1.4

Patches:
Index: core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- core/AudioClip.cpp  15 May 2007 20:15:14 -0000      1.93
+++ core/AudioClip.cpp  17 May 2007 08:39:23 -0000      1.94
@@ -47,6 +47,7 @@
 #include "Project.h"
 #include "Utils.h"
 #include "Information.h"
+#include <Config.h>
 
 #include <commands.h>
 
@@ -108,7 +109,7 @@
        m_readSource = 0;
        m_recordingStatus = NO_RECORDING;
        isSelected = m_invalidReadSource = false;
-       isLocked = true;
+       isLocked = config().get_property("AudioClip", "LockByDefault", 
false).toBool();
        fadeIn = 0;
        fadeOut = 0;
        m_refcount = 0;

Index: traverso/dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- traverso/dialogs/settings/Pages.cpp 15 May 2007 11:25:43 -0000      1.18
+++ traverso/dialogs/settings/Pages.cpp 17 May 2007 08:39:23 -0000      1.19
@@ -418,6 +418,7 @@
        config().set_property("PlayHead", "Follow", 
m_configpage->keepCursorVisibleCheckBox->isChecked());
        config().set_property("PlayHead", "Scrollmode", 
m_configpage->scrollModeComboBox->currentIndex());
        config().set_property("AudioClip", "SyncDuringDrag", 
m_configpage->resyncAudioCheckBox->isChecked());
+       config().set_property("AudioClip", "LockByDefault", 
m_configpage->lockClipsCheckBox->isChecked());
 
        QString oncloseaction;
        if (m_configpage->saveRadioButton->isChecked()) {
@@ -437,12 +438,14 @@
        int defaultNumTracks = config().get_property("Song", 
"trackCreationCount", 6).toInt();
        int scrollMode = config().get_property("PlayHead", "Scrollmode", 
2).toInt();
        bool resyncAudio = config().get_property("AudioClip", "SyncDuringDrag", 
false).toBool();
+       bool lockClips = config().get_property("AudioClip", "LockByDefault", 
false).toBool();
        
        m_configpage->projectDirLineEdit->setText(dir);
        m_configpage->loadLastProjectCheckBox->setChecked(loadLastUsedProject);
        m_configpage->numberOfTrackSpinBox->setValue(defaultNumTracks);
        m_configpage->scrollModeComboBox->setCurrentIndex(scrollMode);
        m_configpage->resyncAudioCheckBox->setChecked(resyncAudio);
+       m_configpage->lockClipsCheckBox->setChecked(lockClips);
        
        if (oncloseaction == "save") {
                m_configpage->saveRadioButton->setChecked(true);
@@ -473,6 +476,7 @@
        config().set_property("PlayHead", "Follow", 0);
        config().set_property("PlayHead", "Scrollmode", 2);
        config().set_property("AudioClip", "SyncDuringDrag", false);
+       config().set_property("AudioClip", "LockByDefault", false);
        
        load_config();
 }

Index: traverso/ui/BehaviorConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/BehaviorConfigPage.ui,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- traverso/ui/BehaviorConfigPage.ui   3 Apr 2007 21:25:25 -0000       1.3
+++ traverso/ui/BehaviorConfigPage.ui   17 May 2007 08:39:23 -0000      1.4
@@ -6,29 +6,47 @@
     <x>0</x>
     <y>0</y>
     <width>351</width>
-    <height>385</height>
+    <height>395</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
    <property name="spacing" >
     <number>6</number>
    </property>
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
       <string>Project Settings</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="margin" >
+      <property name="spacing" >
        <number>9</number>
       </property>
-      <property name="spacing" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
        <number>9</number>
       </property>
       <item>
@@ -40,12 +58,21 @@
       </item>
       <item>
        <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>0</number>
+        </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
         <item>
          <widget class="QLabel" name="label" >
           <property name="text" >
@@ -55,12 +82,21 @@
         </item>
         <item>
          <layout class="QHBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
           <property name="spacing" >
            <number>6</number>
           </property>
+          <property name="leftMargin" >
+           <number>0</number>
+          </property>
+          <property name="topMargin" >
+           <number>0</number>
+          </property>
+          <property name="rightMargin" >
+           <number>0</number>
+          </property>
+          <property name="bottomMargin" >
+           <number>0</number>
+          </property>
           <item>
            <widget class="QLineEdit" name="projectDirLineEdit" />
           </item>
@@ -77,12 +113,21 @@
       </item>
       <item>
        <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>0</number>
+        </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
         <item>
          <widget class="QLabel" name="label_2" >
           <property name="text" >
@@ -92,12 +137,21 @@
         </item>
         <item>
          <layout class="QHBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
           <property name="spacing" >
            <number>6</number>
           </property>
+          <property name="leftMargin" >
+           <number>0</number>
+          </property>
+          <property name="topMargin" >
+           <number>0</number>
+          </property>
+          <property name="rightMargin" >
+           <number>0</number>
+          </property>
+          <property name="bottomMargin" >
+           <number>0</number>
+          </property>
           <item>
            <widget class="QRadioButton" name="saveRadioButton" >
             <property name="text" >
@@ -148,20 +202,38 @@
       <string>New Song Settings</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
       <property name="spacing" >
        <number>6</number>
       </property>
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
       <item>
        <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>0</number>
+        </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
         <item>
          <widget class="QLabel" name="label_4" >
           <property name="text" >
@@ -171,12 +243,12 @@
         </item>
         <item>
          <widget class="QSpinBox" name="numberOfTrackSpinBox" >
-          <property name="maximum" >
-           <number>1024</number>
-          </property>
           <property name="minimum" >
            <number>1</number>
           </property>
+          <property name="maximum" >
+           <number>1024</number>
+          </property>
           <property name="value" >
            <number>1</number>
           </property>
@@ -188,25 +260,59 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="groupBox_4" >
+     <property name="title" >
+      <string>Audio Clip Settings</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <item>
+       <widget class="QCheckBox" name="lockClipsCheckBox" >
+        <property name="text" >
+         <string>Lock Audio Clips by default</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="groupBox_3" >
      <property name="title" >
       <string>Playback Settings</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
       <property name="spacing" >
        <number>6</number>
       </property>
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
       <item>
        <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>0</number>
+        </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
         <item>
          <widget class="QCheckBox" name="keepCursorVisibleCheckBox" >
           <property name="toolTip" >