[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso resources/themes/default/traversotheme...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso resources/themes/default/traversotheme... |
|
Date: |
Mon, 30 Apr 2007 17:50:17 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/04/30 17:50:17
Modified files:
resources/themes/default: traversotheme.xml
src/core : Project.cpp ViewPort.cpp
src/traverso/songcanvas: AudioClipView.cpp
src/traverso/ui: ResourcesWidget.ui
src/traverso/widgets: ResourcesWidget.cpp ResourcesWidget.h
Log message:
* Explicitly get focus when mouse enters ViewPort
* Added simple File viewer in Resources Bin
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ViewPort.cpp?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ResourcesWidget.ui?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.cpp?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.h?cvsroot=traverso&r1=1.2&r2=1.3
Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file:
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- resources/themes/default/traversotheme.xml 26 Apr 2007 17:24:34 -0000
1.21
+++ resources/themes/default/traversotheme.xml 30 Apr 2007 17:50:17 -0000
1.22
@@ -62,6 +62,7 @@
<color name="AudioClip:clipinfobackground" red="240"
green="190" blue="218" alpha="200" />
<color name="AudioClip:clipinfobackground:inactive" red="199"
green="190" blue="218" alpha="200" />
<color name="AudioClip:sampleoverload" red="255" green="0"
blue="0" alpha="255" />
+ <color name="AudioClip:invalidreadsource" red="255" green="0"
blue="0" alpha="100" />
<color name="Curve:active" red="255" green="0" blue="255"
alpha="255" />
Index: src/core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- src/core/Project.cpp 25 Apr 2007 19:49:30 -0000 1.31
+++ src/core/Project.cpp 30 Apr 2007 17:50:17 -0000 1.32
@@ -115,7 +115,7 @@
}
m_id = create_id();
- m_importDir = config().get_property("Project", "DefaultDirectory",
QDir::homePath()).toString();
+ m_importDir = QDir::homePath();
info().information(tr("Created new Project %1").arg(title));
return 1;
@@ -594,6 +594,7 @@
QString Project::get_import_dir() const
{
+ printf("import dir %s\n", QS_C(m_importDir));
return m_importDir;
}
Index: src/core/ViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ViewPort.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/core/ViewPort.cpp 20 Apr 2007 06:12:39 -0000 1.18
+++ src/core/ViewPort.cpp 30 Apr 2007 17:50:17 -0000 1.19
@@ -166,6 +166,7 @@
{
QGraphicsView::enterEvent(e);
cpointer().set_current_viewport(this);
+ setFocus();
}
void ViewPort::leaveEvent ( QEvent * event )
Index: src/traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- src/traverso/songcanvas/AudioClipView.cpp 30 Apr 2007 13:49:59 -0000
1.53
+++ src/traverso/songcanvas/AudioClipView.cpp 30 Apr 2007 17:50:17 -0000
1.54
@@ -126,8 +126,8 @@
painter->setClipRect(clipRect);
if (m_clip->invalid_readsource()) {
- draw_clipinfo_area(painter, xstart, pixelcount);
painter->fillRect(xstart, 0, pixelcount, m_height,
themer()->get_color("AudioClip:invalidreadsource"));
+ draw_clipinfo_area(painter, xstart, pixelcount);
painter->setPen(themer()->get_color("AudioClip:contour"));
painter->drawRect(xstart, 0, pixelcount, m_height - 1);
painter->setPen(Qt::black);
Index: src/traverso/ui/ResourcesWidget.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ResourcesWidget.ui,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/traverso/ui/ResourcesWidget.ui 25 Apr 2007 15:58:50 -0000 1.2
+++ src/traverso/ui/ResourcesWidget.ui 30 Apr 2007 17:50:17 -0000 1.3
@@ -52,6 +52,11 @@
<string>Both</string>
</property>
</item>
+ <item>
+ <property name="text" >
+ <string>Files</string>
+ </property>
+ </item>
</widget>
</item>
<item>
@@ -121,7 +126,7 @@
</layout>
</item>
</layout>
- <widget class="QWidget" name="" >
+ <widget class="QWidget" name="layoutWidget" >
<property name="geometry" >
<rect>
<x>0</x>
Index: src/traverso/widgets/ResourcesWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/traverso/widgets/ResourcesWidget.cpp 27 Apr 2007 12:26:13 -0000
1.4
+++ src/traverso/widgets/ResourcesWidget.cpp 30 Apr 2007 17:50:17 -0000
1.5
@@ -32,7 +32,8 @@
#include <Themer.h>
#include <QHeaderView>
-
+#include <QDirModel>
+#include <QListView>
ResourcesWidget::ResourcesWidget(QWidget * parent)
: QWidget(parent)
@@ -63,14 +64,20 @@
audioFileTreeWidget->header()->setResizeMode(0,
QHeaderView::ResizeToContents);
audioFileTreeWidget->header()->setResizeMode(1,
QHeaderView::ResizeToContents);
- viewComboBox->setFocusPolicy(Qt::NoFocus);
- songComboBox->setFocusPolicy(Qt::NoFocus);
- clipTreeWidget->setFocusPolicy(Qt::NoFocus);
- audioFileTreeWidget->setFocusPolicy(Qt::NoFocus);
-
+ 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_dirModel->setSorting(QDir::DirsFirst | QDir::Name | QDir::IgnoreCase);
+ layout()->addWidget(m_dirView);
+ m_dirView->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*)));
}
@@ -148,14 +155,21 @@
if (index == 0) {
audioFileTreeWidget->show();
clipTreeWidget->hide();
+ m_dirView->hide();
} else if (index == 1) {
audioFileTreeWidget->hide();
clipTreeWidget->show();
- } else {
+ m_dirView->hide();
+ } else if (index == 2) {
audioFileTreeWidget->show();
clipTreeWidget->show();
+ m_dirView->hide();
+ } else {
+ audioFileTreeWidget->hide();
+ clipTreeWidget->hide();
+ m_dirView->show();
+
m_dirView->setRootIndex(m_dirModel->index(m_project->get_import_dir()));
}
-
}
void ResourcesWidget::song_combo_box_index_changed(int index)
@@ -176,3 +190,11 @@
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: src/traverso/widgets/ResourcesWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/traverso/widgets/ResourcesWidget.h 25 Apr 2007 15:58:50 -0000
1.2
+++ src/traverso/widgets/ResourcesWidget.h 30 Apr 2007 17:50:17 -0000
1.3
@@ -27,6 +27,8 @@
class Project;
class Song;
+class QListView;
+class QDirModel;
class ResourcesWidget : public QWidget, protected Ui::ResourcesWidget
{
@@ -40,6 +42,8 @@
private:
Project* m_project;
+ QListView* m_dirView;
+ QDirModel* m_dirModel;
private slots:
@@ -49,6 +53,7 @@
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