diff --git a/data/themes/classic/arrow-down.svg b/data/themes/classic/arrow-down.svg new file mode 100644 index 000000000..f875cbc22 --- /dev/null +++ b/data/themes/classic/arrow-down.svg @@ -0,0 +1,17 @@ + + + + + + Downward-facing arrow + Fawn Sannar + + + + + + + + + + diff --git a/data/themes/classic/arrow-left.svg b/data/themes/classic/arrow-left.svg new file mode 100644 index 000000000..16c1db009 --- /dev/null +++ b/data/themes/classic/arrow-left.svg @@ -0,0 +1,17 @@ + + + + + + Left-facing arrow + Fawn Sannar + + + + + + + + + + diff --git a/data/themes/classic/arrow-right.svg b/data/themes/classic/arrow-right.svg new file mode 100644 index 000000000..973cac9a4 --- /dev/null +++ b/data/themes/classic/arrow-right.svg @@ -0,0 +1,17 @@ + + + + + + Right-facing arrow + Fawn Sannar + + + + + + + + + + diff --git a/data/themes/classic/arrow-up.svg b/data/themes/classic/arrow-up.svg new file mode 100644 index 000000000..444d5e322 --- /dev/null +++ b/data/themes/classic/arrow-up.svg @@ -0,0 +1,17 @@ + + + + + + Upward-facing arrow + Fawn Sannar + + + + + + + + + + diff --git a/data/themes/classic/stepper-down-press.png b/data/themes/classic/stepper-down-press.png deleted file mode 100644 index d0affa54c..000000000 Binary files a/data/themes/classic/stepper-down-press.png and /dev/null differ diff --git a/data/themes/classic/stepper-down.png b/data/themes/classic/stepper-down.png deleted file mode 100644 index 4f0ec4ebd..000000000 Binary files a/data/themes/classic/stepper-down.png and /dev/null differ diff --git a/data/themes/classic/stepper-left-press.png b/data/themes/classic/stepper-left-press.png deleted file mode 100644 index c94234c4f..000000000 Binary files a/data/themes/classic/stepper-left-press.png and /dev/null differ diff --git a/data/themes/classic/stepper-left.png b/data/themes/classic/stepper-left.png deleted file mode 100644 index c4f2820b8..000000000 Binary files a/data/themes/classic/stepper-left.png and /dev/null differ diff --git a/data/themes/classic/stepper-right-press.png b/data/themes/classic/stepper-right-press.png deleted file mode 100644 index 003825136..000000000 Binary files a/data/themes/classic/stepper-right-press.png and /dev/null differ diff --git a/data/themes/classic/stepper-right.png b/data/themes/classic/stepper-right.png deleted file mode 100644 index f7f98d172..000000000 Binary files a/data/themes/classic/stepper-right.png and /dev/null differ diff --git a/data/themes/classic/stepper-up-press.png b/data/themes/classic/stepper-up-press.png deleted file mode 100644 index 9f72354d8..000000000 Binary files a/data/themes/classic/stepper-up-press.png and /dev/null differ diff --git a/data/themes/classic/stepper-up.png b/data/themes/classic/stepper-up.png deleted file mode 100644 index aa61a4168..000000000 Binary files a/data/themes/classic/stepper-up.png and /dev/null differ diff --git a/data/themes/classic/style.css b/data/themes/classic/style.css index d5ebfc8d2..ea19f5ccb 100644 --- a/data/themes/classic/style.css +++ b/data/themes/classic/style.css @@ -373,27 +373,47 @@ lmms--gui--TrackContentWidget { qproperty-embossOffset: 0; } - -/* gear button in tracks */ - - /* 20px = 1px border + 2px padding + 14px icon + 2px padding + 1px border */ QPushButton#btn-mute, +QPushButton#btn-mute-inv, QPushButton#btn-mute-inv:checked, QPushButton#btn-solo, lmms--gui--TrackOperationsWidget QPushButton { + padding: 2; min-height: 14; max-height: 14; min-width: 14; max-width: 14; +} + +/* 16px = 1px border + 2px padding + 10px icon + 2px padding + 1px border */ +QPushButton#btn-stepper-down, +QPushButton#btn-stepper-left, +QPushButton#btn-stepper-right { padding: 2; - border: 1 solid #0f1621; - border-top: 1 solid #18202b; - border-bottom: 1 solid #02060f; + min-height: 10; + max-height: 10; + min-width: 10; + max-width: 10; +} + +QPushButton#btn-stepper-down, +QPushButton#btn-stepper-left, +QPushButton#btn-stepper-right, +QPushButton#btn-mute, +QPushButton#btn-mute-inv:checked, +QPushButton#btn-solo, +lmms--gui--TrackOperationsWidget QPushButton { + border: 1 solid #12161d; + border-top: 1 solid #191d24; + border-bottom: 1 solid #0c1016; border-radius: 4; background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 20%), stop:0.1 rgba(255, 255, 255, 2%), stop:0.9 rgba(0, 0, 0, 2%), stop:1 rgba(0, 0, 0, 40%)); } +QPushButton#btn-stepper-down::menu-indicator, +QPushButton#btn-stepper-left::menu-indicator, +QPushButton#btn-stepper-right::menu-indicator, lmms--gui--TrackOperationsWidget QPushButton::menu-indicator { image: none; } @@ -411,12 +431,30 @@ QPushButton#btn-solo { image: url("resources:headphones.svg"); } +QPushButton#btn-stepper-left { + image: url("resources:arrow-left.svg"); +} + +QPushButton#btn-stepper-right { + image: url("resources:arrow-right.svg"); +} + +QPushButton#btn-stepper-down { + image: url("resources:arrow-down.svg"); +} + +QPushButton#btn-stepper-down:hover, +QPushButton#btn-stepper-left:hover, +QPushButton#btn-stepper-right:hover, QPushButton#btn-mute:hover, QPushButton#btn-solo:hover, lmms--gui--TrackOperationsWidget QPushButton:hover { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 25%), stop:0.1 rgba(255, 255, 255, 7%), stop:0.9 transparent, stop:1 rgba(0, 0, 0, 35%)); } +QPushButton#btn-stepper-down:pressed, +QPushButton#btn-stepper-left:pressed, +QPushButton#btn-stepper-right:pressed, lmms--gui--TrackOperationsWidget QPushButton:pressed { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 25%), stop:0.1 transparent, stop:0.8 rgba(0, 0, 0, 15%), stop:1 rgba(0, 0, 0, 35%)); } diff --git a/data/themes/default/arrow-down.svg b/data/themes/default/arrow-down.svg new file mode 100644 index 000000000..5c72014d7 --- /dev/null +++ b/data/themes/default/arrow-down.svg @@ -0,0 +1,17 @@ + + + + + + Downward-facing arrow + Fawn Sannar + + + + + + + + + + diff --git a/data/themes/default/arrow-left.svg b/data/themes/default/arrow-left.svg new file mode 100644 index 000000000..7de43b16e --- /dev/null +++ b/data/themes/default/arrow-left.svg @@ -0,0 +1,17 @@ + + + + + + Left-facing arrow + Fawn Sannar + + + + + + + + + + diff --git a/data/themes/default/arrow-right.svg b/data/themes/default/arrow-right.svg new file mode 100644 index 000000000..dd307b6cf --- /dev/null +++ b/data/themes/default/arrow-right.svg @@ -0,0 +1,17 @@ + + + + + + Right-facing arrow + Fawn Sannar + + + + + + + + + + diff --git a/data/themes/default/arrow-up.svg b/data/themes/default/arrow-up.svg new file mode 100644 index 000000000..1ba46c355 --- /dev/null +++ b/data/themes/default/arrow-up.svg @@ -0,0 +1,17 @@ + + + + + + Upward-facing arrow + Fawn Sannar + + + + + + + + + + diff --git a/data/themes/default/fader_knob.svg b/data/themes/default/fader_knob.svg index 8a5d9e908..26ab58ca7 100644 --- a/data/themes/default/fader_knob.svg +++ b/data/themes/default/fader_knob.svg @@ -1,18 +1,26 @@ - - - - - - - - - - - - - - - - - + + + + + + Headphones icon + Rebecca Noel Ati + + + + + + + + + + + + + + + + + + diff --git a/data/themes/default/gear.svg b/data/themes/default/gear.svg index dfcd7d4d9..97c80ec46 100644 --- a/data/themes/default/gear.svg +++ b/data/themes/default/gear.svg @@ -1,26 +1,17 @@ - - - - - - - - Fawn Sannar - - - - - - - - - - - + + + + + Gear icon + Fawn Sannar + + + + + + + + + diff --git a/data/themes/default/headphones.svg b/data/themes/default/headphones.svg index ecdc5a18e..b4f699461 100644 --- a/data/themes/default/headphones.svg +++ b/data/themes/default/headphones.svg @@ -1,44 +1,18 @@ - - LMMS solo button (inactive) - - - - - LMMS solo button (inactive) - - - Rebecca Noel Ati, Stakeout Punch - - - - - - - - - - + + + + + Headphones icon + Rebecca Noel Ati + Stakeout Punch + + + + + + + + + diff --git a/data/themes/default/speaker.svg b/data/themes/default/speaker.svg index 1f43f5517..73db489a7 100644 --- a/data/themes/default/speaker.svg +++ b/data/themes/default/speaker.svg @@ -1,42 +1,18 @@ - - LMMS mute button (inactive) - - - - - LMMS mute button (inactive) - - - Rebecca Noel Ati, Stakeout Punch - - - - - - - - - - + + + + + Speaker icon + Rebecca Noel Ati + Stakeout Punch + + + + + + + + + diff --git a/data/themes/default/speaker_slash.svg b/data/themes/default/speaker_slash.svg index 9b42db7ac..b933de209 100644 --- a/data/themes/default/speaker_slash.svg +++ b/data/themes/default/speaker_slash.svg @@ -1,44 +1,18 @@ - - LMMS mute button (active) - - - - - LMMS mute button (active) - - - Rebecca Noel Ati, Stakeout Punch - - - - - - - - - - + + + + + Muted speaker icon + Rebecca Noel Ati + Stakeout Punch + + + + + + + + + diff --git a/data/themes/default/stepper-down-press.png b/data/themes/default/stepper-down-press.png deleted file mode 100644 index 91c1d638b..000000000 Binary files a/data/themes/default/stepper-down-press.png and /dev/null differ diff --git a/data/themes/default/stepper-down.png b/data/themes/default/stepper-down.png deleted file mode 100644 index 89a77bdc4..000000000 Binary files a/data/themes/default/stepper-down.png and /dev/null differ diff --git a/data/themes/default/stepper-left-press.png b/data/themes/default/stepper-left-press.png deleted file mode 100644 index 502f9021a..000000000 Binary files a/data/themes/default/stepper-left-press.png and /dev/null differ diff --git a/data/themes/default/stepper-left.png b/data/themes/default/stepper-left.png deleted file mode 100644 index b52e1b311..000000000 Binary files a/data/themes/default/stepper-left.png and /dev/null differ diff --git a/data/themes/default/stepper-right-press.png b/data/themes/default/stepper-right-press.png deleted file mode 100644 index a35cd939d..000000000 Binary files a/data/themes/default/stepper-right-press.png and /dev/null differ diff --git a/data/themes/default/stepper-right.png b/data/themes/default/stepper-right.png deleted file mode 100644 index fd9030669..000000000 Binary files a/data/themes/default/stepper-right.png and /dev/null differ diff --git a/data/themes/default/stepper-up-press.png b/data/themes/default/stepper-up-press.png deleted file mode 100644 index f4525bf6a..000000000 Binary files a/data/themes/default/stepper-up-press.png and /dev/null differ diff --git a/data/themes/default/stepper-up.png b/data/themes/default/stepper-up.png deleted file mode 100644 index 778ee4a64..000000000 Binary files a/data/themes/default/stepper-up.png and /dev/null differ diff --git a/data/themes/default/style.css b/data/themes/default/style.css index a1a75a41d..efe2dc080 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -427,27 +427,47 @@ lmms--gui--TrackContentWidget { qproperty-embossOffset: 0; } - -/* gear button in tracks */ - - /* 20px = 1px border + 2px padding + 14px icon + 2px padding + 1px border */ QPushButton#btn-mute, +QPushButton#btn-mute-inv, QPushButton#btn-mute-inv:checked, QPushButton#btn-solo, lmms--gui--TrackOperationsWidget QPushButton { + padding: 2; min-height: 14; max-height: 14; min-width: 14; max-width: 14; +} + +/* 16px = 1px border + 2px padding + 10px icon + 2px padding + 1px border */ +QPushButton#btn-stepper-down, +QPushButton#btn-stepper-left, +QPushButton#btn-stepper-right { padding: 2; - border: 1 solid #0f1621; - border-top: 1 solid #18202b; - border-bottom: 1 solid #02060f; + min-height: 10; + max-height: 10; + min-width: 10; + max-width: 10; +} + +QPushButton#btn-stepper-down, +QPushButton#btn-stepper-left, +QPushButton#btn-stepper-right, +QPushButton#btn-mute, +QPushButton#btn-mute-inv:checked, +QPushButton#btn-solo, +lmms--gui--TrackOperationsWidget QPushButton { + border: 1 solid #080b12; + border-top: 1 solid #0e1218; + border-bottom: 1 solid #03060b; border-radius: 2; background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 20%), stop:0.1 rgba(255, 255, 255, 2%), stop:0.9 rgba(0, 0, 0, 2%), stop:1 rgba(0, 0, 0, 40%)); } +QPushButton#btn-stepper-down::menu-indicator, +QPushButton#btn-stepper-left::menu-indicator, +QPushButton#btn-stepper-right::menu-indicator, lmms--gui--TrackOperationsWidget QPushButton::menu-indicator { image: none; } @@ -465,12 +485,30 @@ QPushButton#btn-solo { image: url("resources:headphones.svg"); } +QPushButton#btn-stepper-left { + image: url("resources:arrow-left.svg"); +} + +QPushButton#btn-stepper-right { + image: url("resources:arrow-right.svg"); +} + +QPushButton#btn-stepper-down { + image: url("resources:arrow-down.svg"); +} + +QPushButton#btn-stepper-down:hover, +QPushButton#btn-stepper-left:hover, +QPushButton#btn-stepper-right:hover, QPushButton#btn-mute:hover, QPushButton#btn-solo:hover, lmms--gui--TrackOperationsWidget QPushButton:hover { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 25%), stop:0.1 rgba(255, 255, 255, 7%), stop:0.9 transparent, stop:1 rgba(0, 0, 0, 35%)); } +QPushButton#btn-stepper-down:pressed, +QPushButton#btn-stepper-left:pressed, +QPushButton#btn-stepper-right:pressed, lmms--gui--TrackOperationsWidget QPushButton:pressed { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 25%), stop:0.1 transparent, stop:0.8 rgba(0, 0, 0, 15%), stop:1 rgba(0, 0, 0, 35%)); } @@ -487,7 +525,6 @@ QPushButton#btn-solo:checked { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #5aa8d9, stop:0.1 #2696d1, stop:0.9 #2696d1, stop:1 #16638c); } - /* font sizes */ lmms--gui--Sf2InstrumentView > QLabel { diff --git a/include/LeftRightNav.h b/include/LeftRightNav.h index 49ad25ecf..fdc141159 100644 --- a/include/LeftRightNav.h +++ b/include/LeftRightNav.h @@ -25,7 +25,7 @@ #ifndef LMMS_GUI_LEFT_RIGHT_NAV_H #define LMMS_GUI_LEFT_RIGHT_NAV_H -#include "PixmapButton.h" +#include namespace lmms::gui @@ -36,16 +36,14 @@ class LeftRightNav : public QWidget Q_OBJECT public: LeftRightNav(QWidget *parent=nullptr); - PixmapButton* getLeftBtn(); - PixmapButton* getRightBtn(); void setShortcuts(const QKeySequence &leftShortcut=Qt::Key_Minus, const QKeySequence &rightShortcut=Qt::Key_Plus); signals: void onNavLeft(); void onNavRight(); private: QHBoxLayout m_layout; - PixmapButton m_leftBtn; - PixmapButton m_rightBtn; + QPushButton m_leftBtn; + QPushButton m_rightBtn; }; diff --git a/plugins/Vestige/Vestige.cpp b/plugins/Vestige/Vestige.cpp index 343db4ceb..a71f5efd8 100644 --- a/plugins/Vestige/Vestige.cpp +++ b/plugins/Vestige/Vestige.cpp @@ -532,14 +532,10 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument, m_openPresetButton->setToolTip(tr("Open VST plugin preset")); - m_rolLPresetButton = new PixmapButton( this, "" ); - m_rolLPresetButton->setCheckable( false ); - m_rolLPresetButton->setCursor( Qt::PointingHandCursor ); + m_rolLPresetButton = new QPushButton(this); + m_rolLPresetButton->setObjectName("btn-stepper-left"); + m_rolLPresetButton->setCursor(Qt::PointingHandCursor); m_rolLPresetButton->move( 190, 201 ); - m_rolLPresetButton->setActiveGraphic( embed::getIconPixmap( - "stepper-left-press" ) ); - m_rolLPresetButton->setInactiveGraphic( embed::getIconPixmap( - "stepper-left" ) ); connect( m_rolLPresetButton, SIGNAL( clicked() ), this, SLOT( previousProgram() ) ); m_rolLPresetButton->setToolTip(tr("Previous (-)")); @@ -560,14 +556,10 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument, m_savePresetButton->setToolTip(tr("Save preset")); - m_rolRPresetButton = new PixmapButton( this, "" ); - m_rolRPresetButton->setCheckable( false ); - m_rolRPresetButton->setCursor( Qt::PointingHandCursor ); + m_rolRPresetButton = new QPushButton(this); + m_rolRPresetButton->setObjectName("btn-stepper-right"); + m_rolRPresetButton->setCursor(Qt::PointingHandCursor); m_rolRPresetButton->move( 209, 201 ); - m_rolRPresetButton->setActiveGraphic( embed::getIconPixmap( - "stepper-right-press" ) ); - m_rolRPresetButton->setInactiveGraphic( embed::getIconPixmap( - "stepper-right" ) ); connect( m_rolRPresetButton, SIGNAL( clicked() ), this, SLOT( nextProgram() ) ); m_rolRPresetButton->setToolTip(tr("Next (+)")); @@ -575,16 +567,15 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument, m_rolRPresetButton->setShortcut( Qt::Key_Plus ); - m_selPresetButton = new QPushButton( tr( "" ), this ); - m_selPresetButton->setGeometry( 228, 201, 16, 16 ); + m_selPresetButton = new QPushButton(this); + m_selPresetButton->setObjectName("btn-stepper-down"); + m_selPresetButton->setCursor(Qt::PointingHandCursor); + m_selPresetButton->move(228, 201); auto menu = new QMenu; connect( menu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) ); - - m_selPresetButton->setIcon( embed::getIconPixmap( "stepper-down" ) ); - m_selPresetButton->setMenu(menu); m_toggleGUIButton = new QPushButton( tr( "Show/hide GUI" ), this ); diff --git a/plugins/Vestige/Vestige.h b/plugins/Vestige/Vestige.h index 95d942755..69833065e 100644 --- a/plugins/Vestige/Vestige.h +++ b/plugins/Vestige/Vestige.h @@ -174,8 +174,8 @@ private: PixmapButton * m_openPluginButton; PixmapButton * m_openPresetButton; - PixmapButton * m_rolLPresetButton; - PixmapButton * m_rolRPresetButton; + QPushButton* m_rolLPresetButton; + QPushButton* m_rolRPresetButton; QPushButton * m_selPresetButton; QPushButton * m_toggleGUIButton; PixmapButton * m_managePluginButton; diff --git a/plugins/VstEffect/VstEffectControlDialog.cpp b/plugins/VstEffect/VstEffectControlDialog.cpp index be8abb711..957adfaad 100644 --- a/plugins/VstEffect/VstEffectControlDialog.cpp +++ b/plugins/VstEffect/VstEffectControlDialog.cpp @@ -123,13 +123,9 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : m_openPresetButton->setMinimumHeight( 16 ); m_openPresetButton->setMaximumHeight( 16 ); - m_rolLPresetButton = new PixmapButton( this, "" ); - m_rolLPresetButton->setCheckable( false ); - m_rolLPresetButton->setCursor( Qt::PointingHandCursor ); - m_rolLPresetButton->setActiveGraphic( embed::getIconPixmap( - "stepper-left-press" ) ); - m_rolLPresetButton->setInactiveGraphic( embed::getIconPixmap( - "stepper-left" ) ); + m_rolLPresetButton = new QPushButton(this); + m_rolLPresetButton->setObjectName("btn-stepper-left"); + m_rolLPresetButton->setCursor(Qt::PointingHandCursor); connect( m_rolLPresetButton, SIGNAL( clicked() ), _ctl, SLOT( rolrPreset() ) ); @@ -140,18 +136,10 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : m_rolLPresetButton->setShortcut( Qt::Key_Minus ); - m_rolLPresetButton->setMinimumWidth( 16 ); - m_rolLPresetButton->setMaximumWidth( 16 ); - m_rolLPresetButton->setMinimumHeight( 16 ); - m_rolLPresetButton->setMaximumHeight( 16 ); - m_rolRPresetButton = new PixmapButton( this, "" ); - m_rolRPresetButton->setCheckable( false ); - m_rolRPresetButton->setCursor( Qt::PointingHandCursor ); - m_rolRPresetButton->setActiveGraphic( embed::getIconPixmap( - "stepper-right-press" ) ); - m_rolRPresetButton->setInactiveGraphic( embed::getIconPixmap( - "stepper-right" ) ); + m_rolRPresetButton = new QPushButton(this); + m_rolRPresetButton->setObjectName("btn-stepper-right"); + m_rolRPresetButton->setCursor(Qt::PointingHandCursor); connect( m_rolRPresetButton, SIGNAL( clicked() ), _ctl, SLOT( rollPreset() ) ); @@ -162,16 +150,10 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : m_rolRPresetButton->setShortcut( Qt::Key_Plus ); - m_rolRPresetButton->setMinimumWidth( 16 ); - m_rolRPresetButton->setMaximumWidth( 16 ); - m_rolRPresetButton->setMinimumHeight( 16 ); - m_rolRPresetButton->setMaximumHeight( 16 ); - _ctl->m_selPresetButton = new QPushButton( tr( "" ), this ); - - _ctl->m_selPresetButton->setCheckable( false ); - _ctl->m_selPresetButton->setCursor( Qt::PointingHandCursor ); - _ctl->m_selPresetButton->setIcon( embed::getIconPixmap( "stepper-down" ) ); + _ctl->m_selPresetButton = new QPushButton(this); + _ctl->m_selPresetButton->setObjectName("btn-stepper-down"); + _ctl->m_selPresetButton->setCursor(Qt::PointingHandCursor); auto menu = new QMenu; connect( menu, SIGNAL( aboutToShow() ), _ctl, SLOT( updateMenu() ) ); @@ -299,4 +281,4 @@ void VstEffectControlDialog::togglePluginUI( bool checked ) } -} // namespace lmms::gui \ No newline at end of file +} // namespace lmms::gui diff --git a/plugins/VstEffect/VstEffectControlDialog.h b/plugins/VstEffect/VstEffectControlDialog.h index 9d19dad1b..73ceacf42 100644 --- a/plugins/VstEffect/VstEffectControlDialog.h +++ b/plugins/VstEffect/VstEffectControlDialog.h @@ -60,8 +60,8 @@ private: QPushButton * m_togglePluginButton; PixmapButton * m_openPresetButton; - PixmapButton * m_rolLPresetButton; - PixmapButton * m_rolRPresetButton; + QPushButton* m_rolLPresetButton; + QPushButton* m_rolRPresetButton; PixmapButton * m_managePluginButton; PixmapButton * m_savePresetButton; diff --git a/src/gui/widgets/LeftRightNav.cpp b/src/gui/widgets/LeftRightNav.cpp index 30f7106d3..289b199ab 100644 --- a/src/gui/widgets/LeftRightNav.cpp +++ b/src/gui/widgets/LeftRightNav.cpp @@ -33,30 +33,23 @@ namespace lmms::gui LeftRightNav::LeftRightNav(QWidget *parent) - : QWidget(parent), - m_layout(this), - m_leftBtn(this, tr("Previous")), - m_rightBtn(this, tr("Next")) + : QWidget(parent) + , m_layout(this) + , m_leftBtn(this) + , m_rightBtn(this) { m_layout.setContentsMargins(0, 0, 0, 0); m_layout.setSpacing(2); + m_leftBtn.setObjectName("btn-stepper-left"); + m_rightBtn.setObjectName("btn-stepper-right"); + m_leftBtn.setCheckable(false); m_rightBtn.setCheckable(false); m_leftBtn.setCursor(Qt::PointingHandCursor); m_rightBtn.setCursor(Qt::PointingHandCursor); - m_leftBtn.setActiveGraphic(embed::getIconPixmap( - "stepper-left-press")); - m_rightBtn.setActiveGraphic(embed::getIconPixmap( - "stepper-right-press" )); - - m_leftBtn.setInactiveGraphic(embed::getIconPixmap( - "stepper-left" )); - m_rightBtn.setInactiveGraphic(embed::getIconPixmap( - "stepper-right")); - connect(&m_leftBtn, SIGNAL(clicked()), this, SIGNAL(onNavLeft())); connect(&m_rightBtn, SIGNAL(clicked()), this, @@ -65,10 +58,8 @@ LeftRightNav::LeftRightNav(QWidget *parent) m_leftBtn.setToolTip(tr("Previous")); m_rightBtn.setToolTip(tr("Next")); - m_leftBtn.setWindowTitle(tr("Previous")); - m_rightBtn.setWindowTitle(tr("Next")); - - // AutomatableButton's right click menu (contains irrelevant options like copying and pasting values) + // The context menu contains irrelevant options for these buttons, + // such as copying and pasting values m_leftBtn.setContextMenuPolicy(Qt::NoContextMenu); m_rightBtn.setContextMenuPolicy(Qt::NoContextMenu); @@ -76,14 +67,6 @@ LeftRightNav::LeftRightNav(QWidget *parent) m_layout.addWidget(&m_rightBtn); } -PixmapButton* LeftRightNav::getLeftBtn() -{ - return &m_leftBtn; -} -PixmapButton* LeftRightNav::getRightBtn() -{ - return &m_rightBtn; -} void LeftRightNav::setShortcuts(const QKeySequence &leftShortcut, const QKeySequence &rightShortcut) {