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

Jump to bottom

#1420 Fader Settings improvements #3151

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

#1420 Fader Settings improvements #3151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 44 additions & 5 deletions src/clientdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,17 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
// Edit menu --------------------------------------------------------------
QMenu* pEditMenu = new QMenu ( tr ( "&Edit" ), this );

pEditMenu->addAction ( tr ( "Clear &All Stored Solo and Mute Settings" ), this, SLOT ( OnClearAllStoredSoloMuteSettings() ) );
QMenu* pFaderMenu = new QMenu ( tr ( "Stored &Fader Settings" ), this );
Copy link
Member

Choose a reason for hiding this comment

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

&F is already used in the same menu for Auto-Adjust all &Faders


pEditMenu->addAction ( tr ( "Set All Faders to New Client &Level" ),
pEditMenu->addMenu ( pFaderMenu );
Copy link
Member

Choose a reason for hiding this comment

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

This appears to be the first time Jamulus has used a cascading menu. Works fine on desktop devices, but do we know if it is friendly to Android and iOS?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Here's a screenshot from my phone
Screenshot_20240328-175036

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The iconography isn't clear -- the higher level menu doesn't indicate that the first item is a sub-menu. But that's par for the course with Qt on Android.


pFaderMenu->addAction ( tr ( "Clear &All Stored Fader Settings" ), this, SLOT ( OnClearFaderAllSettings() ) );
pFaderMenu->addAction ( tr ( "Clear Stored &Level Settings" ), this, SLOT ( OnClearFaderLevelSettings() ) );
pFaderMenu->addAction ( tr ( "Clear Stored &Solo Settings" ), this, SLOT ( OnClearFaderSoloSettings() ) );
pFaderMenu->addAction ( tr ( "Clear Stored &Mute Settings" ), this, SLOT ( OnClearFaderMuteSettings() ) );
pFaderMenu->addAction ( tr ( "Clear Stored &Group ID Settings" ), this, SLOT ( OnClearFaderGroupIdSettings() ) );

pEditMenu->addAction ( tr ( "Set Current Faders to New Client &Level" ),
this,
SLOT ( OnSetAllFadersToNewClientLevel() ),
QKeySequence ( Qt::CTRL + Qt::Key_L ) );
Expand Down Expand Up @@ -769,16 +777,47 @@ void CClientDlg::OnConnectDisconBut()
}
}

void CClientDlg::OnClearAllStoredSoloMuteSettings()
// if we are in an active connection, we first have to store all fader settings in
// the settings struct, clear the solo and mute states and then apply the settings again
void CClientDlg::OnClearFaderAllSettings()
{
MainMixerBoard->StoreAllFaderSettings();
pSettings->vecStoredFaderLevels.Reset ( false );
pSettings->vecStoredFaderLevels.Reset ( false );
pSettings->vecStoredFaderIsSolo.Reset ( false );
pSettings->vecStoredFaderIsMute.Reset ( false );
pSettings->vecStoredFaderTags.Reset ( QString() );
MainMixerBoard->LoadAllFaderSettings();
}

void CClientDlg::OnClearFaderLevelSettings()
{
MainMixerBoard->StoreAllFaderSettings();
pSettings->vecStoredFaderLevels.Reset ( false );
MainMixerBoard->LoadAllFaderSettings();
}

void CClientDlg::OnClearFaderSoloSettings()
{
// if we are in an active connection, we first have to store all fader settings in
// the settings struct, clear the solo and mute states and then apply the settings again
MainMixerBoard->StoreAllFaderSettings();
pSettings->vecStoredFaderIsSolo.Reset ( false );
MainMixerBoard->LoadAllFaderSettings();
}

void CClientDlg::OnClearFaderMuteSettings()
{
MainMixerBoard->StoreAllFaderSettings();
pSettings->vecStoredFaderIsMute.Reset ( false );
MainMixerBoard->LoadAllFaderSettings();
}

void CClientDlg::OnClearFaderGroupIdSettings()
{
MainMixerBoard->StoreAllFaderSettings();
pSettings->vecStoredFaderGroupID.Reset ( false );
MainMixerBoard->LoadAllFaderSettings();
}

void CClientDlg::OnLoadChannelSetup()
{
QString strFileName = QFileDialog::getOpenFileName ( this, tr ( "Select Channel Setup File" ), "", QString ( "*." ) + MIX_SETTINGS_FILE_SUFFIX );
Expand Down
8 changes: 7 additions & 1 deletion src/clientdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,15 @@ public slots:
void OnSortChannelsByGroupID() { MainMixerBoard->SetFaderSorting ( ST_BY_GROUPID ); }
void OnSortChannelsByCity() { MainMixerBoard->SetFaderSorting ( ST_BY_CITY ); }
void OnSortChannelsByChannel() { MainMixerBoard->SetFaderSorting ( ST_BY_SERVER_CHANNEL ); }
void OnClearAllStoredSoloMuteSettings();

void OnClearFaderAllSettings();
void OnClearFaderLevelSettings();
void OnClearFaderSoloSettings();
void OnClearFaderMuteSettings();
void OnClearFaderGroupIdSettings();
void OnSetAllFadersToNewClientLevel() { MainMixerBoard->SetAllFaderLevelsToNewClientLevel(); }
void OnAutoAdjustAllFaderLevels() { MainMixerBoard->AutoAdjustAllFaderLevels(); }

void OnNumMixerPanelRowsChanged ( int value ) { MainMixerBoard->SetNumMixerPanelRows ( value ); }

void OnSettingsStateChanged ( int value );
Expand Down
Loading