mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-24 06:51:17 +01:00
DolphinQt: Set window decorations for all top-level QWidgets.
This commit is contained in:
parent
e8d23af0f2
commit
e2fb8fab2f
@ -22,6 +22,7 @@
|
|||||||
#include "DolphinQt/Config/CheatCodeEditor.h"
|
#include "DolphinQt/Config/CheatCodeEditor.h"
|
||||||
#include "DolphinQt/Config/CheatWarningWidget.h"
|
#include "DolphinQt/Config/CheatWarningWidget.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
|
|
||||||
#include "UICommon/GameFile.h"
|
#include "UICommon/GameFile.h"
|
||||||
|
|
||||||
@ -230,6 +231,7 @@ void ARCodeWidget::OnCodeAddClicked()
|
|||||||
|
|
||||||
CheatCodeEditor ed(this);
|
CheatCodeEditor ed(this);
|
||||||
ed.SetARCode(&ar);
|
ed.SetARCode(&ar);
|
||||||
|
SetQWidgetWindowDecorations(&ed);
|
||||||
if (ed.exec() == QDialog::Rejected)
|
if (ed.exec() == QDialog::Rejected)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -253,6 +255,7 @@ void ARCodeWidget::OnCodeEditClicked()
|
|||||||
{
|
{
|
||||||
ed.SetARCode(¤t_ar);
|
ed.SetARCode(¤t_ar);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&ed);
|
||||||
if (ed.exec() == QDialog::Rejected)
|
if (ed.exec() == QDialog::Rejected)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -261,6 +264,7 @@ void ARCodeWidget::OnCodeEditClicked()
|
|||||||
ActionReplay::ARCode ar = current_ar;
|
ActionReplay::ARCode ar = current_ar;
|
||||||
ed.SetARCode(&ar);
|
ed.SetARCode(&ar);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&ed);
|
||||||
if (ed.exec() == QDialog::Rejected)
|
if (ed.exec() == QDialog::Rejected)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
|
|
||||||
#include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
|
#include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/QtUtils/SignalBlocking.h"
|
#include "DolphinQt/QtUtils/SignalBlocking.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
@ -59,6 +60,7 @@ void CommonControllersWidget::OnControllerInterfaceConfigure()
|
|||||||
ControllerInterfaceWindow* window = new ControllerInterfaceWindow(this);
|
ControllerInterfaceWindow* window = new ControllerInterfaceWindow(this);
|
||||||
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
||||||
window->setWindowModality(Qt::WindowModality::WindowModal);
|
window->setWindowModality(Qt::WindowModality::WindowModal);
|
||||||
|
SetQWidgetWindowDecorations(window);
|
||||||
window->show();
|
window->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
#include "Common/Config/Config.h"
|
#include "Common/Config/Config.h"
|
||||||
#include "DolphinQt/Config/ControllerInterface/DualShockUDPClientAddServerDialog.h"
|
#include "DolphinQt/Config/ControllerInterface/DualShockUDPClientAddServerDialog.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h"
|
#include "InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h"
|
||||||
|
|
||||||
DualShockUDPClientWidget::DualShockUDPClientWidget()
|
DualShockUDPClientWidget::DualShockUDPClientWidget()
|
||||||
@ -111,6 +112,7 @@ void DualShockUDPClientWidget::OnServerAdded()
|
|||||||
DualShockUDPClientAddServerDialog add_server_dialog(this);
|
DualShockUDPClientAddServerDialog add_server_dialog(this);
|
||||||
connect(&add_server_dialog, &DualShockUDPClientAddServerDialog::accepted, this,
|
connect(&add_server_dialog, &DualShockUDPClientAddServerDialog::accepted, this,
|
||||||
&DualShockUDPClientWidget::RefreshServerList);
|
&DualShockUDPClientWidget::RefreshServerList);
|
||||||
|
SetQWidgetWindowDecorations(&add_server_dialog);
|
||||||
add_server_dialog.exec();
|
add_server_dialog.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -25,6 +25,7 @@
|
|||||||
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Resources.h"
|
#include "DolphinQt/Resources.h"
|
||||||
|
|
||||||
#include "UICommon/UICommon.h"
|
#include "UICommon/UICommon.h"
|
||||||
@ -364,6 +365,7 @@ void FilesystemWidget::ExtractDirectory(const DiscIO::Partition& partition, cons
|
|||||||
dialog.Reset();
|
dialog.Reset();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(dialog.GetRaw());
|
||||||
dialog.GetRaw()->exec();
|
dialog.GetRaw()->exec();
|
||||||
future.get();
|
future.get();
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
#include "DolphinQt/Config/Mapping/MappingWindow.h"
|
#include "DolphinQt/Config/Mapping/MappingWindow.h"
|
||||||
#include "DolphinQt/Config/ToolTipControls/ToolTipCheckBox.h"
|
#include "DolphinQt/Config/ToolTipControls/ToolTipCheckBox.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
FreeLookWidget::FreeLookWidget(QWidget* parent) : QWidget(parent)
|
FreeLookWidget::FreeLookWidget(QWidget* parent) : QWidget(parent)
|
||||||
@ -97,6 +98,7 @@ void FreeLookWidget::OnFreeLookControllerConfigured()
|
|||||||
MappingWindow* window = new MappingWindow(this, MappingWindow::Type::MAPPING_FREELOOK, index);
|
MappingWindow* window = new MappingWindow(this, MappingWindow::Type::MAPPING_FREELOOK, index);
|
||||||
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
||||||
window->setWindowModality(Qt::WindowModality::WindowModal);
|
window->setWindowModality(Qt::WindowModality::WindowModal);
|
||||||
|
SetQWidgetWindowDecorations(window);
|
||||||
window->show();
|
window->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
#include "DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h"
|
#include "DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h"
|
||||||
#include "DolphinQt/Config/Mapping/MappingWindow.h"
|
#include "DolphinQt/Config/Mapping/MappingWindow.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/QtUtils/SignalBlocking.h"
|
#include "DolphinQt/QtUtils/SignalBlocking.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
@ -137,8 +138,12 @@ void GamecubeControllersWidget::OnGCPadConfigure(size_t index)
|
|||||||
type = MappingWindow::Type::MAPPING_GCPAD;
|
type = MappingWindow::Type::MAPPING_GCPAD;
|
||||||
break;
|
break;
|
||||||
case SerialInterface::SIDEVICE_WIIU_ADAPTER:
|
case SerialInterface::SIDEVICE_WIIU_ADAPTER:
|
||||||
GCPadWiiUConfigDialog(static_cast<int>(index), this).exec();
|
{
|
||||||
|
GCPadWiiUConfigDialog dialog(static_cast<int>(index), this);
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
|
dialog.exec();
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
case SerialInterface::SIDEVICE_GC_STEERING:
|
case SerialInterface::SIDEVICE_GC_STEERING:
|
||||||
type = MappingWindow::Type::MAPPING_GC_STEERINGWHEEL;
|
type = MappingWindow::Type::MAPPING_GC_STEERINGWHEEL;
|
||||||
break;
|
break;
|
||||||
@ -161,6 +166,7 @@ void GamecubeControllersWidget::OnGCPadConfigure(size_t index)
|
|||||||
MappingWindow* window = new MappingWindow(this, type, static_cast<int>(index));
|
MappingWindow* window = new MappingWindow(this, type, static_cast<int>(index));
|
||||||
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
||||||
window->setWindowModality(Qt::WindowModality::WindowModal);
|
window->setWindowModality(Qt::WindowModality::WindowModal);
|
||||||
|
SetQWidgetWindowDecorations(window);
|
||||||
window->show();
|
window->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
#include "DolphinQt/Config/CheatWarningWidget.h"
|
#include "DolphinQt/Config/CheatWarningWidget.h"
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
|
|
||||||
#include "UICommon/GameFile.h"
|
#include "UICommon/GameFile.h"
|
||||||
|
|
||||||
@ -201,6 +202,7 @@ void GeckoCodeWidget::AddCode()
|
|||||||
|
|
||||||
CheatCodeEditor ed(this);
|
CheatCodeEditor ed(this);
|
||||||
ed.SetGeckoCode(&code);
|
ed.SetGeckoCode(&code);
|
||||||
|
SetQWidgetWindowDecorations(&ed);
|
||||||
if (ed.exec() == QDialog::Rejected)
|
if (ed.exec() == QDialog::Rejected)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -219,6 +221,7 @@ void GeckoCodeWidget::EditCode()
|
|||||||
|
|
||||||
CheatCodeEditor ed(this);
|
CheatCodeEditor ed(this);
|
||||||
ed.SetGeckoCode(&m_gecko_codes[index]);
|
ed.SetGeckoCode(&m_gecko_codes[index]);
|
||||||
|
SetQWidgetWindowDecorations(&ed);
|
||||||
if (ed.exec() == QDialog::Rejected)
|
if (ed.exec() == QDialog::Rejected)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
|
#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
|
||||||
#include "DolphinQt/Config/Graphics/PostProcessingConfigWindow.h"
|
#include "DolphinQt/Config/Graphics/PostProcessingConfigWindow.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
#include "VideoCommon/PostProcessing.h"
|
#include "VideoCommon/PostProcessing.h"
|
||||||
@ -570,11 +571,15 @@ void EnhancementsWidget::AddDescriptions()
|
|||||||
|
|
||||||
void EnhancementsWidget::ConfigureColorCorrection()
|
void EnhancementsWidget::ConfigureColorCorrection()
|
||||||
{
|
{
|
||||||
ColorCorrectionConfigWindow(this).exec();
|
ColorCorrectionConfigWindow dialog(this);
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
|
dialog.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
void EnhancementsWidget::ConfigurePostProcessingShader()
|
void EnhancementsWidget::ConfigurePostProcessingShader()
|
||||||
{
|
{
|
||||||
const std::string shader = Config::Get(Config::GFX_ENHANCE_POST_SHADER);
|
const std::string shader = Config::Get(Config::GFX_ENHANCE_POST_SHADER);
|
||||||
PostProcessingConfigWindow(this, shader).exec();
|
PostProcessingConfigWindow dialog(this, shader);
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
|
dialog.exec();
|
||||||
}
|
}
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
|
#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
|
||||||
#include "DolphinQt/Config/ToolTipControls/ToolTipComboBox.h"
|
#include "DolphinQt/Config/ToolTipControls/ToolTipComboBox.h"
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
#include "VideoCommon/VideoBackendBase.h"
|
#include "VideoCommon/VideoBackendBase.h"
|
||||||
@ -164,6 +165,7 @@ void GeneralWidget::SaveSettings()
|
|||||||
confirm_sw.setWindowTitle(tr("Confirm backend change"));
|
confirm_sw.setWindowTitle(tr("Confirm backend change"));
|
||||||
confirm_sw.setText(tr(warningMessage->c_str()));
|
confirm_sw.setText(tr(warningMessage->c_str()));
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&confirm_sw);
|
||||||
if (confirm_sw.exec() != QMessageBox::Yes)
|
if (confirm_sw.exec() != QMessageBox::Yes)
|
||||||
{
|
{
|
||||||
m_backend_combo->setCurrentIndex(m_backend_combo->findData(
|
m_backend_combo->setCurrentIndex(m_backend_combo->findData(
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
|
|
||||||
#include "Core/FreeLookManager.h"
|
#include "Core/FreeLookManager.h"
|
||||||
#include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
|
#include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "InputCommon/InputConfig.h"
|
#include "InputCommon/InputConfig.h"
|
||||||
|
|
||||||
FreeLookRotation::FreeLookRotation(MappingWindow* window) : MappingWidget(window)
|
FreeLookRotation::FreeLookRotation(MappingWindow* window) : MappingWidget(window)
|
||||||
@ -33,6 +34,7 @@ void FreeLookRotation::CreateMainLayout()
|
|||||||
ControllerInterfaceWindow* window = new ControllerInterfaceWindow(this);
|
ControllerInterfaceWindow* window = new ControllerInterfaceWindow(this);
|
||||||
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
||||||
window->setWindowModality(Qt::WindowModality::WindowModal);
|
window->setWindowModality(Qt::WindowModality::WindowModal);
|
||||||
|
SetQWidgetWindowDecorations(window);
|
||||||
window->show();
|
window->show();
|
||||||
});
|
});
|
||||||
m_main_layout->addLayout(alternate_input_layout, 0, 0, 1, -1);
|
m_main_layout->addLayout(alternate_input_layout, 0, 0, 1, -1);
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include "DolphinQt/Config/Mapping/MappingCommon.h"
|
#include "DolphinQt/Config/Mapping/MappingCommon.h"
|
||||||
#include "DolphinQt/Config/Mapping/MappingWidget.h"
|
#include "DolphinQt/Config/Mapping/MappingWidget.h"
|
||||||
#include "DolphinQt/Config/Mapping/MappingWindow.h"
|
#include "DolphinQt/Config/Mapping/MappingWindow.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
|
|
||||||
#include "InputCommon/ControlReference/ControlReference.h"
|
#include "InputCommon/ControlReference/ControlReference.h"
|
||||||
#include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
|
#include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
|
||||||
@ -97,6 +98,7 @@ void MappingButton::AdvancedPressed()
|
|||||||
{
|
{
|
||||||
IOWindow io(m_parent, m_parent->GetController(), m_reference,
|
IOWindow io(m_parent, m_parent->GetController(), m_reference,
|
||||||
m_reference->IsInput() ? IOWindow::Type::Input : IOWindow::Type::Output);
|
m_reference->IsInput() ? IOWindow::Type::Input : IOWindow::Type::Output);
|
||||||
|
SetQWidgetWindowDecorations(&io);
|
||||||
io.exec();
|
io.exec();
|
||||||
|
|
||||||
ConfigChanged();
|
ConfigChanged();
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
#include "DolphinQt/Config/Mapping/MappingIndicator.h"
|
#include "DolphinQt/Config/Mapping/MappingIndicator.h"
|
||||||
#include "DolphinQt/Config/Mapping/MappingNumeric.h"
|
#include "DolphinQt/Config/Mapping/MappingNumeric.h"
|
||||||
#include "DolphinQt/Config/Mapping/MappingWindow.h"
|
#include "DolphinQt/Config/Mapping/MappingWindow.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
|
|
||||||
#include "InputCommon/ControlReference/ControlReference.h"
|
#include "InputCommon/ControlReference/ControlReference.h"
|
||||||
#include "InputCommon/ControllerEmu/Control/Control.h"
|
#include "InputCommon/ControllerEmu/Control/Control.h"
|
||||||
@ -248,6 +249,7 @@ void MappingWidget::ShowAdvancedControlGroupDialog(ControllerEmu::ControlGroup*
|
|||||||
// Enable "Close" button functionality.
|
// Enable "Close" button functionality.
|
||||||
connect(button_box, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
|
connect(button_box, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
dialog.exec();
|
dialog.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -303,6 +305,7 @@ MappingWidget::CreateSettingAdvancedMappingButton(ControllerEmu::NumericSettingB
|
|||||||
setting.SetExpressionFromValue();
|
setting.SetExpressionFromValue();
|
||||||
|
|
||||||
IOWindow io(this, GetController(), &setting.GetInputReference(), IOWindow::Type::Input);
|
IOWindow io(this, GetController(), &setting.GetInputReference(), IOWindow::Type::Input);
|
||||||
|
SetQWidgetWindowDecorations(&io);
|
||||||
io.exec();
|
io.exec();
|
||||||
|
|
||||||
setting.SimplifyIfPossible();
|
setting.SimplifyIfPossible();
|
||||||
|
@ -49,6 +49,7 @@
|
|||||||
#include "DolphinQt/Config/Mapping/WiimoteEmuMotionControlIMU.h"
|
#include "DolphinQt/Config/Mapping/WiimoteEmuMotionControlIMU.h"
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/QtUtils/WindowActivationEventFilter.h"
|
#include "DolphinQt/QtUtils/WindowActivationEventFilter.h"
|
||||||
#include "DolphinQt/QtUtils/WrapInScrollArea.h"
|
#include "DolphinQt/QtUtils/WrapInScrollArea.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
@ -255,6 +256,7 @@ void MappingWindow::OnDeleteProfilePressed()
|
|||||||
error.setIcon(QMessageBox::Critical);
|
error.setIcon(QMessageBox::Critical);
|
||||||
error.setWindowTitle(tr("Error"));
|
error.setWindowTitle(tr("Error"));
|
||||||
error.setText(tr("The profile '%1' does not exist").arg(profile_name));
|
error.setText(tr("The profile '%1' does not exist").arg(profile_name));
|
||||||
|
SetQWidgetWindowDecorations(&error);
|
||||||
error.exec();
|
error.exec();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -267,6 +269,7 @@ void MappingWindow::OnDeleteProfilePressed()
|
|||||||
confirm.setInformativeText(tr("This cannot be undone!"));
|
confirm.setInformativeText(tr("This cannot be undone!"));
|
||||||
confirm.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
|
confirm.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&confirm);
|
||||||
if (confirm.exec() != QMessageBox::Yes)
|
if (confirm.exec() != QMessageBox::Yes)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@ -294,6 +297,7 @@ void MappingWindow::OnLoadProfilePressed()
|
|||||||
error.setIcon(QMessageBox::Critical);
|
error.setIcon(QMessageBox::Critical);
|
||||||
error.setWindowTitle(tr("Error"));
|
error.setWindowTitle(tr("Error"));
|
||||||
error.setText(tr("The profile '%1' does not exist").arg(m_profiles_combo->currentText()));
|
error.setText(tr("The profile '%1' does not exist").arg(m_profiles_combo->currentText()));
|
||||||
|
SetQWidgetWindowDecorations(&error);
|
||||||
error.exec();
|
error.exec();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
|
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
|
||||||
|
|
||||||
#include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
|
#include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
|
|
||||||
#include "InputCommon/InputConfig.h"
|
#include "InputCommon/InputConfig.h"
|
||||||
|
|
||||||
@ -42,6 +43,7 @@ void WiimoteEmuExtensionMotionInput::CreateNunchukLayout()
|
|||||||
ControllerInterfaceWindow* window = new ControllerInterfaceWindow(this);
|
ControllerInterfaceWindow* window = new ControllerInterfaceWindow(this);
|
||||||
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
||||||
window->setWindowModality(Qt::WindowModality::WindowModal);
|
window->setWindowModality(Qt::WindowModality::WindowModal);
|
||||||
|
SetQWidgetWindowDecorations(window);
|
||||||
window->show();
|
window->show();
|
||||||
});
|
});
|
||||||
layout->addLayout(warning_layout, 0, 0, 1, -1);
|
layout->addLayout(warning_layout, 0, 0, 1, -1);
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
|
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
|
||||||
|
|
||||||
#include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
|
#include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
|
|
||||||
#include "InputCommon/InputConfig.h"
|
#include "InputCommon/InputConfig.h"
|
||||||
|
|
||||||
@ -40,6 +41,7 @@ void WiimoteEmuMotionControlIMU::CreateMainLayout()
|
|||||||
ControllerInterfaceWindow* window = new ControllerInterfaceWindow(this);
|
ControllerInterfaceWindow* window = new ControllerInterfaceWindow(this);
|
||||||
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
||||||
window->setWindowModality(Qt::WindowModality::WindowModal);
|
window->setWindowModality(Qt::WindowModality::WindowModal);
|
||||||
|
SetQWidgetWindowDecorations(window);
|
||||||
window->show();
|
window->show();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
#include "Core/PatchEngine.h"
|
#include "Core/PatchEngine.h"
|
||||||
|
|
||||||
#include "DolphinQt/Config/NewPatchDialog.h"
|
#include "DolphinQt/Config/NewPatchDialog.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
|
|
||||||
#include "UICommon/GameFile.h"
|
#include "UICommon/GameFile.h"
|
||||||
|
|
||||||
@ -74,7 +75,13 @@ void PatchesWidget::OnAdd()
|
|||||||
PatchEngine::Patch patch;
|
PatchEngine::Patch patch;
|
||||||
patch.user_defined = true;
|
patch.user_defined = true;
|
||||||
|
|
||||||
if (NewPatchDialog(this, patch).exec())
|
bool new_patch_confirmed = false;
|
||||||
|
{
|
||||||
|
NewPatchDialog dialog(this, patch);
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
|
new_patch_confirmed = dialog.exec();
|
||||||
|
}
|
||||||
|
if (new_patch_confirmed)
|
||||||
{
|
{
|
||||||
m_patches.push_back(patch);
|
m_patches.push_back(patch);
|
||||||
SavePatches();
|
SavePatches();
|
||||||
@ -98,7 +105,13 @@ void PatchesWidget::OnEdit()
|
|||||||
patch.name = tr("%1 (Copy)").arg(QString::fromStdString(patch.name)).toStdString();
|
patch.name = tr("%1 (Copy)").arg(QString::fromStdString(patch.name)).toStdString();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (NewPatchDialog(this, patch).exec())
|
bool new_patch_confirmed = false;
|
||||||
|
{
|
||||||
|
NewPatchDialog dialog(this, patch);
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
|
new_patch_confirmed = dialog.exec();
|
||||||
|
}
|
||||||
|
if (new_patch_confirmed)
|
||||||
{
|
{
|
||||||
if (patch.user_defined)
|
if (patch.user_defined)
|
||||||
{
|
{
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include "DiscIO/Volume.h"
|
#include "DiscIO/Volume.h"
|
||||||
#include "DiscIO/VolumeVerifier.h"
|
#include "DiscIO/VolumeVerifier.h"
|
||||||
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
VerifyWidget::VerifyWidget(std::shared_ptr<DiscIO::Volume> volume) : m_volume(std::move(volume))
|
VerifyWidget::VerifyWidget(std::shared_ptr<DiscIO::Volume> volume) : m_volume(std::move(volume))
|
||||||
@ -180,6 +181,7 @@ void VerifyWidget::Verify()
|
|||||||
|
|
||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
|
SetQWidgetWindowDecorations(progress.GetRaw());
|
||||||
progress.GetRaw()->exec();
|
progress.GetRaw()->exec();
|
||||||
|
|
||||||
std::optional<DiscIO::VolumeVerifier::Result> result = future.get();
|
std::optional<DiscIO::VolumeVerifier::Result> result = future.get();
|
||||||
|
@ -33,6 +33,7 @@
|
|||||||
#include "DolphinQt/Config/Mapping/MappingWindow.h"
|
#include "DolphinQt/Config/Mapping/MappingWindow.h"
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/QtUtils/SignalBlocking.h"
|
#include "DolphinQt/QtUtils/SignalBlocking.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
@ -261,6 +262,7 @@ void WiimoteControllersWidget::OnWiimoteConfigure(size_t index)
|
|||||||
MappingWindow* window = new MappingWindow(this, type, static_cast<int>(index));
|
MappingWindow* window = new MappingWindow(this, type, static_cast<int>(index));
|
||||||
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
window->setAttribute(Qt::WA_DeleteOnClose, true);
|
||||||
window->setWindowModality(Qt::WindowModality::WindowModal);
|
window->setWindowModality(Qt::WindowModality::WindowModal);
|
||||||
|
SetQWidgetWindowDecorations(window);
|
||||||
window->show();
|
window->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "UICommon/GameFile.h"
|
#include "UICommon/GameFile.h"
|
||||||
#include "UICommon/UICommon.h"
|
#include "UICommon/UICommon.h"
|
||||||
|
|
||||||
@ -285,6 +286,7 @@ bool ConvertDialog::ShowAreYouSureDialog(const QString& text)
|
|||||||
warning.setInformativeText(text);
|
warning.setInformativeText(text);
|
||||||
warning.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
|
warning.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&warning);
|
||||||
return warning.exec() == QMessageBox::Yes;
|
return warning.exec() == QMessageBox::Yes;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -409,6 +411,7 @@ void ConvertDialog::Convert()
|
|||||||
.arg(dst_info.fileName()));
|
.arg(dst_info.fileName()));
|
||||||
confirm_replace.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
|
confirm_replace.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&confirm_replace);
|
||||||
if (confirm_replace.exec() == QMessageBox::No)
|
if (confirm_replace.exec() == QMessageBox::No)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -519,6 +522,7 @@ void ConvertDialog::Convert()
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(progress_dialog.GetRaw());
|
||||||
progress_dialog.GetRaw()->exec();
|
progress_dialog.GetRaw()->exec();
|
||||||
if (!success.get())
|
if (!success.get())
|
||||||
{
|
{
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
#include "DolphinQt/Debugger/BreakpointDialog.h"
|
#include "DolphinQt/Debugger/BreakpointDialog.h"
|
||||||
#include "DolphinQt/Debugger/MemoryWidget.h"
|
#include "DolphinQt/Debugger/MemoryWidget.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Resources.h"
|
#include "DolphinQt/Resources.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
@ -313,6 +314,7 @@ void BreakpointWidget::OnClear()
|
|||||||
void BreakpointWidget::OnNewBreakpoint()
|
void BreakpointWidget::OnNewBreakpoint()
|
||||||
{
|
{
|
||||||
BreakpointDialog* dialog = new BreakpointDialog(this);
|
BreakpointDialog* dialog = new BreakpointDialog(this);
|
||||||
|
SetQWidgetWindowDecorations(dialog);
|
||||||
dialog->exec();
|
dialog->exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -322,12 +324,14 @@ void BreakpointWidget::OnEditBreakpoint(u32 address, bool is_instruction_bp)
|
|||||||
{
|
{
|
||||||
auto* dialog =
|
auto* dialog =
|
||||||
new BreakpointDialog(this, m_system.GetPowerPC().GetBreakPoints().GetBreakpoint(address));
|
new BreakpointDialog(this, m_system.GetPowerPC().GetBreakPoints().GetBreakpoint(address));
|
||||||
|
SetQWidgetWindowDecorations(dialog);
|
||||||
dialog->exec();
|
dialog->exec();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
auto* dialog =
|
auto* dialog =
|
||||||
new BreakpointDialog(this, m_system.GetPowerPC().GetMemChecks().GetMemCheck(address));
|
new BreakpointDialog(this, m_system.GetPowerPC().GetMemChecks().GetMemCheck(address));
|
||||||
|
SetQWidgetWindowDecorations(dialog);
|
||||||
dialog->exec();
|
dialog->exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
#include "Core/System.h"
|
#include "Core/System.h"
|
||||||
#include "DolphinQt/Debugger/PatchInstructionDialog.h"
|
#include "DolphinQt/Debugger/PatchInstructionDialog.h"
|
||||||
#include "DolphinQt/Host.h"
|
#include "DolphinQt/Host.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Resources.h"
|
#include "DolphinQt/Resources.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
@ -733,6 +734,7 @@ void CodeViewWidget::AutoStep(CodeTrace::AutoStop option)
|
|||||||
.arg(QString::fromStdString(fmt::format("{:#x}", fmt::join(mem_out, ", "))));
|
.arg(QString::fromStdString(fmt::format("{:#x}", fmt::join(mem_out, ", "))));
|
||||||
|
|
||||||
msgbox.setInformativeText(msgtext);
|
msgbox.setInformativeText(msgtext);
|
||||||
|
SetQWidgetWindowDecorations(&msgbox);
|
||||||
msgbox.exec();
|
msgbox.exec();
|
||||||
|
|
||||||
} while (msgbox.clickedButton() == (QAbstractButton*)run_button);
|
} while (msgbox.clickedButton() == (QAbstractButton*)run_button);
|
||||||
@ -1010,6 +1012,7 @@ void CodeViewWidget::OnReplaceInstruction()
|
|||||||
auto& debug_interface = m_system.GetPowerPC().GetDebugInterface();
|
auto& debug_interface = m_system.GetPowerPC().GetDebugInterface();
|
||||||
PatchInstructionDialog dialog(this, addr, debug_interface.ReadInstruction(guard, addr));
|
PatchInstructionDialog dialog(this, addr, debug_interface.ReadInstruction(guard, addr));
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
if (dialog.exec() == QDialog::Accepted)
|
if (dialog.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
debug_interface.SetPatch(guard, addr, dialog.GetCode());
|
debug_interface.SetPatch(guard, addr, dialog.GetCode());
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
#include "Core/PowerPC/PowerPC.h"
|
#include "Core/PowerPC/PowerPC.h"
|
||||||
#include "Core/System.h"
|
#include "Core/System.h"
|
||||||
#include "DolphinQt/Host.h"
|
#include "DolphinQt/Host.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
static const QString BOX_SPLITTER_STYLESHEET = QStringLiteral(
|
static const QString BOX_SPLITTER_STYLESHEET = QStringLiteral(
|
||||||
@ -213,6 +214,7 @@ void CodeWidget::OnDiff()
|
|||||||
if (!m_diff_dialog)
|
if (!m_diff_dialog)
|
||||||
m_diff_dialog = new CodeDiffDialog(this);
|
m_diff_dialog = new CodeDiffDialog(this);
|
||||||
m_diff_dialog->setWindowFlag(Qt::WindowMinimizeButtonHint);
|
m_diff_dialog->setWindowFlag(Qt::WindowMinimizeButtonHint);
|
||||||
|
SetQWidgetWindowDecorations(m_diff_dialog);
|
||||||
m_diff_dialog->show();
|
m_diff_dialog->show();
|
||||||
m_diff_dialog->raise();
|
m_diff_dialog->raise();
|
||||||
m_diff_dialog->activateWindow();
|
m_diff_dialog->activateWindow();
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
#include "Core/PowerPC/PowerPC.h"
|
#include "Core/PowerPC/PowerPC.h"
|
||||||
#include "Core/System.h"
|
#include "Core/System.h"
|
||||||
#include "DolphinQt/Host.h"
|
#include "DolphinQt/Host.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
RegisterWidget::RegisterWidget(QWidget* parent)
|
RegisterWidget::RegisterWidget(QWidget* parent)
|
||||||
@ -307,6 +308,7 @@ void RegisterWidget::AutoStep(const std::string& reg) const
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
// Can keep running and try again after a time out.
|
// Can keep running and try again after a time out.
|
||||||
|
SetQWidgetWindowDecorations(&msgbox);
|
||||||
msgbox.exec();
|
msgbox.exec();
|
||||||
if (msgbox.clickedButton() != (QAbstractButton*)run_button)
|
if (msgbox.clickedButton() != (QAbstractButton*)run_button)
|
||||||
break;
|
break;
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
#include "DolphinQt/DiscordJoinRequestDialog.h"
|
#include "DolphinQt/DiscordJoinRequestDialog.h"
|
||||||
#include "DolphinQt/QtUtils/RunOnObject.h"
|
#include "DolphinQt/QtUtils/RunOnObject.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
|
|
||||||
DiscordHandler::DiscordHandler(QWidget* parent) : QObject{parent}, m_parent{parent}
|
DiscordHandler::DiscordHandler(QWidget* parent) : QObject{parent}, m_parent{parent}
|
||||||
{
|
{
|
||||||
@ -60,6 +61,7 @@ void DiscordHandler::ShowNewJoinRequest(const std::string& id, const std::string
|
|||||||
std::lock_guard<std::mutex> lock(m_request_dialogs_mutex);
|
std::lock_guard<std::mutex> lock(m_request_dialogs_mutex);
|
||||||
m_request_dialogs.emplace_front(m_parent, id, discord_tag, avatar);
|
m_request_dialogs.emplace_front(m_parent, id, discord_tag, avatar);
|
||||||
DiscordJoinRequestDialog& request_dialog = m_request_dialogs.front();
|
DiscordJoinRequestDialog& request_dialog = m_request_dialogs.front();
|
||||||
|
SetQWidgetWindowDecorations(&request_dialog);
|
||||||
request_dialog.show();
|
request_dialog.show();
|
||||||
request_dialog.raise();
|
request_dialog.raise();
|
||||||
request_dialog.activateWindow();
|
request_dialog.activateWindow();
|
||||||
|
@ -29,6 +29,7 @@
|
|||||||
#include "Core/System.h"
|
#include "Core/System.h"
|
||||||
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Resources.h"
|
#include "DolphinQt/Resources.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
#include "DolphinQt/Settings/GameCubePane.h"
|
#include "DolphinQt/Settings/GameCubePane.h"
|
||||||
@ -486,6 +487,7 @@ void GBAWidget::contextMenuEvent(QContextMenuEvent* event)
|
|||||||
size_menu->addAction(x4_action);
|
size_menu->addAction(x4_action);
|
||||||
|
|
||||||
menu->move(event->globalPos());
|
menu->move(event->globalPos());
|
||||||
|
SetQWidgetWindowDecorations(menu);
|
||||||
menu->show();
|
menu->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
|
|
||||||
using namespace ExpansionInterface;
|
using namespace ExpansionInterface;
|
||||||
|
|
||||||
@ -695,6 +696,7 @@ void GCMemcardManager::FixChecksums()
|
|||||||
void GCMemcardManager::CreateNewCard(Slot slot)
|
void GCMemcardManager::CreateNewCard(Slot slot)
|
||||||
{
|
{
|
||||||
GCMemcardCreateNewDialog dialog(this);
|
GCMemcardCreateNewDialog dialog(this);
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
if (dialog.exec() == QDialog::Accepted)
|
if (dialog.exec() == QDialog::Accepted)
|
||||||
m_slot_file_edit[slot]->setText(QString::fromStdString(dialog.GetMemoryCardPath()));
|
m_slot_file_edit[slot]->setText(QString::fromStdString(dialog.GetMemoryCardPath()));
|
||||||
}
|
}
|
||||||
|
@ -67,6 +67,7 @@
|
|||||||
#include "DolphinQt/QtUtils/DoubleClickEventFilter.h"
|
#include "DolphinQt/QtUtils/DoubleClickEventFilter.h"
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Resources.h"
|
#include "DolphinQt/Resources.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
#include "DolphinQt/WiiUpdate.h"
|
#include "DolphinQt/WiiUpdate.h"
|
||||||
@ -546,6 +547,7 @@ void GameList::OpenProperties()
|
|||||||
connect(properties, &PropertiesDialog::OpenGraphicsSettings, this,
|
connect(properties, &PropertiesDialog::OpenGraphicsSettings, this,
|
||||||
&GameList::OpenGraphicsSettings);
|
&GameList::OpenGraphicsSettings);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(properties);
|
||||||
properties->show();
|
properties->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -600,6 +602,7 @@ void GameList::ConvertFile()
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
ConvertDialog dialog{std::move(games), this};
|
ConvertDialog dialog{std::move(games), this};
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
dialog.exec();
|
dialog.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -617,6 +620,7 @@ void GameList::InstallWAD()
|
|||||||
result_dialog.setWindowTitle(success ? tr("Success") : tr("Failure"));
|
result_dialog.setWindowTitle(success ? tr("Success") : tr("Failure"));
|
||||||
result_dialog.setText(success ? tr("Successfully installed this title to the NAND.") :
|
result_dialog.setText(success ? tr("Successfully installed this title to the NAND.") :
|
||||||
tr("Failed to install this title to the NAND."));
|
tr("Failed to install this title to the NAND."));
|
||||||
|
SetQWidgetWindowDecorations(&result_dialog);
|
||||||
result_dialog.exec();
|
result_dialog.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -634,6 +638,7 @@ void GameList::UninstallWAD()
|
|||||||
"this title from the NAND without deleting its save data. Continue?"));
|
"this title from the NAND without deleting its save data. Continue?"));
|
||||||
warning_dialog.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
|
warning_dialog.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&warning_dialog);
|
||||||
if (warning_dialog.exec() == QMessageBox::No)
|
if (warning_dialog.exec() == QMessageBox::No)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -645,6 +650,7 @@ void GameList::UninstallWAD()
|
|||||||
result_dialog.setWindowTitle(success ? tr("Success") : tr("Failure"));
|
result_dialog.setWindowTitle(success ? tr("Success") : tr("Failure"));
|
||||||
result_dialog.setText(success ? tr("Successfully removed this title from the NAND.") :
|
result_dialog.setText(success ? tr("Successfully removed this title from the NAND.") :
|
||||||
tr("Failed to remove this title from the NAND."));
|
tr("Failed to remove this title from the NAND."));
|
||||||
|
SetQWidgetWindowDecorations(&result_dialog);
|
||||||
result_dialog.exec();
|
result_dialog.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -818,6 +824,7 @@ void GameList::DeleteFile()
|
|||||||
confirm_dialog.setInformativeText(tr("This cannot be undone!"));
|
confirm_dialog.setInformativeText(tr("This cannot be undone!"));
|
||||||
confirm_dialog.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
|
confirm_dialog.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&confirm_dialog);
|
||||||
if (confirm_dialog.exec() == QMessageBox::Yes)
|
if (confirm_dialog.exec() == QMessageBox::Yes)
|
||||||
{
|
{
|
||||||
for (const auto& game : GetSelectedGames())
|
for (const auto& game : GetSelectedGames())
|
||||||
@ -843,6 +850,7 @@ void GameList::DeleteFile()
|
|||||||
"delete the file or whether it's still in use."));
|
"delete the file or whether it's still in use."));
|
||||||
error_dialog.setStandardButtons(QMessageBox::Retry | QMessageBox::Abort);
|
error_dialog.setStandardButtons(QMessageBox::Retry | QMessageBox::Abort);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&error_dialog);
|
||||||
if (error_dialog.exec() == QMessageBox::Abort)
|
if (error_dialog.exec() == QMessageBox::Abort)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
#include "Core/System.h"
|
#include "Core/System.h"
|
||||||
|
|
||||||
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
// Qt is not guaranteed to keep track of file paths using native file pickers, so we use this
|
// Qt is not guaranteed to keep track of file paths using native file pickers, so we use this
|
||||||
@ -149,6 +150,7 @@ void InfinityBaseWindow::LoadFigure(u8 slot)
|
|||||||
void InfinityBaseWindow::CreateFigure(u8 slot)
|
void InfinityBaseWindow::CreateFigure(u8 slot)
|
||||||
{
|
{
|
||||||
CreateFigureDialog create_dlg(this, slot);
|
CreateFigureDialog create_dlg(this, slot);
|
||||||
|
SetQWidgetWindowDecorations(&create_dlg);
|
||||||
if (create_dlg.exec() == CreateFigureDialog::Accepted)
|
if (create_dlg.exec() == CreateFigureDialog::Accepted)
|
||||||
{
|
{
|
||||||
LoadFigurePath(slot, create_dlg.GetFilePath());
|
LoadFigurePath(slot, create_dlg.GetFilePath());
|
||||||
|
@ -35,6 +35,7 @@
|
|||||||
#include "DolphinQt/MainWindow.h"
|
#include "DolphinQt/MainWindow.h"
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/RunOnObject.h"
|
#include "DolphinQt/QtUtils/RunOnObject.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Resources.h"
|
#include "DolphinQt/Resources.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
#include "DolphinQt/Translation.h"
|
#include "DolphinQt/Translation.h"
|
||||||
@ -92,6 +93,7 @@ static bool QtMsgAlertHandler(const char* caption, const char* text, bool yes_no
|
|||||||
return QMessageBox::NoIcon;
|
return QMessageBox::NoIcon;
|
||||||
}());
|
}());
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&message_box);
|
||||||
const int button = message_box.exec();
|
const int button = message_box.exec();
|
||||||
if (button == QMessageBox::Yes)
|
if (button == QMessageBox::Yes)
|
||||||
return true;
|
return true;
|
||||||
@ -284,6 +286,7 @@ int main(int argc, char* argv[])
|
|||||||
"This authorization can be revoked at any time through Dolphin's "
|
"This authorization can be revoked at any time through Dolphin's "
|
||||||
"settings."));
|
"settings."));
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&analytics_prompt);
|
||||||
const int answer = analytics_prompt.exec();
|
const int answer = analytics_prompt.exec();
|
||||||
|
|
||||||
Config::SetBase(Config::MAIN_ANALYTICS_PERMISSION_ASKED, true);
|
Config::SetBase(Config::MAIN_ANALYTICS_PERMISSION_ASKED, true);
|
||||||
|
@ -108,6 +108,7 @@
|
|||||||
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
||||||
#include "DolphinQt/QtUtils/QueueOnObject.h"
|
#include "DolphinQt/QtUtils/QueueOnObject.h"
|
||||||
#include "DolphinQt/QtUtils/RunOnObject.h"
|
#include "DolphinQt/QtUtils/RunOnObject.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/QtUtils/WindowActivationEventFilter.h"
|
#include "DolphinQt/QtUtils/WindowActivationEventFilter.h"
|
||||||
#include "DolphinQt/RenderWidget.h"
|
#include "DolphinQt/RenderWidget.h"
|
||||||
#include "DolphinQt/ResourcePackManager.h"
|
#include "DolphinQt/ResourcePackManager.h"
|
||||||
@ -1225,6 +1226,7 @@ void MainWindow::ShowControllersWindow()
|
|||||||
InstallHotkeyFilter(m_controllers_window);
|
InstallHotkeyFilter(m_controllers_window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(m_controllers_window);
|
||||||
m_controllers_window->show();
|
m_controllers_window->show();
|
||||||
m_controllers_window->raise();
|
m_controllers_window->raise();
|
||||||
m_controllers_window->activateWindow();
|
m_controllers_window->activateWindow();
|
||||||
@ -1238,6 +1240,7 @@ void MainWindow::ShowFreeLookWindow()
|
|||||||
InstallHotkeyFilter(m_freelook_window);
|
InstallHotkeyFilter(m_freelook_window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(m_freelook_window);
|
||||||
m_freelook_window->show();
|
m_freelook_window->show();
|
||||||
m_freelook_window->raise();
|
m_freelook_window->raise();
|
||||||
m_freelook_window->activateWindow();
|
m_freelook_window->activateWindow();
|
||||||
@ -1251,6 +1254,7 @@ void MainWindow::ShowSettingsWindow()
|
|||||||
InstallHotkeyFilter(m_settings_window);
|
InstallHotkeyFilter(m_settings_window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(m_settings_window);
|
||||||
m_settings_window->show();
|
m_settings_window->show();
|
||||||
m_settings_window->raise();
|
m_settings_window->raise();
|
||||||
m_settings_window->activateWindow();
|
m_settings_window->activateWindow();
|
||||||
@ -1271,6 +1275,7 @@ void MainWindow::ShowGeneralWindow()
|
|||||||
void MainWindow::ShowAboutDialog()
|
void MainWindow::ShowAboutDialog()
|
||||||
{
|
{
|
||||||
AboutDialog about{this};
|
AboutDialog about{this};
|
||||||
|
SetQWidgetWindowDecorations(&about);
|
||||||
about.exec();
|
about.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1282,6 +1287,7 @@ void MainWindow::ShowHotkeyDialog()
|
|||||||
InstallHotkeyFilter(m_hotkey_window);
|
InstallHotkeyFilter(m_hotkey_window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(m_hotkey_window);
|
||||||
m_hotkey_window->show();
|
m_hotkey_window->show();
|
||||||
m_hotkey_window->raise();
|
m_hotkey_window->raise();
|
||||||
m_hotkey_window->activateWindow();
|
m_hotkey_window->activateWindow();
|
||||||
@ -1304,6 +1310,7 @@ void MainWindow::ShowGraphicsWindow()
|
|||||||
InstallHotkeyFilter(m_graphics_window);
|
InstallHotkeyFilter(m_graphics_window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(m_graphics_window);
|
||||||
m_graphics_window->show();
|
m_graphics_window->show();
|
||||||
m_graphics_window->raise();
|
m_graphics_window->raise();
|
||||||
m_graphics_window->activateWindow();
|
m_graphics_window->activateWindow();
|
||||||
@ -1311,6 +1318,7 @@ void MainWindow::ShowGraphicsWindow()
|
|||||||
|
|
||||||
void MainWindow::ShowNetPlaySetupDialog()
|
void MainWindow::ShowNetPlaySetupDialog()
|
||||||
{
|
{
|
||||||
|
SetQWidgetWindowDecorations(m_netplay_setup_dialog);
|
||||||
m_netplay_setup_dialog->show();
|
m_netplay_setup_dialog->show();
|
||||||
m_netplay_setup_dialog->raise();
|
m_netplay_setup_dialog->raise();
|
||||||
m_netplay_setup_dialog->activateWindow();
|
m_netplay_setup_dialog->activateWindow();
|
||||||
@ -1321,6 +1329,7 @@ void MainWindow::ShowNetPlayBrowser()
|
|||||||
auto* browser = new NetPlayBrowser(this);
|
auto* browser = new NetPlayBrowser(this);
|
||||||
browser->setAttribute(Qt::WA_DeleteOnClose, true);
|
browser->setAttribute(Qt::WA_DeleteOnClose, true);
|
||||||
connect(browser, &NetPlayBrowser::Join, this, &MainWindow::NetPlayJoin);
|
connect(browser, &NetPlayBrowser::Join, this, &MainWindow::NetPlayJoin);
|
||||||
|
SetQWidgetWindowDecorations(browser);
|
||||||
browser->exec();
|
browser->exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1333,6 +1342,7 @@ void MainWindow::ShowFIFOPlayer()
|
|||||||
[this](const QString& path) { StartGame(path, ScanForSecondDisc::No); });
|
[this](const QString& path) { StartGame(path, ScanForSecondDisc::No); });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(m_fifo_window);
|
||||||
m_fifo_window->show();
|
m_fifo_window->show();
|
||||||
m_fifo_window->raise();
|
m_fifo_window->raise();
|
||||||
m_fifo_window->activateWindow();
|
m_fifo_window->activateWindow();
|
||||||
@ -1345,6 +1355,7 @@ void MainWindow::ShowSkylanderPortal()
|
|||||||
m_skylander_window = new SkylanderPortalWindow();
|
m_skylander_window = new SkylanderPortalWindow();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(m_skylander_window);
|
||||||
m_skylander_window->show();
|
m_skylander_window->show();
|
||||||
m_skylander_window->raise();
|
m_skylander_window->raise();
|
||||||
m_skylander_window->activateWindow();
|
m_skylander_window->activateWindow();
|
||||||
@ -1357,6 +1368,7 @@ void MainWindow::ShowInfinityBase()
|
|||||||
m_infinity_window = new InfinityBaseWindow();
|
m_infinity_window = new InfinityBaseWindow();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(m_infinity_window);
|
||||||
m_infinity_window->show();
|
m_infinity_window->show();
|
||||||
m_infinity_window->raise();
|
m_infinity_window->raise();
|
||||||
m_infinity_window->activateWindow();
|
m_infinity_window->activateWindow();
|
||||||
@ -1759,6 +1771,7 @@ void MainWindow::OnImportNANDBackup()
|
|||||||
dialog.Reset();
|
dialog.Reset();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(dialog.GetRaw());
|
||||||
dialog.GetRaw()->exec();
|
dialog.GetRaw()->exec();
|
||||||
|
|
||||||
result.wait();
|
result.wait();
|
||||||
@ -1866,6 +1879,7 @@ void MainWindow::ShowTASInput()
|
|||||||
const auto si_device = Config::Get(Config::GetInfoForSIDevice(i));
|
const auto si_device = Config::Get(Config::GetInfoForSIDevice(i));
|
||||||
if (si_device == SerialInterface::SIDEVICE_GC_GBA_EMULATED)
|
if (si_device == SerialInterface::SIDEVICE_GC_GBA_EMULATED)
|
||||||
{
|
{
|
||||||
|
SetQWidgetWindowDecorations(m_gba_tas_input_windows[i]);
|
||||||
m_gba_tas_input_windows[i]->show();
|
m_gba_tas_input_windows[i]->show();
|
||||||
m_gba_tas_input_windows[i]->raise();
|
m_gba_tas_input_windows[i]->raise();
|
||||||
m_gba_tas_input_windows[i]->activateWindow();
|
m_gba_tas_input_windows[i]->activateWindow();
|
||||||
@ -1873,6 +1887,7 @@ void MainWindow::ShowTASInput()
|
|||||||
else if (si_device != SerialInterface::SIDEVICE_NONE &&
|
else if (si_device != SerialInterface::SIDEVICE_NONE &&
|
||||||
si_device != SerialInterface::SIDEVICE_GC_GBA)
|
si_device != SerialInterface::SIDEVICE_GC_GBA)
|
||||||
{
|
{
|
||||||
|
SetQWidgetWindowDecorations(m_gc_tas_input_windows[i]);
|
||||||
m_gc_tas_input_windows[i]->show();
|
m_gc_tas_input_windows[i]->show();
|
||||||
m_gc_tas_input_windows[i]->raise();
|
m_gc_tas_input_windows[i]->raise();
|
||||||
m_gc_tas_input_windows[i]->activateWindow();
|
m_gc_tas_input_windows[i]->activateWindow();
|
||||||
@ -1884,6 +1899,7 @@ void MainWindow::ShowTASInput()
|
|||||||
if (Config::Get(Config::GetInfoForWiimoteSource(i)) == WiimoteSource::Emulated &&
|
if (Config::Get(Config::GetInfoForWiimoteSource(i)) == WiimoteSource::Emulated &&
|
||||||
(!Core::IsRunning() || SConfig::GetInstance().bWii))
|
(!Core::IsRunning() || SConfig::GetInstance().bWii))
|
||||||
{
|
{
|
||||||
|
SetQWidgetWindowDecorations(m_wii_tas_input_windows[i]);
|
||||||
m_wii_tas_input_windows[i]->show();
|
m_wii_tas_input_windows[i]->show();
|
||||||
m_wii_tas_input_windows[i]->raise();
|
m_wii_tas_input_windows[i]->raise();
|
||||||
m_wii_tas_input_windows[i]->activateWindow();
|
m_wii_tas_input_windows[i]->activateWindow();
|
||||||
@ -1910,6 +1926,7 @@ void MainWindow::ShowAchievementsWindow()
|
|||||||
m_achievements_window = new AchievementsWindow(this);
|
m_achievements_window = new AchievementsWindow(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(m_achievements_window);
|
||||||
m_achievements_window->show();
|
m_achievements_window->show();
|
||||||
m_achievements_window->raise();
|
m_achievements_window->raise();
|
||||||
m_achievements_window->activateWindow();
|
m_achievements_window->activateWindow();
|
||||||
@ -1920,6 +1937,7 @@ void MainWindow::ShowMemcardManager()
|
|||||||
{
|
{
|
||||||
GCMemcardManager manager(this);
|
GCMemcardManager manager(this);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&manager);
|
||||||
manager.exec();
|
manager.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1927,11 +1945,13 @@ void MainWindow::ShowResourcePackManager()
|
|||||||
{
|
{
|
||||||
ResourcePackManager manager(this);
|
ResourcePackManager manager(this);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&manager);
|
||||||
manager.exec();
|
manager.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::ShowCheatsManager()
|
void MainWindow::ShowCheatsManager()
|
||||||
{
|
{
|
||||||
|
SetQWidgetWindowDecorations(m_cheats_manager);
|
||||||
m_cheats_manager->show();
|
m_cheats_manager->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1950,6 +1970,7 @@ void MainWindow::ShowRiivolutionBootWidget(const UICommon::GameFile& game)
|
|||||||
auto& disc = std::get<BootParameters::Disc>(boot_params->parameters);
|
auto& disc = std::get<BootParameters::Disc>(boot_params->parameters);
|
||||||
RiivolutionBootWidget w(disc.volume->GetGameID(), disc.volume->GetRevision(),
|
RiivolutionBootWidget w(disc.volume->GetGameID(), disc.volume->GetRevision(),
|
||||||
disc.volume->GetDiscNumber(), game.GetFilePath(), this);
|
disc.volume->GetDiscNumber(), game.GetFilePath(), this);
|
||||||
|
SetQWidgetWindowDecorations(&w);
|
||||||
w.exec();
|
w.exec();
|
||||||
if (!w.ShouldBoot())
|
if (!w.ShouldBoot())
|
||||||
return;
|
return;
|
||||||
@ -1961,7 +1982,10 @@ void MainWindow::ShowRiivolutionBootWidget(const UICommon::GameFile& game)
|
|||||||
void MainWindow::Show()
|
void MainWindow::Show()
|
||||||
{
|
{
|
||||||
if (!Settings::Instance().IsBatchModeEnabled())
|
if (!Settings::Instance().IsBatchModeEnabled())
|
||||||
|
{
|
||||||
|
SetQWidgetWindowDecorations(this);
|
||||||
QWidget::show();
|
QWidget::show();
|
||||||
|
}
|
||||||
|
|
||||||
// If the booting of a game was requested on start up, do that now
|
// If the booting of a game was requested on start up, do that now
|
||||||
if (m_pending_boot != nullptr)
|
if (m_pending_boot != nullptr)
|
||||||
|
@ -59,6 +59,7 @@
|
|||||||
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
#include "DolphinQt/Updater.h"
|
#include "DolphinQt/Updater.h"
|
||||||
|
|
||||||
@ -1178,8 +1179,12 @@ void MenuBar::CheckNAND()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (NANDRepairDialog(result, this).exec() != QDialog::Accepted)
|
{
|
||||||
return;
|
NANDRepairDialog dialog(result, this);
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
|
if (dialog.exec() != QDialog::Accepted)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (WiiUtils::RepairNAND(ios))
|
if (WiiUtils::RepairNAND(ios))
|
||||||
{
|
{
|
||||||
@ -1336,6 +1341,7 @@ void MenuBar::GenerateSymbolsFromRSOAuto()
|
|||||||
|
|
||||||
return matches;
|
return matches;
|
||||||
});
|
});
|
||||||
|
SetQWidgetWindowDecorations(progress.GetRaw());
|
||||||
progress.GetRaw()->exec();
|
progress.GetRaw()->exec();
|
||||||
|
|
||||||
const auto matches = future.get();
|
const auto matches = future.get();
|
||||||
|
@ -14,14 +14,17 @@
|
|||||||
|
|
||||||
#include "Common/Config/Config.h"
|
#include "Common/Config/Config.h"
|
||||||
#include "Core/Config/MainSettings.h"
|
#include "Core/Config/MainSettings.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Resources.h"
|
#include "DolphinQt/Resources.h"
|
||||||
|
|
||||||
bool NKitWarningDialog::ShowUnlessDisabled(QWidget* parent)
|
bool NKitWarningDialog::ShowUnlessDisabled(QWidget* parent)
|
||||||
{
|
{
|
||||||
if (Config::Get(Config::MAIN_SKIP_NKIT_WARNING))
|
if (Config::Get(Config::MAIN_SKIP_NKIT_WARNING))
|
||||||
return true;
|
return true;
|
||||||
else
|
|
||||||
return NKitWarningDialog(parent).exec() == QDialog::Accepted;
|
NKitWarningDialog dialog(parent);
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
|
return dialog.exec() == QDialog::Accepted;
|
||||||
}
|
}
|
||||||
|
|
||||||
NKitWarningDialog::NKitWarningDialog(QWidget* parent) : QDialog(parent)
|
NKitWarningDialog::NKitWarningDialog(QWidget* parent) : QDialog(parent)
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
|
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
NetPlayBrowser::NetPlayBrowser(QWidget* parent) : QDialog(parent)
|
NetPlayBrowser::NetPlayBrowser(QWidget* parent) : QDialog(parent)
|
||||||
@ -303,6 +304,7 @@ void NetPlayBrowser::accept()
|
|||||||
dialog->setWindowModality(Qt::WindowModal);
|
dialog->setWindowModality(Qt::WindowModal);
|
||||||
dialog->setTextEchoMode(QLineEdit::Password);
|
dialog->setTextEchoMode(QLineEdit::Password);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(dialog);
|
||||||
if (dialog->exec() != QDialog::Accepted)
|
if (dialog->exec() != QDialog::Accepted)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -51,6 +51,7 @@
|
|||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/QueueOnObject.h"
|
#include "DolphinQt/QtUtils/QueueOnObject.h"
|
||||||
#include "DolphinQt/QtUtils/RunOnObject.h"
|
#include "DolphinQt/QtUtils/RunOnObject.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Resources.h"
|
#include "DolphinQt/Resources.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
#include "DolphinQt/Settings/GameCubePane.h"
|
#include "DolphinQt/Settings/GameCubePane.h"
|
||||||
@ -213,6 +214,7 @@ void NetPlayDialog::CreateMainLayout()
|
|||||||
m_game_digest_menu->addAction(tr("Other game..."), this, [this] {
|
m_game_digest_menu->addAction(tr("Other game..."), this, [this] {
|
||||||
GameListDialog gld(m_game_list_model, this);
|
GameListDialog gld(m_game_list_model, this);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&gld);
|
||||||
if (gld.exec() != QDialog::Accepted)
|
if (gld.exec() != QDialog::Accepted)
|
||||||
return;
|
return;
|
||||||
Settings::Instance().GetNetPlayServer()->ComputeGameDigest(
|
Settings::Instance().GetNetPlayServer()->ComputeGameDigest(
|
||||||
@ -335,6 +337,7 @@ void NetPlayDialog::ConnectWidgets()
|
|||||||
Settings::Instance().GetNetPlayServer()->KickPlayer(id);
|
Settings::Instance().GetNetPlayServer()->KickPlayer(id);
|
||||||
});
|
});
|
||||||
connect(m_assign_ports_button, &QPushButton::clicked, [this] {
|
connect(m_assign_ports_button, &QPushButton::clicked, [this] {
|
||||||
|
SetQWidgetWindowDecorations(m_pad_mapping);
|
||||||
m_pad_mapping->exec();
|
m_pad_mapping->exec();
|
||||||
|
|
||||||
Settings::Instance().GetNetPlayServer()->SetPadMapping(m_pad_mapping->GetGCPadArray());
|
Settings::Instance().GetNetPlayServer()->SetPadMapping(m_pad_mapping->GetGCPadArray());
|
||||||
@ -380,6 +383,7 @@ void NetPlayDialog::ConnectWidgets()
|
|||||||
|
|
||||||
connect(m_game_button, &QPushButton::clicked, [this] {
|
connect(m_game_button, &QPushButton::clicked, [this] {
|
||||||
GameListDialog gld(m_game_list_model, this);
|
GameListDialog gld(m_game_list_model, this);
|
||||||
|
SetQWidgetWindowDecorations(&gld);
|
||||||
if (gld.exec() == QDialog::Accepted)
|
if (gld.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
Settings& settings = Settings::Instance();
|
Settings& settings = Settings::Instance();
|
||||||
|
@ -5,6 +5,8 @@
|
|||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
|
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
|
|
||||||
ModalMessageBox::ModalMessageBox(QWidget* parent, Qt::WindowModality modality)
|
ModalMessageBox::ModalMessageBox(QWidget* parent, Qt::WindowModality modality)
|
||||||
: QMessageBox(parent != nullptr ? parent->window() : nullptr)
|
: QMessageBox(parent != nullptr ? parent->window() : nullptr)
|
||||||
{
|
{
|
||||||
@ -28,6 +30,7 @@ static inline int ExecMessageBox(ModalMessageBox::Icon icon, QWidget* parent, co
|
|||||||
msg.setStandardButtons(buttons);
|
msg.setStandardButtons(buttons);
|
||||||
msg.setDefaultButton(default_button);
|
msg.setDefaultButton(default_button);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&msg);
|
||||||
return msg.exec();
|
return msg.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
#include "Common/FileUtil.h"
|
#include "Common/FileUtil.h"
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "UICommon/ResourcePack/Manager.h"
|
#include "UICommon/ResourcePack/Manager.h"
|
||||||
|
|
||||||
ResourcePackManager::ResourcePackManager(QWidget* widget) : QDialog(widget)
|
ResourcePackManager::ResourcePackManager(QWidget* widget) : QDialog(widget)
|
||||||
@ -241,6 +242,7 @@ void ResourcePackManager::Remove()
|
|||||||
box.setIcon(QMessageBox::Warning);
|
box.setIcon(QMessageBox::Warning);
|
||||||
box.setStandardButtons(QMessageBox::Yes | QMessageBox::Abort);
|
box.setStandardButtons(QMessageBox::Yes | QMessageBox::Abort);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&box);
|
||||||
if (box.exec() != QMessageBox::Yes)
|
if (box.exec() != QMessageBox::Yes)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -39,6 +39,7 @@
|
|||||||
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/QtUtils/SignalBlocking.h"
|
#include "DolphinQt/QtUtils/SignalBlocking.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
#include "DolphinQt/Settings/BroadbandAdapterSettingsDialog.h"
|
#include "DolphinQt/Settings/BroadbandAdapterSettingsDialog.h"
|
||||||
@ -379,22 +380,32 @@ void GameCubePane::OnConfigPressed(ExpansionInterface::Slot slot)
|
|||||||
BrowseAGPRom(slot);
|
BrowseAGPRom(slot);
|
||||||
return;
|
return;
|
||||||
case ExpansionInterface::EXIDeviceType::Microphone:
|
case ExpansionInterface::EXIDeviceType::Microphone:
|
||||||
|
{
|
||||||
// TODO: convert MappingWindow to use Slot?
|
// TODO: convert MappingWindow to use Slot?
|
||||||
MappingWindow(this, MappingWindow::Type::MAPPING_GC_MICROPHONE, static_cast<int>(slot)).exec();
|
MappingWindow dialog(this, MappingWindow::Type::MAPPING_GC_MICROPHONE, static_cast<int>(slot));
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
|
dialog.exec();
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
case ExpansionInterface::EXIDeviceType::Ethernet:
|
case ExpansionInterface::EXIDeviceType::Ethernet:
|
||||||
{
|
{
|
||||||
BroadbandAdapterSettingsDialog(this, BroadbandAdapterSettingsDialog::Type::Ethernet).exec();
|
BroadbandAdapterSettingsDialog dialog(this, BroadbandAdapterSettingsDialog::Type::Ethernet);
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
|
dialog.exec();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
case ExpansionInterface::EXIDeviceType::EthernetXLink:
|
case ExpansionInterface::EXIDeviceType::EthernetXLink:
|
||||||
{
|
{
|
||||||
BroadbandAdapterSettingsDialog(this, BroadbandAdapterSettingsDialog::Type::XLinkKai).exec();
|
BroadbandAdapterSettingsDialog dialog(this, BroadbandAdapterSettingsDialog::Type::XLinkKai);
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
|
dialog.exec();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
case ExpansionInterface::EXIDeviceType::EthernetBuiltIn:
|
case ExpansionInterface::EXIDeviceType::EthernetBuiltIn:
|
||||||
{
|
{
|
||||||
BroadbandAdapterSettingsDialog(this, BroadbandAdapterSettingsDialog::Type::BuiltIn).exec();
|
BroadbandAdapterSettingsDialog dialog(this, BroadbandAdapterSettingsDialog::Type::BuiltIn);
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
|
dialog.exec();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
|
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/QtUtils/SignalBlocking.h"
|
#include "DolphinQt/QtUtils/SignalBlocking.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
@ -370,6 +371,7 @@ void GeneralPane::GenerateNewIdentity()
|
|||||||
message_box.setIcon(QMessageBox::Information);
|
message_box.setIcon(QMessageBox::Information);
|
||||||
message_box.setWindowTitle(tr("Identity Generation"));
|
message_box.setWindowTitle(tr("Identity Generation"));
|
||||||
message_box.setText(tr("New identity generated."));
|
message_box.setText(tr("New identity generated."));
|
||||||
|
SetQWidgetWindowDecorations(&message_box);
|
||||||
message_box.exec();
|
message_box.exec();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -35,6 +35,7 @@
|
|||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
|
||||||
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/QtUtils/SignalBlocking.h"
|
#include "DolphinQt/QtUtils/SignalBlocking.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
#include "DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h"
|
#include "DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h"
|
||||||
@ -288,6 +289,7 @@ void WiiPane::CreateSDCard()
|
|||||||
progress_dialog.Reset();
|
progress_dialog.Reset();
|
||||||
return good;
|
return good;
|
||||||
});
|
});
|
||||||
|
SetQWidgetWindowDecorations(progress_dialog.GetRaw());
|
||||||
progress_dialog.GetRaw()->exec();
|
progress_dialog.GetRaw()->exec();
|
||||||
if (!success.get())
|
if (!success.get())
|
||||||
ModalMessageBox::warning(this, tr("Convert Folder to File Now"), tr("Conversion failed."));
|
ModalMessageBox::warning(this, tr("Convert Folder to File Now"), tr("Conversion failed."));
|
||||||
@ -312,6 +314,7 @@ void WiiPane::CreateSDCard()
|
|||||||
progress_dialog.Reset();
|
progress_dialog.Reset();
|
||||||
return good;
|
return good;
|
||||||
});
|
});
|
||||||
|
SetQWidgetWindowDecorations(progress_dialog.GetRaw());
|
||||||
progress_dialog.GetRaw()->exec();
|
progress_dialog.GetRaw()->exec();
|
||||||
if (!success.get())
|
if (!success.get())
|
||||||
ModalMessageBox::warning(this, tr("Convert File to Folder Now"), tr("Conversion failed."));
|
ModalMessageBox::warning(this, tr("Convert File to Folder Now"), tr("Conversion failed."));
|
||||||
@ -468,6 +471,7 @@ void WiiPane::OnUSBWhitelistAddButton()
|
|||||||
USBDeviceAddToWhitelistDialog usb_whitelist_dialog(this);
|
USBDeviceAddToWhitelistDialog usb_whitelist_dialog(this);
|
||||||
connect(&usb_whitelist_dialog, &USBDeviceAddToWhitelistDialog::accepted, this,
|
connect(&usb_whitelist_dialog, &USBDeviceAddToWhitelistDialog::accepted, this,
|
||||||
&WiiPane::PopulateUSBPassthroughListWidget);
|
&WiiPane::PopulateUSBPassthroughListWidget);
|
||||||
|
SetQWidgetWindowDecorations(&usb_whitelist_dialog);
|
||||||
usb_whitelist_dialog.exec();
|
usb_whitelist_dialog.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,6 +34,7 @@
|
|||||||
#include "Core/System.h"
|
#include "Core/System.h"
|
||||||
|
|
||||||
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
#include "DolphinQt/QtUtils/DolphinFileDialog.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Resources.h"
|
#include "DolphinQt/Resources.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
@ -560,6 +561,7 @@ void SkylanderPortalWindow::CreateSkylanderAdvanced()
|
|||||||
|
|
||||||
connect(buttons, &QDialogButtonBox::rejected, create_window, &QDialog::reject);
|
connect(buttons, &QDialogButtonBox::rejected, create_window, &QDialog::reject);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(create_window);
|
||||||
create_window->show();
|
create_window->show();
|
||||||
create_window->raise();
|
create_window->raise();
|
||||||
}
|
}
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
|
|
||||||
#include "DolphinQt/QtUtils/AspectRatioWidget.h"
|
#include "DolphinQt/QtUtils/AspectRatioWidget.h"
|
||||||
#include "DolphinQt/QtUtils/QueueOnObject.h"
|
#include "DolphinQt/QtUtils/QueueOnObject.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/TAS/IRWidget.h"
|
#include "DolphinQt/TAS/IRWidget.h"
|
||||||
#include "DolphinQt/TAS/TASCheckBox.h"
|
#include "DolphinQt/TAS/TASCheckBox.h"
|
||||||
#include "DolphinQt/TAS/TASSpinBox.h"
|
#include "DolphinQt/TAS/TASSpinBox.h"
|
||||||
@ -395,15 +396,21 @@ void WiiTASInputWindow::UpdateExt()
|
|||||||
if (m_active_extension == WiimoteEmu::ExtensionNumber::NUNCHUK)
|
if (m_active_extension == WiimoteEmu::ExtensionNumber::NUNCHUK)
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("Wii TAS Input %1 - Wii Remote + Nunchuk").arg(m_num + 1));
|
setWindowTitle(tr("Wii TAS Input %1 - Wii Remote + Nunchuk").arg(m_num + 1));
|
||||||
|
SetQWidgetWindowDecorations(m_ir_box);
|
||||||
m_ir_box->show();
|
m_ir_box->show();
|
||||||
|
SetQWidgetWindowDecorations(m_nunchuk_stick_box);
|
||||||
m_nunchuk_stick_box->show();
|
m_nunchuk_stick_box->show();
|
||||||
m_classic_right_stick_box->hide();
|
m_classic_right_stick_box->hide();
|
||||||
m_classic_left_stick_box->hide();
|
m_classic_left_stick_box->hide();
|
||||||
|
SetQWidgetWindowDecorations(m_remote_accelerometer_box);
|
||||||
m_remote_accelerometer_box->show();
|
m_remote_accelerometer_box->show();
|
||||||
m_remote_gyroscope_box->setVisible(m_is_motion_plus_attached);
|
m_remote_gyroscope_box->setVisible(m_is_motion_plus_attached);
|
||||||
|
SetQWidgetWindowDecorations(m_nunchuk_accelerometer_box);
|
||||||
m_nunchuk_accelerometer_box->show();
|
m_nunchuk_accelerometer_box->show();
|
||||||
m_triggers_box->hide();
|
m_triggers_box->hide();
|
||||||
|
SetQWidgetWindowDecorations(m_nunchuk_buttons_box);
|
||||||
m_nunchuk_buttons_box->show();
|
m_nunchuk_buttons_box->show();
|
||||||
|
SetQWidgetWindowDecorations(m_remote_buttons_box);
|
||||||
m_remote_buttons_box->show();
|
m_remote_buttons_box->show();
|
||||||
m_classic_buttons_box->hide();
|
m_classic_buttons_box->hide();
|
||||||
}
|
}
|
||||||
@ -412,14 +419,18 @@ void WiiTASInputWindow::UpdateExt()
|
|||||||
setWindowTitle(tr("Wii TAS Input %1 - Classic Controller").arg(m_num + 1));
|
setWindowTitle(tr("Wii TAS Input %1 - Classic Controller").arg(m_num + 1));
|
||||||
m_ir_box->hide();
|
m_ir_box->hide();
|
||||||
m_nunchuk_stick_box->hide();
|
m_nunchuk_stick_box->hide();
|
||||||
|
SetQWidgetWindowDecorations(m_classic_right_stick_box);
|
||||||
m_classic_right_stick_box->show();
|
m_classic_right_stick_box->show();
|
||||||
|
SetQWidgetWindowDecorations(m_classic_left_stick_box);
|
||||||
m_classic_left_stick_box->show();
|
m_classic_left_stick_box->show();
|
||||||
m_remote_accelerometer_box->hide();
|
m_remote_accelerometer_box->hide();
|
||||||
m_remote_gyroscope_box->hide();
|
m_remote_gyroscope_box->hide();
|
||||||
m_nunchuk_accelerometer_box->hide();
|
m_nunchuk_accelerometer_box->hide();
|
||||||
|
SetQWidgetWindowDecorations(m_triggers_box);
|
||||||
m_triggers_box->show();
|
m_triggers_box->show();
|
||||||
m_remote_buttons_box->hide();
|
m_remote_buttons_box->hide();
|
||||||
m_nunchuk_buttons_box->hide();
|
m_nunchuk_buttons_box->hide();
|
||||||
|
SetQWidgetWindowDecorations(m_classic_buttons_box);
|
||||||
m_classic_buttons_box->show();
|
m_classic_buttons_box->show();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -429,10 +440,12 @@ void WiiTASInputWindow::UpdateExt()
|
|||||||
m_nunchuk_stick_box->hide();
|
m_nunchuk_stick_box->hide();
|
||||||
m_classic_right_stick_box->hide();
|
m_classic_right_stick_box->hide();
|
||||||
m_classic_left_stick_box->hide();
|
m_classic_left_stick_box->hide();
|
||||||
|
SetQWidgetWindowDecorations(m_remote_accelerometer_box);
|
||||||
m_remote_accelerometer_box->show();
|
m_remote_accelerometer_box->show();
|
||||||
m_remote_gyroscope_box->setVisible(m_is_motion_plus_attached);
|
m_remote_gyroscope_box->setVisible(m_is_motion_plus_attached);
|
||||||
m_nunchuk_accelerometer_box->hide();
|
m_nunchuk_accelerometer_box->hide();
|
||||||
m_triggers_box->hide();
|
m_triggers_box->hide();
|
||||||
|
SetQWidgetWindowDecorations(m_remote_buttons_box);
|
||||||
m_remote_buttons_box->show();
|
m_remote_buttons_box->show();
|
||||||
m_nunchuk_buttons_box->hide();
|
m_nunchuk_buttons_box->hide();
|
||||||
m_classic_buttons_box->hide();
|
m_classic_buttons_box->hide();
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
#include "Common/Version.h"
|
#include "Common/Version.h"
|
||||||
|
|
||||||
#include "DolphinQt/QtUtils/RunOnObject.h"
|
#include "DolphinQt/QtUtils/RunOnObject.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
// Refer to docs/autoupdate_overview.md for a detailed overview of the autoupdate process
|
// Refer to docs/autoupdate_overview.md for a detailed overview of the autoupdate process
|
||||||
@ -100,6 +101,7 @@ void Updater::OnUpdateAvailable(const NewVersionInformation& info)
|
|||||||
connect(buttons, &QDialogButtonBox::accepted, dialog, &QDialog::accept);
|
connect(buttons, &QDialogButtonBox::accepted, dialog, &QDialog::accept);
|
||||||
connect(buttons, &QDialogButtonBox::rejected, dialog, &QDialog::reject);
|
connect(buttons, &QDialogButtonBox::rejected, dialog, &QDialog::reject);
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(dialog);
|
||||||
return dialog->exec();
|
return dialog->exec();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
|
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/QtUtils/QueueOnObject.h"
|
#include "DolphinQt/QtUtils/QueueOnObject.h"
|
||||||
|
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
|
||||||
|
|
||||||
namespace WiiUpdate
|
namespace WiiUpdate
|
||||||
{
|
{
|
||||||
@ -130,6 +131,7 @@ static WiiUtils::UpdateResult ShowProgress(QWidget* parent, Callable function, A
|
|||||||
return res;
|
return res;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
SetQWidgetWindowDecorations(&dialog);
|
||||||
dialog.exec();
|
dialog.exec();
|
||||||
return result.get();
|
return result.get();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user