RPCN menu changes (#17936)
- Adds a shortcut for RPCN to the toolbar - Adds a link for the Network tab to the Configuration menu
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
@@ -17,5 +17,6 @@
|
|||||||
<file>Icons/combo_config_bordered.png</file>
|
<file>Icons/combo_config_bordered.png</file>
|
||||||
<file>rpcs3.svg</file>
|
<file>rpcs3.svg</file>
|
||||||
<file>Icons/DualShock_3.svg</file>
|
<file>Icons/DualShock_3.svg</file>
|
||||||
|
<file>Icons/rpcn.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|||||||
@@ -1777,6 +1777,7 @@ void main_window::RepaintToolBarIcons()
|
|||||||
ui->toolbar_grid ->setIcon(icon(":/Icons/grid.png"));
|
ui->toolbar_grid ->setIcon(icon(":/Icons/grid.png"));
|
||||||
ui->toolbar_list ->setIcon(icon(":/Icons/list.png"));
|
ui->toolbar_list ->setIcon(icon(":/Icons/list.png"));
|
||||||
ui->toolbar_refresh ->setIcon(icon(":/Icons/refresh.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->toolbar_stop ->setIcon(icon(":/Icons/stop.png"));
|
||||||
|
|
||||||
ui->sysStopAct->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->confAudioAct, &QAction::triggered, this, [open_settings]() { open_settings(2); });
|
||||||
connect(ui->confIOAct, &QAction::triggered, this, [open_settings]() { open_settings(3); });
|
connect(ui->confIOAct, &QAction::triggered, this, [open_settings]() { open_settings(3); });
|
||||||
connect(ui->confSystemAct, &QAction::triggered, this, [open_settings]() { open_settings(4); });
|
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->confAdvAct, &QAction::triggered, this, [open_settings]() { open_settings(6); });
|
||||||
connect(ui->confEmuAct, &QAction::triggered, this, [open_settings]() { open_settings(7); });
|
connect(ui->confEmuAct, &QAction::triggered, this, [open_settings]() { open_settings(7); });
|
||||||
connect(ui->confGuiAct, &QAction::triggered, this, [open_settings]() { open_settings(8); });
|
connect(ui->confGuiAct, &QAction::triggered, this, [open_settings]() { open_settings(8); });
|
||||||
@@ -2907,11 +2909,13 @@ void main_window::CreateConnects()
|
|||||||
dlg.exec();
|
dlg.exec();
|
||||||
});
|
});
|
||||||
|
|
||||||
connect(ui->confRPCNAct, &QAction::triggered, this, [this]()
|
const auto open_rpcn_settings = [this]
|
||||||
{
|
{
|
||||||
rpcn_settings_dialog dlg(this);
|
rpcn_settings_dialog dlg(this);
|
||||||
dlg.exec();
|
dlg.exec();
|
||||||
});
|
};
|
||||||
|
|
||||||
|
connect(ui->confRPCNAct, &QAction::triggered, this, open_rpcn_settings);
|
||||||
|
|
||||||
connect(ui->confClansAct, &QAction::triggered, this, [this]()
|
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_config, &QAction::triggered, this, [=]() { open_settings(0); });
|
||||||
connect(ui->toolbar_list, &QAction::triggered, this, [this]() { ui->setlistModeListAct->trigger(); });
|
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_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::valueChanged, this, &main_window::ResizeIcons);
|
||||||
connect(ui->sizeSlider, &QSlider::sliderReleased, this, [this]
|
connect(ui->sizeSlider, &QSlider::sliderReleased, this, [this]
|
||||||
|
|||||||
@@ -277,6 +277,7 @@
|
|||||||
<addaction name="confAudioAct"/>
|
<addaction name="confAudioAct"/>
|
||||||
<addaction name="confIOAct"/>
|
<addaction name="confIOAct"/>
|
||||||
<addaction name="confSystemAct"/>
|
<addaction name="confSystemAct"/>
|
||||||
|
<addaction name="confNetwrkAct"/>
|
||||||
<addaction name="confAdvAct"/>
|
<addaction name="confAdvAct"/>
|
||||||
<addaction name="confEmuAct"/>
|
<addaction name="confEmuAct"/>
|
||||||
<addaction name="confGuiAct"/>
|
<addaction name="confGuiAct"/>
|
||||||
@@ -486,6 +487,7 @@
|
|||||||
<addaction name="toolbar_start"/>
|
<addaction name="toolbar_start"/>
|
||||||
<addaction name="toolbar_config"/>
|
<addaction name="toolbar_config"/>
|
||||||
<addaction name="toolbar_controls"/>
|
<addaction name="toolbar_controls"/>
|
||||||
|
<addaction name="toolbar_rpcn"/>
|
||||||
<addaction name="toolbar_list"/>
|
<addaction name="toolbar_list"/>
|
||||||
<addaction name="toolbar_grid"/>
|
<addaction name="toolbar_grid"/>
|
||||||
</widget>
|
</widget>
|
||||||
@@ -614,6 +616,14 @@
|
|||||||
<string>Configure system</string>
|
<string>Configure system</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
|
<action name="confNetwrkAct">
|
||||||
|
<property name="text">
|
||||||
|
<string>Network</string>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Configure Network settings</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
<action name="confAdvAct">
|
<action name="confAdvAct">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Advanced</string>
|
<string>Advanced</string>
|
||||||
@@ -1026,6 +1036,18 @@
|
|||||||
<string>Configure the emulator</string>
|
<string>Configure the emulator</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
|
<action name="toolbar_rpcn">
|
||||||
|
<property name="icon">
|
||||||
|
<iconset>
|
||||||
|
<normaloff>:/Icons/rpcn.png</normaloff>:/Icons/rpcn.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>RPCN</string>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Configure RPCN settings</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
<action name="toolbar_controls">
|
<action name="toolbar_controls">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset resource="../resources.qrc">
|
<iconset resource="../resources.qrc">
|
||||||
|
|||||||
Reference in New Issue
Block a user