Skip to content

Commit

Permalink
RMG: turn 'Play Game with Disk' context menu item into a dynamic cont…
Browse files Browse the repository at this point in the history 
…ext menu
  • Loading branch information
@Rosalie241
Rosalie241 committed Jan 21, 2025
1 parent 667c2d5 commit c1db77a
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 10 deletions.
7 changes: 7 additions & 0 deletions Source/RMG/UserInterface/MainWindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@ void MainWindow::initializeUI(bool launchROM)
&MainWindow::on_RomBrowser_PlayGame);
connect(this->ui_Widget_RomBrowser, &Widget::RomBrowserWidget::PlayGameWith, this,
&MainWindow::on_RomBrowser_PlayGameWith);
connect(this->ui_Widget_RomBrowser, &Widget::RomBrowserWidget::PlayGameWithDisk, this,
&MainWindow::on_RomBrowser_PlayGameWithDisk);
connect(this->ui_Widget_RomBrowser, &Widget::RomBrowserWidget::PlayGameWithSlot, this,
&MainWindow::on_RomBrowser_PlayGameWithSlot);
connect(this->ui_Widget_RomBrowser, &Widget::RomBrowserWidget::EditGameSettings, this,
Expand Down Expand Up @@ -2076,6 +2078,11 @@ void MainWindow::on_RomBrowser_PlayGameWith(CoreRomType type, QString file)
this->launchEmulationThread(mainRom, otherRom);
}

void MainWindow::on_RomBrowser_PlayGameWithDisk(QString cartridge, QString disk)
{
this->launchEmulationThread(cartridge, disk);
}

void MainWindow::on_RomBrowser_PlayGameWithSlot(QString file, int slot)
{
this->launchEmulationThread(file, "", false, slot);
Expand Down
1 change: 1 addition & 0 deletions Source/RMG/UserInterface/MainWindow.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ class MainWindow : public QMainWindow, private Ui::MainWindow

void on_RomBrowser_PlayGame(QString file);
void on_RomBrowser_PlayGameWith(CoreRomType type, QString file);
void on_RomBrowser_PlayGameWithDisk(QString cartridge, QString disk);
void on_RomBrowser_PlayGameWithSlot(QString file, int slot);
void on_RomBrowser_ChangeRomDirectory(void);
void on_RomBrowser_RomInformation(QString file);
Expand Down
98 changes: 95 additions & 3 deletions Source/RMG/UserInterface/Widget/RomBrowser/RomBrowserWidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ RomBrowserWidget::RomBrowserWidget(QWidget *parent) : QStackedWidget(parent)
this->contextMenu = new QMenu(this);
this->action_PlayGame = new QAction(this);
this->action_PlayGameWith = new QAction(this);
this->menu_PlayGameWithDisk = new QMenu(this);
this->menu_PlayGameWithSlot = new QMenu(this);
this->action_RefreshRomList = new QAction(this);
this->action_OpenRomDirectory = new QAction(this);
Expand All @@ -193,6 +194,7 @@ RomBrowserWidget::RomBrowserWidget(QWidget *parent) : QStackedWidget(parent)
// configure context menu contents
this->action_PlayGame->setText("Play Game");
this->action_PlayGameWith->setText("Play Game with Disk");
this->menu_PlayGameWithDisk->menuAction()->setText("Play Game with Disk");
this->menu_PlayGameWithSlot->menuAction()->setText("Play Game with State");
this->action_RefreshRomList->setText("Refresh ROM List");
this->action_OpenRomDirectory->setText("Open ROM Directory");
Expand All @@ -207,6 +209,7 @@ RomBrowserWidget::RomBrowserWidget(QWidget *parent) : QStackedWidget(parent)
this->action_RemoveCoverImage->setText("Remove Cover Image");
connect(this->action_PlayGame, &QAction::triggered, this, &RomBrowserWidget::on_Action_PlayGame);
connect(this->action_PlayGameWith, &QAction::triggered, this, &RomBrowserWidget::on_Action_PlayGameWith);
connect(this->menu_PlayGameWithDisk, &QMenu::triggered, this, &RomBrowserWidget::on_Menu_PlayGameWithDisk);
connect(this->action_RefreshRomList, &QAction::triggered, this, &RomBrowserWidget::on_Action_RefreshRomList);
connect(this->action_OpenRomDirectory, &QAction::triggered, this, &RomBrowserWidget::on_Action_OpenRomDirectory);
connect(this->action_ChangeRomDirectory, &QAction::triggered, this, &RomBrowserWidget::on_Action_ChangeRomDirectory);
Expand All @@ -221,6 +224,7 @@ RomBrowserWidget::RomBrowserWidget(QWidget *parent) : QStackedWidget(parent)
// configure context menu
this->contextMenu->addAction(this->action_PlayGame);
this->contextMenu->addAction(this->action_PlayGameWith);
this->contextMenu->addMenu(this->menu_PlayGameWithDisk);
this->contextMenu->addMenu(this->menu_PlayGameWithSlot);
this->contextMenu->addSeparator();
this->contextMenu->addAction(this->action_RefreshRomList);
Expand Down Expand Up @@ -260,6 +264,8 @@ void RomBrowserWidget::RefreshRomList(void)
this->listViewModel->removeRows(0, this->listViewModel->rowCount());
this->gridViewModel->removeRows(0, this->gridViewModel->rowCount());

this->menu_PlayGameWithDisk->clear();

this->coversDirectory = QString::fromStdString(CoreGetUserDataDirectory().string());
this->coversDirectory += "/Covers";

Expand Down Expand Up @@ -362,6 +368,11 @@ QMap<QString, CoreRomSettings> RomBrowserWidget::GetModelData(void)
QStandardItemModel* RomBrowserWidget::getCurrentModel(void)
{
QWidget* currentWidget = this->currentWidget();
if (currentWidget == this->loadingWidget)
{
currentWidget = this->currentViewWidget;
}

if (currentWidget == this->listViewWidget)
{
return this->listViewModel;
Expand All @@ -377,6 +388,11 @@ QStandardItemModel* RomBrowserWidget::getCurrentModel(void)
QAbstractItemView* RomBrowserWidget::getCurrentModelView(void)
{
QWidget* currentWidget = this->currentWidget();
if (currentWidget == this->loadingWidget)
{
currentWidget = this->currentViewWidget;
}

if (currentWidget == this->listViewWidget)
{
return this->listViewWidget;
Expand Down Expand Up @@ -614,11 +630,19 @@ void RomBrowserWidget::customContextMenuRequested(QPoint position)

RomBrowserModelData data;
bool hasSelection = view->selectionModel()->hasSelection();
bool showPlayWithDiskMenu;

this->getCurrentData(data);
if (!this->getCurrentData(data))
{
return;
}

showPlayWithDiskMenu = data.type == CoreRomType::Cartridge && !this->menu_PlayGameWithDisk->isEmpty();

this->action_PlayGame->setEnabled(hasSelection);
this->action_PlayGameWith->setEnabled(hasSelection);
this->action_PlayGameWith->setVisible(!showPlayWithDiskMenu);
this->menu_PlayGameWithDisk->menuAction()->setVisible(showPlayWithDiskMenu);
this->menu_PlayGameWithSlot->menuAction()->setEnabled(hasSelection);
this->action_RomInformation->setEnabled(hasSelection);
this->action_EditGameSettings->setEnabled(hasSelection);
Expand All @@ -638,11 +662,11 @@ void RomBrowserWidget::customContextMenuRequested(QPoint position)

if (hasSelection && data.type == CoreRomType::Disk)
{ // disk selected
this->action_PlayGameWith->setText("Play Game with Cartridge");
this->action_PlayGameWith->setText("Play Game with Cartridge...");
}
else
{ // cartridge selected
this->action_PlayGameWith->setText("Play Game with Disk");
this->action_PlayGameWith->setText("Play Game with Disk...");
}

if (view == this->listViewWidget)
Expand Down Expand Up @@ -683,6 +707,47 @@ void RomBrowserWidget::generateColumnsMenu(void)
}
}

void RomBrowserWidget::generatePlayWithDiskMenu(void)
{
QAction* playGameWithAction;
QStandardItemModel* model = this->getCurrentModel();
RomBrowserModelData modelData;
int count = 0;

this->menu_PlayGameWithDisk->clear();

if (model == nullptr)
{
return;
}

for (int i = 0; i < model->rowCount(); i++)
{
modelData = model->item(i)->data().value<RomBrowserModelData>();
if (modelData.type == CoreRomType::Disk)
{
if (count == 0)
{ // only add 'Browse...' action when there are disks
this->menu_PlayGameWithDisk->addAction("Browse...");
this->menu_PlayGameWithDisk->addSeparator();
}

playGameWithAction = new QAction(this);
playGameWithAction->setText(model->item(i)->text());
playGameWithAction->setData(model->item(i)->data());
this->menu_PlayGameWithDisk->addAction(playGameWithAction);

// only add 10 disks to menu,
// to prevent an overwhelming amount
// of menu items
if (count++ >= 10)
{
return;
}
}
}
}

void RomBrowserWidget::generateStateMenu(void)
{
this->menu_PlayGameWithSlot->clear();
Expand Down Expand Up @@ -915,6 +980,11 @@ void RomBrowserWidget::on_RomBrowserThread_Finished(bool canceled)
}
}

// generate 'Play Game with Disk' menu here
// instead of when a context menu has been requested,
// this should save a lot of otherwise wasted CPU cycles
this->generatePlayWithDiskMenu();

// when canceled, we shouldn't switch to the grid/list view
// because that can cause some flicker, so just return here
// and don't do anything because a refresh will be triggered
Expand Down Expand Up @@ -959,6 +1029,28 @@ void RomBrowserWidget::on_Action_PlayGameWith(void)
emit this->PlayGameWith(data.type, data.file);
}

void RomBrowserWidget::on_Menu_PlayGameWithDisk(QAction* action)
{
RomBrowserModelData cartridgeData;
RomBrowserModelData diskData;
bool hasDiskData = !action->data().isNull();

if (!this->getCurrentData(cartridgeData))
{
return;
}

if (hasDiskData)
{
diskData = action->data().value<RomBrowserModelData>();
emit this->PlayGameWithDisk(cartridgeData.file, diskData.file);
}
else
{
emit this->PlayGameWith(CoreRomType::Cartridge, cartridgeData.file);
}
}

void RomBrowserWidget::on_Action_PlayGameWithSlot(int slot)
{
RomBrowserModelData data;
Expand Down
18 changes: 11 additions & 7 deletions Source/RMG/UserInterface/Widget/RomBrowser/RomBrowserWidget.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ class RomBrowserWidget : public QStackedWidget
QAction* action_SetCoverImage;
QAction* action_RemoveCoverImage;

QMenu* menu_PlayGameWithDisk;
QMenu* menu_PlayGameWithSlot;
QMenu* menu_Columns;
QAction* action_ColumnsMenuEntry;
Expand All @@ -114,6 +115,7 @@ class RomBrowserWidget : public QStackedWidget
void on_DoubleClicked(const QModelIndex& index);
void customContextMenuRequested(QPoint position);
void generateColumnsMenu(void);
void generatePlayWithDiskMenu(void);
void generateStateMenu(void);

void on_listViewWidget_sortIndicatorChanged(int logicalIndex, Qt::SortOrder sortOrder);
Expand All @@ -131,6 +133,7 @@ class RomBrowserWidget : public QStackedWidget

void on_Action_PlayGame(void);
void on_Action_PlayGameWith(void);
void on_Menu_PlayGameWithDisk(QAction* action);
void on_Action_PlayGameWithSlot(int);
void on_Action_RefreshRomList(void);
void on_Action_OpenRomDirectory(void);
Expand All @@ -144,14 +147,15 @@ class RomBrowserWidget : public QStackedWidget
void on_Action_RemoveCoverImage(void);

signals:
void PlayGame(QString);
void PlayGameWith(CoreRomType, QString);
void PlayGameWithSlot(QString, int);
void EditGameSettings(QString);
void EditGameInputSettings(QString);
void Cheats(QString);
void PlayGame(QString file);
void PlayGameWith(CoreRomType type, QString file);
void PlayGameWithDisk(QString cartridge, QString disk);
void PlayGameWithSlot(QString file, int slot);
void EditGameSettings(QString file);
void EditGameInputSettings(QString file);
void Cheats(QString file);
void ChangeRomDirectory(void);
void RomInformation(QString);
void RomInformation(QString file);

void FileDropped(QDropEvent* event);
};
Expand Down

0 comments on commit c1db77a

Please sign in to comment.