[Traverso-commit] traverso/src/traverso/dialogs/project SongManag...

[Remon Sijrier]

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

Modified files:
        src/traverso/dialogs/project: SongManagerDialog.cpp 
                                      SongManagerDialog.h 

Log message:
        Added 'NewSongDialog', reworked SongManager Dialog a bit to also make 
use of it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/SongManagerDialog.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/SongManagerDialog.h?cvsroot=traverso&r1=1.5&r2=1.6

Patches:
Index: SongManagerDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/project/SongManagerDialog.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- SongManagerDialog.cpp       2 Apr 2007 21:05:43 -0000       1.10
+++ SongManagerDialog.cpp       3 Apr 2007 14:20:13 -0000       1.11
@@ -26,6 +26,8 @@
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QHeaderView>
+#include <dialogs/NewSongDialog.h>
+#include <Interface.h>
 
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
@@ -36,18 +38,16 @@
 {
        setupUi(this);
 
-       treeSongWidget->setColumnCount(4);
-       treeSongWidget->header()->resizeSection(0, 200);
-       treeSongWidget->header()->resizeSection(1, 60);
-       treeSongWidget->header()->resizeSection(2, 120);
+       treeSongWidget->setColumnCount(3);
+       treeSongWidget->header()->resizeSection(0, 160);
+       treeSongWidget->header()->resizeSection(1, 55);
+       treeSongWidget->header()->resizeSection(2, 70);
        QStringList stringList;
-       stringList << "Song Name" << "Tracks" << "Length h:m:s,fr" << "Size" ;
+       stringList << "Song Name" << "Tracks" << "Length";
        treeSongWidget->setHeaderLabels(stringList);
        
        set_project(pm().get_project());
        
-       trackCountSpinBox->setValue(config().get_property("Song", 
"trackCreationCount", 4).toInt());
-       
        connect(treeSongWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), 
this, SLOT(songitem_clicked(QTreeWidgetItem*,int)));
        connect(&pm(), SIGNAL(projectLoaded(Project*)), this, 
SLOT(set_project(Project*)));
 }
@@ -60,8 +60,8 @@
        m_project = project;
        
        if (m_project) {
-               connect(m_project, SIGNAL(songAdded(Song*)), this, 
SLOT(song_added(Song*)));
-               connect(m_project, SIGNAL(songRemoved(Song*)), this, 
SLOT(song_removed(Song*)));
+               connect(m_project, SIGNAL(songAdded(Song*)), this, 
SLOT(update_song_list()));
+               connect(m_project, SIGNAL(songRemoved(Song*)), this, 
SLOT(update_song_list()));
                setWindowTitle("Manage Project - " + m_project->get_title());
        } else {
                setWindowTitle("Manage Project - No Project loaded!");
@@ -94,11 +94,9 @@
                QTreeWidgetItem* item = new QTreeWidgetItem(treeSongWidget);
                item->setTextAlignment(1, Qt::AlignHCenter);
                item->setTextAlignment(2, Qt::AlignHCenter);
-               item->setTextAlignment(3, Qt::AlignHCenter);
                item->setText(0, songName);
                item->setText(1, numberOfTracks);
                item->setText(2, songLength);
-               item->setText(3, songSpaceAllocated);
                
                item->setData(0, Qt::UserRole, song->get_id());
        }
@@ -169,17 +167,7 @@
 
 void SongManagerDialog::on_createSongButton_clicked( )
 {
-       if ( ! m_project) {
-               return;
-       }
-       
-       int trackcount = trackCountSpinBox->value();
-       Song* song = new Song(m_project, trackcount);
-       
-       song->set_title(newSongNameLineEdit->text());
-       song->set_artists(artistsLineEdit->text());
-       
-       Command::process_command(m_project->add_song(song));
+       Interface::instance()->show_newsong_dialog();
 }
 
 
@@ -204,15 +192,5 @@
        }
 }
 
-void SongManagerDialog::song_removed(Song * song)
-{
-       update_song_list();
-}
-
-void SongManagerDialog::song_added(Song * song)
-{
-       update_song_list();
-}
-
 //eof
 

Index: SongManagerDialog.h
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/project/SongManagerDialog.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SongManagerDialog.h 21 Mar 2007 19:17:16 -0000      1.5
+++ SongManagerDialog.h 3 Apr 2007 14:20:14 -0000       1.6
@@ -40,20 +40,16 @@
        void hideEvent ( QHideEvent * event );
        void showEvent ( QShowEvent * event );
 
-public slots:
-        void update_song_list();
-
 private:
        Project* m_project;
 
 private slots:
+       void update_song_list();
        void set_project(Project* project);
        void songitem_clicked( QTreeWidgetItem* item, int);
        void on_renameSongButton_clicked();
         void on_deleteSongButton_clicked();
         void on_createSongButton_clicked();
-       void song_removed(Song* song);
-       void song_added(Song* song);
 };
 
 #endif