[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso src/traverso/ui/ResourcesWidget.ui src...
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso src/traverso/ui/ResourcesWidget.ui src... |
Date: |
Fri, 04 May 2007 01:05:08 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/05/04 01:05:08
Modified files:
src/traverso/ui: ResourcesWidget.ui
src/traverso/widgets: ResourcesWidget.cpp
. : TODO
Log message:
* moving to 1 QTreeWidget
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ResourcesWidget.ui?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/TODO?cvsroot=traverso&r1=1.6&r2=1.7
Patches:
Index: src/traverso/ui/ResourcesWidget.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ResourcesWidget.ui,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/traverso/ui/ResourcesWidget.ui 30 Apr 2007 17:50:17 -0000 1.3
+++ src/traverso/ui/ResourcesWidget.ui 4 May 2007 01:05:07 -0000 1.4
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>151</width>
- <height>289</height>
+ <width>540</width>
+ <height>530</height>
</rect>
</property>
<property name="windowTitle" >
@@ -39,17 +39,7 @@
</property>
<item>
<property name="text" >
- <string>Audio</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Clips</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Both</string>
+ <string>Sources</string>
</property>
</item>
<item>
@@ -86,24 +76,21 @@
<number>6</number>
</property>
<item>
- <widget class="QTreeWidget" name="audioFileTreeWidget" >
- <column>
- <property name="text" >
- <string>Audio Name</string>
+ <widget class="QTreeWidget" name="sourcesTreeWidget" >
+ <property name="sortingEnabled" >
+ <bool>false</bool>
+ </property>
+ <property name="animated" >
+ <bool>false</bool>
</property>
- </column>
<column>
<property name="text" >
- <string>Length</string>
+ <string>Name</string>
</property>
</column>
- </widget>
- </item>
- <item>
- <widget class="QTreeWidget" name="clipTreeWidget" >
<column>
<property name="text" >
- <string>Clip Name</string>
+ <string>Length</string>
</property>
</column>
<column>
@@ -116,11 +103,6 @@
<string>End</string>
</property>
</column>
- <column>
- <property name="text" >
- <string>Length</string>
- </property>
- </column>
</widget>
</item>
</layout>
Index: src/traverso/widgets/ResourcesWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/traverso/widgets/ResourcesWidget.cpp 3 May 2007 23:38:12 -0000
1.10
+++ src/traverso/widgets/ResourcesWidget.cpp 4 May 2007 01:05:07 -0000
1.11
@@ -145,26 +145,18 @@
QPalette palette;
palette.setColor(QPalette::AlternateBase,
themer()->get_color("Track:background"));
- clipTreeWidget->setPalette(palette);
- clipTreeWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
- clipTreeWidget->setAlternatingRowColors(true);
- clipTreeWidget->setDragEnabled(true);
- clipTreeWidget->setDropIndicatorShown(true);
- clipTreeWidget->setIndentation(12);
- clipTreeWidget->header()->setResizeMode(0,
QHeaderView::ResizeToContents);
- clipTreeWidget->header()->setResizeMode(1,
QHeaderView::ResizeToContents);
- clipTreeWidget->header()->setResizeMode(2,
QHeaderView::ResizeToContents);
- clipTreeWidget->header()->setResizeMode(3,
QHeaderView::ResizeToContents);
- clipTreeWidget->hide();
-
- audioFileTreeWidget->setPalette(palette);
-
audioFileTreeWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
- audioFileTreeWidget->setAlternatingRowColors(true);
- audioFileTreeWidget->setDragEnabled(true);
- audioFileTreeWidget->setDropIndicatorShown(true);
- audioFileTreeWidget->setIndentation(12);
- audioFileTreeWidget->header()->setResizeMode(0,
QHeaderView::ResizeToContents);
- audioFileTreeWidget->header()->setResizeMode(1,
QHeaderView::ResizeToContents);
+ sourcesTreeWidget->setPalette(palette);
+
sourcesTreeWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
+ sourcesTreeWidget->setAlternatingRowColors(true);
+ sourcesTreeWidget->setDragEnabled(true);
+ sourcesTreeWidget->setDropIndicatorShown(true);
+ sourcesTreeWidget->setIndentation(18);
+ sourcesTreeWidget->header()->setResizeMode(0,
QHeaderView::ResizeToContents);
+ sourcesTreeWidget->header()->setResizeMode(1,
QHeaderView::ResizeToContents);
+ sourcesTreeWidget->header()->setResizeMode(2,
QHeaderView::ResizeToContents);
+ sourcesTreeWidget->header()->setResizeMode(3,
QHeaderView::ResizeToContents);
+ sourcesTreeWidget->header()->setStretchLastSection(false);
+
m_filewidget = new FileWidget(this);
layout()->addWidget(m_filewidget);
@@ -182,8 +174,7 @@
void ResourcesWidget::set_project(Project * project)
{
- audioFileTreeWidget->clear();
- clipTreeWidget->clear();
+ sourcesTreeWidget->clear();
songComboBox->clear();
m_project = project;
@@ -205,63 +196,59 @@
void ResourcesWidget::update_tree_widgets()
{
- audioFileTreeWidget->clear();
- clipTreeWidget->clear();
+ sourcesTreeWidget->clear();
foreach(ReadSource* rs,
m_project->get_audiosource_manager()->get_all_audio_sources()) {
- QTreeWidgetItem* item = new
QTreeWidgetItem(audioFileTreeWidget);
+ QTreeWidgetItem* item = new QTreeWidgetItem(sourcesTreeWidget);
QString duration = frame_to_ms(rs->get_nframes(), 44100);
item->setText(0, rs->get_short_name());
item->setText(1, duration);
+ item->setText(2, "");
+ item->setText(3, "");
item->setData(0, Qt::UserRole, rs->get_id());
item->setToolTip(0, rs->get_short_name() + " " + duration);
if (!rs->get_ref_count()) {
item->setForeground(0, QColor(Qt::lightGray));
item->setForeground(1, QColor(Qt::lightGray));
- }
+ item->setForeground(2, QColor(Qt::lightGray));
+ item->setForeground(3, QColor(Qt::lightGray));
}
-
foreach(AudioClip* clip,
m_project->get_audiosource_manager()->get_all_clips()) {
- QTreeWidgetItem* item = new QTreeWidgetItem(clipTreeWidget);
- item->setText(0, clip->get_name());
+ if ( ! (clip->get_readsource_id() == rs->get_id())) {
+ continue;
+ }
+ QTreeWidgetItem* clipitem = new QTreeWidgetItem(item);
+ clipitem->setText(0, clip->get_name());
QString start = frame_to_ms(clip->get_source_start_frame(),
clip->get_rate());
QString end = frame_to_ms(clip->get_source_end_frame(),
clip->get_rate());
- item->setText(1, start);
- item->setText(2, end);
- item->setText(3, frame_to_ms(clip->get_length(),
clip->get_rate()));
- item->setData(0, Qt::UserRole, clip->get_id());
- item->setToolTip(0, clip->get_name() + " " + start + " - " +
end);
+ clipitem->setText(1, frame_to_ms(clip->get_length(),
clip->get_rate()));
+ clipitem->setText(2, start);
+ clipitem->setText(3, end);
+ clipitem->setData(0, Qt::UserRole, clip->get_id());
+ clipitem->setToolTip(0, clip->get_name() + " " +
start + " - " + end);
if (!clip->get_ref_count()) {
- item->setForeground(0, QColor(Qt::lightGray));
- item->setForeground(1, QColor(Qt::lightGray));
- item->setForeground(2, QColor(Qt::lightGray));
- item->setForeground(3, QColor(Qt::lightGray));
+ clipitem->setForeground(0,
QColor(Qt::lightGray));
+ clipitem->setForeground(1,
QColor(Qt::lightGray));
+ clipitem->setForeground(2,
QColor(Qt::lightGray));
+ clipitem->setForeground(3,
QColor(Qt::lightGray));
}
}
+ }
+
- clipTreeWidget->sortItems(0, Qt::AscendingOrder);
- audioFileTreeWidget->sortItems(0, Qt::AscendingOrder);
+
+ sourcesTreeWidget->sortItems(0, Qt::AscendingOrder);
}
void ResourcesWidget::view_combo_box_index_changed(int index)
{
if (index == 0) {
- audioFileTreeWidget->show();
- clipTreeWidget->hide();
+ sourcesTreeWidget->show();
m_filewidget->hide();
} else if (index == 1) {
- audioFileTreeWidget->hide();
- clipTreeWidget->show();
- m_filewidget->hide();
- } else if (index == 2) {
- audioFileTreeWidget->show();
- clipTreeWidget->show();
- m_filewidget->hide();
- } else {
- audioFileTreeWidget->hide();
- clipTreeWidget->hide();
+ sourcesTreeWidget->hide();
m_filewidget->show();
m_filewidget->set_current_path(m_project->get_import_dir());
}
Index: TODO
===================================================================
RCS file: /sources/traverso/traverso/TODO,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- TODO 1 May 2007 23:29:25 -0000 1.6
+++ TODO 4 May 2007 01:05:08 -0000 1.7
@@ -1,5 +1,7 @@
TOBEDONE FOR 0.40.0
+* don't push mute/solo to history stack.
+
* FadeView merging code messes up start of clip when fade lenght is very short
(1 or even 0 pixels)
* switching to effect mode crashes with 0 tracks
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso src/traverso/ui/ResourcesWidget.ui src...,
Remon Sijrier <=