traverso-commit
[Top][All Lists]
Advanced

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

[Traverso-commit] traverso/src core/Project.cpp core/Project.h co...


From: Remon Sijrier
Subject: [Traverso-commit] traverso/src core/Project.cpp core/Project.h co...
Date: Thu, 03 May 2007 14:05:00 +0000

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/03 14:05:00

Modified files:
        src/core       : Project.cpp Project.h ProjectManager.cpp 
                         ReadSource.cpp 
        src/traverso   : ExportWidget.cpp ExportWidget.h 
        src/traverso/ui: ExportWidget.ui 

Log message:
        * Fixed export widget a bit, why doesn't it still resize automatically 
??

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.h?cvsroot=traverso&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ProjectManager.cpp?cvsroot=traverso&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.cpp?cvsroot=traverso&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.h?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ExportWidget.ui?cvsroot=traverso&r1=1.2&r2=1.3

Patches:
Index: core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- core/Project.cpp    30 Apr 2007 18:15:39 -0000      1.33
+++ core/Project.cpp    3 May 2007 14:04:59 -0000       1.34
@@ -602,19 +602,27 @@
        m_importDir = dir;
 }
 
-bool Project::is_save_to_close()
+bool Project::is_save_to_close() const
 {
-       foreach(Song* song, m_songs) {
-               if (song->is_recording() && song->is_transporting()) {
+       if (is_recording()) {
                        QMessageBox::information( 0, 
                                tr("Traverso - Information"), 
-                               tr("You're still recording, please stop 
recording first to be able to quit the application!"),
+                               tr("You're still recording, please stop 
recording first to be able to exit the application!"),
                                   QMessageBox::Ok);
                        return false;
                }
-       }
        return true;
 }
 
+bool Project::is_recording() const
+{
+       foreach(Song* song, m_songs) {
+               if (song->is_recording() && song->is_transporting()) {
+                       return true;
+               }
+       }
+       return false;
+}
+
 //eof
 

Index: core/Project.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- core/Project.h      16 Apr 2007 09:08:31 -0000      1.17
+++ core/Project.h      3 May 2007 14:04:59 -0000       1.18
@@ -73,7 +73,8 @@
        Command* remove_song(Song* song, bool historable=true);
        
        bool has_changed();
-       bool is_save_to_close();
+       bool is_save_to_close() const;
+       bool is_recording() const;
        
        int save();
        int load(QString projectfile = "");

Index: core/ProjectManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ProjectManager.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- core/ProjectManager.cpp     16 Apr 2007 18:44:26 -0000      1.30
+++ core/ProjectManager.cpp     3 May 2007 14:05:00 -0000       1.31
@@ -275,7 +275,8 @@
                                        tr("Created new Project directory for 
you here: %1\n").arg(newPath), 
                                        "OK", 0 );
                }
-               config().set_property("Project", "directory", newPath);
+               QDir newdir(newPath);
+               config().set_property("Project", "directory", 
newdir.canonicalPath());
        }
        
        bool loadProjectAtStartUp = config().get_property("Project", 
"loadLastUsed", 1).toBool();

Index: core/ReadSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- core/ReadSource.cpp 2 May 2007 05:58:20 -0000       1.26
+++ core/ReadSource.cpp 3 May 2007 14:05:00 -0000       1.27
@@ -245,6 +245,7 @@
 void ReadSource::set_was_recording(bool wasRecording)
 {
        m_wasRecording = wasRecording;
+       m_shortName = m_name.left(m_name.length() - 20);
 }
 
 int ReadSource::reset_filename(const QString & filename)

Index: traverso/ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- traverso/ExportWidget.cpp   22 Apr 2007 20:05:38 -0000      1.8
+++ traverso/ExportWidget.cpp   3 May 2007 14:05:00 -0000       1.9
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2005-2006 Remon Sijrier 
+    Copyright (C) 2005-2007 Remon Sijrier 
  
     This file is part of Traverso
  
@@ -17,7 +17,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  
-    $Id: ExportWidget.cpp,v 1.8 2007/04/22 20:05:38 n_doebelin Exp $
 */
 
 #include "ExportWidget.h"
@@ -44,6 +43,10 @@
 {
         setupUi(this);
 
+       m_layout = new QHBoxLayout(this);
+       m_layout->setMargin(0);
+       setLayout(m_layout);
+
         m_project = pm().get_project();
 
         if (!m_project) {
@@ -52,13 +55,6 @@
                 spec = new ExportSpecification;
                 spec->exportdir = m_project->get_root_dir() + "/Export/";
                 exportDirName->setText(spec->exportdir);
-                QStringList list;
-               foreach(Song* song, m_project->get_songs()) {
-                       list.append(song->get_title());
-               }
-                QAbstractItemModel* model = new QStringListModel(list);
-                songListView->setModel(model);
-                
songListView->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
                 connect(m_project, SIGNAL(songExportProgressChanged(int)), 
this, SLOT(update_song_progress(int)));
                 connect(m_project, SIGNAL(overallExportProgressChanged(int)), 
this, SLOT(update_overall_progress(int)));
@@ -82,11 +78,8 @@
 
         audioTypeComboBox->insertItem(0, "WAV");
         audioTypeComboBox->insertItem(1, "AIFF");
-       audioTypeComboBox->insertItem(2, "CD image (cdrdao)");
-        char  buffer [128] ;
-        sf_command (NULL, SFC_GET_LIB_VERSION, buffer, sizeof (buffer));
-        if (QByteArray(buffer) >= "libsndfile-1.0.12")
-                audioTypeComboBox->insertItem(3, "FLAC");
+       audioTypeComboBox->insertItem(2, "FLAC");
+       audioTypeComboBox->insertItem(3, "CD image (cdrdao)");
 
 
         switch(audiodevice().get_sample_rate()) {
@@ -107,8 +100,10 @@
                 break;
         }
 
-        songListView->hide();
         show_settings_view();
+
+       connect(buttonBox, SIGNAL(accepted()), this, 
SLOT(on_exportStartButton_clicked()));
+       connect(buttonBox, SIGNAL(rejected()), this, 
SLOT(on_cancelButton_clicked()));
 }
 
 ExportWidget::~ ExportWidget( )
@@ -116,7 +111,10 @@
 
 void ExportWidget::on_exportStartButton_clicked( )
 {
-        show_progress_view();
+       if (m_project->is_recording()) {
+               info().warning(tr("Export during recording is not supported!"));
+               return;
+       }
 
         QDir exportDir;
         QString dirName = exportDirName->text();
@@ -128,6 +126,10 @@
                 }
         }
 
+       
+       show_progress_view();
+       
+       
         switch (audioTypeComboBox->currentIndex()) {
         case   0:
                 spec->format = SF_FORMAT_WAV;
@@ -138,21 +140,17 @@
                 spec->extension = ".aiff";
                 break;
         case   2:
-                spec->format = SF_FORMAT_WAV;
-                spec->extension = ".wav";
+               spec->format = SF_FORMAT_FLAC;
+               spec->extension = ".flac";
                 break;
         case   3:
-                char  buffer [128] ;
-                sf_command (NULL, SFC_GET_LIB_VERSION, buffer, sizeof 
(buffer));
-                if (QByteArray(buffer) == "libsndfile-1.0.12") {
-                        spec->format = 0x170000; // == SF_FORMAT_FLAC
-                        spec->extension = ".flac";
-                }
+               spec->format = SF_FORMAT_WAV;
+               spec->extension = ".wav";
                 break;
         }
 
        // check if CD-format is required
-       if (audioTypeComboBox->currentIndex() == 2) {
+       if (audioTypeComboBox->currentIndex() == 3) {
 
                 spec->data_width = 16;
                spec->format |= SF_FORMAT_PCM_16;
@@ -285,38 +283,38 @@
         songProgressBar->setValue(0);
         overalProgressBar->setValue(0);
 
-        if (!spec->stop)
+        if (!spec->stop) {
                 hide();
+       }
 
         show_settings_view();
 }
 
 void ExportWidget::set_exporting_song( Song * song )
 {
-        QString name = 
QString::number(m_project->get_song_index(song->get_id())) + " - " + 
song->get_title();
+        QString name = tr("Progress of Song ") + 
+                       
QString::number(m_project->get_song_index(song->get_id())) + ": " +
+                       song->get_title();
+
         currentProcessingSongName->setText(name);
 }
 
 void ExportWidget::show_progress_view( )
 {
-        exportSpecificationsGroupBox->hide();
-        generalOptionsGroupBox->hide();
-        exportStartButton->hide();
-        ExportStateGroupBox->show();
-        resize(370, 160);
+       optionsWidget->hide();
+       progressWidget->show();
+       m_layout->removeWidget(optionsWidget);
+       m_layout->addWidget(progressWidget);
+       resize(370, 150);
 }
 
 void ExportWidget::show_settings_view( )
 {
-        exportSpecificationsGroupBox->show();
-        generalOptionsGroupBox->show();
-        exportStartButton->show();
-        ExportStateGroupBox->hide();
-
-        if (selectionSongButton->isChecked())
-                resize(370, 455);
-        else
-                resize(370, 330);
+       m_layout->removeWidget(progressWidget);
+       m_layout->addWidget(optionsWidget);
+       optionsWidget->show();
+       progressWidget->hide();
+       resize(370, 300);
 }
 
 

Index: traverso/ExportWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- traverso/ExportWidget.h     28 Feb 2007 21:23:09 -0000      1.3
+++ traverso/ExportWidget.h     3 May 2007 14:05:00 -0000       1.4
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2005-2006 Remon Sijrier 
+    Copyright (C) 2005-2007 Remon Sijrier 
  
     This file is part of Traverso
  
@@ -17,7 +17,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  
-    $Id: ExportWidget.h,v 1.3 2007/02/28 21:23:09 r_sijrier Exp $
 */
 
 #ifndef EXPORTWIDGET_H
@@ -25,8 +24,8 @@
 
 #include "ui_ExportWidget.h"
 
-#include <QWidget>
 #include <QDialog>
+#include <QHBoxLayout>
 
 class Project;
 class Song;
@@ -43,6 +42,7 @@
 private:
         Project*               m_project;
         ExportSpecification*   spec;
+       QHBoxLayout* m_layout;
 
         void show_progress_view();
         void show_settings_view();

Index: traverso/ui/ExportWidget.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ExportWidget.ui,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- traverso/ui/ExportWidget.ui 28 Feb 2007 21:23:09 -0000      1.2
+++ traverso/ui/ExportWidget.ui 3 May 2007 14:05:00 -0000       1.3
@@ -1,41 +1,25 @@
 <ui version="4.0" >
  <class>ExportWidget</class>
- <widget class="QWidget" name="ExportWidget" >
+ <widget class="QDialog" name="ExportWidget" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>482</width>
-    <height>689</height>
+    <width>529</width>
+    <height>592</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>5</hsizetype>
-    <vsizetype>5</vsizetype>
-    <horstretch>0</horstretch>
-    <verstretch>3</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize" >
-   <size>
-    <width>250</width>
-    <height>100</height>
-   </size>
-  </property>
-  <property name="font" >
-   <font>
-    <family>Bitstream Vera Sans Mono</family>
-    <pointsize>9</pointsize>
-    <weight>50</weight>
-    <italic>false</italic>
-    <bold>false</bold>
-    <underline>false</underline>
-    <strikeout>false</strikeout>
-   </font>
-  </property>
   <property name="windowTitle" >
-   <string>Project export</string>
+   <string>Export to harddisk</string>
+  </property>
+  <widget class="QWidget" native="1" name="optionsWidget" >
+   <property name="geometry" >
+    <rect>
+     <x>9</x>
+     <y>9</y>
+     <width>463</width>
+     <height>339</height>
+    </rect>
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
@@ -46,85 +30,68 @@
    </property>
    <item>
     <widget class="QGroupBox" name="generalOptionsGroupBox" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>5</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="title" >
       <string>General options</string>
      </property>
-     <layout class="QGridLayout" >
+      <layout class="QVBoxLayout" >
       <property name="margin" >
-       <number>8</number>
+        <number>9</number>
       </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="4" column="0" colspan="4" >
-       <widget class="QListView" name="songListView" />
-      </item>
-      <item row="0" column="0" colspan="2" >
+       <item>
        <widget class="QLabel" name="label" >
         <property name="text" >
          <string>Export directory</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="3" >
+       <item>
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
        <widget class="QLineEdit" name="exportDirName" >
         <property name="sizePolicy" >
          <sizepolicy>
-          <hsizetype>5</hsizetype>
+             <hsizetype>7</hsizetype>
           <vsizetype>0</vsizetype>
-          <horstretch>6</horstretch>
+             <horstretch>5</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
        </widget>
       </item>
-      <item row="1" column="3" >
+         <item>
        <widget class="QPushButton" name="fileSelectButton" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize" >
-         <size>
-          <width>50</width>
-          <height>16777215</height>
-         </size>
-        </property>
         <property name="text" >
          <string>...</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="2" >
+        </layout>
+       </item>
+       <item>
        <widget class="QLabel" name="label_6" >
         <property name="text" >
          <string>Song(s) to render</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="2" >
-       <widget class="QRadioButton" name="selectionSongButton" >
-        <property name="enabled" >
-         <bool>false</bool>
+       <item>
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
         </property>
-        <property name="text" >
-         <string>Selection</string>
+         <property name="spacing" >
+          <number>6</number>
         </property>
-       </widget>
-      </item>
-      <item row="3" column="0" >
+         <item>
        <widget class="QRadioButton" name="currentSongButton" >
         <property name="text" >
          <string>Current</string>
@@ -134,13 +101,25 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="1" >
+         <item>
        <widget class="QRadioButton" name="allSongsButton" >
         <property name="text" >
          <string>All</string>
         </property>
        </widget>
       </item>
+         <item>
+          <widget class="QRadioButton" name="selectionSongButton" >
+           <property name="enabled" >
+            <bool>false</bool>
+           </property>
+           <property name="text" >
+            <string>Selection</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
      </layout>
     </widget>
    </item>
@@ -149,7 +128,7 @@
      <property name="sizePolicy" >
       <sizepolicy>
        <hsizetype>5</hsizetype>
-       <vsizetype>1</vsizetype>
+        <vsizetype>5</vsizetype>
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -157,14 +136,22 @@
      <property name="title" >
       <string>Export specifications</string>
      </property>
-     <layout class="QGridLayout" >
+      <layout class="QHBoxLayout" >
       <property name="margin" >
-       <number>8</number>
+        <number>9</number>
       </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="0" column="0" >
+       <item>
+        <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
        <widget class="QLabel" name="label_2" >
         <property name="sizePolicy" >
          <sizepolicy>
@@ -179,26 +166,30 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QComboBox" name="audioTypeComboBox" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>1</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>4</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
+         <item>
+          <widget class="QComboBox" name="audioTypeComboBox" />
       </item>
-      <item row="2" column="0" >
+         <item>
        <widget class="QLabel" name="label_4" >
         <property name="text" >
          <string>Channels</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
+         <item>
+          <widget class="QComboBox" name="channelComboBox" />
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
        <widget class="QLabel" name="label_3" >
         <property name="sizePolicy" >
          <sizepolicy>
@@ -213,99 +204,88 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
+         <item>
        <widget class="QComboBox" name="bitdepthComboBox" />
       </item>
-      <item row="3" column="0" >
-       <widget class="QComboBox" name="channelComboBox" />
-      </item>
-      <item row="3" column="1" >
-       <widget class="QComboBox" name="sampleRateComboBox" />
-      </item>
-      <item row="2" column="1" >
+         <item>
        <widget class="QLabel" name="label_8" >
         <property name="text" >
          <string>Sample rate</string>
         </property>
        </widget>
       </item>
+         <item>
+          <widget class="QComboBox" name="sampleRateComboBox" />
+         </item>
      </layout>
-    </widget>
    </item>
-   <item>
-    <widget class="QWidget" native="1" name="widget" />
+      </layout>
+     </widget>
    </item>
    <item>
-    <spacer>
+     <widget class="QDialogButtonBox" name="buttonBox" >
      <property name="orientation" >
-      <enum>Qt::Vertical</enum>
+       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
-      <size>
-       <width>466</width>
-       <height>16</height>
-      </size>
+      <property name="standardButtons" >
+       
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
      </property>
-    </spacer>
+     </widget>
    </item>
-   <item>
+   </layout>
+  </widget>
+  <widget class="QWidget" native="1" name="progressWidget" >
+   <property name="geometry" >
+    <rect>
+     <x>9</x>
+     <y>354</y>
+     <width>294</width>
+     <height>166</height>
+    </rect>
+   </property>
     <layout class="QHBoxLayout" >
      <property name="margin" >
-      <number>0</number>
+     <number>9</number>
      </property>
      <property name="spacing" >
       <number>6</number>
      </property>
      <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
+     <widget class="QGroupBox" name="ExportStateGroupBox" >
+      <property name="title" >
+       <string>Export status</string>
        </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="exportStartButton" >
-       <property name="text" >
-        <string>Start</string>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="cancelButton" >
-       <property name="text" >
-        <string>Cancel</string>
+       <property name="spacing" >
+        <number>6</number>
        </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
    <item>
-    <widget class="QGroupBox" name="ExportStateGroupBox" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>5</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+        <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
      </property>
-     <property name="title" >
-      <string>Export status</string>
+         <property name="spacing" >
+          <number>6</number>
      </property>
-     <layout class="QGridLayout" >
+         <item>
+          <layout class="QHBoxLayout" >
       <property name="margin" >
-       <number>8</number>
+            <number>0</number>
       </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="0" column="2" colspan="2" >
+           <item>
+            <widget class="QLabel" name="currentProcessingSongName" >
+             <property name="text" >
+              <string>-</string>
+             </property>
+            </widget>
+           </item>
+           <item>
        <spacer>
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
@@ -318,36 +298,27 @@
         </property>
        </spacer>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="label_7" >
-        <property name="text" >
-         <string>Progress of Song:</string>
-        </property>
-       </widget>
+          </layout>
       </item>
-      <item row="0" column="1" >
-       <widget class="QLabel" name="currentProcessingSongName" >
-        <property name="text" >
-         <string>-</string>
+         <item>
+          <widget class="QProgressBar" name="songProgressBar" >
+           <property name="value" >
+            <number>0</number>
         </property>
-       </widget>
-      </item>
-      <item row="3" column="3" >
-       <widget class="QPushButton" name="exportStopButton" >
-        <property name="text" >
-         <string>Stop</string>
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="3" >
+         <item>
        <widget class="QLabel" name="label_5" >
         <property name="text" >
          <string>Overall Progress</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="3" >
-       <widget class="QProgressBar" name="songProgressBar" >
+         <item>
+          <widget class="QProgressBar" name="overalProgressBar" >
         <property name="value" >
          <number>0</number>
         </property>
@@ -356,21 +327,44 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0" colspan="3" >
-       <widget class="QProgressBar" name="overalProgressBar" >
-        <property name="value" >
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" >
+         <property name="margin" >
          <number>0</number>
         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <spacer>
         <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" >
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="exportStopButton" >
+           <property name="text" >
+            <string>Stop</string>
         </property>
        </widget>
       </item>
      </layout>
+       </item>
+      </layout>
     </widget>
    </item>
   </layout>
  </widget>
+ </widget>
  <resources/>
  <connections/>
 </ui>




reply via email to

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