From 8e47e374ca6f767add187c798fcabffef306c8f0 Mon Sep 17 00:00:00 2001 From: allejok96 Date: Mon, 5 Oct 2020 17:28:13 +0200 Subject: [PATCH 1/6] Terminology and icon changes - Quantize (piano and SE) becomes grid and snap, with different icons - Note lock (piano) becomes Same as note - Change scale icon (piano) --- data/themes/default/grid_size.png | Bin 0 -> 5038 bytes data/themes/default/grid_snap_size.png | Bin 0 -> 6288 bytes data/themes/default/scale.png | Bin 237 -> 4704 bytes data/themes/default/snap.png | Bin 0 -> 4511 bytes src/gui/editors/PianoRoll.cpp | 8 ++++---- src/gui/editors/SongEditor.cpp | 3 ++- 6 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 data/themes/default/grid_size.png create mode 100644 data/themes/default/grid_snap_size.png create mode 100644 data/themes/default/snap.png diff --git a/data/themes/default/grid_size.png b/data/themes/default/grid_size.png new file mode 100644 index 0000000000000000000000000000000000000000..49f674b42569c52bffd3eac68c74a5ad7d174190 GIT binary patch literal 5038 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 Eg6C+I@&Et; literal 0 HcmV?d00001 diff --git a/data/themes/default/grid_snap_size.png b/data/themes/default/grid_snap_size.png new file mode 100644 index 0000000000000000000000000000000000000000..54d3f8f74430bace6ba8609c87b01211a48911f4 GIT binary patch literal 6288 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 Y^=_5kHUHPo0NTpn>FVdQ&MBb@0CYi5zW@LL diff --git a/data/themes/default/snap.png b/data/themes/default/snap.png new file mode 100644 index 0000000000000000000000000000000000000000..776f3ecf22ee5a15cd67a2a642e6ed20a48d9db1 GIT binary patch literal 4511 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 literal 0 HcmV?d00001 diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index 3ce684ecef8..31f321bfe04 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -340,7 +340,7 @@ PianoRoll::PianoRoll() : this, SLOT(zoomingYChanged())); // Set up quantization model - m_quantizeModel.addItem( tr( "Note lock" ) ); + m_quantizeModel.addItem(tr("Same as note")); for (auto q : Quantizations) { m_quantizeModel.addItem(QString("1/%1").arg(q)); } @@ -4322,7 +4322,7 @@ PianoRollWindow::PianoRollWindow() : connect( editModeGroup, SIGNAL( triggered( int ) ), m_editor, SLOT( setEditMode( int ) ) ); - QAction* quantizeAction = new QAction(embed::getIconPixmap( "quantize" ), tr( "Quantize" ), this ); + QAction* quantizeAction = new QAction(embed::getIconPixmap("snap"), tr("Snap notes to grid"), this); connect( quantizeAction, SIGNAL( triggered() ), m_editor, SLOT( quantizeNotes() ) ); notesActionsToolBar->addAction( drawAction ); @@ -4384,12 +4384,12 @@ PianoRollWindow::PianoRollWindow() : // setup quantize-stuff QLabel * quantize_lbl = new QLabel( m_toolBar ); - quantize_lbl->setPixmap( embed::getIconPixmap( "quantize" ) ); + quantize_lbl->setPixmap(embed::getIconPixmap("grid_size")); m_quantizeComboBox = new ComboBox( m_toolBar ); m_quantizeComboBox->setModel( &m_editor->m_quantizeModel ); m_quantizeComboBox->setFixedSize( 64, ComboBox::DEFAULT_HEIGHT ); - m_quantizeComboBox->setToolTip( tr( "Quantization") ); + m_quantizeComboBox->setToolTip(tr("Grid size")); // setup note-len-stuff QLabel * note_len_lbl = new QLabel( m_toolBar ); diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp index 8829bedfd22..95c9033bca6 100644 --- a/src/gui/editors/SongEditor.cpp +++ b/src/gui/editors/SongEditor.cpp @@ -981,7 +981,7 @@ SongEditorWindow::SongEditorWindow(Song* song) : DropToolBar *snapToolBar = addDropToolBarToTop(tr("Snap controls")); QLabel * snap_lbl = new QLabel( m_toolBar ); - snap_lbl->setPixmap( embed::getIconPixmap( "quantize" ) ); + snap_lbl->setPixmap(embed::getIconPixmap("grid_snap_size")); //Set up quantization/snapping selector m_snappingComboBox = new ComboBox( m_toolBar ); @@ -998,6 +998,7 @@ SongEditorWindow::SongEditorWindow(Song* song) : connect(m_setProportionalSnapAction, SIGNAL(triggered()), this, SLOT(updateSnapLabel()) ); snapToolBar->addWidget( snap_lbl ); + snapToolBar->addSeparator(); snapToolBar->addWidget( m_snappingComboBox ); snapToolBar->addSeparator(); snapToolBar->addAction( m_setProportionalSnapAction ); From c6f5173aca0102156293f76d6b1baad1e8a2bd72 Mon Sep 17 00:00:00 2001 From: allejok96 Date: Wed, 21 Oct 2020 19:23:17 +0200 Subject: [PATCH 2/6] Revert verbiage changes --- src/gui/editors/PianoRoll.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index 31f321bfe04..379c580e68e 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -4322,7 +4322,7 @@ PianoRollWindow::PianoRollWindow() : connect( editModeGroup, SIGNAL( triggered( int ) ), m_editor, SLOT( setEditMode( int ) ) ); - QAction* quantizeAction = new QAction(embed::getIconPixmap("snap"), tr("Snap notes to grid"), this); + QAction* quantizeAction = new QAction(embed::getIconPixmap( "quantize" ), tr( "Quantize" ), this ); connect( quantizeAction, SIGNAL( triggered() ), m_editor, SLOT( quantizeNotes() ) ); notesActionsToolBar->addAction( drawAction ); @@ -4389,7 +4389,7 @@ PianoRollWindow::PianoRollWindow() : m_quantizeComboBox = new ComboBox( m_toolBar ); m_quantizeComboBox->setModel( &m_editor->m_quantizeModel ); m_quantizeComboBox->setFixedSize( 64, ComboBox::DEFAULT_HEIGHT ); - m_quantizeComboBox->setToolTip(tr("Grid size")); + m_quantizeComboBox->setToolTip( tr( "Quantization") ); // setup note-len-stuff QLabel * note_len_lbl = new QLabel( m_toolBar ); From 4b2ed7b50203be5798fd1d996c632fb9e87875ca Mon Sep 17 00:00:00 2001 From: allejok96 Date: Wed, 21 Oct 2020 20:33:17 +0200 Subject: [PATCH 3/6] Add menu with more action to quantize button --- data/themes/default/style.css | 12 ++++++++++++ include/PianoRoll.h | 9 ++++++++- src/gui/editors/PianoRoll.cpp | 35 +++++++++++++++++++++++++++++------ 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 832da176f28..710016371d6 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -496,6 +496,18 @@ QToolButton:checked { background-image: url(resources:shadow_p.png); } +/* buttons with menu */ + +QToolButton[popupMode="1"] { + padding-right: 15px; +} + +QToolButton::menu-button { + border-top-right-radius: 1px; + border-bottom-right-radius: 1px; + width: 15px; +} + /* track label buttons - the part that contains the icon and track title */ TrackLabelButton { diff --git a/include/PianoRoll.h b/include/PianoRoll.h index e3e4b312085..09353a44f35 100644 --- a/include/PianoRoll.h +++ b/include/PianoRoll.h @@ -140,6 +140,13 @@ class PianoRoll : public QWidget int quantization() const; protected: + enum QuantizeActions + { + QuantizeBoth, + QuantizePos, + QuantizeLength + }; + void keyPressEvent( QKeyEvent * ke ) override; void keyReleaseEvent( QKeyEvent * ke ) override; void leaveEvent( QEvent * e ) override; @@ -196,7 +203,7 @@ protected slots: void quantizeChanged(); void noteLengthChanged(); void keyChanged(); - void quantizeNotes(); + void quantizeNotes(QuantizeActions mode = QuantizeBoth); void updateSemiToneMarkerMenu(); diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index 379c580e68e..da07f04ee8a 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #ifndef __USE_XOPEN #define __USE_XOPEN @@ -4178,7 +4179,7 @@ int PianoRoll::quantization() const } -void PianoRoll::quantizeNotes() +void PianoRoll::quantizeNotes(QuantizeActions mode) { if( ! hasValidPattern() ) { @@ -4206,8 +4207,15 @@ void PianoRoll::quantizeNotes() Note copy(*n); m_pattern->removeNote( n ); - copy.quantizePos( quantization() ); - m_pattern->addNote( copy ); + if (mode == QuantizeBoth || mode == QuantizePos) + { + copy.quantizePos(quantization()); + } + if (mode == QuantizeBoth || mode == QuantizeLength) + { + copy.quantizeLength(quantization()); + } + m_pattern->addNote(copy, false); } update(); @@ -4322,15 +4330,30 @@ PianoRollWindow::PianoRollWindow() : connect( editModeGroup, SIGNAL( triggered( int ) ), m_editor, SLOT( setEditMode( int ) ) ); - QAction* quantizeAction = new QAction(embed::getIconPixmap( "quantize" ), tr( "Quantize" ), this ); - connect( quantizeAction, SIGNAL( triggered() ), m_editor, SLOT( quantizeNotes() ) ); + // Quantize combo button + QToolButton *quantizeButton = new QToolButton(notesActionsToolBar); + QMenu *quantizeButtonMenu = new QMenu(quantizeButton); + + QAction *quantizeAction = new QAction(embed::getIconPixmap("quantize"), tr("Quantize"), this); + QAction *quantizePosAction = new QAction(tr("Quantize positions"), this); + QAction *quantizeLengthAction = new QAction(tr("Quantize lengths"), this); + + connect(quantizeAction, &QAction::triggered, [this](){ m_editor->quantizeNotes(); }); + connect(quantizePosAction, &QAction::triggered, [this](){ m_editor->quantizeNotes(PianoRoll::QuantizePos); }); + connect(quantizeLengthAction, &QAction::triggered, [this](){ m_editor->quantizeNotes(PianoRoll::QuantizeLength); }); + + quantizeButton->setPopupMode(QToolButton::MenuButtonPopup); + quantizeButton->setDefaultAction(quantizeAction); + quantizeButton->setMenu(quantizeButtonMenu); + quantizeButtonMenu->addAction(quantizePosAction); + quantizeButtonMenu->addAction(quantizeLengthAction); notesActionsToolBar->addAction( drawAction ); notesActionsToolBar->addAction( eraseAction ); notesActionsToolBar->addAction( selectAction ); notesActionsToolBar->addAction( pitchBendAction ); notesActionsToolBar->addSeparator(); - notesActionsToolBar->addAction( quantizeAction ); + notesActionsToolBar->addWidget(quantizeButton); // Copy + paste actions DropToolBar *copyPasteActionsToolBar = addDropToolBarToTop( tr( "Copy paste controls" ) ); From b20fba3cb7ae7e27f5cf45e33eed527ae2b3826f Mon Sep 17 00:00:00 2001 From: allejok96 Date: Tue, 22 Dec 2020 18:09:58 +0100 Subject: [PATCH 4/6] Revert to old scale icon --- data/themes/default/scale.png | Bin 4704 -> 237 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/themes/default/scale.png b/data/themes/default/scale.png index 26b04237aa0d942bd469787372195ec948d1b3ac..1610b2eba99d7e455c41474545194e7a21a9878b 100644 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4^NZHxonD>YZFL#(uec}iLjGXE-g5~+E!<@bSEoA Y^=_5kHUHPo0NTpn>FVdQ&MBb@0CYi5zW@LL literal 4704 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 Date: Tue, 22 Dec 2020 18:11:33 +0100 Subject: [PATCH 5/6] Bring back magnet icon --- data/themes/default/quantize.png | Bin 585 -> 4511 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/themes/default/quantize.png b/data/themes/default/quantize.png index 3a2a0a861c75b77d0e77b27880aca9dd4fc99003..776f3ecf22ee5a15cd67a2a642e6ed20a48d9db1 100644 GIT binary patch literal 4511 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 literal 585 zcmV-P0=E5$P)xV4)gxTJN|As}SRCn#8u)*%fqp$?j zfm2}m2k=zhfMej&_57hWm`YR!&egdGTmg?jAiu2x8$b=1l|WLT3u^{amM0bY1F-9Q z{;MhMI0_em8(>pqQr6{~QV%;MHP_%38#sX2D)KDidn;I@1SHdvHnb;^4{YFyWB}}n z4}!66B3M=WRbJ!>R`;1-`xEL#QvzZdOe%;2xmSGuvuU8S#&L9nd! zXA?n3=^I55<0x#zQP_~7A_NfO`_(Pw}?Wp1a6&Y;Ct7PG)j9EC-D zbO_9e9=M)=mm!dqTP3;fkX-+JSqB+$J--2*8B9m|VA`e!u#;)fNUC+M&%8X8yO#)yGXqt@HHyT)9nGVSqJ_Bvt&~#*TOZ49|@qZN` Xm9UCzaVO7y00000NkvXXu0mjfb Date: Tue, 22 Dec 2020 18:13:48 +0100 Subject: [PATCH 6/6] Remove special grid size icon --- data/themes/default/grid_size.png | Bin 5038 -> 0 bytes data/themes/default/snap.png | Bin 4511 -> 0 bytes src/gui/editors/PianoRoll.cpp | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 data/themes/default/grid_size.png delete mode 100644 data/themes/default/snap.png diff --git a/data/themes/default/grid_size.png b/data/themes/default/grid_size.png deleted file mode 100644 index 49f674b42569c52bffd3eac68c74a5ad7d174190..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5038 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 Eg6C+I@&Et; diff --git a/data/themes/default/snap.png b/data/themes/default/snap.png deleted file mode 100644 index 776f3ecf22ee5a15cd67a2a642e6ed20a48d9db1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4511 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 diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index da07f04ee8a..0a3dd183280 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -4407,7 +4407,7 @@ PianoRollWindow::PianoRollWindow() : // setup quantize-stuff QLabel * quantize_lbl = new QLabel( m_toolBar ); - quantize_lbl->setPixmap(embed::getIconPixmap("grid_size")); + quantize_lbl->setPixmap( embed::getIconPixmap( "quantize" ) ); m_quantizeComboBox = new ComboBox( m_toolBar ); m_quantizeComboBox->setModel( &m_editor->m_quantizeModel );