diff --git a/data/backgrounds/newbg.png b/data/backgrounds/newbg.png new file mode 100644 index 000000000..6cafbdaf4 Binary files /dev/null and b/data/backgrounds/newbg.png differ diff --git a/data/themes/default/add_automation.png b/data/themes/default/add_automation.png index 2d0c7ba4d..71e147425 100644 Binary files a/data/themes/default/add_automation.png and b/data/themes/default/add_automation.png differ diff --git a/data/themes/default/add_bb_track.png b/data/themes/default/add_bb_track.png index a42e8b517..fd9cb7f1d 100644 Binary files a/data/themes/default/add_bb_track.png and b/data/themes/default/add_bb_track.png differ diff --git a/data/themes/default/add_sample_track.png b/data/themes/default/add_sample_track.png index 3e9caf262..2f7500a7d 100644 Binary files a/data/themes/default/add_sample_track.png and b/data/themes/default/add_sample_track.png differ diff --git a/data/themes/default/sample_track.png b/data/themes/default/sample_track.png index d65bc0752..754146f3e 100644 Binary files a/data/themes/default/sample_track.png and b/data/themes/default/sample_track.png differ diff --git a/data/themes/default/sbarrow_down.png b/data/themes/default/sbarrow_down.png new file mode 100644 index 000000000..56fa504c1 Binary files /dev/null and b/data/themes/default/sbarrow_down.png differ diff --git a/data/themes/default/sbarrow_down_d.png b/data/themes/default/sbarrow_down_d.png new file mode 100644 index 000000000..f8c54f32f Binary files /dev/null and b/data/themes/default/sbarrow_down_d.png differ diff --git a/data/themes/default/sbarrow_left.png b/data/themes/default/sbarrow_left.png new file mode 100644 index 000000000..d50031e30 Binary files /dev/null and b/data/themes/default/sbarrow_left.png differ diff --git a/data/themes/default/sbarrow_left_d.png b/data/themes/default/sbarrow_left_d.png new file mode 100644 index 000000000..fe246df05 Binary files /dev/null and b/data/themes/default/sbarrow_left_d.png differ diff --git a/data/themes/default/sbarrow_right.png b/data/themes/default/sbarrow_right.png new file mode 100644 index 000000000..2112ec1da Binary files /dev/null and b/data/themes/default/sbarrow_right.png differ diff --git a/data/themes/default/sbarrow_right_d.png b/data/themes/default/sbarrow_right_d.png new file mode 100644 index 000000000..39b0220cc Binary files /dev/null and b/data/themes/default/sbarrow_right_d.png differ diff --git a/data/themes/default/sbarrow_up.png b/data/themes/default/sbarrow_up.png new file mode 100644 index 000000000..2b61c257c Binary files /dev/null and b/data/themes/default/sbarrow_up.png differ diff --git a/data/themes/default/sbarrow_up_d.png b/data/themes/default/sbarrow_up_d.png new file mode 100644 index 000000000..f80d6b39b Binary files /dev/null and b/data/themes/default/sbarrow_up_d.png differ diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 006ff6164..466aac8d4 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -89,9 +89,126 @@ pianoRoll { background-color: rgb(0, 0, 0); } -/*TrackContainerView QWidget{ - background-color: #5b6571; -}*/ +/* scrollbar: trough */ + +QScrollBar:horizontal { + border: 1px solid #131313; + background: rgb( 50,50,50 ); + height: 14px; + margin: 0px 13px; +} +QScrollBar:vertical { + border: 1px solid #131313; + background: rgb( 50,50,50 ); + width: 14px; + margin: 13px 0px; +} + +/* scrollbar: trough clicky things */ + +QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal, +QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { + background: none; +} + +QScrollBar::add-page:horizontal:pressed, QScrollBar::sub-page:horizontal:pressed, +QScrollBar::add-page:vertical:pressed, QScrollBar::sub-page:vertical:pressed { + background: rgba(0,0,0,50); +} + +/* scrollbar: handles (sliders) */ + +QScrollBar::handle:horizontal { + background: qlineargradient(spread:reflect, + x1:0.5, y1:0, x2:0.5, y2:1, + stop:0 #747474, stop:0.5 #c9c9c9, stop:1 #808080); + border: 1px outset #888; + border-radius: 2px; + min-width: 24px; +} + +QScrollBar::handle:horizontal:hover { + background: qlineargradient(spread:reflect, + x1:0.5, y1:0, x2:0.5, y2:1, + stop:0 #747474, stop:0.5 #f0f0f0, stop:1 #808080); +} + +QScrollBar::handle:horizontal:pressed { + background: qlineargradient(spread:reflect, + x1:0.5, y1:0, x2:0.5, y2:1, + stop:0 #747474, stop:1 #c9c9c9); +} + +QScrollBar::handle:vertical { + background: qlineargradient(spread:reflect, + x1:0, y1:0.5, x2:1, y2:0.5, + stop:0 #747474, stop:0.5 #c9c9c9, stop:1 #808080); + border: 1px outset #888; + border-radius: 2px; + min-height: 24px; +} + +QScrollBar::handle:vertical:hover { + background: qlineargradient(spread:reflect, + x1:0, y1:0.5, x2:1, y2:0.5, + stop:0 #747474, stop:0.5 #f0f0f0, stop:1 #808080); +} + +QScrollBar::handle:vertical:pressed { + background: qlineargradient(spread:reflect, + x1:0, y1:0.5, x2:1, y2:0.5, + stop:0 #747474, stop:1 #c9c9c9); +} + +QScrollBar::handle:horizontal:disabled, QScrollBar::handle:vertical:disabled { + background: #747474; + border-radius: 1px; + border: 1px solid rgba(0,0,0,32); +} + +/* arrow buttons */ + +QScrollBar::add-line, QScrollBar::sub-line { + background: qradialgradient(cx:0.3, cy:0.3, radius:0.8, fx:0.3, fy:0.3, stop:0 #c9c9c9, stop:1 #969696 ); + border-radius: 1px; + border: 1px solid #131313; + subcontrol-origin: margin; +} + +QScrollBar::add-line:horizontal { subcontrol-position: right; width: 12px;} +QScrollBar::sub-line:horizontal { subcontrol-position: left; width: 12px;} +QScrollBar::add-line:vertical { subcontrol-position: bottom; height: 12px;} +QScrollBar::sub-line:vertical { subcontrol-position: top; height: 12px;} + +QScrollBar::add-line:hover, QScrollBar::sub-line:hover { + background: qradialgradient(cx:0.3, cy:0.3, radius:0.8, fx:0.3, fy:0.3, stop:0 #e0e0e0, stop:0.5 #c9c9c9, stop:1 #969696 ); +} + +QScrollBar::add-line:pressed, QScrollBar::sub-line:pressed { + background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #969696, stop:0.5 #c9c9c9, stop:1 #969696 ); +} + +QScrollBar::add-line:disabled, QScrollBar::sub-line:disabled { + background: #747474; +} + +QScrollBar::left-arrow:horizontal, QScrollBar::right-arrow:horizontal, +QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical { + border: none; + background-color: none; + width: 5px; + height: 5px; +} + +QScrollBar::left-arrow:horizontal { background-image: url(resources:sbarrow_left.png);} +QScrollBar::right-arrow:horizontal { background-image: url(resources:sbarrow_right.png);} +QScrollBar::up-arrow:vertical { background-image: url(resources:sbarrow_up.png);} +QScrollBar::down-arrow:vertical { background-image: url(resources:sbarrow_down.png);} +QScrollBar::left-arrow:horizontal:disabled { background-image: url(resources:sbarrow_left_d.png);} +QScrollBar::right-arrow:horizontal:disabled { background-image: url(resources:sbarrow_right_d.png);} +QScrollBar::up-arrow:vertical:disabled { background-image: url(resources:sbarrow_up_d.png);} +QScrollBar::down-arrow:vertical:disabled { background-image: url(resources:sbarrow_down_d.png);} + TrackContainerView QFrame{ background-color: #49515b; @@ -105,25 +222,6 @@ trackOperationsWidget > QPushButton { background: none; border:none; } -/* -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 > QPushButton::menu-indicator { image: url(resources:trackop.png); diff --git a/include/LmmsStyle.h b/include/LmmsStyle.h index 48c48d449..7b74a06f7 100644 --- a/include/LmmsStyle.h +++ b/include/LmmsStyle.h @@ -68,7 +68,7 @@ public: virtual QPalette standardPalette( void ) const; - virtual void drawControl( ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget ) const; +// virtual void drawControl( ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget ) const; virtual void drawComplexControl( ComplexControl control, @@ -84,8 +84,8 @@ public: const QStyleOption * option = 0, const QWidget * widget = 0 ) const; - QSize sizeFromContents( ContentsType type, const QStyleOption* option, const QSize& size, const QWidget* widget ) const; - QRect subControlRect( ComplexControl control, const QStyleOptionComplex *option, SubControl subControl, const QWidget *widget ) const; +// QSize sizeFromContents( ContentsType type, const QStyleOption* option, const QSize& size, const QWidget* widget ) const; +// QRect subControlRect( ComplexControl control, const QStyleOptionComplex *option, SubControl subControl, const QWidget *widget ) const; private: QImage colorizeXpm( const char * const * xpm, const QBrush& fill ) const; diff --git a/plugins/triple_oscillator/am_active.png b/plugins/triple_oscillator/am_active.png index c02e68fc6..88546daa0 100644 Binary files a/plugins/triple_oscillator/am_active.png and b/plugins/triple_oscillator/am_active.png differ diff --git a/plugins/triple_oscillator/am_inactive.png b/plugins/triple_oscillator/am_inactive.png index bcdbc4ca4..d467da4eb 100644 Binary files a/plugins/triple_oscillator/am_inactive.png and b/plugins/triple_oscillator/am_inactive.png differ diff --git a/plugins/triple_oscillator/artwork.png b/plugins/triple_oscillator/artwork.png index e3ef38116..7c61a87ec 100644 Binary files a/plugins/triple_oscillator/artwork.png and b/plugins/triple_oscillator/artwork.png differ diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp index 8d3a15ab3..9df416b8f 100644 --- a/src/gui/LmmsStyle.cpp +++ b/src/gui/LmmsStyle.cpp @@ -232,7 +232,7 @@ QPalette LmmsStyle::standardPalette( void ) const { QPalette pal = QPlastiqueStyle::standardPalette(); - + /* sane defaults in case fetching from stylesheet fails*/ pal.setColor( QPalette::Background, QColor( 91, 101, 113 ) ); @@ -245,17 +245,17 @@ QPalette LmmsStyle::standardPalette( void ) const pal.setColor( QPalette::BrightText, QColor( 74, 253, 133 ) ); pal.setColor( QPalette::Highlight, QColor( 100, 100, 100 ) ); pal.setColor( QPalette::HighlightedText, QColor( 255, 255, 255 ) ); - + /* fetch from stylesheet using regexp */ QStringList paletteData = qApp->styleSheet().split( '\n' ).filter( QRegExp( "^palette:*" ) ); foreach( QString s, paletteData ) { - if (s.contains(":background")) { pal.setColor( QPalette::Background, QColor( s.mid( s.indexOf("#"), 7 ) ) ); } + if (s.contains(":background")) { pal.setColor( QPalette::Background, QColor( s.mid( s.indexOf("#"), 7 ) ) ); } else if (s.contains(":windowtext")) { pal.setColor( QPalette::WindowText, QColor( s.mid( s.indexOf("#"), 7 ) ) ); } else if (s.contains(":base")) { pal.setColor( QPalette::Base, QColor( s.mid( s.indexOf("#"), 7 ) ) ); } - else if (s.contains(":buttontext")) { pal.setColor( QPalette::ButtonText, QColor( s.mid( s.indexOf("#"), 7 ) ) ); } - else if (s.contains(":brighttext")) { pal.setColor( QPalette::BrightText, QColor( s.mid( s.indexOf("#"), 7 ) ) ); } + else if (s.contains(":buttontext")) { pal.setColor( QPalette::ButtonText, QColor( s.mid( s.indexOf("#"), 7 ) ) ); } + else if (s.contains(":brighttext")) { pal.setColor( QPalette::BrightText, QColor( s.mid( s.indexOf("#"), 7 ) ) ); } else if (s.contains(":text")) { pal.setColor( QPalette::Text, QColor( s.mid( s.indexOf("#"), 7 ) ) ); } else if (s.contains(":button")) { pal.setColor( QPalette::Button, QColor( s.mid( s.indexOf("#"), 7 ) ) ); } else if (s.contains(":shadow")) { pal.setColor( QPalette::Shadow, QColor( s.mid( s.indexOf("#"), 7 ) ) ); } @@ -268,7 +268,7 @@ QPalette LmmsStyle::standardPalette( void ) const - +/* void LmmsStyle::drawControl( ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget ) const { @@ -294,7 +294,7 @@ void LmmsStyle::drawControl( ControlElement element, const QStyleOption* option, cache.fill( QColor( 48, 48, 48 ) ); QColor sliderColor; QColor blurColor; - hoverColors(sunken, hover, + hoverColors(sunken, hover, scrollBar->activeSubControls & SC_ScrollBarAddLine && isEnabled, sliderColor, blurColor); @@ -455,7 +455,7 @@ void LmmsStyle::drawControl( ControlElement element, const QStyleOption* option, } } - +*/ void LmmsStyle::drawComplexControl( ComplexControl control, const QStyleOptionComplex * option, @@ -482,12 +482,12 @@ void LmmsStyle::drawComplexControl( ComplexControl control, return; } } - else if( control == CC_ScrollBar ) +/* else if( control == CC_ScrollBar ) { - QColor background = QColor( 48, 48, 48 ); - painter->fillRect( option->rect, background ); + painter->fillRect( option->rect, QApplication::palette().color( QPalette::Active, + QPalette::Background ) ); - } + }*/ QPlastiqueStyle::drawComplexControl( control, option, painter, widget ); } @@ -633,7 +633,7 @@ int LmmsStyle::pixelMetric( PixelMetric _metric, const QStyleOption * _option, } // QStyle::SH_TitleBar_NoBorder - +/* QSize LmmsStyle::sizeFromContents( ContentsType type, const QStyleOption* option, const QSize& size, const QWidget* widget ) const { if( type == CT_ScrollBar ) @@ -655,8 +655,8 @@ QSize LmmsStyle::sizeFromContents( ContentsType type, const QStyleOption* option return QPlastiqueStyle::sizeFromContents( type, option, size, widget ); } - - +*/ +/* QRect LmmsStyle::subControlRect( ComplexControl control, const QStyleOptionComplex* option, SubControl subControl, const QWidget* widget ) const { QRect rect = QPlastiqueStyle::subControlRect( control, option, subControl, widget ); @@ -797,7 +797,7 @@ QRect LmmsStyle::subControlRect( ComplexControl control, const QStyleOptionCompl return rect; } - +*/