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.

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

Commits on Dec 18, 2022

  1. Remove extra transparency in send/receive arrows

    The extra transparency was conflicting with the positioning of
    the arrows in the layout
    sakertooth committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    b447484 View commit details
    Browse the repository at this point in the history
  2. Begin reimplementing MixerChannelView

    MixerChannelView is now a combination of the
    MixerLine with the previous MixerChannelView
    sakertooth committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    fb94805 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4e5135f View commit details
    Browse the repository at this point in the history
  4. Remove MixerLine

    - Move MixerChannelView into src/gui
    sakertooth committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    3b71b6a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e5b81d2 View commit details
    Browse the repository at this point in the history
  6. Remove header of MixerLine

    sakertooth committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    6511771 View commit details
    Browse the repository at this point in the history
  7. Change MixerView.h to use MixerChannelView

    Change MixerView.h to use MixerChannelView rather than MixerLine
    Also do some cleanup, such as removing an unused forward declaration
    of QButtonGroup
    sakertooth committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    28c8ab2 View commit details
    Browse the repository at this point in the history
  8. Create EffectRackView

    + Set height of sizeHint() using MIXER_CHANNEL_HEIGHT (287)
    sakertooth committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    48a5d4d View commit details
    Browse the repository at this point in the history
  9. Remove include of MixerLine

    - Include MixerChannelView
    sakertooth committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    4ba600f View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    1908231 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    dcfb14c View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    539c2cf View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    e3be7c8 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    beb3d8e View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    dfe0561 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    63d5989 View commit details
    Browse the repository at this point in the history
  17. Remove places where MixerChannelView is being deleted

    Before, MixerChannelView was not inherited by QWidget,
    meaning it could not have a parent and had to be deleted
    when necessary. Since the MixerView owns the
    new MixerChannelView, this is no longer necessary.
    sakertooth committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    1905431 View commit details
    Browse the repository at this point in the history
  18. Replace MixerLine with MixerChannelView

    - Include MixerChannelView in MixerView
    sakertooth committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    f915d3f View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    b83b510 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    fed3389 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    c6fcee5 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    135c16c View commit details
    Browse the repository at this point in the history
  23. Add QColor properties from style

    - Set the Qt::WA_StyledBackground attribute on
    sakertooth committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    4eddae6 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    937c4a1 View commit details
    Browse the repository at this point in the history
  25. Set size for MixerChannelView

    - Change nullptr to this for certain widgets
       - Some custom widgets may expect there to be a parent
    - Add spacing in channel layout
    - Increase size of mixer channel
    sakertooth committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    abb4520 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    b9b894e View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2022

  1. Implement paintEvent

    - Rename states in SendReceiveState
    sakertooth committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    38d176e View commit details
    Browse the repository at this point in the history
  2. Implement send/receive arrow toggling

    - Make maxTextHeight constexpr in elideName
    - Remove background changing on mouse press
    (is now handled in paintEvent)
    sakertooth committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    484fe76 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4b3dba2 View commit details
    Browse the repository at this point in the history
  4. Implement color functions

    sakertooth committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    cfad01e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    12e5759 View commit details
    Browse the repository at this point in the history
  6. Do some cleanup

    Not sure if that connection with the mute model was needed, but removing
    it did not seem to introduce any issues.
    sakertooth committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    d2a3e5f View commit details
    Browse the repository at this point in the history
  7. Include cassert

    sakertooth committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    7dec220 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    354fd2a View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2022

  1. Reduce height

    + Make m_renameLineEdit transparent
    + Retain size when LCD is hidden
    + Remove stretch after renameLineEdit in layout
    sakertooth committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    a51855c View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2022

  1. Remove trailing whitespace

    sakertooth committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    0e92d4d View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2022

  1. Make m_renameLineEdit read only

    + Transpose m_renameLineEditView rectangle (with 5px offset)
    sakertooth committed Dec 24, 2022
    Configuration menu
    Copy the full SHA
    51bb83f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2a451a7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3eac413 View commit details
    Browse the repository at this point in the history
  4. Use sizeHint for mixerChannelSize

    + Leave auto fill background to false in MixerChannelView
    + Only set width for EffectRackView
    sakertooth committed Dec 24, 2022
    Configuration menu
    Copy the full SHA
    ff7965a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ac835dc View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2023

  1. Merge master and fix the build

    Finxing the build mostly includes applying several of the changes that have been made to `MixerLine` in the meantime to `MixerChannelView`. The relevant commits are:
    * Classier enums: f102777
    * Keep master bus color on FX Mixer when switching project: 609c008
    * Use std::optional for colour interfaces and storage: dc8c49a
    
    Commit aa050ae also made changes to `MixerLine`. These have not been applied as they do not seem to be relevant to `MixerChannelView`.
    
    `InstrumentTrackView` and `SampleTrackView` had references to `MixerLineLcdSpinBox`. These have been adjusted to `MixerChannelLcdSpinBox` in the header files and the implementation files.
    
    Conflicts:
    * include/MixerChannelLcdSpinBox.h
    * include/MixerLine.h
    * include/SampleTrackWindow.h
    * src/gui/MixerLine.cpp
    * src/gui/MixerView.cpp
    * src/gui/SendButtonIndicator.cpp
    michaelgregorius committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    d6a0f4d View commit details
    Browse the repository at this point in the history
  2. Move solo and mute closer to each other

    Move the solo and mute buttons closer to each other in the mixer channels.
    
    Technically this is accomplished by putting them into their own layout with minimal margins and spacing.
    michaelgregorius committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    27f91c3 View commit details
    Browse the repository at this point in the history
  3. Fixes for CodeFactor

    michaelgregorius committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    29e4cfe View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. Code review changes

    Mostly whitespace and formatting changes: remove tabs, remove spaces in parameter lists, remove underscores from parameter names.
    
    Some lines have been shortened by introducing intermediate variables, e.g. in `MixerChannelView`.
    
    `MixerView` has many changes but only related to whitespace. Spaces have been introduced for if and for statements. Whitespace at round braces has been removed everywhere in the implementation file even if a line was not touched by the intial changes.
    
    Remove duplicate forward declaration of `MixerChannelView`.
    michaelgregorius committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    f32d9ce View commit details
    Browse the repository at this point in the history
  2. Adjust parameter order in MixerChannelView's constructor

    Make the parent `QWidget` the first parameter as it is a Qt convention. The default parameter had to be removed due to this.
    michaelgregorius committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    6950998 View commit details
    Browse the repository at this point in the history
  3. Move styling of rename line edit into style sheets

    Move the style of the `QGraphicsView` for the rename line edit from the code into the style sheets of the default and classic theme.
    michaelgregorius committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    1d3ee18 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2023

  1. More code review changes

    Fix spaces between types and references/pointers, e.g. use `const QBrush& c` instead of `const QBrush & c`.
    Remove underscores from parameter names.
    Remove spaces near parentheses.
    Replace tabs with spaces.
    Introduce intermediate variable to resolve "hanging" + operator.
    Replace the connection for the periodic fader updates with one that uses function pointers instead of `SIGNAL` and `SLOT`.
    michaelgregorius committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    92878ce View commit details
    Browse the repository at this point in the history