summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse2/muse/conf.cpp4
-rw-r--r--muse2/share/darkbase.cfg1
-rw-r--r--muse2/share/darkbase.qss14
3 files changed, 14 insertions, 5 deletions
diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp
index 535b6dbc..73a234d9 100644
--- a/muse2/muse/conf.cpp
+++ b/muse2/muse/conf.cpp
@@ -863,10 +863,8 @@ void readConfiguration(Xml& xml, bool doReadMidiPortConfig, bool doReadGlobalCon
MusEGlobal::config.rulerBg = readColor(xml);
else if (tag == "rulerForegroundColor")
MusEGlobal::config.rulerFg = readColor(xml);
- else if (tag == "rulerCurrentColor") {
+ else if (tag == "rulerCurrentColor")
MusEGlobal::config.rulerCurrent = readColor(xml);
- printf ("Read ruler current color!!!!!\n");
- }
else if (tag == "midiCanvasBackgroundColor")
MusEGlobal::config.midiCanvasBg = readColor(xml);
else if (tag == "midiControllerViewBackgroundColor")
diff --git a/muse2/share/darkbase.cfg b/muse2/share/darkbase.cfg
index bdf65cf8..9673ded7 100644
--- a/muse2/share/darkbase.cfg
+++ b/muse2/share/darkbase.cfg
@@ -50,6 +50,7 @@
<waveEditBackgroundColor r="200" g="200" b="200"></waveEditBackgroundColor>
<rulerBackgroundColor r="46" g="46" b="46"></rulerBackgroundColor>
<rulerForegroundColor r="154" g="154" b="154"></rulerForegroundColor>
+ <rulerCurrentColor r="104" g="104" b="104"></rulerCurrentColor>
<waveedit>
<bgcolor r="200" g="200" b="200"></bgcolor>
</waveedit>
diff --git a/muse2/share/darkbase.qss b/muse2/share/darkbase.qss
index 99c51280..8c40a4ba 100644
--- a/muse2/share/darkbase.qss
+++ b/muse2/share/darkbase.qss
@@ -13,6 +13,18 @@ QToolBar QToolButton {
}
+QAction {
+ background-color: rgb(150,150,150);
+ spacing: 3px;
+ padding: 1px 4px;
+ background: transparent;
+ border-radius: 4px;
+ }
+
+QMenu::item:selected {
+ background-color: rgb(40,90,40);
+}
+
QToolBar QToolButton:hover {
background-color: rgb(50,50,50);
border-color: rgb(58,167,221);
@@ -39,5 +51,3 @@ QToolBar QToolButton:checked {
padding: 2px;
}
-/*
-*/ \ No newline at end of file