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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/10/17 14:46:18

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

Log message:
        * move trackpanel separation painting code back to it's original 
position

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelView.cpp?cvsroot=traverso&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelViewPort.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelViewPort.h?cvsroot=traverso&r1=1.3&r2=1.4

Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file: 
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- resources/themes/default/traversotheme.xml  17 Oct 2007 14:26:03 -0000      
1.44
+++ resources/themes/default/traversotheme.xml  17 Oct 2007 14:46:17 -0000      
1.45
@@ -161,7 +161,7 @@
                <color name="TrackPanel:sololed" red="135" green="254" 
blue="135" alpha="255" />
                <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:trackseparation" red="180" green="180" 
blue="180" 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" />

Index: src/traverso/songcanvas/TrackPanelView.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/songcanvas/TrackPanelView.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- src/traverso/songcanvas/TrackPanelView.cpp  9 Jul 2007 19:16:09 -0000       
1.29
+++ src/traverso/songcanvas/TrackPanelView.cpp  17 Oct 2007 14:46:18 -0000      
1.30
@@ -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.29 2007/07/09 19:16:09 n_doebelin Exp $
+$Id: TrackPanelView.cpp,v 1.30 2007/10/17 14:46:18 r_sijrier Exp $
 */
 
 #include <QGraphicsScene>
@@ -126,7 +126,7 @@
        }
 
        // 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"));
+       painter->fillRect(m_viewPort->width() - 3, 0, 3, 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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/traverso/songcanvas/TrackPanelViewPort.cpp      27 Jun 2007 21:01:21 
-0000      1.10
+++ src/traverso/songcanvas/TrackPanelViewPort.cpp      17 Oct 2007 14:46:18 
-0000      1.11
@@ -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.10 2007/06/27 21:01:21 r_sijrier Exp $
+    $Id: TrackPanelViewPort.cpp,v 1.11 2007/10/17 14:46:18 r_sijrier Exp $
 */
 
 #include "TrackPanelViewPort.h"
@@ -41,16 +41,6 @@
        setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 }
 
-void TrackPanelViewPort::paintEvent( QPaintEvent* e )
-{
-//     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)
 {
        QList<QGraphicsItem *> itemlist = 
items(cpointer().on_first_input_event_x(), cpointer().on_first_input_event_y());

Index: src/traverso/songcanvas/TrackPanelViewPort.h
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/songcanvas/TrackPanelViewPort.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/traverso/songcanvas/TrackPanelViewPort.h        14 Jan 2007 17:50:15 
-0000      1.3
+++ src/traverso/songcanvas/TrackPanelViewPort.h        17 Oct 2007 14:46:18 
-0000      1.4
@@ -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.h,v 1.3 2007/01/14 17:50:15 r_sijrier Exp $
+    $Id: TrackPanelViewPort.h,v 1.4 2007/10/17 14:46:18 r_sijrier Exp $
 */
 
 #ifndef TRACK_PANEL_VIEW_PORT_H
@@ -35,9 +35,6 @@
        
         void get_pointed_context_items(QList<ContextItem* > &list);
 
-protected:
-        void paintEvent( QPaintEvent* e);
-
 private:
        SongWidget*     m_sw;
 };