diff --git a/data/themes/default/led_green.png b/data/themes/default/led_green.png index 270849195..a326b2928 100644 Binary files a/data/themes/default/led_green.png and b/data/themes/default/led_green.png differ diff --git a/data/themes/default/led_off.png b/data/themes/default/led_off.png index e61b3a584..1b564c852 100644 Binary files a/data/themes/default/led_off.png and b/data/themes/default/led_off.png differ diff --git a/data/themes/default/led_red.png b/data/themes/default/led_red.png index f553b2c4a..f48ac4850 100644 Binary files a/data/themes/default/led_red.png and b/data/themes/default/led_red.png differ diff --git a/data/themes/default/led_yellow.png b/data/themes/default/led_yellow.png index 7030bbd08..7fe385b42 100644 Binary files a/data/themes/default/led_yellow.png and b/data/themes/default/led_yellow.png differ diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 908e609b4..46c099148 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -18,20 +18,20 @@ QToolTip { border-radius: 4px; background: qlineargradient(spread:reflect, x1:0.5, y1:0.5, x2:0.5, y2:0, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(50, 50, 50, 220)); opacity: 175; - border: 1.5px solid rgba(0,0,0,255); - color: #00ff00; + border: 1.0px solid rgba(0,0,0,255); + color: #4afd85; } QMenu { - border:1px solid black; - background-color: rgb( 192, 192, 192 ); + border:1px solid #747474; + background-color: #c9c9c9; font-size:11px; } QMenu::separator { height: 1px; - background: rgb(128,128,128); + background: #c9c9c9; margin-left: 5px; margin-right: 5px; } @@ -45,16 +45,16 @@ QMenu::item { QMenu::item:selected { color: white; font-weight:bold; - background-color: rgb(54,57,66); + background-color: #747474; margin:3px; } QMenu::item:disabled { - color: white; + color: #747474; + background-color: #c9c9c9; margin:0px; - background-color: rgba(0,0,0,192); font-size:12px; - font-weight:bold; + font-weight: normal; padding: 4px 32px 4px 20px; } @@ -62,7 +62,7 @@ QMenu::indicator { width: 16; height: 16; opacity: 0; - background-color: rgb( 192, 192, 192 ); + background-color: #c9c9c9; } QMenu::indicator:checked { @@ -70,18 +70,48 @@ QMenu::indicator:checked { } QMenu::indicator:selected { - background-color: rgb(54,57,66); + image: url("resources:apply-selected.png"); + background-color: #747474; } pianoRoll { background-color: rgb(0, 0, 0); } +trackContainerView QWidget{ + background-color: #5b6571; +} + +trackContainerView QFrame{ + background-color: #49515b; +} + trackOperationsWidget > QPushButton { max-height: 26px; max-width: 26px; min-height: 26px; min-width: 26px; + background-color: #c9c9c9; + border-radius: 2px; + border: 1px solid rgba(0,0,0,64); +} + +trackOperationsWidget > QPushButton:hover { + background: qlineargradient(spread:reflect, x1:0.5, y1:0.5, x2:0.5, y2:0, stop:0 rgba(224, 224, 224, 255), stop:1 rgba(201, 201, 201, 255)); + border: 1px solid rgba(0,0,0,255); + color: black; +} + +trackOperationsWidget > QPushButton:pressed { + background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #747474, stop:0.5 #c9c9c9, stop:1 #c0c0c0 ); + border: 1px solid rgba(0,0,0,255); + color: black; +} + +trackOperationsWidget > QPushButton:flat { + background-color: #c9c9c9; + border-radius: 2px; + border: none; } trackOperationsWidget#automationDisabled > QPushButton::menu-indicator { @@ -92,6 +122,16 @@ trackOperationsWidget#automationEnabled > QPushButton::menu-indicator { image: url(resources:track_op_menu.png); } +trackOperationsWidget > QPushButton::menu-indicator { + subcontrol-origin: padding; + subcontrol-position: center; +} + +trackOperationsWidget > QPushButton::menu-indicator:pressed { + position: relative; + top: 1px; +} + trackWidget { /* border-bottom: 1px solid rgb(0, 0, 0);*/ background-color: rgb(0, 0, 0); @@ -113,34 +153,79 @@ QToolButton, toolButton { padding: 2px 1px 1px 2px; border-radius: 2px; border: 1px solid rgba(0,0,0,64); - background: rgba(172,176,188,32); + background: #c9c9c9; font-size:10px; - color: white; + color: black; } QToolButton:hover { - background: rgba(255,255,255,96); - border-radius: 3px; + background: qlineargradient(spread:reflect, x1:0.5, y1:0.5, x2:0.5, y2:0, stop:0 rgba(224, 224, 224, 255), stop:1 rgba(201, 201, 201, 255)); border: 1px solid rgba(0,0,0,255); color: black; } QToolButton:pressed { - background: rgba(192,192,192,96); - padding: 3px 0px 0px 3px; - border-radius: 3px; - border: 1px solid rgba(255,255,255,64); + background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #747474, stop:0.5 #c9c9c9, stop:1 #c0c0c0 ); + padding: 3px 1px 0px 2px; + border: 1px solid rgba(0,0,0,255); + color: white; } QToolButton:checked { - background: rgba(233,239,255,96); - border-radius: 3px; - border: 1px solid black; - padding: 3px 0px 0px 3px; + background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #747474, stop:0.5 #c9c9c9, stop:1 #c0c0c0 ); + padding: 3px 1px 0px 2px; + border: 1px solid rgba(0,0,0,64); + color: black; } +trackContainerView QToolButton { + background-color: #5b6571; + color: #c9c9c9; + font-size: 10px; + font-weight: normal; + border-radius: 1px; + border: 1px solid rgba(0,0,0,64); +} + +trackContainerView QToolButton:hover { + background-color: #7b838d; + color: white; + border: 1px solid black; +} + +trackContainerView QToolButton:pressed { + background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.5 #5b6571, stop:1 #6b7581 ); + color: white; + border: 1px solid black; + font-weight: bold; +} + +trackContainerView QToolButton:checked { + background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.5 #5b6571, stop:1 #6b7581 ); + color: #c9c9c9; + border: 1px solid rgba(0,0,0,64); + font-weight: bold; +} + +trackContainerView QToolButton:checked:hover { + background-color: #7b838d; + color: white; + border: 1px solid black; + font-weight: bold; +} + +trackContainerView QToolButton:checked:pressed { + background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.5 #5b6571, stop:1 #6b7581 ); + color: white; + border: 1px solid black; + font-weight: bold; +} + + + + SideBar { - background: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop: 0 #66728c, stop: 1.0 #38404e); + background: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop: 0 #98a2a7, stop: 1.0 #5b646f); } SideBar QToolButton { @@ -156,7 +241,7 @@ timeLine { } QTreeView { - alternate-background-color: rgb(108,108,108); + alternate-background-color: #747474; } /* Plugins */ @@ -215,8 +300,8 @@ organicInstrumentView knob#volKnob { } sf2InstrumentView knob { - color: #ff0066; - qproperty-outerColor: rgb(30, 35, 37); + color: #ff00ea; + qproperty-outerColor: rgb(20, 5, 18); qproperty-innerRadius: 2; qproperty-outerRadius: 9.2; qproperty-centerPointX: 15.5; @@ -230,9 +315,9 @@ opl2instrumentView knob { qproperty-innerRadius: 2; qproperty-outerRadius: 9; qproperty-lineWidth: 2; -} -/* Notes: - +} +/* Notes: + lcd-spinbox colors: (12, 250, 150), (37, 57, 42) diff --git a/data/themes/default/track_op_menu.png b/data/themes/default/track_op_menu.png index 4207a3ea1..169036970 100644 Binary files a/data/themes/default/track_op_menu.png and b/data/themes/default/track_op_menu.png differ diff --git a/plugins/sf2_player/artwork.png b/plugins/sf2_player/artwork.png index b274dc432..a784766c8 100644 Binary files a/plugins/sf2_player/artwork.png and b/plugins/sf2_player/artwork.png differ diff --git a/src/gui/lmms_style.cpp b/src/gui/lmms_style.cpp index c73c33a79..31944ebc1 100644 --- a/src/gui/lmms_style.cpp +++ b/src/gui/lmms_style.cpp @@ -50,16 +50,16 @@ lmmsStyle::lmmsStyle() : QPalette lmmsStyle::standardPalette( void ) const { QPalette pal = QPlastiqueStyle::standardPalette(); - pal.setColor( QPalette::Background, QColor( 72, 76, 88 ) ); + pal.setColor( QPalette::Background, QColor( 91, 101, 113 ) ); pal.setColor( QPalette::WindowText, QColor( 240, 240, 240 ) ); pal.setColor( QPalette::Base, QColor( 128, 128, 128 ) ); pal.setColor( QPalette::Text, QColor( 224, 224, 224 ) ); - pal.setColor( QPalette::Button, QColor( 172, 176, 188 ) ); + pal.setColor( QPalette::Button, QColor( 201, 201, 201 ) ); pal.setColor( QPalette::Shadow, QColor( 0, 0, 0 ) ); - pal.setColor( QPalette::ButtonText, QColor( 255, 255, 255 ) ); - pal.setColor( QPalette::BrightText, QColor( 0, 255, 0 ) ); - pal.setColor( QPalette::Highlight, QColor( 224, 224, 224 ) ); - pal.setColor( QPalette::HighlightedText, QColor( 0, 0, 0 ) ); + pal.setColor( QPalette::ButtonText, QColor( 0, 0, 0 ) ); + pal.setColor( QPalette::BrightText, QColor( 74, 253, 133 ) ); + pal.setColor( QPalette::Highlight, QColor( 100, 100, 100 ) ); + pal.setColor( QPalette::HighlightedText, QColor( 255, 255, 255 ) ); return( pal ); } diff --git a/src/gui/widgets/group_box.cpp b/src/gui/widgets/group_box.cpp index 01ce277d3..8f074bdb3 100644 --- a/src/gui/widgets/group_box.cpp +++ b/src/gui/widgets/group_box.cpp @@ -46,7 +46,7 @@ groupBox::groupBox( const QString & _caption, QWidget * _parent ) : m_led = new pixmapButton( this, _caption ); m_led->setCheckable( true ); - m_led->move( 3, 3 ); + m_led->move( 3, 0 ); m_led->setActiveGraphic( embed::getIconPixmap( "led_green" ) ); m_led->setInactiveGraphic( embed::getIconPixmap( "led_off" ) );