mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 08:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dagimon super mega level

Browse Source 
add stretchToDisplayArea to settingsdialog

fix color picker and toolbar background

settingsdialog adjustments

fix tooltips + .pup

fix adapter box
This commit is contained in:
Megamouse 2017-07-08 15:56:49 +02:00 committed by Ivan
parent 1a4e1919fc
commit b7aed7bbde
7 changed files with 253 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rpcs3/Json/tooltips.json
View File

@ -12,7 +12,7 @@
"LLVM": "Recompiles the game's executable once before running it for the first time.\nThis is by far the fastest option and should always be used.\nShould you face compatibility issues, fall back to one of the Interpreters and retry.\nIf unsure, use this option."
},
"SPU": {
"precise": "This is extremely slow but may fix broken graphics in some games,\nin particular Rockstar games like Midnight Club LA and GTA V.",
"precise": "This is extremely slow but may fix broken graphics in some games.",
"fast": "This is slower than the SPU recompiler but significantly faster than the precise interpreter.\nGames rarely need this however.",
"ASMJIT": "This is the fastest option with very good compatibility.\nIf unsure, use this option.",
"LLVM": "This doesn't exist (yet)"
@ -57,7 +57,8 @@
"readDepth": "Never use this.",
"vsync": "By having this off you might obtain a higher frame rate at the cost of tearing artifacts in the game.",
"autoInvalidateCache": "Enable this option if the game has broken shadows. May slightly degrade performance.",
"gpuTextureScaling": "Small to significant performance boost in most games and rarely with side effects.\nMay cause texture corruption in rare cases.\nOnly works with OpenGL for now."
"gpuTextureScaling": "Small to significant performance boost in most games and rarely with side effects.\nMay cause texture corruption in rare cases.\nOnly works with OpenGL for now.",
"stretchToDisplayArea": "Overrides the aspect ratio and stretches the image to the full display area."
},
"debug": {
"glLegacyBuffers": "Enables use of classic openGL buffers which allows capturing tools to work with rpcs3 e.g RenderDoc.\nIf unsure, don't use this option.",
@ -72,7 +73,7 @@
"padHandlerBox": "If you want to use the keyboard to control, select the Keyboard option.\nYou can change the button mappings in Configuration --> Controls.\nIf you have a DualShock 4, select DualShock 4.\nWindows: If you have an Xbox controller, or another compatible device, use XInput.\nOlder controllers such as PS2 controllers with an adapter usually work fine with mmjoystick.\nCheck button mappings in the Windows control panel.\n\nLinux: evdev input is WIP.",
"keyboardHandlerBox": "Some games support native keyboard input.\nBasic will work in these cases.",
"mouseHandlerBox": "Some games support native mouse input.\nBasic will work in these cases.",
"cameraBox": "Camera support is not implemented, leave this on null.",
"useFakeCamera": "Camera support is not implemented, leave this on null.",
"cameraTypeBox": "Camera support is not implemented, leave this on unknown."
},
"network": {

4
rpcs3/rpcs3qt/gui_settings.cpp
View File

@ -181,7 +181,7 @@ void gui_settings::SetGamelistColVisibility(int col, bool val)
void gui_settings::SetCustomColor(int col, const QColor& val)
{
SetValue(GUI_SAVE(GUI::meta, "CustomColor" + QString::number(col), QColor(0, 0, 0, 0)), val);
SetValue(GUI_SAVE(GUI::meta, "CustomColor" + QString::number(col), GUI::mw_tool_bar_color), val);
}
void gui_settings::SaveCurrentConfig(const QString& friendlyName)
@ -204,7 +204,7 @@ bool gui_settings::GetGamelistColVisibility(int col)
QColor gui_settings::GetCustomColor(int col)
{
return GetValue(GUI_SAVE(GUI::meta, "CustomColor" + QString::number(col), QColor(255, 255, 255, 255))).value<QColor>();
return GetValue(GUI_SAVE(GUI::meta, "CustomColor" + QString::number(col), GUI::mw_tool_bar_color)).value<QColor>();
}
QStringList gui_settings::GetConfigEntries()

7
rpcs3/rpcs3qt/gui_settings.h
View File

@ -52,6 +52,9 @@ namespace GUI
const QString meta = "Meta";
const QString fs = "FileSystem";
const QColor mw_tool_bar_color = QColor(227, 227, 227, 255);
const QColor gl_icon_color = QColor(209, 209, 209, 255);
const GUI_SAVE rg_freeze = GUI_SAVE(main_window, "recentGamesFrozen", false);
const GUI_SAVE rg_entries = GUI_SAVE(main_window, "recentGamesNames", QVariant::fromValue(q_pair_list()));
@ -70,7 +73,7 @@ namespace GUI
const GUI_SAVE mw_logger = GUI_SAVE( main_window, "loggerVisible", true );
const GUI_SAVE mw_gamelist = GUI_SAVE( main_window, "gamelistVisible", true );
const GUI_SAVE mw_toolBarVisible = GUI_SAVE( main_window, "toolBarVisible", true );
const GUI_SAVE mw_toolBarColor = GUI_SAVE( main_window, "toolBarColor", QColor(227, 227, 227, 255));
const GUI_SAVE mw_toolBarColor = GUI_SAVE( main_window, "toolBarColor", mw_tool_bar_color);
const GUI_SAVE mw_geometry = GUI_SAVE( main_window, "geometry", QByteArray() );
const GUI_SAVE mw_windowState = GUI_SAVE( main_window, "windowState", QByteArray() );
const GUI_SAVE mw_mwState = GUI_SAVE( main_window, "wwState", QByteArray() );
@ -87,7 +90,7 @@ namespace GUI
const GUI_SAVE gl_sortCol = GUI_SAVE( game_list, "sortCol", 1 );
const GUI_SAVE gl_state = GUI_SAVE( game_list, "state", QByteArray() );
const GUI_SAVE gl_iconSize = GUI_SAVE( game_list, "iconSize", gl_icon_key_small );
const GUI_SAVE gl_iconColor = GUI_SAVE( game_list, "iconColor", QColor(209, 209, 209, 255));
const GUI_SAVE gl_iconColor = GUI_SAVE( game_list, "iconColor", gl_icon_color);
const GUI_SAVE gl_listMode = GUI_SAVE( game_list, "listMode", true );
const GUI_SAVE gl_textFactor = GUI_SAVE( game_list, "textFactor", (qreal) 2.0 );
const GUI_SAVE gl_marginFactor = GUI_SAVE( game_list, "marginFactor", (qreal) 0.09 );

19
rpcs3/rpcs3qt/main_window.cpp
View File

@ -73,7 +73,7 @@ main_window::main_window(QWidget *parent) : QMainWindow(parent), m_sys_menu_open
}
}
ui->sizeSlider->setSliderPosition(icon_size_index);
ui->toolBar->addWidget(ui->sizeSlider);
ui->toolBar->addWidget(ui->sizeSliderContainer);
ui->toolBar->addSeparator();
ui->toolBar->addWidget(ui->searchBar);
@ -975,7 +975,14 @@ void main_window::CreateConnects()
connect(&dlg, &settings_dialog::accepted, [this](){
gameListFrame->LoadSettings();
QColor tbc = guiSettings->GetValue(GUI::mw_toolBarColor).value<QColor>();
ui->toolBar->setStyleSheet(QString("background-color: rgba(%1, %2, %3, %4);").arg(tbc.red()).arg(tbc.green()).arg(tbc.blue()).arg(tbc.alpha())); });
ui->toolBar->setStyleSheet(QString(
"QToolBar { background-color: rgba(%1, %2, %3, %4); }"
"QToolBar::separator {background-color: rgba(%5, %6, %7, %8); width: 1px; margin-top: 2px; margin-bottom: 2px;}"
"QSlider { background-color: rgba(%1, %2, %3, %4); }"
"QLineEdit { background-color: rgba(%1, %2, %3, %4); }")
.arg(tbc.red()).arg(tbc.green()).arg(tbc.blue()).arg(tbc.alpha())
.arg(tbc.red() - 20).arg(tbc.green() - 20).arg(tbc.blue() - 20).arg(tbc.alpha() - 20));
});
dlg.exec();
};
connect(ui->confCPUAct, &QAction::triggered, [=]() { openSettings(0); });
@ -1238,7 +1245,13 @@ void main_window::ConfigureGuiFromSettings(bool configureAll)
ui->toolBar->setVisible(ui->showToolBarAct->isChecked());
QColor tbc = guiSettings->GetValue(GUI::mw_toolBarColor).value<QColor>();
ui->toolBar->setStyleSheet(QString("background-color: rgba(%1, %2, %3, %4);").arg(tbc.red()).arg(tbc.green()).arg(tbc.blue()).arg(tbc.alpha()));
ui->toolBar->setStyleSheet(QString(
"QToolBar { background-color: rgba(%1, %2, %3, %4); }"
"QToolBar::separator {background-color: rgba(%5, %6, %7, %8); width: 1px; margin-top: 2px; margin-bottom: 2px;}"
"QSlider { background-color: rgba(%1, %2, %3, %4); }"
"QLineEdit { background-color: rgba(%1, %2, %3, %4); }")
.arg(tbc.red()).arg(tbc.green()).arg(tbc.blue()).arg(tbc.alpha())
.arg(tbc.red() - 20).arg(tbc.green() - 20).arg(tbc.blue() - 20).arg(tbc.alpha() - 20));
ui->showCatHDDGameAct->setChecked(guiSettings->GetCategoryVisibility(Category::Non_Disc_Game));
ui->showCatDiscGameAct->setChecked(guiSettings->GetCategoryVisibility(Category::Disc_Game));

78
rpcs3/rpcs3qt/main_window.ui
View File

@ -83,40 +83,66 @@ margin-left:14px;</string>
<bool>false</bool>
</property>
</widget>
<widget class="QSlider" name="sizeSlider">
<widget class="QWidget" name="sizeSliderContainer" native="true">
<property name="geometry">
<rect>
<x>290</x>
<y>20</y>
<width>160</width>
<x>280</x>
<y>10</y>
<width>181</width>
<height>21</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="styleSheet">
<string notr="true">QSlider::handle:horizontal {
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>14</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>14</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QSlider" name="sizeSlider">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true">QSlider::handle:horizontal {
background: #404040;
}
QSlider {
padding-left: 6px;
padding-right:6px
}</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::NoTicks</enum>
</property>
</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::NoTicks</enum>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
<widget class="QMenuBar" name="menuBar">
@ -272,8 +298,10 @@ QSlider {
<string>Show tool bar</string>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(227, 227, 227);
selection-background-color: rgb(85, 170, 255);</string>
<string notr="true">QToolBar { background-color: rgba(227, 227, 227, 255); }
QToolBar::separator {background-color: #D1D1D1; width: 1px; margin-top: 2px; margin-bottom: 2px;}
QSlider { background-color: rgba(227, 227, 227, 255); }
QLineEdit { background-color: rgba(227, 227, 227, 255); }</string>
</property>
<property name="movable">
<bool>false</bool>
@ -335,7 +363,7 @@ selection-background-color: rgb(85, 170, 255);</string>
</action>
<action name="bootInstallPupAct">
<property name="text">
<string>Install .pup</string>
<string>Install firmware</string>
</property>
<property name="toolTip">
<string>Install firmware from PS3UPDAT.PUP</string>

275
rpcs3/rpcs3qt/settings_dialog.cpp
View File

@ -87,9 +87,12 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
connect(ui->cancelButton, &QAbstractButton::clicked, this, &QWidget::close);
connect(ui->tabWidget, &QTabWidget::currentChanged, [=]() {ui->cancelButton->setFocus(); });
// Cpu Tab ------------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// _____ _____ _ _ _______ _
// / ____| __ \| | | | |__ __| | |
// | | | |__) | | | | | | __ _| |__
// | | | ___/| | | | | |/ _` | '_ \
// | |____| | | |__| | | | (_| | |_) |
// \_____|_| \____/ |_|\__,_|_.__/
// Checkboxes
xemu_settings->EnhanceCheckBox(ui->hookStFunc, emu_settings::HookStaticFuncs);
@ -294,9 +297,12 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
l_OnLibButtonClicked(buttid);
}
// Gpu Tab -------------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// _____ _____ _ _ _______ _
// / ____| __ \| | | | |__ __| | |
// | | __| |__) | | | | | | __ _| |__
// | | |_ | ___/| | | | | |/ _` | '_ \
// | |__| | | | |__| | | | (_| | |_) |
// \_____|_| \____/ |_|\__,_|_.__/
// Comboboxes
ui->graphicsAdapterBox->setToolTip(json_gpu_cbs["graphicsAdapterBox"].toString());
@ -335,6 +341,9 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
xemu_settings->EnhanceCheckBox(ui->gpuTextureScaling, emu_settings::GPUTextureScaling);
ui->gpuTextureScaling->setToolTip(json_gpu_main["gpuTextureScaling"].toString());
xemu_settings->EnhanceCheckBox(ui->stretchToDisplayArea, emu_settings::StretchToDisplayArea);
ui->stretchToDisplayArea->setToolTip(json_gpu_main["stretchToDisplayArea"].toString());
// Checkboxes: debug options
xemu_settings->EnhanceCheckBox(ui->glLegacyBuffers, emu_settings::LegacyBuffers);
ui->glLegacyBuffers->setToolTip(json_gpu_deb["glLegacyBuffers"].toString());
@ -399,131 +408,128 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
}
}
if (supportsD3D12 || supportsVulkan)
QString oldRender = ui->renderBox->itemText(ui->renderBox->currentIndex());
auto switchGraphicsAdapter = [=](int index)
{
QString oldRender = ui->renderBox->itemText(ui->renderBox->currentIndex());
QString render = ui->renderBox->itemText(index);
m_isD3D12 = render == r_D3D12;
m_isVulkan = render == r_Vulkan;
ui->graphicsAdapterBox->setEnabled(m_isD3D12 || m_isVulkan);
auto switchGraphicsAdapter = [=](int index)
// D3D Adapter
if (m_isD3D12)
{
QString render = ui->renderBox->itemText(index);
m_isD3D12 = render == r_D3D12;
m_isVulkan = render == r_Vulkan;
ui->graphicsAdapterBox->setEnabled(m_isD3D12 || m_isVulkan);
// D3D Adapter
if (m_isD3D12)
// Reset other adapters to old config
if (supportsVulkan)
{
// Reset other adapters to old config
if (supportsVulkan)
{
xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(old_Vulkan));
}
// Fill combobox
ui->graphicsAdapterBox->clear();
for (const auto& adapter : D3D12Adapters)
{
ui->graphicsAdapterBox->addItem(adapter);
}
// Reset Adapter to old config
int idx = ui->graphicsAdapterBox->findText(old_D3D12);
if (idx == -1)
{
idx = 0;
if (old_D3D12.isEmpty())
{
LOG_WARNING(RSX, "%s adapter config empty: setting to default!", sstr(r_D3D12));
}
else
{
LOG_WARNING(RSX, "Last used %s adapter not found: setting to default!", sstr(r_D3D12));
}
}
ui->graphicsAdapterBox->setCurrentIndex(idx);
xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(ui->graphicsAdapterBox->currentText()));
xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(old_Vulkan));
}
// Vulkan Adapter
else if (m_isVulkan)
// Fill combobox
ui->graphicsAdapterBox->clear();
for (const auto& adapter : D3D12Adapters)
{
// Reset other adapters to old config
if (supportsD3D12)
{
xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(old_D3D12));
}
// Fill combobox
ui->graphicsAdapterBox->clear();
for (const auto& adapter : vulkanAdapters)
{
ui->graphicsAdapterBox->addItem(adapter);
}
// Reset Adapter to old config
int idx = ui->graphicsAdapterBox->findText(old_Vulkan);
if (idx == -1)
{
idx = 0;
if (old_Vulkan.isEmpty())
{
LOG_WARNING(RSX, "%s adapter config empty: setting to default!", sstr(r_Vulkan));
}
else
{
LOG_WARNING(RSX, "Last used %s adapter not found: setting to default!", sstr(r_Vulkan));
}
}
ui->graphicsAdapterBox->setCurrentIndex(idx);
xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(ui->graphicsAdapterBox->currentText()));
ui->graphicsAdapterBox->addItem(adapter);
}
// Other Adapter
else
// Reset Adapter to old config
int idx = ui->graphicsAdapterBox->findText(old_D3D12);
if (idx == -1)
{
// Reset Adapters to old config
if (supportsD3D12)
idx = 0;
if (old_D3D12.isEmpty())
{
xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(old_D3D12));
LOG_WARNING(RSX, "%s adapter config empty: setting to default!", sstr(r_D3D12));
}
if (supportsVulkan)
else
{
xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(old_Vulkan));
LOG_WARNING(RSX, "Last used %s adapter not found: setting to default!", sstr(r_D3D12));
}
// Fill combobox with placeholder
ui->graphicsAdapterBox->clear();
ui->graphicsAdapterBox->addItem(tr("Not needed for %1 renderer").arg(render));
}
};
ui->graphicsAdapterBox->setCurrentIndex(idx);
xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(ui->graphicsAdapterBox->currentText()));
}
auto setAdapter = [=](QString text)
// Vulkan Adapter
else if (m_isVulkan)
{
if (text.isEmpty()) return;
// don't set adapter if signal was created by switching render
QString newRender = ui->renderBox->itemText(ui->renderBox->currentIndex());
if (m_oldRender == newRender)
// Reset other adapters to old config
if (supportsD3D12)
{
if (m_isD3D12 && D3D12Adapters.contains(text))
xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(old_D3D12));
}
// Fill combobox
ui->graphicsAdapterBox->clear();
for (const auto& adapter : vulkanAdapters)
{
ui->graphicsAdapterBox->addItem(adapter);
}
// Reset Adapter to old config
int idx = ui->graphicsAdapterBox->findText(old_Vulkan);
if (idx == -1)
{
idx = 0;
if (old_Vulkan.isEmpty())
{
xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(text));
LOG_WARNING(RSX, "%s adapter config empty: setting to default!", sstr(r_Vulkan));
}
else if (m_isVulkan && vulkanAdapters.contains(text))
else
{
xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(text));
LOG_WARNING(RSX, "Last used %s adapter not found: setting to default!", sstr(r_Vulkan));
}
}
else
ui->graphicsAdapterBox->setCurrentIndex(idx);
xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(ui->graphicsAdapterBox->currentText()));
}
// Other Adapter
else
{
// Reset Adapters to old config
if (supportsD3D12)
{
m_oldRender = newRender;
xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(old_D3D12));
}
if (supportsVulkan)
{
xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(old_Vulkan));
}
};
// Init
setAdapter(ui->graphicsAdapterBox->currentText());
switchGraphicsAdapter(ui->renderBox->currentIndex());
// Fill combobox with placeholder
ui->graphicsAdapterBox->clear();
ui->graphicsAdapterBox->addItem(tr("Not needed for %1 renderer").arg(render));
}
};
// Events
connect(ui->graphicsAdapterBox, &QComboBox::currentTextChanged, setAdapter);
connect(ui->renderBox, static_cast<void (QComboBox::*)(int index)>(&QComboBox::currentIndexChanged), switchGraphicsAdapter);
}
auto setAdapter = [=](QString text)
{
if (text.isEmpty()) return;
// don't set adapter if signal was created by switching render
QString newRender = ui->renderBox->itemText(ui->renderBox->currentIndex());
if (m_oldRender == newRender)
{
if (m_isD3D12 && D3D12Adapters.contains(text))
{
xemu_settings->SetSetting(emu_settings::D3D12Adapter, sstr(text));
}
else if (m_isVulkan && vulkanAdapters.contains(text))
{
xemu_settings->SetSetting(emu_settings::VulkanAdapter, sstr(text));
}
}
else
{
m_oldRender = newRender;
}
};
// Init
setAdapter(ui->graphicsAdapterBox->currentText());
switchGraphicsAdapter(ui->renderBox->currentIndex());
// Events
connect(ui->graphicsAdapterBox, &QComboBox::currentTextChanged, setAdapter);
connect(ui->renderBox, static_cast<void (QComboBox::*)(int index)>(&QComboBox::currentIndexChanged), switchGraphicsAdapter);
auto fixGLLegacy = [=](const QString& text) {
ui->glLegacyBuffers->setEnabled(text == r_OpenGL);
@ -533,9 +539,12 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
fixGLLegacy(ui->renderBox->currentText()); // Init
connect(ui->renderBox, &QComboBox::currentTextChanged, fixGLLegacy);
// Audio Tab -----------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// _ _ _______ _
// /\ | (_) |__ __| | |
// / \ _ _ __| |_ ___ | | __ _| |__
// / /\ \| | | |/ _` | |/ _ \ | |/ _` | '_ \
// / ____ \ |_| | (_| | | (_) | | | (_| | |_) |
// /_/ \_\__,_|\__,_|_|\___/ |_|\__,_|_.__/
// Comboboxes
@ -553,9 +562,12 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
xemu_settings->EnhanceCheckBox(ui->downmix, emu_settings::DownmixStereo);
ui->downmix->setToolTip(json_audio["downmix"].toString());
// I/O Tab -------------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// _____ __ ____ _______ _
// |_ _| / / / __ \ |__ __| | |
// | | / / | | | | | | __ _| |__
// | | / / | | | | | |/ _` | '_ \
// _| |_ / / | |__| | | | (_| | |_) |
// |_____| /_/ \____/ |_|\__,_|_.__/
// Comboboxes
@ -576,9 +588,14 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
xemu_settings->EnhanceCheckBox(ui->useFakeCamera, emu_settings::Camera);
ui->useFakeCamera->setToolTip(json_input["useFakeCamera"].toString());
// System Tab ----------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// _____ _ _______ _
// / ____| | | |__ __| | |
// | (___ _ _ ___| |_ ___ _ __ ___ | | __ _| |__
// \___ \| | | / __| __/ _ \ '_ ` _ \ | |/ _` | '_ \
// ____) | |_| \__ \ || __/ | | | | | | | (_| | |_) |
// |_____/ \__, |___/\__\___|_| |_| |_| |_|\__,_|_.__/
// __/ |
// |___/
// Comboboxes
@ -590,18 +607,24 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
xemu_settings->EnhanceCheckBox(ui->enableHostRoot, emu_settings::EnableHostRoot);
ui->enableHostRoot->setToolTip(json_sys["enableHostRoot"].toString());
// Network Tab ---------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// _ _ _ _ _______ _
// | \ | | | | | | |__ __| | |
// | \| | ___| |___ _____ _ __| | __ | | __ _| |__
// | . ` |/ _ \ __\ \ /\ / / _ \| '__| |/ / | |/ _` | '_ \
// | |\ | __/ |_ \ V V / (_) | | | < | | (_| | |_) |
// |_| \_|\___|\__| \_/\_/ \___/|_| |_|\_\ |_|\__,_|_.__/
// Comboboxes
xemu_settings->EnhanceComboBox(ui->netStatusBox, emu_settings::ConnectionStatus);
ui->netStatusBox->setToolTip(json_net["netStatusBox"].toString());
// Emulator Tab --------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
// ______ _ _ _______ _
// | ____| | | | | |__ __| | |
// | |__ _ __ ___ _ _| | __ _| |_ ___ _ __ | | __ _| |__
// | __| | '_ ` _ \| | | | |/ _` | __/ _ \| '__| | |/ _` | '_ \
// | |____| | | | | | |_| | | (_| | || (_) | | | | (_| | |_) |
// |______|_| |_| |_|\__,_|_|\__,_|\__\___/|_| |_|\__,_|_.__/
// Comboboxes
@ -670,12 +693,14 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
{
dlg.setCustomColor(i, xgui_settings->GetCustomColor(i));
}
dlg.exec();
for (int i = 0; i < dlg.customCount(); i++)
if (dlg.exec() == QColorDialog::Accepted)
{
xgui_settings->SetCustomColor(i, dlg.customColor(i));
for (int i = 0; i < dlg.customCount(); i++)
{
xgui_settings->SetCustomColor(i, dlg.customColor(i));
}
xgui_settings->SetValue(color, dlg.selectedColor());
}
xgui_settings->SetValue(color, dlg.selectedColor());
};
connect(ui->pb_icon_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::gl_iconColor, "Choose icon color"); });
connect(ui->pb_tool_bar_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::mw_toolBarColor, "Choose tool bar color"); });

32
rpcs3/rpcs3qt/settings_dialog.ui
View File

@ -499,6 +499,13 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="stretchToDisplayArea">
<property name="text">
<string>Stretch To Display Area</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@ -693,7 +700,9 @@
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Audio settings allow you to change the way audio is encoded and handled by the emulator. More detailed settings will be added in the future.</string>
<string>Audio settings allow you to change the way audio is encoded and handled by the emulator. More detailed settings will be added in the future.
</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
@ -820,7 +829,9 @@
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>I/O settings allow you to change controller, keyboard and mouse handlers as well as PlayStation camera inputs. More detailed settings will be added in the future.</string>
<string>I/O settings allow you to change controller, keyboard and mouse handlers as well as PlayStation camera inputs. More detailed settings will be added in the future.
</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
@ -922,7 +933,8 @@
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>System settings allow you change basic system settings found within a real PlayStation 3 system. Depending on the application in use, the console language setting will change the language of the application accordingly. More detailed settings will be added in the future.</string>
<string>System settings allow you change basic system settings found within a real PlayStation 3 system. Depending on the application in use, the console language setting will change the language of the application accordingly. More detailed settings will be added in the future.
</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
@ -991,7 +1003,9 @@
<item>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Network settings allow you to change basic network settings found within a real PlayStation 3 system. More detailed settings may or may not be added in the future.</string>
<string>Network settings allow you to change basic network settings found within a real PlayStation 3 system. More detailed settings may or may not be added in the future.
</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
@ -1142,20 +1156,20 @@
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>UI Colors (missing in stylesheets)</string>
<string>UI Colors (difficult in stylesheets)</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
<item>
<widget class="QPushButton" name="pb_icon_color">
<widget class="QPushButton" name="pb_tool_bar_color">
<property name="text">
<string>Gamelist icons</string>
<string>Main window tool bar</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_tool_bar_color">
<widget class="QPushButton" name="pb_icon_color">
<property name="text">
<string>Mainwindow tool bar</string>
<string>Gamelist icons</string>
</property>
</widget>
</item>