mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 14:49:42 -06:00
Merge pull request #11456 from MayImilae/remove-boot-from-dvd
Remove Boot from DVD Backup
This commit is contained in:
@ -479,8 +479,6 @@ void MainWindow::ConnectMenuBar()
|
||||
connect(m_menu_bar, &MenuBar::Exit, this, &MainWindow::close);
|
||||
connect(m_menu_bar, &MenuBar::EjectDisc, this, &MainWindow::EjectDisc);
|
||||
connect(m_menu_bar, &MenuBar::ChangeDisc, this, &MainWindow::ChangeDisc);
|
||||
connect(m_menu_bar, &MenuBar::BootDVDBackup, this,
|
||||
[this](const QString& drive) { StartGame(drive, ScanForSecondDisc::No); });
|
||||
connect(m_menu_bar, &MenuBar::OpenUserFolder, this, &MainWindow::OpenUserFolder);
|
||||
|
||||
// Emulation
|
||||
|
@ -189,19 +189,6 @@ void MenuBar::OnDebugModeToggled(bool enabled)
|
||||
}
|
||||
}
|
||||
|
||||
void MenuBar::AddDVDBackupMenu(QMenu* file_menu)
|
||||
{
|
||||
m_backup_menu = file_menu->addMenu(tr("&Boot from DVD Backup"));
|
||||
|
||||
const std::vector<std::string> drives = Common::GetCDDevices();
|
||||
// Windows Limitation of 24 character drives
|
||||
for (size_t i = 0; i < drives.size() && i < 24; i++)
|
||||
{
|
||||
auto drive = QString::fromStdString(drives[i]);
|
||||
m_backup_menu->addAction(drive, this, [this, drive] { emit BootDVDBackup(drive); });
|
||||
}
|
||||
}
|
||||
|
||||
void MenuBar::AddFileMenu()
|
||||
{
|
||||
QMenu* file_menu = addMenu(tr("&File"));
|
||||
@ -212,8 +199,6 @@ void MenuBar::AddFileMenu()
|
||||
m_change_disc = file_menu->addAction(tr("Change &Disc..."), this, &MenuBar::ChangeDisc);
|
||||
m_eject_disc = file_menu->addAction(tr("&Eject Disc"), this, &MenuBar::EjectDisc);
|
||||
|
||||
AddDVDBackupMenu(file_menu);
|
||||
|
||||
file_menu->addSeparator();
|
||||
|
||||
m_open_user_folder =
|
||||
|
@ -54,7 +54,6 @@ signals:
|
||||
void Open();
|
||||
void Exit();
|
||||
void ChangeDisc();
|
||||
void BootDVDBackup(const QString& backup);
|
||||
void EjectDisc();
|
||||
void OpenUserFolder();
|
||||
|
||||
@ -127,7 +126,6 @@ private:
|
||||
void OnEmulationStateChanged(Core::State state);
|
||||
|
||||
void AddFileMenu();
|
||||
void AddDVDBackupMenu(QMenu* file_menu);
|
||||
|
||||
void AddEmulationMenu();
|
||||
void AddStateLoadMenu(QMenu* emu_menu);
|
||||
|
Reference in New Issue
Block a user