diff --git a/rpcs3/Icons/rpcn.png b/rpcs3/Icons/rpcn.png new file mode 100644 index 0000000000..1470fa7999 Binary files /dev/null and b/rpcs3/Icons/rpcn.png differ diff --git a/rpcs3/resources.qrc b/rpcs3/resources.qrc index ebace85372..006c71fc8c 100644 --- a/rpcs3/resources.qrc +++ b/rpcs3/resources.qrc @@ -17,5 +17,6 @@ Icons/combo_config_bordered.png rpcs3.svg Icons/DualShock_3.svg + Icons/rpcn.png diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 36b2891f63..9278e7e6b3 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -1777,6 +1777,7 @@ void main_window::RepaintToolBarIcons() ui->toolbar_grid ->setIcon(icon(":/Icons/grid.png")); ui->toolbar_list ->setIcon(icon(":/Icons/list.png")); ui->toolbar_refresh ->setIcon(icon(":/Icons/refresh.png")); + ui->toolbar_rpcn ->setIcon(icon(":/Icons/rpcn.png")); ui->toolbar_stop ->setIcon(icon(":/Icons/stop.png")); ui->sysStopAct->setIcon(icon(":/Icons/stop.png")); @@ -2792,6 +2793,7 @@ void main_window::CreateConnects() connect(ui->confAudioAct, &QAction::triggered, this, [open_settings]() { open_settings(2); }); connect(ui->confIOAct, &QAction::triggered, this, [open_settings]() { open_settings(3); }); connect(ui->confSystemAct, &QAction::triggered, this, [open_settings]() { open_settings(4); }); + connect(ui->confNetwrkAct, &QAction::triggered, this, [open_settings]() { open_settings(5); }); connect(ui->confAdvAct, &QAction::triggered, this, [open_settings]() { open_settings(6); }); connect(ui->confEmuAct, &QAction::triggered, this, [open_settings]() { open_settings(7); }); connect(ui->confGuiAct, &QAction::triggered, this, [open_settings]() { open_settings(8); }); @@ -2907,11 +2909,13 @@ void main_window::CreateConnects() dlg.exec(); }); - connect(ui->confRPCNAct, &QAction::triggered, this, [this]() + const auto open_rpcn_settings = [this] { rpcn_settings_dialog dlg(this); dlg.exec(); - }); + }; + + connect(ui->confRPCNAct, &QAction::triggered, this, open_rpcn_settings); connect(ui->confClansAct, &QAction::triggered, this, [this]() { @@ -3373,6 +3377,7 @@ void main_window::CreateConnects() connect(ui->toolbar_config, &QAction::triggered, this, [=]() { open_settings(0); }); connect(ui->toolbar_list, &QAction::triggered, this, [this]() { ui->setlistModeListAct->trigger(); }); connect(ui->toolbar_grid, &QAction::triggered, this, [this]() { ui->setlistModeGridAct->trigger(); }); + connect(ui->toolbar_rpcn, &QAction::triggered, this, open_rpcn_settings); connect(ui->sizeSlider, &QSlider::valueChanged, this, &main_window::ResizeIcons); connect(ui->sizeSlider, &QSlider::sliderReleased, this, [this] diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index b62e26492e..96ae6b397d 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -277,6 +277,7 @@ + @@ -486,6 +487,7 @@ + @@ -614,6 +616,14 @@ Configure system + + + Network + + + Configure Network settings + + Advanced @@ -1026,6 +1036,18 @@ Configure the emulator + + + + :/Icons/rpcn.png:/Icons/rpcn.png + + + RPCN + + + Configure RPCN settings + +