[Traverso-commit] traverso/src/traverso ExportWidget.cpp ExportWi...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/10 20:44:21

Modified files:
        src/traverso   : ExportWidget.cpp ExportWidget.h 
        src/traverso/ui: ExportWidget.ui 
        src/traverso/widgets: ResourcesWidget.cpp 

Log message:
        * don't allow the user to do anything during export!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.h?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ExportWidget.ui?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.cpp?cvsroot=traverso&r1=1.16&r2=1.17

Patches:
Index: ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- ExportWidget.cpp    10 May 2007 20:25:48 -0000      1.16
+++ ExportWidget.cpp    10 May 2007 20:44:20 -0000      1.17
@@ -433,6 +433,7 @@
        }
        
        cd_render();
+       closeButton->setEnabled(false);
 }
 
 
@@ -474,6 +475,8 @@
        progressBar->setMaximum(100);
        progressBar->setValue(0);
        
+       closeButton->setEnabled(true);
+       
        m_writingState = NO_STATE;
        exportWidget->setEnabled(true);
        optionsGroupBox->setEnabled(true);
@@ -675,3 +678,12 @@
        }       
        
 }
+
+void ExportWidget::closeEvent(QCloseEvent * event)
+{
+       if (m_writingState != NO_STATE || !buttonBox->isEnabled()) {
+               event->setAccepted(false);
+               return;
+       }
+       QDialog::closeEvent(event);
+}

Index: ExportWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ExportWidget.h      10 May 2007 20:02:36 -0000      1.6
+++ ExportWidget.h      10 May 2007 20:44:20 -0000      1.7
@@ -39,6 +39,10 @@
         ExportWidget(QWidget* parent = 0);
         ~ExportWidget();
 
+       
+protected:
+       void closeEvent ( QCloseEvent * event );
+
 private:
         Project* m_project;
        QProcess* m_burnprocess;

Index: ui/ExportWidget.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ExportWidget.ui,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ui/ExportWidget.ui  10 May 2007 20:02:36 -0000      1.7
+++ ui/ExportWidget.ui  10 May 2007 20:44:20 -0000      1.8
@@ -1,6 +1,9 @@
 <ui version="4.0" >
  <class>ExportWidget</class>
  <widget class="QDialog" name="ExportWidget" >
+  <property name="windowModality" >
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -433,7 +436,7 @@
         <number>6</number>
        </property>
        <item>
-        <widget class="QGroupBox" name="groupBox_2" >
+        <widget class="QGroupBox" name="optionsGroupBox" >
          <property name="title" >
           <string>Options</string>
          </property>

Index: widgets/ResourcesWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- widgets/ResourcesWidget.cpp 8 May 2007 17:11:02 -0000       1.16
+++ widgets/ResourcesWidget.cpp 10 May 2007 20:44:20 -0000      1.17
@@ -244,7 +244,6 @@
                foreach(AudioClip* clip, 
resources_manager()->get_clips_for_source(rs)) {
                        QTreeWidgetItem* clipitem = new QTreeWidgetItem(item);
                        m_clipindices.insert(clip->get_id(), clipitem);
-                       printf("update_tree_widgets: clip is %lld\n", 
clip->get_id());
                        clipitem->setText(0, clip->get_name());
                        QString start = 
frame_to_ms(clip->get_source_start_frame(), clip->get_rate());
                        QString end = frame_to_ms(clip->get_source_end_frame(), 
clip->get_rate());