[Traverso-commit] traverso resources/themes/default/traversotheme...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/21 08:49:46

Modified files:
        resources/themes/default: traversotheme.xml 
        src/core       : Peak.cpp 
        src/traverso/dialogs: MarkerDialog.cpp 
        src/traverso/dialogs/project: OpenProjectDialog.cpp 
        src/traverso/ui: MarkerDialog.ui ResourcesWidget.ui 
        src/traverso/widgets: ResourcesWidget.cpp 

Log message:
        * Added alternating row color too themefile (for Resources Bin)
        * various small fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/MarkerDialog.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/MarkerDialog.ui?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ResourcesWidget.ui?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.cpp?cvsroot=traverso&r1=1.20&r2=1.21

Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file: 
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- resources/themes/default/traversotheme.xml  15 May 2007 11:25:42 -0000      
1.33
+++ resources/themes/default/traversotheme.xml  21 May 2007 08:49:45 -0000      
1.34
@@ -114,6 +114,8 @@
                <color name="PluginSlider:background" red="199" green="228" 
blue="211" alpha="255" />
                <color name="PluginSlider:value"  red="240" green="190" 
blue="218"  alpha="255" />
                
+               <color name="ResourcesBin:alternaterowcolor" red="243" 
green="248" blue="255" alpha="255" />
+               
                <color name="Song:background" red="248" green="248" blue="248" 
alpha="255" />
                <color name="SongPanel:background" red="248" green="248" 
blue="248" alpha="255" />
                

Index: src/core/Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/core/Peak.cpp   18 May 2007 10:40:58 -0000      1.27
+++ src/core/Peak.cpp   21 May 2007 08:49:46 -0000      1.28
@@ -678,12 +678,13 @@
 PeakProcessor::PeakProcessor()
 {
        m_ppthread = new PPThread(this);
-       m_ppthread->start();
        m_taskRunning = false;
        m_runningPeak = 0;
 
        moveToThread(m_ppthread);
        
+       m_ppthread->start();
+       
        connect(this, SIGNAL(newTask()), this, SLOT(start_task()), 
Qt::QueuedConnection);
 }
 

Index: src/traverso/dialogs/MarkerDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/MarkerDialog.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/traverso/dialogs/MarkerDialog.cpp       18 May 2007 19:23:12 -0000      
1.10
+++ src/traverso/dialogs/MarkerDialog.cpp       21 May 2007 08:49:46 -0000      
1.11
@@ -45,12 +45,7 @@
        
        checkBoxAllSongs->hide();
 
-       m_project = pm().get_project();
-       
-       if (m_project) {
-               setWindowTitle("Marker Editor - Project " + 
m_project->get_title());
-               set_project(m_project);
-       }
+       set_project(pm().get_project());
 
        QString mask = "99:99:99";
        lineEditPosition->setInputMask(mask);
@@ -66,8 +61,6 @@
 
        // connect signals which require an update of the song list
        connect(&pm(), SIGNAL(projectLoaded(Project*)), this, 
SLOT(set_project(Project*)));
-       connect(m_project, SIGNAL(songAdded(Song*)), this, 
SLOT(update_songs()));
-       connect(m_project, SIGNAL(songRemoved(Song*)), this, 
SLOT(update_songs()));
 
        // connect signals which require an update of the treeWidget's items
        connect(comboBoxDisplaySong, SIGNAL(currentIndexChanged(int)), this, 
SLOT(update_marker_treeview()));
@@ -110,6 +103,11 @@
                return;
        }
        
+       setWindowTitle("Marker Editor - Project " + m_project->get_title());
+       
+       connect(m_project, SIGNAL(songAdded(Song*)), this, 
SLOT(update_songs()));
+       connect(m_project, SIGNAL(songRemoved(Song*)), this, 
SLOT(update_songs()));
+       
        // fill the combo box with the names of the songs
        m_songlist = m_project->get_songs();
        for (int i = 0; i < m_songlist.size(); ++i) {

Index: src/traverso/dialogs/project/OpenProjectDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/traverso/dialogs/project/OpenProjectDialog.cpp  3 May 2007 22:43:12 
-0000       1.4
+++ src/traverso/dialogs/project/OpenProjectDialog.cpp  21 May 2007 08:49:46 
-0000      1.5
@@ -214,7 +214,7 @@
 
 void OpenProjectDialog::on_projectDirSelectButton_clicked( )
 {
-       QString path = config().get_property("Project", "DefaultDirectory", 
getenv("HOME")).toString();
+       QString path = config().get_property("Project", "directory", 
getenv("HOME")).toString();
        
        QString newPath = QFileDialog::getExistingDirectory(this,
                        tr("Choose an existing or create a new Project 
Directory"), path);

Index: src/traverso/ui/MarkerDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/MarkerDialog.ui,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/traverso/ui/MarkerDialog.ui     6 May 2007 00:02:38 -0000       1.5
+++ src/traverso/ui/MarkerDialog.ui     21 May 2007 08:49:46 -0000      1.6
@@ -48,6 +48,9 @@
    </item>
    <item>
     <widget class="QTreeWidget" name="markersTreeWidget" >
+     <property name="editTriggers" >
+      
<set>QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::NoEditTriggers</set>
+     </property>
      <property name="rootIsDecorated" >
       <bool>false</bool>
      </property>

Index: src/traverso/ui/ResourcesWidget.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ResourcesWidget.ui,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/traverso/ui/ResourcesWidget.ui  4 May 2007 01:05:07 -0000       1.4
+++ src/traverso/ui/ResourcesWidget.ui  21 May 2007 08:49:46 -0000      1.5
@@ -77,6 +77,24 @@
      </property>
      <item>
       <widget class="QTreeWidget" name="sourcesTreeWidget" >
+       <property name="mouseTracking" >
+        <bool>false</bool>
+       </property>
+       <property name="editTriggers" >
+        
<set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::NoEditTriggers</set>
+       </property>
+       <property name="alternatingRowColors" >
+        <bool>true</bool>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="textElideMode" >
+        <enum>Qt::ElideMiddle</enum>
+       </property>
        <property name="sortingEnabled" >
         <bool>false</bool>
        </property>

Index: src/traverso/widgets/ResourcesWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/traverso/widgets/ResourcesWidget.cpp    18 May 2007 11:11:56 -0000      
1.20
+++ src/traverso/widgets/ResourcesWidget.cpp    21 May 2007 08:49:46 -0000      
1.21
@@ -48,7 +48,7 @@
        : QWidget(parent)
        {
                QPalette palette;
-               palette.setColor(QPalette::AlternateBase, 
themer()->get_color("Track:background"));
+               palette.setColor(QPalette::AlternateBase, 
themer()->get_color("ResourcesBin:alternaterowcolor"));
                
                m_dirModel = new QDirModel;
                m_dirModel->setFilter(QDir::Dirs | QDir::Files | 
QDir::NoDotAndDotDot);
@@ -165,7 +165,7 @@
        setupUi(this);
        
        QPalette palette;
-       palette.setColor(QPalette::AlternateBase, 
themer()->get_color("Track:background"));
+       palette.setColor(QPalette::AlternateBase, 
themer()->get_color("ResourcesBin:alternaterowcolor"));
        sourcesTreeWidget->setPalette(palette);
        
sourcesTreeWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
        sourcesTreeWidget->setAlternatingRowColors(true);
@@ -196,6 +196,8 @@
 void ResourcesWidget::set_project(Project * project)
 {
        sourcesTreeWidget->clear();
+       m_sourceindices.clear();
+       m_clipindices.clear();
        songComboBox->clear();
        
        m_project = project;
@@ -219,8 +221,6 @@
 
 void ResourcesWidget::populate_tree()
 {
-       sourcesTreeWidget->clear();
-       
        if (!m_project) {
                return;
        }
@@ -275,8 +275,6 @@
                ClipTreeItem* clipitem = new ClipTreeItem(sourceitem, clip);
                m_clipindices.insert(clip->get_id(), clipitem);
        
-               clipitem->setData(0, Qt::UserRole, clip->get_id());
-               
                connect(clip, SIGNAL(positionChanged(Snappable*)), clipitem, 
SLOT(clip_state_changed()));
        }
        
@@ -347,6 +345,7 @@
        : QTreeWidgetItem(parent)
        , m_clip(clip)
 {
+       setData(0, Qt::UserRole, clip->get_id());
 }
 
 void ClipTreeItem::clip_state_changed()