[Traverso-commit] traverso/src core/Project.cpp core/Track.cpp tr...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/03 22:43:12

Modified files:
        src/core       : Project.cpp Track.cpp 
        src/traverso/dialogs/project: OpenProjectDialog.cpp 
        src/traverso/widgets: ResourcesWidget.cpp ResourcesWidget.h 

Log message:
        * completely useless stuff, who cares to know ?

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Track.cpp?cvsroot=traverso&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.cpp?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.h?cvsroot=traverso&r1=1.3&r2=1.4

Patches:
Index: core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- core/Project.cpp    3 May 2007 18:15:32 -0000       1.36
+++ core/Project.cpp    3 May 2007 22:43:12 -0000       1.37
@@ -482,7 +482,6 @@
                        if (spec->peakvalue > (1.0 + FLT_EPSILON)) {
                                info().critical(tr("Detected clipping in 
exported audio! (%1)")
                                                
.arg(coefficient_to_dbstring(spec->peakvalue)));
-                               spec->normvalue = 1.0;
                        }
                        
                        info().information(tr("calculated norm factor: 
%1").arg(coefficient_to_dbstring(spec->normvalue)));

Index: core/Track.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Track.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- core/Track.cpp      3 May 2007 10:38:29 -0000       1.52
+++ core/Track.cpp      3 May 2007 22:43:12 -0000       1.53
@@ -306,8 +306,7 @@
                return 0;
        }
        
-       QString name =  "s-" + 
QString::number(pm().get_project()->get_song_index(m_song->get_id())) +
-                       "_track-" + 
QString::number(m_song->get_track_index(m_id)) +
+       QString name =  "track-" + 
QString::number(m_song->get_track_index(m_id)) +
                        "_take-" + QString::number(++numtakes);
        
        AudioClip* clip = resources_manager()->new_audio_clip(name);

Index: traverso/dialogs/project/OpenProjectDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- traverso/dialogs/project/OpenProjectDialog.cpp      3 May 2007 18:12:07 
-0000       1.3
+++ traverso/dialogs/project/OpenProjectDialog.cpp      3 May 2007 22:43:12 
-0000       1.4
@@ -176,6 +176,8 @@
        if (pm().load_project(title)<0) {
                PERROR("Could not load project %s", title.toAscii().data());
        }
+       
+       hide();
 }
 
 void OpenProjectDialog::on_deleteProjectbutton_clicked( )

Index: traverso/widgets/ResourcesWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- traverso/widgets/ResourcesWidget.cpp        3 May 2007 10:38:29 -0000       
1.7
+++ traverso/widgets/ResourcesWidget.cpp        3 May 2007 22:43:12 -0000       
1.8
@@ -34,6 +34,102 @@
 #include <QHeaderView>
 #include <QDirModel>
 #include <QListView>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QComboBox>
+
+class FileWidget : public QWidget
+{
+       Q_OBJECT
+public:
+       
+       FileWidget(QWidget* parent=0)
+       : QWidget(parent)
+       {
+               QPalette palette;
+               palette.setColor(QPalette::AlternateBase, 
themer()->get_color("Track:background"));
+               
+               m_dirModel = new QDirModel;
+               m_dirModel->setFilter(QDir::Dirs | QDir::Files | 
QDir::NoDotAndDotDot);
+               m_dirView = new QListView;
+               m_dirView->setModel(m_dirModel);
+               m_dirView->setDragEnabled(true);
+               m_dirView->setDropIndicatorShown(true);
+               
m_dirView->setSelectionMode(QAbstractItemView::ExtendedSelection);
+               m_dirView->setAlternatingRowColors(true);
+               m_dirView->setPalette(palette);
+               m_dirModel->setSorting(QDir::DirsFirst | QDir::Name | 
QDir::IgnoreCase);
+               
+               m_box = new QComboBox(this);
+               m_box->addItem("");
+               m_box->addItem(QDir::homePath());
+               m_box->addItem(QDir::rootPath());
+               QPushButton* button = new QPushButton(this);
+               QIcon icon = 
QApplication::style()->standardIcon(QStyle::SP_FileDialogToParent);
+               button->setIcon(icon);
+               
+               QHBoxLayout* hlay = new QHBoxLayout;
+               hlay->addWidget(m_box, 10);
+               hlay->addWidget(button);
+               hlay->addSpacing(2);
+               
+               QVBoxLayout* lay = new QVBoxLayout(this);
+               lay->setMargin(0);
+               lay->addLayout(hlay);
+               lay->addWidget(m_dirView);
+               
+               setLayout(lay);
+               
+               connect(m_dirView, SIGNAL(clicked(const QModelIndex& )), this, 
SLOT(dirview_item_clicked(const QModelIndex&)));
+               connect(button, SIGNAL(clicked()), this, 
SLOT(dir_up_button_clicked()));
+               connect(m_box, SIGNAL(activated(const QString&)), this, 
SLOT(box_actived(const QString&)));
+               
+       }
+       
+       void set_current_path(const QString& path) const;
+       
+private slots:
+       void dirview_item_clicked(const QModelIndex & index);
+       void dir_up_button_clicked();
+       void box_actived(const QString& path);
+       
+private:
+       QListView* m_dirView;
+       QDirModel* m_dirModel;
+       QComboBox* m_box;
+};
+
+#include "ResourcesWidget.moc"
+                        
+void FileWidget::dirview_item_clicked(const QModelIndex & index)
+{
+       if (m_dirModel->isDir(index)) {
+               m_dirView->setRootIndex(index);
+               pm().get_project()->set_import_dir(m_dirModel->filePath(index));
+               m_box->setItemText(0, m_dirModel->filePath(index));
+       }
+}
+
+void FileWidget::dir_up_button_clicked()
+{
+       QDir dir(m_dirModel->filePath(m_dirView->rootIndex()));
+       dir.cdUp();
+       m_dirView->setRootIndex(m_dirModel->index(dir.canonicalPath()));
+       m_box->setItemText(0, dir.canonicalPath());
+}
+
+void FileWidget::box_actived(const QString& path)
+{
+       m_dirView->setRootIndex(m_dirModel->index(path));
+}
+
+void FileWidget::set_current_path(const QString& path) const
+{
+       m_dirView->setRootIndex(m_dirModel->index(path));
+       m_box->setItemText(0, path);
+}
+
 
 ResourcesWidget::ResourcesWidget(QWidget * parent)
        : QWidget(parent)
@@ -63,22 +159,13 @@
        audioFileTreeWidget->header()->setResizeMode(0, 
QHeaderView::ResizeToContents);
        audioFileTreeWidget->header()->setResizeMode(1, 
QHeaderView::ResizeToContents);
        
-       m_dirModel = new QDirModel;
-       m_dirModel->setFilter(QDir::Dirs | QDir::Files);
-       m_dirView = new QListView;
-       m_dirView->setModel(m_dirModel);
-       m_dirView->setDragEnabled(true);
-       m_dirView->setDropIndicatorShown(true);
-       m_dirView->setSelectionMode(QAbstractItemView::ExtendedSelection);
-       m_dirView->setAlternatingRowColors(true);
-       m_dirView->setPalette(palette);
-       m_dirModel->setSorting(QDir::DirsFirst | QDir::Name | QDir::IgnoreCase);
-       layout()->addWidget(m_dirView);
-       m_dirView->hide();
+       m_filewidget = new FileWidget(this);
+       layout()->addWidget(m_filewidget);
+       m_filewidget->hide();
+       
        
        connect(viewComboBox, SIGNAL(currentIndexChanged(int)), this, 
SLOT(view_combo_box_index_changed(int)));
        connect(songComboBox, SIGNAL(currentIndexChanged(int)), this, 
SLOT(song_combo_box_index_changed(int)));
-       connect(m_dirView, SIGNAL(clicked(const QModelIndex& )), this, 
SLOT(dirview_item_clicked(const QModelIndex&)));
        connect(&pm(), SIGNAL(projectLoaded(Project*)), this, 
SLOT(set_project(Project*)));
 }
 
@@ -156,20 +243,20 @@
        if (index == 0) {
                audioFileTreeWidget->show();
                clipTreeWidget->hide();
-               m_dirView->hide();
+               m_filewidget->hide();
        } else if (index == 1) {
                audioFileTreeWidget->hide();
                clipTreeWidget->show();
-               m_dirView->hide();
+               m_filewidget->hide();
        } else if (index == 2) {
                audioFileTreeWidget->show();
                clipTreeWidget->show();
-               m_dirView->hide();
+               m_filewidget->hide();
        } else {
                audioFileTreeWidget->hide();
                clipTreeWidget->hide();
-               m_dirView->show();
-               
m_dirView->setRootIndex(m_dirModel->index(m_project->get_import_dir()));
+               m_filewidget->show();
+               m_filewidget->set_current_path(m_project->get_import_dir());
        }
 }
 
@@ -191,11 +278,3 @@
        update_tree_widgets();
 }
 
-void ResourcesWidget::dirview_item_clicked(const QModelIndex & index)
-{
-       if (m_dirModel->isDir(index)) {
-               m_dirView->setRootIndex(index);
-               m_project->set_import_dir(m_dirModel->filePath(index));
-       }
-}
-

Index: traverso/widgets/ResourcesWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- traverso/widgets/ResourcesWidget.h  30 Apr 2007 17:50:17 -0000      1.3
+++ traverso/widgets/ResourcesWidget.h  3 May 2007 22:43:12 -0000       1.4
@@ -27,8 +27,7 @@
 
 class Project;
 class Song;
-class QListView;
-class QDirModel;
+class FileWidget;
 
 class ResourcesWidget : public QWidget, protected Ui::ResourcesWidget
 {
@@ -42,8 +41,7 @@
        
 private:
        Project* m_project;
-       QListView* m_dirView;
-       QDirModel* m_dirModel;
+       FileWidget* m_filewidget;
        
 
 private slots:
@@ -53,7 +51,6 @@
        void song_combo_box_index_changed(int index);
        void song_added(Song* song);
        void song_removed(Song* song);
-       void dirview_item_clicked(const QModelIndex& index );
 };
 
 #endif