Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Qt layouts for mixer channels #6591

Merged
merged 48 commits into from
Dec 30, 2023
Merged

Use Qt layouts for mixer channels #6591

Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b447484
Remove extra transparency in send/receive arrows
sakertooth Dec 18, 2022
fb94805
Begin reimplementing MixerChannelView
sakertooth Dec 18, 2022
4e5135f
Adjust SendButtonIndicator to use MixerChannelView
sakertooth Dec 18, 2022
3b71b6a
Remove MixerLine
sakertooth Dec 18, 2022
e5b81d2
Remove MixerView::MixerChannelView
sakertooth Dec 18, 2022
6511771
Remove header of MixerLine
sakertooth Dec 18, 2022
28c8ab2
Change MixerView.h to use MixerChannelView
sakertooth Dec 18, 2022
48a5d4d
Create EffectRackView
sakertooth Dec 18, 2022
4ba600f
Remove include of MixerLine
sakertooth Dec 18, 2022
1908231
Phase 1: Adjust MixerView to use new MixerChannelView
sakertooth Dec 18, 2022
dcfb14c
Move children wigets into header file
sakertooth Dec 18, 2022
539c2cf
Phase 2: Adjust MixerView to use new MixerChannelView
sakertooth Dec 18, 2022
e3be7c8
Phase 3: Adjust MixerView to use new MixerChannelView
sakertooth Dec 18, 2022
beb3d8e
Phase 4: Adjust MixerView to use new MixerChannelView
sakertooth Dec 18, 2022
dfe0561
Phase 5: Adjust MixerView to use new MixerChannelView
sakertooth Dec 18, 2022
63d5989
Phase 5: Adjust MixerView to use new MixerChannelView
sakertooth Dec 18, 2022
1905431
Remove places where MixerChannelView is being deleted
sakertooth Dec 18, 2022
f915d3f
Replace MixerLine with MixerChannelView
sakertooth Dec 18, 2022
b83b510
Replace setCurrentMixerLine calls with setCurrentMixerChannel around …
sakertooth Dec 18, 2022
fed3389
Add event handlers in MixerChannelView
sakertooth Dec 18, 2022
c6fcee5
Implement MixerChannelView::eventFilter
sakertooth Dec 18, 2022
135c16c
Update theme styles to use MixerChannelView
sakertooth Dec 18, 2022
4eddae6
Add QColor properties from style
sakertooth Dec 18, 2022
937c4a1
Add effect rack to rack layout when adding channel
sakertooth Dec 18, 2022
abb4520
Set size for MixerChannelView
sakertooth Dec 18, 2022
b9b894e
Retain size when widgets are hidden
sakertooth Dec 18, 2022
38d176e
Implement paintEvent
sakertooth Dec 19, 2022
484fe76
Implement send/receive arrow toggling
sakertooth Dec 19, 2022
4b3dba2
Implement renaming mixer channels
sakertooth Dec 19, 2022
cfad01e
Implement color functions
sakertooth Dec 19, 2022
12e5759
Implement channel moving/removing functions
sakertooth Dec 19, 2022
d2a3e5f
Do some cleanup
sakertooth Dec 19, 2022
7dec220
Include cassert
sakertooth Dec 19, 2022
354fd2a
Replace references to MixerLine with MixerChannelView
sakertooth Dec 19, 2022
a51855c
Reduce height
sakertooth Dec 22, 2022
0e92d4d
Remove trailing whitespace
sakertooth Dec 23, 2022
51bb83f
Make m_renameLineEdit read only
sakertooth Dec 24, 2022
2a451a7
Set spacing in channel layout back to 0
sakertooth Dec 24, 2022
3eac413
Remove sizeHint override and constant size
sakertooth Dec 24, 2022
ff7965a
Use sizeHint for mixerChannelSize
sakertooth Dec 24, 2022
ac835dc
Set margins to 4 on all sides in MixerChannelView
sakertooth Dec 24, 2022
d6a0f4d
Merge master and fix the build
michaelgregorius Dec 27, 2023
27f91c3
Move solo and mute closer to each other
michaelgregorius Dec 27, 2023
29e4cfe
Fixes for CodeFactor
michaelgregorius Dec 27, 2023
f32d9ce
Code review changes
michaelgregorius Dec 29, 2023
6950998
Adjust parameter order in MixerChannelView's constructor
michaelgregorius Dec 29, 2023
1d3ee18
Move styling of rename line edit into style sheets
michaelgregorius Dec 29, 2023
92878ce
More code review changes
michaelgregorius Dec 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions data/locale/ar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5334,62 +5334,62 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>MixerLine</name>
<name>MixerChannelView</name>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="86"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="86"/>
<source>Channel send amount</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="242"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="242"/>
<source>Move &amp;left</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="243"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="243"/>
<source>Move &amp;right</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="245"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="245"/>
<source>Rename &amp;channel</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="250"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="250"/>
<source>R&amp;emove channel</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="253"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="253"/>
<source>Remove &amp;unused channels</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="255"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="255"/>
<source>Set channel color</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="256"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="256"/>
<source>Remove channel color</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="257"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="257"/>
<source>Pick random channel color</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>MixerLineLcdSpinBox</name>
<name>MixerChannelLcdSpinBox</name>
<message>
<location filename="../../src/gui/widgets/MixerLineLcdSpinBox.cpp" line="58"/>
<location filename="../../src/gui/widgets/MixerChannelLcdSpinBox.cpp" line="58"/>
<source>Assign to:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/widgets/MixerLineLcdSpinBox.cpp" line="58"/>
<location filename="../../src/gui/widgets/MixerChannelLcdSpinBox.cpp" line="58"/>
<source>New Mixer Channel</source>
<translation type="unfinished"/>
</message>
Expand Down
22 changes: 11 additions & 11 deletions data/locale/bs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2698,14 +2698,14 @@ Please make sure you have write-permission to the file and the directory contain
</message>
</context>
<context>
<name>MixerLine</name>
<name>MixerChannelView</name>
<message>
<location filename="src/gui/MixerLine.cpp" line="71"/>
<location filename="src/gui/MixerChannelView.cpp" line="71"/>
<source>Channel send amount</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/MixerLine.cpp" line="85"/>
<location filename="src/gui/MixerChannelView.cpp" line="85"/>
<source>The Mixer channel receives input from one or more instrument tracks.
It in turn can be routed to multiple other mixer channels. LMMS automatically takes care of preventing infinite loops for you and doesn't allow making a connection that would result in an infinite loop.

Expand All @@ -2716,27 +2716,27 @@ You can remove and move mixer channels in the context menu, which is accessed by
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/MixerLine.cpp" line="213"/>
<location filename="src/gui/MixerChannelView.cpp" line="213"/>
<source>Move &amp;left</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/MixerLine.cpp" line="214"/>
<location filename="src/gui/MixerChannelView.cpp" line="214"/>
<source>Move &amp;right</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/MixerLine.cpp" line="216"/>
<location filename="src/gui/MixerChannelView.cpp" line="216"/>
<source>Rename &amp;channel</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/MixerLine.cpp" line="221"/>
<location filename="src/gui/MixerChannelView.cpp" line="221"/>
<source>R&amp;emove channel</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/MixerLine.cpp" line="226"/>
<location filename="src/gui/MixerChannelView.cpp" line="226"/>
<source>Remove &amp;unused channels</source>
<translation type="unfinished"/>
</message>
Expand Down Expand Up @@ -2789,12 +2789,12 @@ You can remove and move mixer channels in the context menu, which is accessed by
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/MixerLine.cpp" line="241"/>
<location filename="src/gui/MixerChannelView.cpp" line="241"/>
<source>Rename mixer channel</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="src/gui/MixerLine.cpp" line="242"/>
<location filename="src/gui/MixerChannelView.cpp" line="242"/>
<source>Enter the new name for this mixer channel</source>
<translation type="unfinished"/>
</message>
Expand Down Expand Up @@ -9752,7 +9752,7 @@ Please make sure you have read-permission to the file and the directory containi
</message>
</context>
<context>
<name>MixerLineLcdSpinBox</name>
<name>MixerChannelLcdSpinBox</name>
<message>
<location filename="src/tracks/InstrumentTrack.cpp" line="1246"/>
<source>Assign to:</source>
Expand Down
26 changes: 13 additions & 13 deletions data/locale/ca.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5333,62 +5333,62 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>MixerLine</name>
<name>MixerChannelView</name>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="86"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="86"/>
<source>Channel send amount</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="242"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="242"/>
<source>Move &amp;left</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="243"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="243"/>
<source>Move &amp;right</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="245"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="245"/>
<source>Rename &amp;channel</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="250"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="250"/>
<source>R&amp;emove channel</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="253"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="253"/>
<source>Remove &amp;unused channels</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="255"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="255"/>
<source>Set channel color</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="256"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="256"/>
<source>Remove channel color</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="257"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="257"/>
<source>Pick random channel color</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>MixerLineLcdSpinBox</name>
<name>MixerChannelLcdSpinBox</name>
<message>
<location filename="../../src/gui/widgets/MixerLineLcdSpinBox.cpp" line="58"/>
<location filename="../../src/gui/widgets/MixerChannelLcdSpinBox.cpp" line="58"/>
<source>Assign to:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/widgets/MixerLineLcdSpinBox.cpp" line="58"/>
<location filename="../../src/gui/widgets/MixerChannelLcdSpinBox.cpp" line="58"/>
<source>New mixer Channel</source>
<translation type="unfinished"/>
</message>
Expand Down
26 changes: 13 additions & 13 deletions data/locale/cs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5334,62 +5334,62 @@ Ověřte si prosím, zda máte povolen zápis do souboru a do složky, ve které
</message>
</context>
<context>
<name>MixerLine</name>
<name>MixerChannelView</name>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="86"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="86"/>
<source>Channel send amount</source>
<translation>Množství odeslaného kanálu</translation>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="242"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="242"/>
<source>Move &amp;left</source>
<translation>Přesunout do&amp;leva</translation>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="243"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="243"/>
<source>Move &amp;right</source>
<translation>Přesun dop&amp;rava</translation>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="245"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="245"/>
<source>Rename &amp;channel</source>
<translation>Přejmenovat &amp;kanál</translation>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="250"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="250"/>
<source>R&amp;emove channel</source>
<translation>Př&amp;esunout kanál</translation>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="253"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="253"/>
<source>Remove &amp;unused channels</source>
<translation>Odstranit nepo&amp;užívané kanály</translation>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="255"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="255"/>
<source>Set channel color</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="256"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="256"/>
<source>Remove channel color</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="257"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="257"/>
<source>Pick random channel color</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>MixerLineLcdSpinBox</name>
<name>MixerChannelLcdSpinBox</name>
<message>
<location filename="../../src/gui/widgets/MixerLineLcdSpinBox.cpp" line="58"/>
<location filename="../../src/gui/widgets/MixerChannelLcdSpinBox.cpp" line="58"/>
<source>Assign to:</source>
<translation>Přiřadit k:</translation>
</message>
<message>
<location filename="../../src/gui/widgets/MixerLineLcdSpinBox.cpp" line="58"/>
<location filename="../../src/gui/widgets/MixerChannelLcdSpinBox.cpp" line="58"/>
<source>New mixer Channel</source>
<translation>Nový efektový kanál</translation>
</message>
Expand Down
26 changes: 13 additions & 13 deletions data/locale/de.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5334,62 +5334,62 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>MixerLine</name>
<name>MixerChannelView</name>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="86"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="86"/>
<source>Channel send amount</source>
<translation>Kanal Sendemenge</translation>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="242"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="242"/>
<source>Move &amp;left</source>
<translation>Nach &amp;links verschieben</translation>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="243"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="243"/>
<source>Move &amp;right</source>
<translation>Nach &amp;rechts verschieben</translation>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="245"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="245"/>
<source>Rename &amp;channel</source>
<translation>&amp;Kanal umbenennen</translation>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="250"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="250"/>
<source>R&amp;emove channel</source>
<translation>Kanal &amp;Entfernen</translation>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="253"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="253"/>
<source>Remove &amp;unused channels</source>
<translation>Entferne &amp;unbenutzte Kanäle</translation>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="255"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="255"/>
<source>Set channel color</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="256"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="256"/>
<source>Remove channel color</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/gui/MixerLine.cpp" line="257"/>
<location filename="../../src/gui/MixerChannelView.cpp" line="257"/>
<source>Pick random channel color</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>MixerLineLcdSpinBox</name>
<name>MixerChannelLcdSpinBox</name>
<message>
<location filename="../../src/gui/widgets/MixerLineLcdSpinBox.cpp" line="58"/>
<location filename="../../src/gui/widgets/MixerChannelLcdSpinBox.cpp" line="58"/>
<source>Assign to:</source>
<translation>Weise hinzu:</translation>
</message>
<message>
<location filename="../../src/gui/widgets/MixerLineLcdSpinBox.cpp" line="58"/>
<location filename="../../src/gui/widgets/MixerChannelLcdSpinBox.cpp" line="58"/>
<source>New mixer Channel</source>
<translation>Neuer FX-Kanal</translation>
</message>
Expand Down
Loading
Loading