mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-09-01 15:16:22 +00:00
Merge branch 'master' of https://github.com/dolphin-emu/dolphin
This commit is contained in:
commit
68012cb2c6
1 changed files with 4 additions and 8 deletions
|
@ -118,12 +118,9 @@ void ToolBar::MakeActions()
|
|||
|
||||
addSeparator();
|
||||
|
||||
m_pause_play_action = addAction(tr("Local Play"), this, &ToolBar::PlayPressed);
|
||||
m_start_netplay_action = addAction(tr("Online Play"), this, &ToolBar::StartNetPlayPressed);
|
||||
m_pause_play_action = addAction(tr("Play"), this, &ToolBar::PlayPressed);
|
||||
|
||||
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);
|
||||
|
||||
|
@ -165,8 +162,8 @@ void ToolBar::UpdatePausePlayButtonState(const bool playing_state)
|
|||
else
|
||||
{
|
||||
disconnect(m_pause_play_action, nullptr, nullptr, nullptr);
|
||||
m_pause_play_action->setText(tr("Local Play"));
|
||||
m_pause_play_action->setIcon(Resources::GetScaledThemeIcon("play"));
|
||||
m_pause_play_action->setText(tr("Play"));
|
||||
m_pause_play_action->setIcon(Resources::GetThemeIcon("play"));
|
||||
connect(m_pause_play_action, &QAction::triggered, this, &ToolBar::PlayPressed);
|
||||
}
|
||||
}
|
||||
|
@ -196,5 +193,4 @@ void ToolBar::UpdateIcons()
|
|||
m_config_action->setIcon(Resources::GetThemeIcon("config"));
|
||||
m_controllers_action->setIcon(Resources::GetThemeIcon("classic"));
|
||||
m_graphics_action->setIcon(Resources::GetThemeIcon("graphics"));
|
||||
m_start_netplay_action->setIcon(Resources::GetScaledThemeIcon("wifi"));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue