mirror of https://github.com/PCSX2/pcsx2.git
parent
c03e52c06f
commit
a92eb4d10a
|
@ -594,11 +594,9 @@ void MainWindow::updateEmulationActions(bool starting, bool running)
|
||||||
m_ui.actionReset->setEnabled(running);
|
m_ui.actionReset->setEnabled(running);
|
||||||
m_ui.actionPause->setEnabled(running);
|
m_ui.actionPause->setEnabled(running);
|
||||||
m_ui.actionChangeDisc->setEnabled(running);
|
m_ui.actionChangeDisc->setEnabled(running);
|
||||||
m_ui.actionCheats->setEnabled(running);
|
|
||||||
m_ui.actionScreenshot->setEnabled(running);
|
m_ui.actionScreenshot->setEnabled(running);
|
||||||
m_ui.actionViewSystemDisplay->setEnabled(starting_or_running);
|
m_ui.actionViewSystemDisplay->setEnabled(starting_or_running);
|
||||||
m_ui.menuChangeDisc->setEnabled(running);
|
m_ui.menuChangeDisc->setEnabled(running);
|
||||||
m_ui.menuCheats->setEnabled(running);
|
|
||||||
|
|
||||||
m_ui.actionSaveState->setEnabled(running);
|
m_ui.actionSaveState->setEnabled(running);
|
||||||
m_ui.menuSaveState->setEnabled(running);
|
m_ui.menuSaveState->setEnabled(running);
|
||||||
|
|
|
@ -48,15 +48,6 @@
|
||||||
<addaction name="actionRemoveDisc"/>
|
<addaction name="actionRemoveDisc"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QMenu" name="menuCheats">
|
|
||||||
<property name="title">
|
|
||||||
<string>Cheats</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset theme="flask-line">
|
|
||||||
<normaloff>.</normaloff>.</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QMenu" name="menuLoadState">
|
<widget class="QMenu" name="menuLoadState">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Load State</string>
|
<string>Load State</string>
|
||||||
|
@ -85,7 +76,6 @@
|
||||||
<addaction name="actionPause"/>
|
<addaction name="actionPause"/>
|
||||||
<addaction name="menuChangeDisc"/>
|
<addaction name="menuChangeDisc"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="menuCheats"/>
|
|
||||||
<addaction name="actionScreenshot"/>
|
<addaction name="actionScreenshot"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="menuLoadState"/>
|
<addaction name="menuLoadState"/>
|
||||||
|
@ -235,7 +225,6 @@
|
||||||
<addaction name="actionReset"/>
|
<addaction name="actionReset"/>
|
||||||
<addaction name="actionPause"/>
|
<addaction name="actionPause"/>
|
||||||
<addaction name="actionChangeDisc"/>
|
<addaction name="actionChangeDisc"/>
|
||||||
<addaction name="actionCheats"/>
|
|
||||||
<addaction name="actionScreenshot"/>
|
<addaction name="actionScreenshot"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="actionLoadState"/>
|
<addaction name="actionLoadState"/>
|
||||||
|
@ -478,15 +467,6 @@
|
||||||
<string>Change Disc...</string>
|
<string>Change Disc...</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionCheats">
|
|
||||||
<property name="icon">
|
|
||||||
<iconset theme="flask-line">
|
|
||||||
<normaloff>.</normaloff>.</iconset>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Cheats...</string>
|
|
||||||
</property>
|
|
||||||
</action>
|
|
||||||
<action name="actionAudioSettings">
|
<action name="actionAudioSettings">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset theme="volume-up-line">
|
<iconset theme="volume-up-line">
|
||||||
|
|
|
@ -100,6 +100,12 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsDialog* dialog, QWidget
|
||||||
m_ui.renderToMainWindow, tr("Render To Main Window"), tr("Checked"),
|
m_ui.renderToMainWindow, tr("Render To Main Window"), tr("Checked"),
|
||||||
tr("Renders the display of the simulated console to the main window of the application, over "
|
tr("Renders the display of the simulated console to the main window of the application, over "
|
||||||
"the game list. If unchecked, the display will render in a separate window."));
|
"the game list. If unchecked, the display will render in a separate window."));
|
||||||
|
|
||||||
|
// Not yet used, disable the options
|
||||||
|
m_ui.pauseOnStart->setDisabled(true);
|
||||||
|
m_ui.pauseOnFocusLoss->setDisabled(true);
|
||||||
|
m_ui.disableWindowResizing->setDisabled(true);
|
||||||
|
m_ui.hideMouseCursor->setDisabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
InterfaceSettingsWidget::~InterfaceSettingsWidget() = default;
|
InterfaceSettingsWidget::~InterfaceSettingsWidget() = default;
|
||||||
|
|
Loading…
Reference in New Issue