hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

New graphics for FX faders, some stylesheet changes. The changes in fader.cpp are just colour changes

Browse Source
This commit is contained in:
Vesa
2014-01-17 15:04:39 +02:00
parent 9097993973
commit 684326a1ff
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/themes/default/fader_background.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 457 B

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
data/themes/default/fader_knob.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 449 B

After

Width:  |  Height:  |  Size: 768 B

BIN
data/themes/default/fader_leds.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 747 B

After

Width:  |  Height:  |  Size: 3.6 KiB

20
data/themes/default/style.css
View File

@@ -13,6 +13,18 @@ AutomationEditor {
}
QLineEdit {
border-radius: 4px;
border: 2px inset rgba(91,101,113,128);
background: #49515b;
color: #e0e0e0;
}
QLineEdit:focus {
/* background: qlineargradient (spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 #49515b, stop:0.9 #5b6571, stop:1 #5b6571);*/
border: 1px solid rgba(0,0,0, 128);
}
QToolTip {
border-radius: 4px;
@@ -196,14 +208,14 @@ trackLabelButton:hover {
background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 #5b6571, stop:0.75 #7b838d, stop:1 #7b838d );
color: white;
border: 1px solid rgba(0,0,0,64);
padding: 1px 0px;
padding: 1px 0px;
}
trackLabelButton:pressed {
background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.3 #5b6571, stop:1 #6b7581 );
color: white;
border: 1px solid rgba(0,0,0,64);
padding: 2px 0px 0px;
padding: 2px 0px 0px;
font-weight: bold;
}
@@ -211,7 +223,7 @@ trackLabelButton:checked {
background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.3 #5b6571, stop:1 #6b7581 );
color: white;
border: 1px solid rgba(0,0,0,128);
padding: 2px 0px 0px;
padding: 2px 0px 0px;
font-weight: bold;
}
@@ -329,7 +341,7 @@ palette:button {color: #c9c9c9}
palette:shadow {color: #000000}
palette:buttontext {color: #000000}
palette:brighttext {color: #4afd85}
palette:highlight {color: #303030}
palette:highlight {color: #202020}
palette:highlightedtext {color: #ffffff}
/* Notes:

2
src/gui/widgets/fader.cpp
View File

@@ -290,7 +290,7 @@ void fader::paintEvent( QPaintEvent * ev)
if( m_persistentPeak_L > 0.05 )
{
painter.fillRect( QRect( 2, persistentPeak_L, 4, 1 ), (m_persistentPeak_L < 1.0 )? QColor( 0, 200, 0) : QColor( 200, 0, 0));
painter.fillRect( QRect( 2, persistentPeak_L, 4, 1 ), (m_persistentPeak_L < 1.0 )? QColor( 74, 253, 133) : QColor( 255, 100, 100));
}
int peak_R = calculateDisplayPeak( m_fPeakValue_R - m_fMinPeak );