diff options
| -rw-r--r-- | muse2/ChangeLog | 5 | ||||
| -rw-r--r-- | muse2/muse/arranger/tlist.cpp | 11 | ||||
| -rw-r--r-- | muse2/muse/gconfig.cpp | 2 | ||||
| -rw-r--r-- | muse2/share/templates/MusE.cfg | 38 |
4 files changed, 34 insertions, 22 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 610c71e3..9b42c2ae 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,3 +1,8 @@ +20.09.2011: + - Revert the change in coloring of the selected track in tlist. Making full transpaency optional + requires more substantial changes. (Orcan) + - Update the default config file with the same defaults as in gconfig.cpp. Question: Why do we + have defaults defined in multiple places? (Orcan) 17.09.2011: - Minor namespace fix in osc.cpp. (Orcan) 16.09.2011: diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index 3b219f71..c28a40b2 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -193,8 +193,10 @@ void TList::paint(const QRect& r) mask.setColorAt(0, mask_edge); mask.setColorAt(0.15, mask_center); mask.setColorAt(0.3, mask_center); + mask.setColorAt(0.85, mask_edge); mask.setColorAt(1, mask_edge); + TrackList* l = song->tracks(); int idx = 0; int yy = -ypos; @@ -212,7 +214,11 @@ void TList::paint(const QRect& r) // clear one row // QColor bg; - + if (track->selected()) { + bg = MusEConfig::config.selectTrackBg; + p.setPen(MusEConfig::config.selectTrackFg); + } + else { switch(type) { case Track::MIDI: bg = MusEConfig::config.midiTrackBg; @@ -240,7 +246,8 @@ void TList::paint(const QRect& r) break; } - p.setPen(palette().color(QPalette::Active, QPalette::Text)); + p.setPen(palette().color(QPalette::Active, QPalette::Text)); + } p.fillRect(x1, yy, w, trackHeight, bg); if (track->selected()) { diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp index 9492650b..0a521c3a 100644 --- a/muse2/muse/gconfig.cpp +++ b/muse2/muse/gconfig.cpp @@ -98,7 +98,7 @@ GlobalConfigValues config = { // at the price of only few more pixels than Normal mode. }, QColor(84, 97, 114), // trackBg; - QColor(120, 229, 166), // selected track Bg; + QColor(109, 174, 178), // selected track Bg; QColor(0x00, 0x00, 0x00), // selected track Fg; QColor(74, 150, 194), // midiTrackLabelBg; // Med blue diff --git a/muse2/share/templates/MusE.cfg b/muse2/share/templates/MusE.cfg index 9406e1ae..b95593d0 100644 --- a/muse2/share/templates/MusE.cfg +++ b/muse2/share/templates/MusE.cfg @@ -100,28 +100,28 @@ <partColorName14>Keyboard</partColorName14> <partColorName15>Piano</partColorName15> <partColorName16>Saxophone</partColorName16> - <partCanvasBg r="98" g="124" b="168"></partCanvasBg> <trackBg r="84" g="97" b="114"></trackBg> - <selectTrackBg r="128" g="255" b="128"></selectTrackBg> + <selectTrackBg r="109" g="174" b="178"></selectTrackBg> <selectTrackFg r="0" g="0" b="0"></selectTrackFg> - <mixerBg r="0" g="0" b="0"></mixerBg> - <midiTrackLabelBg r="0" g="160" b="255"></midiTrackLabelBg> - <drumTrackLabelBg r="0" g="160" b="255"></drumTrackLabelBg> - <waveTrackLabelBg r="255" g="0" b="255"></waveTrackLabelBg> - <outputTrackLabelBg r="0" g="255" b="0"></outputTrackLabelBg> - <inputTrackLabelBg r="255" g="0" b="0"></inputTrackLabelBg> - <groupTrackLabelBg r="255" g="255" b="0"></groupTrackLabelBg> - <auxTrackLabelBg r="120" g="255" b="255"></auxTrackLabelBg> - <synthTrackLabelBg r="255" g="130" b="0"></synthTrackLabelBg> - <midiTrackBg r="220" g="220" b="220"></midiTrackBg> + <midiTrackLabelBg r="74" g="150" b="194"></midiTrackLabelBg> + <drumTrackLabelBg r="74" g="150" b="194"></drumTrackLabelBg> + <waveTrackLabelBg r="213" g="128" b="202"></waveTrackLabelBg> + <outputTrackLabelBg r="84" g="185" b="58"></outputTrackLabelBg> + <inputTrackLabelBg r="199" g="75" b="64"></inputTrackLabelBg> + <groupTrackLabelBg r="236" g="214" b="90"></groupTrackLabelBg> + <auxTrackLabelBg r="161" g="234" b="242"></auxTrackLabelBg> + <synthTrackLabelBg r="229" g="157" b="101"></synthTrackLabelBg> + <midiTrackBg r="215" g="220" b="230"></midiTrackBg> + <drumTrackBg r="215" g="220" b="230"></drumTrackBg> + <waveTrackBg r="220" g="209" b="217"></waveTrackBg> + <outputTrackBg r="197" g="220" b="206"></outputTrackBg> + <inputTrackBg r="220" g="214" b="206"></inputTrackBg> + <groupTrackBg r="220" g="216" b="202"></groupTrackBg> + <auxTrackBg r="208" g="215" b="220"></auxTrackBg> + <synthTrackBg r="220" g="211" b="202"></synthTrackBg> + <partCanvasBg r="98" g="124" b="168"></partCanvasBg> <ctrlGraphFg r="255" g="170" b="0"></ctrlGraphFg> - <drumTrackBg r="220" g="220" b="220"></drumTrackBg> - <waveTrackBg r="220" g="220" b="220"></waveTrackBg> - <outputTrackBg r="189" g="220" b="193"></outputTrackBg> - <inputTrackBg r="189" g="220" b="193"></inputTrackBg> - <groupTrackBg r="220" g="220" b="220"></groupTrackBg> - <auxTrackBg r="220" g="220" b="220"></auxTrackBg> - <synthTrackBg r="220" g="220" b="220"></synthTrackBg> + <mixerBg r="0" g="0" b="0"></mixerBg> <mtctype>1</mtctype> <mtcoffset>00:00:00:00:00</mtcoffset> <extSync>0</extSync> |