Merge branch 'master' of github.com:LMMS/lmms

This commit is contained in:
Tobias Doerffel
2014-03-26 11:40:55 +01:00
53 changed files with 1664 additions and 3 deletions

View File

@@ -238,7 +238,7 @@ TrackContainerView QFrame{
/* autoscroll, loop, stop behaviour toggle buttons */
nStateButton {
nStateButton {
max-height: 26px;
max-width: 26px;
min-height: 26px;
@@ -366,7 +366,7 @@ toolButton#playButton {
toolButton#stopButton {
border-top-right-radius: 5px 15px;
border-bottom-right-radius: 5px 15px;
border-bottom-right-radius: 5px 15px;
}
/* record and record-accompany can be styled with #recordButton and #recordAccompanyButton respectively */
@@ -608,6 +608,42 @@ sidInstrumentView knob {
qproperty-lineWidth: 2;
}
WatsynView knob {
qproperty-innerRadius: 1;
qproperty-outerRadius: 7;
qproperty-centerPointX: 9.5;
qproperty-centerPointY: 9.5;
qproperty-lineWidth: 2;
}
WatsynView knob#aKnob {
color: #43b2ff;
qproperty-outerColor: #43b2ff;
}
WatsynView knob#bKnob {
color: #fc5431;
qproperty-outerColor: #fc5431;
}
WatsynView knob#mixKnob {
color: #43ff82;
qproperty-outerColor: #43ff82;
qproperty-outerRadius: 13;
qproperty-centerPointX: 15.5;
qproperty-centerPointY: 15.5;
}
WatsynView knob#mixenvKnob {
color: #43ff82;
qproperty-outerColor: #43ff82;
}
WatsynView knob#xtalkKnob {
color: #fb50fb;
qproperty-outerColor: #fb50fb;
}
/* palette information - each colour definition must be on a single line, and the line must begin with "palette:", with no leading whitespace
* colour codes MUST be of the form #RRGGBB */