traverso-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Traverso-commit] traverso/src/sheetcanvas dialogs/AudioClipEditD...


From: Remon Sijrier
Subject: [Traverso-commit] traverso/src/sheetcanvas dialogs/AudioClipEditD...
Date: Sat, 21 Mar 2009 14:35:41 +0000

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       09/03/21 14:35:41

Modified files:
        src/sheetcanvas/dialogs: AudioClipEditDialog.cpp 
        src/sheetcanvas/ui: AudioClipEditDialog.ui 

Log message:
        * add a line edit with the source file name, I think that makes sense?

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/dialogs/AudioClipEditDialog.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/ui/AudioClipEditDialog.ui?cvsroot=traverso&r1=1.1&r2=1.2

Patches:
Index: dialogs/AudioClipEditDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/sheetcanvas/dialogs/AudioClipEditDialog.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- dialogs/AudioClipEditDialog.cpp     21 Feb 2008 20:00:49 -0000      1.2
+++ dialogs/AudioClipEditDialog.cpp     21 Mar 2009 14:35:39 -0000      1.3
@@ -26,6 +26,7 @@
 #include "FadeCurve.h"
 #include "ProjectManager.h"
 #include "Project.h"
+#include "ReadSource.h"
 #include "Utils.h"
 #include "Mixer.h"
 #include "Command.h"
@@ -110,6 +111,8 @@
        }
        
        clipGainSpinBox->setValue(coefficient_to_dB(m_clip->get_gain()));
+        sourceLineEdit->setText(m_clip->get_readsource()->get_filename());
+        sourceLineEdit->setToolTip(m_clip->get_readsource()->get_filename());
 }
 
 void AudioClipEditDialog::save_changes()

Index: ui/AudioClipEditDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/ui/AudioClipEditDialog.ui,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ui/AudioClipEditDialog.ui   21 Jan 2008 16:17:31 -0000      1.1
+++ ui/AudioClipEditDialog.ui   21 Mar 2009 14:35:39 -0000      1.2
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>AudioClipEditDialog</class>
- <widget class="QDialog" name="AudioClipEditDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="AudioClipEditDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,158 +10,188 @@
     <height>285</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
+   <property name="margin">
+    <number>9</number>
+   </property>
    <item>
-    <widget class="QTabWidget" name="tabWidget" >
-     <property name="currentIndex" >
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
        <string>Clip Parameters</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <property name="margin" >
-        <number>9</number>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <layout class="QVBoxLayout" name="verticalLayout_2">
+           <item>
+            <widget class="QLabel" name="label_14">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
        </property>
-       <property name="spacing" >
-        <number>6</number>
+             <property name="text">
+              <string>Source</string>
        </property>
-       <item row="5" column="0" colspan="2" >
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label">
+             <property name="text">
+              <string>Name</string>
          </property>
-         <property name="sizeHint" >
-          <size>
-           <width>261</width>
-           <height>20</height>
-          </size>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label_4">
+             <property name="text">
+              <string>Gain</string>
          </property>
-        </spacer>
+            </widget>
        </item>
-       <item row="5" column="2" >
-        <widget class="QPushButton" name="externalProcessingButton" >
-         <property name="text" >
-          <string>External Processing</string>
+           <item>
+            <widget class="QLabel" name="label_3">
+             <property name="text">
+              <string>Track start</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1" colspan="2" >
-        <widget class="QLineEdit" name="clipNameLineEdit" />
+           <item>
+            <widget class="QLabel" name="label_2">
+             <property name="text">
+              <string>Length</string>
+             </property>
+            </widget>
        </item>
-       <item row="1" column="1" colspan="2" >
-        <widget class="QDoubleSpinBox" name="clipGainSpinBox" >
-         <property name="maximum" >
-          <double>30.000000000000000</double>
+           <item>
+            <widget class="QLabel" name="label_6">
+             <property name="text">
+              <string>End</string>
          </property>
-         <property name="minimum" >
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
+            <widget class="QLineEdit" name="sourceLineEdit">
+             <property name="readOnly">
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="clipNameLineEdit"/>
+           </item>
+           <item>
+            <widget class="QDoubleSpinBox" name="clipGainSpinBox">
+             <property name="minimum">
           <double>-120.000000000000000</double>
          </property>
-         <property name="singleStep" >
+             <property name="maximum">
+              <double>30.000000000000000</double>
+             </property>
+             <property name="singleStep">
           <double>0.200000000000000</double>
          </property>
         </widget>
        </item>
-       <item row="2" column="1" colspan="2" >
-        <widget class="QTimeEdit" name="clipStartEdit" >
-         <property name="toolTip" >
+           <item>
+            <widget class="QTimeEdit" name="clipStartEdit">
+             <property name="toolTip">
           <string>hh:mm:ss.sss</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1" colspan="2" >
-        <widget class="QTimeEdit" name="clipLengthEdit" >
-         <property name="toolTip" >
+           <item>
+            <widget class="QTimeEdit" name="clipLengthEdit">
+             <property name="toolTip">
           <string>hh:mm:ss.sss</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1" colspan="2" >
-        <widget class="QLabel" name="clipEndLineEdit" >
-         <property name="frameShape" >
+           <item>
+            <widget class="QLabel" name="clipEndLineEdit">
+             <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
-         <property name="frameShadow" >
+             <property name="frameShadow">
           <enum>QFrame::Sunken</enum>
          </property>
-         <property name="text" >
+             <property name="text">
           <string>TextLabel</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0" >
-        <widget class="QLabel" name="label_6" >
-         <property name="text" >
-          <string>End</string>
-         </property>
-        </widget>
+          </layout>
        </item>
-       <item row="3" column="0" >
-        <widget class="QLabel" name="label_2" >
-         <property name="text" >
-          <string>Length</string>
-         </property>
-        </widget>
+        </layout>
        </item>
-       <item row="2" column="0" >
-        <widget class="QLabel" name="label_3" >
-         <property name="text" >
-          <string>Track start</string>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <spacer>
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
          </property>
-        </widget>
-       </item>
-       <item row="1" column="0" >
-        <widget class="QLabel" name="label_4" >
-         <property name="text" >
-          <string>Gain</string>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>261</width>
+             <height>20</height>
+            </size>
          </property>
-        </widget>
+          </spacer>
        </item>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="label" >
-         <property name="text" >
-          <string>Name</string>
+         <item>
+          <widget class="QPushButton" name="externalProcessingButton">
+           <property name="text">
+            <string>External Processing</string>
          </property>
         </widget>
        </item>
       </layout>
+       </item>
+      </layout>
      </widget>
-     <widget class="QWidget" name="tab_2" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
        <string>Fades</string>
       </attribute>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>9</number>
-       </property>
-       <property name="spacing" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
+       <property name="margin">
+        <number>9</number>
+       </property>
        <item>
-        <widget class="QGroupBox" name="groupBox" >
-         <property name="title" >
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
           <string>Fade In</string>
          </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
+         <layout class="QGridLayout">
+          <property name="margin">
            <number>9</number>
           </property>
-          <property name="spacing" >
+          <property name="spacing">
            <number>6</number>
           </property>
-          <item row="0" column="1" >
-           <widget class="QTimeEdit" name="fadeInEdit" >
-            <property name="maximumTime" >
+          <item row="0" column="1">
+           <widget class="QTimeEdit" name="fadeInEdit">
+            <property name="maximumTime">
              <time>
               <hour>22</hour>
               <minute>0</minute>
@@ -169,67 +200,67 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1" >
-           <widget class="QDoubleSpinBox" name="fadeInStrengthBox" >
-            <property name="maximum" >
+          <item row="3" column="1">
+           <widget class="QDoubleSpinBox" name="fadeInStrengthBox">
+            <property name="maximum">
              <double>1.000000000000000</double>
             </property>
-            <property name="singleStep" >
+            <property name="singleStep">
              <double>0.050000000000000</double>
             </property>
            </widget>
           </item>
-          <item row="2" column="1" >
-           <widget class="QDoubleSpinBox" name="fadeInBendingBox" >
-            <property name="maximum" >
+          <item row="2" column="1">
+           <widget class="QDoubleSpinBox" name="fadeInBendingBox">
+            <property name="maximum">
              <double>1.000000000000000</double>
             </property>
-            <property name="singleStep" >
+            <property name="singleStep">
              <double>0.050000000000000</double>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="label_7" >
-            <property name="text" >
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_7">
+            <property name="text">
              <string>Mode</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0" >
-           <widget class="QLabel" name="label_10" >
-            <property name="text" >
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_10">
+            <property name="text">
              <string>Bending</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="0" >
-           <widget class="QLabel" name="label_5" >
-            <property name="text" >
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_5">
+            <property name="text">
              <string>Length</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QComboBox" name="fadeInModeBox" />
+          <item row="1" column="1">
+           <widget class="QComboBox" name="fadeInModeBox"/>
           </item>
-          <item row="3" column="0" >
-           <widget class="QLabel" name="label_11" >
-            <property name="text" >
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_11">
+            <property name="text">
              <string>Strength</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="0" >
-           <widget class="QPushButton" name="fadeInLinearButton" >
-            <property name="text" >
+          <item row="4" column="0">
+           <widget class="QPushButton" name="fadeInLinearButton">
+            <property name="text">
              <string>&amp;Linear</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="1" >
-           <widget class="QPushButton" name="fadeInDefaultButton" >
-            <property name="text" >
+          <item row="4" column="1">
+           <widget class="QPushButton" name="fadeInDefaultButton">
+            <property name="text">
              <string>&amp;Default</string>
             </property>
            </widget>
@@ -238,81 +269,81 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_2" >
-         <property name="title" >
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="title">
           <string>Fade Out</string>
          </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
+         <layout class="QGridLayout">
+          <property name="margin">
            <number>9</number>
           </property>
-          <property name="spacing" >
+          <property name="spacing">
            <number>6</number>
           </property>
-          <item row="3" column="1" >
-           <widget class="QDoubleSpinBox" name="fadeOutStrengthBox" >
-            <property name="maximum" >
+          <item row="3" column="1">
+           <widget class="QDoubleSpinBox" name="fadeOutStrengthBox">
+            <property name="maximum">
              <double>1.000000000000000</double>
             </property>
-            <property name="singleStep" >
+            <property name="singleStep">
              <double>0.050000000000000</double>
             </property>
            </widget>
           </item>
-          <item row="2" column="0" >
-           <widget class="QLabel" name="label_12" >
-            <property name="text" >
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_12">
+            <property name="text">
              <string>Bending</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="label_8" >
-            <property name="text" >
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_8">
+            <property name="text">
              <string>Mode</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QComboBox" name="fadeOutModeBox" />
+          <item row="1" column="1">
+           <widget class="QComboBox" name="fadeOutModeBox"/>
           </item>
-          <item row="0" column="0" >
-           <widget class="QLabel" name="label_9" >
-            <property name="text" >
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_9">
+            <property name="text">
              <string>Length</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" >
-           <widget class="QTimeEdit" name="fadeOutEdit" />
+          <item row="0" column="1">
+           <widget class="QTimeEdit" name="fadeOutEdit"/>
           </item>
-          <item row="3" column="0" >
-           <widget class="QLabel" name="label_13" >
-            <property name="text" >
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_13">
+            <property name="text">
              <string>Strength</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1" >
-           <widget class="QDoubleSpinBox" name="fadeOutBendingBox" >
-            <property name="maximum" >
+          <item row="2" column="1">
+           <widget class="QDoubleSpinBox" name="fadeOutBendingBox">
+            <property name="maximum">
              <double>1.000000000000000</double>
             </property>
-            <property name="singleStep" >
+            <property name="singleStep">
              <double>0.050000000000000</double>
             </property>
            </widget>
           </item>
-          <item row="4" column="0" >
-           <widget class="QPushButton" name="fadeOutLinearButton" >
-            <property name="text" >
+          <item row="4" column="0">
+           <widget class="QPushButton" name="fadeOutLinearButton">
+            <property name="text">
              <string>&amp;Linear</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="1" >
-           <widget class="QPushButton" name="fadeOutDefaultButton" >
-            <property name="text" >
+          <item row="4" column="1">
+           <widget class="QPushButton" name="fadeOutDefaultButton">
+            <property name="text">
              <string>&amp;Default</string>
             </property>
            </widget>
@@ -325,12 +356,12 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
-      
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]