[Traverso-commit] traverso/src core/Themer.cpp traverso/widgets/V...

[Nicola Doebelin]

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

Modified files:
        src/core       : Themer.cpp 
        src/traverso/widgets: VUMeter.cpp VUMeter.h 

Log message:
        * some bugfixes in VUMeter theming
        * themer prints error messages if a non-existent theme element was 
requested

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Themer.cpp?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/VUMeter.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/VUMeter.h?cvsroot=traverso&r1=1.2&r2=1.3

Patches:
Index: core/Themer.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Themer.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- core/Themer.cpp     16 Apr 2009 18:05:34 -0000      1.13
+++ core/Themer.cpp     16 Apr 2009 19:38:18 -0000      1.14
@@ -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: Themer.cpp,v 1.13 2009/04/16 18:05:34 n_doebelin Exp $
+$Id: Themer.cpp,v 1.14 2009/04/16 19:38:18 n_doebelin Exp $
 */
 
 #include "Themer.h"
@@ -303,6 +303,7 @@
        if (m_colors.contains(name)) {
                return m_colors.value(name);
        } else {
+               printf("Colour %s was requested, but no such element was found 
in the theme file\n", QS_C(name));
                return themer()->get_default_color(name);
        }
 }
@@ -339,6 +340,7 @@
        }
        
        // not a gradient either? return a fallback colour.
+       printf("Brush %s was requested, but no such element was found in the 
theme file\n", QS_C(name));
        return QBrush(themer()->get_default_color(name));
 }
 
@@ -348,10 +350,9 @@
 {
        if (m_gradients.contains(name))
        {
-qDebug() << QString("**** gradient found");
                return m_gradients.value(name);
        } else {
-qDebug() << QString("**** gradient NOT found");
+               printf("Gradient %s was requested, but no such element was 
found in the theme file\n", QS_C(name));
                return QLinearGradient();
        }
 }

Index: traverso/widgets/VUMeter.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/VUMeter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- traverso/widgets/VUMeter.cpp        13 Apr 2009 21:33:59 -0000      1.2
+++ traverso/widgets/VUMeter.cpp        16 Apr 2009 19:38:19 -0000      1.3
@@ -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: VUMeter.cpp,v 1.2 2009/04/13 21:33:59 n_doebelin Exp $
+    $Id: VUMeter.cpp,v 1.3 2009/04/16 19:38:19 n_doebelin Exp $
 */
 
 #include "VUMeter.h"
@@ -444,7 +444,7 @@
 {
        m_colActive = themer()->get_color("VUMeter:overled:active");
        m_colInactive = themer()->get_color("VUMeter:overled:inactive");
-       m_colBg = themer()->get_color("VUMeter:background:bar");
+       m_colBg = themer()->get_brush("VUMeter:background:bar");
 }
 
 /**********************************************************************/
@@ -601,10 +601,6 @@
                painter.drawLine(1, 0, 1, height());
                painter.setPen(rcol);
                painter.drawLine(width()-2, 0, width()-2, height());
-
-               painter.setPen(QPen(m_colBg));
-               painter.drawLine(0, 0, 0, height());
-               painter.drawLine(width()-1, 0, width()-1, height());
        }
 
        painter.end();
@@ -708,7 +704,7 @@
        
setMinimumWidth(themer()->get_property("VUMeter:layout:minimumlevelwidth", 
6).toInt());
 
        m_colOverLed = themer()->get_color("VUMeter:overled:active");
-       m_colBg = themer()->get_color("VUMeter:background:bar");
+       m_colBg = themer()->get_brush("VUMeter:background:bar");
 
        resize_level_pixmap(); //Â applies the new theme to the buffer pixmaps
 }

Index: traverso/widgets/VUMeter.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/VUMeter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- traverso/widgets/VUMeter.h  13 Apr 2009 21:33:59 -0000      1.2
+++ traverso/widgets/VUMeter.h  16 Apr 2009 19:38:19 -0000      1.3
@@ -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: VUMeter.h,v 1.2 2009/04/13 21:33:59 n_doebelin Exp $
+    $Id: VUMeter.h,v 1.3 2009/04/16 19:38:19 n_doebelin Exp $
 */
 
 #ifndef VUMETER_H
@@ -179,14 +179,14 @@
         bool           activeTail;
        bool            peakHoldFalling;
         AudioChannel*  m_channel;
-        QBrush         levelClearColor;
+        QBrush         levelClearColor,
+                       m_colBg;
         QPixmap                levelPixmap;
         QPixmap                clearPixmap;
         QTimer                 timer,
                        phTimer;
        QLinearGradient gradient2D;
-       QColor          m_colOverLed,
-                       m_colBg;
+       QColor          m_colOverLed;
 
         float                  presetMark[7];
         float                  tailDeltaY;