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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/06/27 21:01:21

Modified files:
        resources/themes/default: traversotheme.xml 
        src/traverso/songcanvas: SongView.cpp TrackPanelView.cpp 
                                 TrackPanelViewPort.cpp 

Log message:
        playing with theme file

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelView.cpp?cvsroot=traverso&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelViewPort.cpp?cvsroot=traverso&r1=1.9&r2=1.10

Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file: 
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- resources/themes/default/traversotheme.xml  5 Jun 2007 22:51:29 -0000       
1.36
+++ resources/themes/default/traversotheme.xml  27 Jun 2007 21:01:21 -0000      
1.37
@@ -20,7 +20,7 @@
                <property name="Track:bottomborderwidth" value="1" />
                <property name="Track:cliptopmargin" value="3" />
                <property name="Track:clipbottommargin" value="0" />
-               <property name="Track:paintbackground" value="1" />
+               <property name="Track:paintbackground" value="0" />
                
                <property name="VUMeter:layout:vuspacing" value="3" />
                <property name="VUMeter:layout:vulayoutspacing" value="5" />
@@ -66,8 +66,8 @@
                <color name="AudioClip:background:muted:mousehover"  red="245" 
green="245" blue="245"  alpha="170" />
                <color name="AudioClip:background:selected"  red="101" 
green="111" blue="171"  alpha="170" />
                <color name="AudioClip:background:selected:mousehover"  
red="111" green="121" blue="182"  alpha="170" />
-               <color name="AudioClip:background"  red="249" green="249" 
blue="255"  alpha="170" />
-               <color name="AudioClip:background:mousehover"  red="255" 
green="255" blue="255"  alpha="170" />
+               <color name="AudioClip:background"  red="254" green="251" 
blue="254"  alpha="170" />
+               <color name="AudioClip:background:mousehover"  red="253" 
green="255" blue="253"  alpha="230" />
                <color name="AudioClip:channelseperator"  red="178" green="191" 
blue="182"  alpha="255" />
                <color name="AudioClip:channelseperator:selected"  red="24" 
green="137" blue="210"  alpha="255" />
                <color name="AudioClip:contour"  red="50" green="50" blue="50"  
alpha="150" />
@@ -117,8 +117,8 @@
                
                <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" />
+               <color name="Song:background" red="244" green="244" blue="243" 
alpha="255" />
+               <color name="SongPanel:background" red="240" green="240" 
blue="248" alpha="255" />
                
                <color name="Timeline:background" red="180" green="189" 
blue="189" alpha="255" />
                <color name="Timeline:text" red="0" green="0" blue="0" 
alpha="255" />
@@ -127,6 +127,7 @@
                <color name="Track:clipbottomoffset" red="120" green="120" 
blue="160" alpha="255" />
                <color name="Track:background" red="250" green="250" blue="251" 
alpha="100" />
                
+               <color name="TrackPanel:background" red="250" green="250" 
blue="250" alpha="255" />
                <color name="TrackPanel:text" red="0" green="0" blue="25" 
alpha="255" />
                <color name="TrackPanel:slider:background" red="200" 
green="200" blue="240" alpha="255" />
                <color name="TrackPanel:head:active" red="240" green="140" 
blue="150" alpha="255" />

Index: src/traverso/songcanvas/SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- src/traverso/songcanvas/SongView.cpp        26 Jun 2007 23:43:21 -0000      
1.72
+++ src/traverso/songcanvas/SongView.cpp        27 Jun 2007 21:01:21 -0000      
1.73
@@ -588,7 +588,7 @@
        m_trackTopIndent = themer()->get_property("Song:track:topindent", 
6).toInt();
        
        
m_clipsViewPort->setBackgroundBrush(themer()->get_color("Song:background"));
-       m_tpvp->setBackgroundBrush(themer()->get_color("Song:background"));
+       
m_tpvp->setBackgroundBrush(themer()->get_color("TrackPanel:background"));
 
        layout_tracks();
 }

Index: src/traverso/songcanvas/TrackPanelView.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/songcanvas/TrackPanelView.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/traverso/songcanvas/TrackPanelView.cpp  14 May 2007 22:53:36 -0000      
1.27
+++ src/traverso/songcanvas/TrackPanelView.cpp  27 Jun 2007 21:01:21 -0000      
1.28
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: TrackPanelView.cpp,v 1.27 2007/05/14 22:53:36 r_sijrier Exp $
+$Id: TrackPanelView.cpp,v 1.28 2007/06/27 21:01:21 r_sijrier Exp $
 */
 
 #include <QGraphicsScene>
@@ -125,7 +125,8 @@
                painter->fillRect(xstart, m_track->get_height() - 
m_tv->m_bottomborderwidth, pixelcount, m_tv->m_bottomborderwidth, color);
        }
 
-       painter->fillRect(m_viewPort->width() - 2, 0, 2, m_track->get_height() 
- 1, themer()->get_color("TrackPanel:trackseparation"));
+       // Track / track panel seperator is painted in TrackPanelViewPort... 
not the best place perhaps ?
+//     painter->fillRect(m_viewPort->width() - 2, 0, 2, m_track->get_height() 
- 1, themer()->get_color("TrackPanel:trackseparation"));
        
        if (xstart < 180) {
                draw_panel_track_name(painter);

Index: src/traverso/songcanvas/TrackPanelViewPort.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/songcanvas/TrackPanelViewPort.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/traverso/songcanvas/TrackPanelViewPort.cpp      24 May 2007 17:45:20 
-0000      1.9
+++ src/traverso/songcanvas/TrackPanelViewPort.cpp      27 Jun 2007 21:01:21 
-0000      1.10
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  
-    $Id: TrackPanelViewPort.cpp,v 1.9 2007/05/24 17:45:20 r_sijrier Exp $
+    $Id: TrackPanelViewPort.cpp,v 1.10 2007/06/27 21:01:21 r_sijrier Exp $
 */
 
 #include "TrackPanelViewPort.h"
@@ -45,6 +45,10 @@
 {
 //     PWARN("TrackPanelViewPort::paintEvent()");
        QGraphicsView::paintEvent(e);
+       
+       // Acts as track / trackpanel seperator... Not the best place, but what 
can I do ?
+       QPainter painter(viewport());
+       painter.fillRect(width() - 2, 0, 2, height(), 
themer()->get_color("TrackPanel:trackseparation"));
 }
 
 void TrackPanelViewPort::get_pointed_context_items(QList<ContextItem* > &list)