[Traverso-commit] traverso/src/traverso dialogs/AudioClipEditDial...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/08/02 17:57:26

Modified files:
        src/traverso/dialogs: AudioClipEditDialog.cpp 
        src/traverso/ui: AudioClipEditWidget.ui 

Log message:
        Allow cancelling from the AudioClipEditDialog.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/AudioClipEditDialog.cpp?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/AudioClipEditWidget.ui?cvsroot=traverso&r1=1.6&r2=1.7

Patches:
Index: dialogs/AudioClipEditDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/AudioClipEditDialog.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- dialogs/AudioClipEditDialog.cpp     1 Jul 2007 11:21:08 -0000       1.5
+++ dialogs/AudioClipEditDialog.cpp     2 Aug 2007 17:57:26 -0000       1.6
@@ -23,6 +23,8 @@
 #include "AudioClipEditDialog.h"
 
 #include <QWidget>
+#include <QDomDocument>
+#include <QDomElement>
 #include "ui_AudioClipEditWidget.h"
 
 #include "AudioClip.h"
@@ -49,6 +51,10 @@
 
                locked = false;
 
+               // Used for cancelling the changes on Cancel button activated
+               QDomDocument tempDoc;
+               m_origState = clip->get_state(tempDoc);
+               
                clipStartEdit->setDisplayFormat(TIME_FORMAT);
                clipLengthEdit->setDisplayFormat(TIME_FORMAT);
                fadeInEdit->setDisplayFormat(TIME_FORMAT);
@@ -96,12 +102,14 @@
                
                connect(externalProcessingButton, SIGNAL(clicked()), this, 
SLOT(external_processing()));
                connect(buttonBox, SIGNAL(accepted()), this, 
SLOT(save_changes()));
+               connect(buttonBox, SIGNAL(rejected()), this, 
SLOT(cancel_changes()));
        }
        
        ~AudioClipEditWidget() {}
        
 private:
        AudioClip* m_clip;
+       QDomNode m_origState;
        friend class AudioClipEditDialog;
        
        nframes_t qtime_to_nframes(const QTime& time, uint rate);
@@ -112,6 +120,7 @@
        void external_processing();
        void clip_state_changed();
        void save_changes();
+       void cancel_changes();
        void clip_position_changed();
        void gain_spinbox_value_changed(double value);
 
@@ -186,6 +195,13 @@
        }               
 }
 
+void AudioClipEditWidget::cancel_changes()
+{
+       parentWidget()->hide();
+       m_clip->set_state(m_origState);
+       
+}
+
 void AudioClipEditWidget::gain_spinbox_value_changed(double value)
 {
        float gain = dB_to_scale_factor(value);

Index: ui/AudioClipEditWidget.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/AudioClipEditWidget.ui,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ui/AudioClipEditWidget.ui   3 Jul 2007 15:19:50 -0000       1.6
+++ ui/AudioClipEditWidget.ui   2 Aug 2007 17:57:26 -0000       1.7
@@ -336,7 +336,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons" >
-      
<set>QDialogButtonBox::Close|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>