summaryrefslogtreecommitdiff
path: root/muse2/muse/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/muse/widgets')
-rw-r--r--muse2/muse/widgets/CMakeLists.txt4
-rw-r--r--muse2/muse/widgets/appearancebase.ui441
-rw-r--r--muse2/muse/widgets/colorframe.cpp17
-rw-r--r--muse2/muse/widgets/colorframe.h23
-rw-r--r--muse2/muse/widgets/mtscale.cpp2
-rw-r--r--muse2/muse/widgets/mtscale_flo.cpp2
6 files changed, 269 insertions, 220 deletions
diff --git a/muse2/muse/widgets/CMakeLists.txt b/muse2/muse/widgets/CMakeLists.txt
index 8c407525..a4db13af 100644
--- a/muse2/muse/widgets/CMakeLists.txt
+++ b/muse2/muse/widgets/CMakeLists.txt
@@ -36,7 +36,8 @@ QT4_WRAP_CPP (widget_mocs
action.h
bigtime.h
canvas.h
- checkbox.h
+ checkbox.h
+ colorframe.h
comboQuant.h
combobox.h
comment.h
@@ -158,6 +159,7 @@ file (GLOB widgets_source_files
canvas.cpp
checkbox.cpp
citem.cpp
+ colorframe.cpp
comboQuant.cpp
combobox.cpp
comment.cpp
diff --git a/muse2/muse/widgets/appearancebase.ui b/muse2/muse/widgets/appearancebase.ui
index b82ff182..0468cef7 100644
--- a/muse2/muse/widgets/appearancebase.ui
+++ b/muse2/muse/widgets/appearancebase.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>558</width>
- <height>531</height>
+ <width>519</width>
+ <height>517</height>
</rect>
</property>
<property name="windowTitle">
@@ -23,7 +23,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
- <number>0</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="tab1">
<attribute name="title">
@@ -776,19 +776,13 @@
<item row="0" column="2">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QFrame" name="colorframe">
+ <widget class="ColorFrame" name="colorwidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
</widget>
</item>
<item>
@@ -1084,15 +1078,9 @@
</sizepolicy>
</property>
<property name="title">
- <string>QT Theme</string>
+ <string>Themes</string>
</property>
- <layout class="QVBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="margin">
- <number>11</number>
- </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout">
<item>
@@ -1209,23 +1197,34 @@
</widget>
</item>
<item>
- <widget class="QComboBox" name="colorSchemeComboBox">
- <item>
- <property name="text">
- <string>current settings</string>
- </property>
- </item>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
- <property name="text">
- <string>light theme (changing overrides all other settings)</string>
- </property>
+ <widget class="QComboBox" name="colorSchemeComboBox">
+ <item>
+ <property name="text">
+ <string>current settings</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>light theme (changing overrides all other settings)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>dark theme (changing overrides all other settings)</string>
+ </property>
+ </item>
+ </widget>
</item>
<item>
- <property name="text">
- <string>dark theme (changing overrides all other settings)</string>
- </property>
+ <widget class="QPushButton" name="changeThemeButton">
+ <property name="text">
+ <string>Change</string>
+ </property>
+ </widget>
</item>
- </widget>
+ </layout>
</item>
<item>
<spacer name="spacer3">
@@ -1258,33 +1257,47 @@
<property name="spacing">
<number>6</number>
</property>
- <item row="0" column="1">
- <widget class="QLabel" name="textLabel2">
+ <item row="2" column="4">
+ <widget class="QCheckBox" name="italic1">
<property name="text">
- <string>Family</string>
+ <string>Italic</string>
</property>
- <property name="wordWrap">
- <bool>false</bool>
+ </widget>
+ </item>
+ <item row="6" column="4">
+ <widget class="QCheckBox" name="italic5">
+ <property name="text">
+ <string>Italic</string>
</property>
</widget>
</item>
- <item row="0" column="2">
- <widget class="QLabel" name="TextLabel1_1">
+ <item row="4" column="4">
+ <widget class="QCheckBox" name="italic3">
<property name="text">
- <string>Size</string>
+ <string>Italic</string>
</property>
- <property name="wordWrap">
- <bool>false</bool>
+ </widget>
+ </item>
+ <item row="7" column="1">
+ <widget class="QLineEdit" name="fontName6">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="textLabel4">
- <property name="text">
- <string>Font 1</string>
+ <item row="3" column="5">
+ <widget class="QToolButton" name="fontBrowse2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="wordWrap">
- <bool>false</bool>
+ <property name="text">
+ <string>...</string>
</property>
</widget>
</item>
@@ -1298,28 +1311,28 @@
</property>
</widget>
</item>
- <item row="4" column="0">
- <widget class="QLabel" name="textLabel6">
+ <item row="0" column="1">
+ <widget class="QLabel" name="textLabel2">
<property name="text">
- <string>Font 3</string>
+ <string>Family</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="fontName0">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <item row="6" column="0">
+ <widget class="QLabel" name="textLabel7_2">
+ <property name="text">
+ <string>Font 5</string>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="fontName1">
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="fontName3">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -1328,216 +1341,205 @@
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QLineEdit" name="fontName2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <item row="2" column="3">
+ <widget class="QCheckBox" name="bold1">
+ <property name="text">
+ <string>Bold</string>
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QLineEdit" name="fontName3">
+ <item row="7" column="4">
+ <widget class="QCheckBox" name="italic6">
+ <property name="text">
+ <string>Italic</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="5">
+ <widget class="QToolButton" name="fontBrowse5">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="text">
+ <string>...</string>
+ </property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="textLabel3">
+ <item row="4" column="0">
+ <widget class="QLabel" name="textLabel6">
<property name="text">
- <string>Font 0</string>
+ <string>Font 3</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="QSpinBox" name="fontSize0">
+ <item row="6" column="1">
+ <widget class="QLineEdit" name="fontName5">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
- <item row="2" column="2">
- <widget class="QSpinBox" name="fontSize1">
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="fontName0">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
- <item row="3" column="2">
- <widget class="QSpinBox" name="fontSize2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <item row="3" column="3">
+ <widget class="QCheckBox" name="bold2">
+ <property name="text">
+ <string>Bold</string>
</property>
</widget>
</item>
- <item row="4" column="2">
- <widget class="QSpinBox" name="fontSize3">
+ <item row="5" column="5">
+ <widget class="QToolButton" name="fontBrowse4">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- </widget>
- </item>
- <item row="2" column="3">
- <widget class="QCheckBox" name="bold1">
- <property name="text">
- <string>Bold</string>
- </property>
- </widget>
- </item>
- <item row="3" column="3">
- <widget class="QCheckBox" name="bold2">
<property name="text">
- <string>Bold</string>
+ <string>...</string>
</property>
</widget>
</item>
- <item row="4" column="3">
- <widget class="QCheckBox" name="bold3">
- <property name="text">
- <string>Bold</string>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="fontName1">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
</widget>
</item>
- <item row="1" column="3">
- <widget class="QCheckBox" name="bold0">
- <property name="text">
- <string>Bold</string>
+ <item row="2" column="5">
+ <widget class="QToolButton" name="fontBrowse1">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- </widget>
- </item>
- <item row="3" column="4">
- <widget class="QCheckBox" name="italic2">
<property name="text">
- <string>Italic</string>
+ <string>...</string>
</property>
</widget>
</item>
- <item row="4" column="4">
- <widget class="QCheckBox" name="italic3">
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel3">
<property name="text">
- <string>Italic</string>
+ <string>Font 0</string>
</property>
- </widget>
- </item>
- <item row="2" column="4">
- <widget class="QCheckBox" name="italic1">
- <property name="text">
- <string>Italic</string>
+ <property name="wordWrap">
+ <bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="4">
- <widget class="QCheckBox" name="italic0">
- <property name="text">
- <string>Italic</string>
+ <item row="2" column="2">
+ <widget class="QSpinBox" name="fontSize1">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
</widget>
</item>
- <item row="1" column="5">
- <widget class="QToolButton" name="fontBrowse0">
+ <item row="1" column="2">
+ <widget class="QSpinBox" name="fontSize0">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text">
- <string>...</string>
- </property>
</widget>
</item>
- <item row="2" column="5">
- <widget class="QToolButton" name="fontBrowse1">
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="fontName2">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text">
- <string>...</string>
- </property>
</widget>
</item>
- <item row="3" column="5">
- <widget class="QToolButton" name="fontBrowse2">
+ <item row="7" column="2">
+ <widget class="QSpinBox" name="fontSize6">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ </widget>
+ </item>
+ <item row="5" column="3">
+ <widget class="QCheckBox" name="bold4">
<property name="text">
- <string>...</string>
+ <string>Bold</string>
</property>
</widget>
</item>
- <item row="4" column="5">
- <widget class="QToolButton" name="fontBrowse3">
+ <item row="5" column="2">
+ <widget class="QSpinBox" name="fontSize4">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text">
- <string>...</string>
- </property>
</widget>
</item>
- <item row="5" column="0">
- <widget class="QLabel" name="textLabel7">
+ <item row="2" column="0">
+ <widget class="QLabel" name="textLabel4">
<property name="text">
- <string>Font 4</string>
+ <string>Font 1</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="5" column="1">
- <widget class="QLineEdit" name="fontName4">
+ <item row="4" column="2">
+ <widget class="QSpinBox" name="fontSize3">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
- <item row="6" column="0">
- <widget class="QLabel" name="textLabel7_2">
- <property name="text">
- <string>Font 5</string>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
+ <item row="6" column="2">
+ <widget class="QSpinBox" name="fontSize5">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
</widget>
</item>
- <item row="6" column="1">
- <widget class="QLineEdit" name="fontName5">
+ <item row="5" column="1">
+ <widget class="QLineEdit" name="fontName4">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -1556,24 +1558,37 @@
</property>
</widget>
</item>
- <item row="7" column="1">
- <widget class="QLineEdit" name="fontName6">
+ <item row="6" column="3">
+ <widget class="QCheckBox" name="bold5">
+ <property name="text">
+ <string>Bold</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="5">
+ <widget class="QToolButton" name="fontBrowse0">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="text">
+ <string>...</string>
+ </property>
</widget>
</item>
- <item row="7" column="2">
- <widget class="QSpinBox" name="fontSize6">
+ <item row="7" column="5">
+ <widget class="QToolButton" name="fontBrowse6">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="text">
+ <string>...</string>
+ </property>
</widget>
</item>
<item row="7" column="3">
@@ -1583,97 +1598,81 @@
</property>
</widget>
</item>
- <item row="7" column="4">
- <widget class="QCheckBox" name="italic6">
+ <item row="3" column="4">
+ <widget class="QCheckBox" name="italic2">
<property name="text">
<string>Italic</string>
</property>
</widget>
</item>
- <item row="7" column="5">
- <widget class="QToolButton" name="fontBrowse6">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <item row="4" column="3">
+ <widget class="QCheckBox" name="bold3">
<property name="text">
- <string>...</string>
+ <string>Bold</string>
</property>
</widget>
</item>
- <item row="5" column="2">
- <widget class="QSpinBox" name="fontSize4">
+ <item row="4" column="5">
+ <widget class="QToolButton" name="fontBrowse3">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- </widget>
- </item>
- <item row="6" column="2">
- <widget class="QSpinBox" name="fontSize5">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="text">
+ <string>...</string>
</property>
</widget>
</item>
- <item row="5" column="3">
- <widget class="QCheckBox" name="bold4">
+ <item row="1" column="4">
+ <widget class="QCheckBox" name="italic0">
<property name="text">
- <string>Bold</string>
+ <string>Italic</string>
</property>
</widget>
</item>
- <item row="6" column="3">
- <widget class="QCheckBox" name="bold5">
+ <item row="1" column="3">
+ <widget class="QCheckBox" name="bold0">
<property name="text">
<string>Bold</string>
</property>
</widget>
</item>
- <item row="5" column="4">
- <widget class="QCheckBox" name="italic4">
+ <item row="5" column="0">
+ <widget class="QLabel" name="textLabel7">
<property name="text">
- <string>Italic</string>
+ <string>Font 4</string>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
</property>
</widget>
</item>
- <item row="6" column="4">
- <widget class="QCheckBox" name="italic5">
+ <item row="5" column="4">
+ <widget class="QCheckBox" name="italic4">
<property name="text">
<string>Italic</string>
</property>
</widget>
</item>
- <item row="5" column="5">
- <widget class="QToolButton" name="fontBrowse4">
+ <item row="3" column="2">
+ <widget class="QSpinBox" name="fontSize2">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text">
- <string>...</string>
- </property>
</widget>
</item>
- <item row="6" column="5">
- <widget class="QToolButton" name="fontBrowse5">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <item row="0" column="2">
+ <widget class="QLabel" name="TextLabel1_1">
<property name="text">
- <string>...</string>
+ <string>Size</string>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
</property>
</widget>
</item>
@@ -1737,6 +1736,14 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
+ <customwidgets>
+ <customwidget>
+ <class>ColorFrame</class>
+ <extends>QWidget</extends>
+ <header>colorframe.h</header>
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
<tabstops>
<tabstop>TabWidget2</tabstop>
<tabstop>itemList</tabstop>
diff --git a/muse2/muse/widgets/colorframe.cpp b/muse2/muse/widgets/colorframe.cpp
new file mode 100644
index 00000000..8e61ae4b
--- /dev/null
+++ b/muse2/muse/widgets/colorframe.cpp
@@ -0,0 +1,17 @@
+#include <QPainter>
+#include <QPaintEvent>
+
+#include "colorframe.h"
+
+ColorFrame::ColorFrame(QWidget *parent) :
+ QWidget(parent)
+{
+}
+
+void ColorFrame::paintEvent(QPaintEvent *e)
+{
+ QRect r(e->rect());
+ QPainter p(this);
+ p.fillRect(r, color);
+}
+
diff --git a/muse2/muse/widgets/colorframe.h b/muse2/muse/widgets/colorframe.h
new file mode 100644
index 00000000..8dc940f5
--- /dev/null
+++ b/muse2/muse/widgets/colorframe.h
@@ -0,0 +1,23 @@
+#ifndef COLORFRAME_H
+#define COLORFRAME_H
+
+#include <QWidget>
+
+class ColorFrame : public QWidget
+{
+ Q_OBJECT
+ virtual void paintEvent(QPaintEvent*);
+
+public:
+ explicit ColorFrame(QWidget *parent = 0);
+ void setColor(QColor c) {color = c; update();}
+
+signals:
+
+public slots:
+
+private:
+ QColor color;
+};
+
+#endif // COLORFRAME_H
diff --git a/muse2/muse/widgets/mtscale.cpp b/muse2/muse/widgets/mtscale.cpp
index e15d22fa..bcf6ad0c 100644
--- a/muse2/muse/widgets/mtscale.cpp
+++ b/muse2/muse/widgets/mtscale.cpp
@@ -281,7 +281,7 @@ void MTScale::pdraw(QPainter& p, const QRect& r)
{
if (m->second.current())
{
- p.fillRect(tr, Qt::white);
+ p.fillRect(tr, MusEGlobal::config.rulerCurrent);
}
int x2;
diff --git a/muse2/muse/widgets/mtscale_flo.cpp b/muse2/muse/widgets/mtscale_flo.cpp
index 3b6ea502..f043d461 100644
--- a/muse2/muse/widgets/mtscale_flo.cpp
+++ b/muse2/muse/widgets/mtscale_flo.cpp
@@ -224,7 +224,7 @@ void MTScaleFlo::draw(QPainter& p, const QRect& r)
if(!wr.isEmpty())
{
if (m->second.current())
- p.fillRect(wr, Qt::white);
+ p.fillRect(wr, MusEGlobal::config.rulerCurrent);
int x2;
if (mm != marker->end())