mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-31 20:34:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename FxMixer to Mixer (#6239)

Browse Source 
... as decided in #6089 and #5592.

This PR replaces every occurrence of "FX" where "Mixer Channel" is meant.
This commit is contained in:
Yashraj Shinde
2022-01-09 12:45:23 +05:30
committed by GitHub
parent 54fff4ff23
commit bf323d2024
281 changed files with 2816 additions and 2788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/MainWindow.cpp
View File

@@ -48,7 +48,7 @@
#include "ExportProjectDialog.h"
#include "FileBrowser.h"
#include "FileDialog.h"
#include "FxMixerView.h"
#include "MixerView.h"
#include "GuiApplication.h"
#include "ImportFilter.h"
#include "InstrumentTrackView.h"
@@ -526,12 +526,12 @@ void MainWindow::finalize()
m_toolBar );
automation_editor_window->setShortcut( Qt::CTRL + Qt::Key_4 );
ToolButton * fx_mixer_window = new ToolButton(
embed::getIconPixmap( "fx_mixer" ),
tr( "FX Mixer" ) + " (Ctrl+5)",
this, SLOT( toggleFxMixerWin() ),
ToolButton * mixer_window = new ToolButton(
embed::getIconPixmap( "mixer" ),
tr( "Mixer" ) + " (Ctrl+5)",
this, SLOT( toggleMixerWin() ),
m_toolBar );
fx_mixer_window->setShortcut( Qt::CTRL + Qt::Key_5 );
mixer_window->setShortcut( Qt::CTRL + Qt::Key_5 );
ToolButton * controllers_window = new ToolButton(
embed::getIconPixmap( "controller" ),
@@ -561,7 +561,7 @@ void MainWindow::finalize()
m_toolBarLayout->addWidget( bb_editor_window, 1, 2 );
m_toolBarLayout->addWidget( piano_roll_window, 1, 3 );
m_toolBarLayout->addWidget( automation_editor_window, 1, 4 );
m_toolBarLayout->addWidget( fx_mixer_window, 1, 5 );
m_toolBarLayout->addWidget( mixer_window, 1, 5 );
m_toolBarLayout->addWidget( controllers_window, 1, 6 );
m_toolBarLayout->addWidget( project_notes_window, 1, 7 );
m_toolBarLayout->addWidget( microtuner_window, 1, 8 );
@@ -745,7 +745,7 @@ void MainWindow::clearKeyModifiers()
void MainWindow::saveWidgetState( QWidget * _w, QDomElement & _de )
{
// If our widget is the main content of a window (e.g. piano roll, FxMixer, etc),
// If our widget is the main content of a window (e.g. piano roll, Mixer, etc),
// we really care about the position of the *window* - not the position of the widget within its window
if( _w->parentWidget() != nullptr &&
_w->parentWidget()->inherits( "QMdiSubWindow" ) )
@@ -782,7 +782,7 @@ void MainWindow::restoreWidgetState( QWidget * _w, const QDomElement & _de )
qMax( _w->minimumHeight(), _de.attribute( "height" ).toInt() ) );
if( _de.hasAttribute( "visible" ) && !r.isNull() )
{
// If our widget is the main content of a window (e.g. piano roll, FxMixer, etc),
// If our widget is the main content of a window (e.g. piano roll, Mixer, etc),
// we really care about the position of the *window* - not the position of the widget within its window
if ( _w->parentWidget() != nullptr &&
_w->parentWidget()->inherits( "QMdiSubWindow" ) )
@@ -1118,9 +1118,9 @@ void MainWindow::toggleAutomationEditorWin()
void MainWindow::toggleFxMixerWin()
void MainWindow::toggleMixerWin()
{
toggleWindow( getGUI()->fxMixerView() );
toggleWindow( getGUI()->mixerView() );
}
@@ -1154,9 +1154,9 @@ void MainWindow::updateViewMenu()
this,
SLOT( toggleAutomationEditorWin())
);
m_viewMenu->addAction(embed::getIconPixmap( "fx_mixer" ),
tr( "FX Mixer" ) + "\tCtrl+5",
this, SLOT( toggleFxMixerWin() )
m_viewMenu->addAction(embed::getIconPixmap( "mixer" ),
tr( "Mixer" ) + "\tCtrl+5",
this, SLOT( toggleMixerWin() )
);
m_viewMenu->addAction(embed::getIconPixmap( "controller" ),
tr( "Controller Rack" ) + "\tCtrl+6",