Skip to content

Redesign of the Controller Rack #2944

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

Open
BaraMGB wants to merge 35 commits into
base: master
Choose a base branch
from
Open

Redesign of the Controller Rack #2944

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
16203e1
Redesign of the Controller Rack
BaraMGB Jul 28, 2016
f8ea0cc
makes the controller title bar themable in styles.css
BaraMGB Jul 31, 2016
e79196f
change width when scroll bar is needed
BaraMGB Jul 31, 2016
ff124c2
minor style corretions
BaraMGB Jul 31, 2016
9ba7cd7
change window width if scrollbar is needed/minor style corrections
BaraMGB Jul 31, 2016
8ccf0f7
minor corrections
BaraMGB Jul 31, 2016
5eb3b63
change order of member variables to avoiding compiler warnings
BaraMGB Aug 2, 2016
ff7cd24
change identify method for peakcontroller dialog for avoiding subwindow
BaraMGB Aug 2, 2016
c7dbd45
detect collapse for resize window if scrollbar is not needed anymore
BaraMGB Aug 2, 2016
b853dc3
Adds drop feature to controller
BaraMGB Aug 5, 2016
82da86b
change some Headers
BaraMGB Jan 24, 2017
187406e
rebase to master
BaraMGB Jan 24, 2017
aa88b07
correct artwork files
BaraMGB Jan 24, 2017
2aa980d
add controller type to title bar
BaraMGB Jan 24, 2017
b152520
pull master
BaraMGB Aug 27, 2017
8c98234
Merge branch 'master' of https://github.com/LMMS/lmms into controller…
BaraMGB Mar 11, 2018
a93c61a
remove the <controls> button in the effect chain for peak controllers
BaraMGB Mar 11, 2018
50c6cce
Controls button in EffectRack now shows/hides ControllerRack
BaraMGB Mar 12, 2018
437facd
add <collapse/expand all> in context menu
BaraMGB Mar 12, 2018
286414e
add <move up/down controller> in the context menu
BaraMGB Mar 13, 2018
210d7f2
merge master
BaraMGB Jun 12, 2019
40c557d
clean up ControllerRackView.*
BaraMGB Jun 25, 2019
1f8b0e2
clean up ControllerView.*
BaraMGB Jun 25, 2019
f5ef8a3
fix: Controller position after reload project is wrong
BaraMGB Aug 1, 2019
5dd58d6
merge master
BaraMGB Aug 1, 2019
7427142
merge master part2
BaraMGB Aug 1, 2019
cf6c7a8
ensure qt5.4 compatibility for windows builds
BaraMGB Aug 13, 2019
d325dd2
improve the collapsing
BaraMGB Aug 13, 2019
3ea3da8
saves the collapsing state with the project / clean up code
BaraMGB Aug 24, 2019
1252142
clean up code
BaraMGB Aug 24, 2019
66ad5b5
fix crash during load an old project
BaraMGB Aug 25, 2019
b863932
suggested changes from code review by PhysSong
BaraMGB Aug 28, 2019
afafa21
move SubWindow logic from EffectView to EffectControllerDialog
BaraMGB Aug 28, 2019
9e67b38
export ControllerRackView class
BaraMGB Aug 29, 2019
63a14a4
clean up #includes in PeakControllerDialog.cpp
BaraMGB Aug 29, 2019
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
1 change: 0 additions & 1 deletion plugins/peak_controller_effect/peak_controller_effect_control_dialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ class LedCheckBox;

class PeakControllerEffectControlDialog : public EffectControlDialog
{
Q_OBJECT
public:
PeakControllerEffectControlDialog(
PeakControllerEffectControls * _controls );
Expand Down
3 changes: 2 additions & 1 deletion src/gui/widgets/EffectView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include "TempoSyncKnob.h"
#include "ToolTip.h"
#include "Song.h"
#include "plugins/peak_controller_effect/peak_controller_effect_control_dialog.h"


EffectView::EffectView( Effect * _model, QWidget * _parent ) :
Expand Down Expand Up @@ -111,7 +112,7 @@ EffectView::EffectView( Effect * _model, QWidget * _parent ) :
m_controlView = effect()->controls()->createView();
if( m_controlView )
{
if( !(m_controlView->windowTitle() == "Peak Controller") )
if( dynamic_cast<PeakControllerEffectControlDialog*>( m_controlView ) == NULL )
Copy link
Contributor Author

@BaraMGB BaraMGB Aug 2, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to remove the Q_OBJECT macro from PeakControllerEffectDialog otherwise I get a linker error. Actually the Q_OBJECT macro isn't needed because there is no Signal/Slot stuff in this class. and everything works fine. But eventually someone can look into this.

{
m_subWindow = gui->mainWindow()->addWindowedWidget( m_controlView,
Qt::SubWindow | Qt::CustomizeWindowHint |
Expand Down