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

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    07/07/09 19:16:09

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

Log message:
        completed theming of track panel

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelView.cpp?cvsroot=traverso&r1=1.28&r2=1.29

Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file: 
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- resources/themes/default/traversotheme.xml  8 Jul 2007 20:51:28 -0000       
1.42
+++ resources/themes/default/traversotheme.xml  9 Jul 2007 19:16:09 -0000       
1.43
@@ -162,6 +162,14 @@
                <color name="TrackPanel:recled" red="255" green="58" blue="58" 
alpha="255" />
                <color name="TrackPanel:led:inactive" red="237" green="237" 
blue="250" alpha="255" />
                <color name="TrackPanel:trackseparation" red="160" green="160" 
blue="200" alpha="255" />
+               <color name="TrackPanel:led:margin:active" red="100" 
green="100" blue="100" alpha="0" />
+               <color name="TrackPanel:led:margin:inactive" red="200" 
green="200" blue="200" alpha="255" />
+               <color name="TrackPanel:led:font:active" red="0" green="0" 
blue="0" alpha="255" />
+               <color name="TrackPanel:led:font:inactive" red="150" 
green="150" blue="150" alpha="255" />
+               
+               <color name="TrackPanel:bus:font" red="0" green="0" blue="0" 
alpha="255" />
+               <color name="TrackPanel:bus:background" red="237" green="237" 
blue="250" alpha="255" />
+               <color name="TrackPanel:bus:margin" red="200" green="200" 
blue="200" alpha="255" />
                
                <color name="Workcursor:default" red="255" green="0" blue="0" 
alpha="255" />
                

Index: src/traverso/songcanvas/TrackPanelView.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/songcanvas/TrackPanelView.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/traverso/songcanvas/TrackPanelView.cpp  27 Jun 2007 21:01:21 -0000      
1.28
+++ src/traverso/songcanvas/TrackPanelView.cpp  9 Jul 2007 19:16:09 -0000       
1.29
@@ -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.28 2007/06/27 21:01:21 r_sijrier Exp $
+$Id: TrackPanelView.cpp,v 1.29 2007/07/09 19:16:09 n_doebelin Exp $
 */
 
 #include <QGraphicsScene>
@@ -159,6 +159,7 @@
                title = fm.elidedText(title, Qt::ElideMiddle, 90);
        }
        
+       painter->setPen(themer()->get_color("TrackPanel:text"));
        painter->setFont(themer()->get_font("TrackPanel:fontscale:name"));
        painter->drawText(4, 12, title);
 }
@@ -377,16 +378,14 @@
                QColor color = themer()->get_color("TrackPanel:" + m_name + 
"led");
                if (mousehover) {
                        color = color.light(110);
-                       painter->setPen(QColor(190, 190, 190));
-               } else {
-                       painter->setPen(Qt::NoPen);
                }
                
+               
painter->setPen(themer()->get_color("TrackPanel:led:margin:active"));
                painter->setBrush(color);
                painter->drawRoundRect(m_boundingRect, roundfactor, 
roundfactor);
                
                
painter->setFont(themer()->get_font("TrackPanel:fontscale:led"));
-               painter->setPen(QColor(Qt::black));
+               
painter->setPen(themer()->get_color("TrackPanel:led:font:active"));
                
                painter->drawText(m_boundingRect, Qt::AlignCenter, m_name);
        } else {
@@ -395,12 +394,12 @@
                        color = color.light(110);
                }
                
-               painter->setPen(QColor(240, 240, 240));
+               
painter->setPen(themer()->get_color("TrackPanel:led:margin:inactive"));
                painter->setBrush(color);
                painter->drawRoundRect(m_boundingRect, roundfactor, 
roundfactor);
                
                
painter->setFont(themer()->get_font("TrackPanel:fontscale:led"));
-               painter->setPen(QColor(Qt::gray));
+               
painter->setPen(themer()->get_color("TrackPanel:led:font:inactive"));
                
                painter->drawText(m_boundingRect, Qt::AlignCenter, m_name);
        }
@@ -443,7 +442,7 @@
        Q_UNUSED(option);
        Q_UNUSED(widget);
        
-       QColor color = themer()->get_color("TrackPanel:led:inactive");
+       QColor color = themer()->get_color("TrackPanel:bus:background");
        int roundfactor = 15;
        
        painter->setRenderHint(QPainter::Antialiasing);
@@ -452,12 +451,12 @@
                color = color.light(110);
        }
         
-       painter->setPen(QColor(240, 240, 240));
+       painter->setPen(themer()->get_color("TrackPanel:bus:margin"));
        painter->setBrush(color);
        painter->drawRoundRect(m_boundingRect, roundfactor, roundfactor);
        
        painter->setFont(themer()->get_font("TrackPanel:fontscale:led"));
-       painter->setPen(QColor(150, 150, 150));
+       painter->setPen(themer()->get_color("TrackPanel:bus:font"));
        
        QString leftright = "";