[Traverso-commit] traverso/src core/Song.cpp traverso/ExportWidge...

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    07/08/30 20:42:43

Modified files:
        src/core       : Song.cpp 
        src/traverso   : ExportWidget.cpp ExportWidget.h 
        src/traverso/ui: ExportWidget.ui 

Log message:
        Added a spinbox to burn multiple CDs of the same image

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.133&r2=1.134
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.h?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ExportWidget.ui?cvsroot=traverso&r1=1.15&r2=1.16

Patches:
Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- core/Song.cpp       29 Aug 2007 18:00:36 -0000      1.133
+++ core/Song.cpp       30 Aug 2007 20:42:43 -0000      1.134
@@ -884,7 +884,7 @@
                QString s_start = frame_to_cd(start, m_project->get_rate());
                QString s_length = frame_to_cd(length, m_project->get_rate());
 
-               output += "  FILE \"" + spec->name + "\" " + s_start + " " + 
s_length + "\n\n";
+               output += "  FILE \"" + spec->name + "." + 
spec->extraFormat["filetype"] + "\" " + s_start + " " + s_length + "\n\n";
                start += length;
 
                // check if the second marker is of type "Endmarker"

Index: traverso/ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- traverso/ExportWidget.cpp   15 Aug 2007 00:18:52 -0000      1.54
+++ traverso/ExportWidget.cpp   30 Aug 2007 20:42:43 -0000      1.55
@@ -463,6 +463,7 @@
                return;
        }
        
+       m_copyNumber = 0;
        cd_render();
        
        int index = cdDeviceComboBox->currentIndex();
@@ -504,7 +505,20 @@
        progressBar->setMaximum(100);
        progressBar->setValue(0);
        
+       // check if we have to write another CD
+       bool writeAnotherCd = false;
+       if (m_copyNumber < spinBoxNumCopies->value()) {
+               if (QMessageBox::information(this, tr("Writing CD %1 of 
%2").arg(m_copyNumber+1).arg(spinBoxNumCopies->value()), tr("Please insert an 
empty CD and press OK to continue."), QMessageBox::Ok | QMessageBox::Cancel) == 
QMessageBox::Ok) {
+                       writeAnotherCd = true;
+               }
+       }
+
+       if (writeAnotherCd) {
+               write_to_cd();
+       }
+       else {
        enable_ui_interaction();
+       }
 }
 
 void ExportWidget::cd_render()
@@ -584,6 +598,9 @@
 void ExportWidget::write_to_cd()
 {
        PENTER;
+
+       m_copyNumber++;
+
        if ( ! (m_burnprocess->state() == QProcess::NotRunning) ) {
                info().critical(tr("Burn process is still running, cannot start 
it twice!!"));
                return;

Index: traverso/ExportWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- traverso/ExportWidget.h     29 Jun 2007 22:15:18 -0000      1.13
+++ traverso/ExportWidget.h     30 Aug 2007 20:42:43 -0000      1.14
@@ -75,6 +75,7 @@
        int m_writingState;
        int m_lastSheetExported;
        bool m_wasClosed;
+       int m_copyNumber;
        QString get_device(int index);
 
 private slots:

Index: traverso/ui/ExportWidget.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ExportWidget.ui,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- traverso/ui/ExportWidget.ui 24 May 2007 11:53:25 -0000      1.15
+++ traverso/ui/ExportWidget.ui 30 Aug 2007 20:42:43 -0000      1.16
@@ -9,32 +9,20 @@
     <x>0</x>
     <y>0</y>
     <width>410</width>
-    <height>423</height>
+    <height>456</height>
    </rect>
   </property>
-  <property name="minimumSize" >
-   <size>
-    <width>410</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize" >
-   <size>
-    <width>440</width>
-    <height>440</height>
-   </size>
-  </property>
   <property name="windowTitle" >
    <string>Export</string>
   </property>
-  <layout class="QHBoxLayout" >
+  <layout class="QGridLayout" >
    <property name="margin" >
     <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item>
+   <item row="0" column="0" >
     <widget class="QTabWidget" name="tabWidget" >
      <property name="enabled" >
       <bool>true</bool>
@@ -294,6 +282,19 @@
             </widget>
            </item>
            <item>
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" >
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
             <widget class="QDialogButtonBox" name="buttonBox" >
              <property name="orientation" >
               <enum>Qt::Horizontal</enum>
@@ -508,6 +509,33 @@
             </property>
            </widget>
           </item>
+          <item>
+           <layout class="QHBoxLayout" >
+            <property name="margin" >
+             <number>0</number>
+            </property>
+            <property name="spacing" >
+             <number>6</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="label_10" >
+              <property name="text" >
+               <string>Number of copies</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="spinBoxNumCopies" >
+              <property name="minimum" >
+               <number>1</number>
+              </property>
+              <property name="value" >
+               <number>1</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
        </item>