Merge branch 'dolphin-mpn' into master

This commit is contained in:
Nayla 2023-04-05 04:10:05 -04:00 committed by GitHub
commit f3669dbbd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
903 changed files with 4243 additions and 386 deletions

View file

@ -118,9 +118,12 @@ void ToolBar::MakeActions()
addSeparator();
m_pause_play_action = addAction(tr("Play"), this, &ToolBar::PlayPressed);
m_pause_play_action = addAction(tr("Local Play"), this, &ToolBar::PlayPressed);
m_start_netplay_action = addAction(tr("Online Play"), this, &ToolBar::StartNetPlayPressed);
m_stop_action = addAction(tr("Stop"), this, &ToolBar::StopPressed);
addSeparator();
m_fullscreen_action = addAction(tr("FullScr"), this, &ToolBar::FullScreenPressed);
m_screenshot_action = addAction(tr("ScrShot"), this, &ToolBar::ScreenShotPressed);
@ -162,7 +165,7 @@ void ToolBar::UpdatePausePlayButtonState(const bool playing_state)
else
{
disconnect(m_pause_play_action, 0, 0, 0);
m_pause_play_action->setText(tr("Play"));
m_pause_play_action->setText(tr("Local Play"));
m_pause_play_action->setIcon(Resources::GetScaledThemeIcon("play"));
connect(m_pause_play_action, &QAction::triggered, this, &ToolBar::PlayPressed);
}
@ -193,4 +196,5 @@ void ToolBar::UpdateIcons()
m_config_action->setIcon(Resources::GetScaledThemeIcon("config"));
m_controllers_action->setIcon(Resources::GetScaledThemeIcon("classic"));
m_graphics_action->setIcon(Resources::GetScaledThemeIcon("graphics"));
m_start_netplay_action->setIcon(Resources::GetScaledThemeIcon("wifi"));
}