diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 5ca60c22b2..3881dcd0c4 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -70,10 +70,8 @@ DMainWindow::DMainWindow(QWidget* parent_widget) connect(m_ui->actionIconView, &QAction::triggered, this, &DMainWindow::OnGameListStyleChanged); connect(m_ui->actionPlay, &QAction::triggered, this, &DMainWindow::OnPlay); - connect(m_ui->actionPlay_mnu, &QAction::triggered, this, &DMainWindow::OnPlay); connect(m_game_tracker, &DGameTracker::StartGame, this, &DMainWindow::OnPlay); connect(m_ui->actionStop, &QAction::triggered, this, &DMainWindow::OnStop); - connect(m_ui->actionStop_mnu, &QAction::triggered, this, &DMainWindow::OnStop); connect(m_ui->actionReset, &QAction::triggered, this, &DMainWindow::OnReset); connect(m_ui->actionWebsite, &QAction::triggered, this, [&]() { @@ -339,13 +337,11 @@ void DMainWindow::OnCoreStateChanged(Core::EState state) { m_ui->actionPlay->setIcon(Resources::GetIcon(Resources::TOOLBAR_PAUSE)); m_ui->actionPlay->setText(tr("Pause")); - m_ui->actionPlay_mnu->setText(tr("Pause")); } else if (is_paused || is_not_initialized) { m_ui->actionPlay->setIcon(Resources::GetIcon(Resources::TOOLBAR_PLAY)); m_ui->actionPlay->setText(tr("Play")); - m_ui->actionPlay_mnu->setText(tr("Play")); } m_ui->actionStop->setEnabled(!is_not_initialized); diff --git a/Source/Core/DolphinQt/MainWindow.ui b/Source/Core/DolphinQt/MainWindow.ui index 966486f29f..26db42cd1f 100644 --- a/Source/Core/DolphinQt/MainWindow.ui +++ b/Source/Core/DolphinQt/MainWindow.ui @@ -19,9 +19,6 @@ 32 - - Qt::ToolButtonTextUnderIcon - true @@ -32,9 +29,12 @@ 0 0 990 - 19 + 21 + + true + Fi&le @@ -49,8 +49,8 @@ E&mulation - - + + @@ -108,6 +108,9 @@ Toolbar + + Qt::ToolButtonTextUnderIcon + TopToolBarArea @@ -160,11 +163,23 @@ Play + + F10 + + + false + Stop + + Esc + + + false + @@ -216,22 +231,6 @@ Exit - - - &Play - - - F10 - - - - - &Stop - - - Esc - - &Reset