ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Debugger: Make various improvements to the UI

This commit is contained in:
chaoticgd 2025-02-26 20:25:55 +00:00 committed by Ty
parent 4f4ff00ecf
commit ab1cdb4c9d
38 changed files with 1170 additions and 476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2-qt/Debugger/Breakpoints/BreakpointWidget.cpp
View File

@ -146,6 +146,7 @@ void BreakpointWidget::contextDelete()
void BreakpointWidget::contextNew()
{
BreakpointDialog* bpDialog = new BreakpointDialog(this, &cpu(), *m_model);
bpDialog->setAttribute(Qt::WA_DeleteOnClose);
bpDialog->show();
}
@ -161,6 +162,7 @@ void BreakpointWidget::contextEdit()
auto bpObject = m_model->at(selectedRow);
BreakpointDialog* bpDialog = new BreakpointDialog(this, &cpu(), *m_model, bpObject, selectedRow);
bpDialog->setAttribute(Qt::WA_DeleteOnClose);
bpDialog->show();
}

53
pcsx2-qt/Debugger/DebuggerWidget.cpp
View File

@ -11,7 +11,6 @@
#include "DebugTools/DebugInterface.h"
#include "common/Assertions.h"
#include "common/Console.h"
DebuggerWidget::DebuggerWidget(const DebuggerWidgetParameters& parameters, u32 flags)
: QWidget(parameters.parent)
@ -20,6 +19,7 @@ DebuggerWidget::DebuggerWidget(const DebuggerWidgetParameters& parameters, u32 f
, m_cpu_override(parameters.cpu_override)
, m_flags(flags)
{
updateStyleSheet();
}
DebugInterface& DebuggerWidget::cpu() const
@ -61,9 +61,13 @@ QString DebuggerWidget::customDisplayName() const
return m_custom_display_name;
}
void DebuggerWidget::setCustomDisplayName(QString display_name)
bool DebuggerWidget::setCustomDisplayName(QString display_name)
{
if (display_name.size() > DockUtils::MAX_DOCK_WIDGET_NAME_SIZE)
return false;
m_custom_display_name = display_name;
return true;
}
bool DebuggerWidget::isPrimary() const
@ -102,9 +106,7 @@ bool DebuggerWidget::handleEvent(const DebuggerEvents::Event& event)
auto [begin, end] = m_event_handlers.equal_range(typeid(event).name());
for (auto handler = begin; handler != end; handler++)
if (handler->second(event))
{
return true;
}
return false;
}
@ -126,11 +128,14 @@ void DebuggerWidget::toJson(JsonValueWrapper& json)
json.value().AddMember("isPrimary", m_is_primary, json.allocator());
}
bool DebuggerWidget::fromJson(JsonValueWrapper& json)
bool DebuggerWidget::fromJson(const JsonValueWrapper& json)
{
auto custom_display_name = json.value().FindMember("customDisplayName");
if (custom_display_name != json.value().MemberEnd() && custom_display_name->value.IsString())
{
m_custom_display_name = QString(custom_display_name->value.GetString());
m_custom_display_name.truncate(DockUtils::MAX_DOCK_WIDGET_NAME_SIZE);
}
auto is_primary = json.value().FindMember("isPrimary");
if (is_primary != json.value().MemberEnd() && is_primary->value.IsBool())
@ -139,19 +144,6 @@ bool DebuggerWidget::fromJson(JsonValueWrapper& json)
return true;
}
void DebuggerWidget::applyMonospaceFont()
{
// Easiest way to handle cross platform monospace fonts
// There are issues related to TabWidget -> Children font inheritance otherwise
#if defined(WIN32)
setStyleSheet(QStringLiteral("font: 10pt 'Lucida Console'"));
#elif defined(__APPLE__)
setStyleSheet(QStringLiteral("font: 10pt 'Monaco'"));
#else
setStyleSheet(QStringLiteral("font: 10pt 'Monospace'"));
#endif
}
void DebuggerWidget::switchToThisTab()
{
g_debugger_window->dockManager().switchToDebuggerWidget(this);
@ -188,6 +180,31 @@ void DebuggerWidget::setDisplayNameSuffixNumber(std::optional<int> suffix_number
m_display_name_suffix_number = suffix_number;
}
void DebuggerWidget::updateStyleSheet()
{
QString stylesheet;
if (m_flags & MONOSPACE_FONT)
{
// Easiest way to handle cross platform monospace fonts
// There are issues related to TabWidget -> Children font inheritance otherwise
#if defined(WIN32)
stylesheet += QStringLiteral("font-family: 'Lucida Console';");
#elif defined(__APPLE__)
stylesheet += QStringLiteral("font-family: 'Monaco';");
#else
stylesheet += QStringLiteral("font-family: 'Monospace';");
#endif
}
// HACK: Make the font size smaller without applying a stylesheet to the
// whole window (which would impact performance).
if (g_debugger_window)
stylesheet += QString("font-size: %1pt;").arg(g_debugger_window->fontSize());
setStyleSheet(stylesheet);
}
void DebuggerWidget::goToInDisassembler(u32 address, bool switch_to_tab)
{
DebuggerEvents::GoToAddress event;

12
pcsx2-qt/Debugger/DebuggerWidget.h
View File

@ -34,7 +34,7 @@ public:
QString displayNameWithoutSuffix() const;
QString customDisplayName() const;
void setCustomDisplayName(QString display_name);
bool setCustomDisplayName(QString display_name);
bool isPrimary() const;
void setPrimary(bool is_primary);
@ -137,9 +137,7 @@ public:
}
virtual void toJson(JsonValueWrapper& json);
virtual bool fromJson(JsonValueWrapper& json);
void applyMonospaceFont();
virtual bool fromJson(const JsonValueWrapper& json);
void switchToThisTab();
@ -150,6 +148,8 @@ public:
std::optional<int> displayNameSuffixNumber() const;
void setDisplayNameSuffixNumber(std::optional<int> suffix_number);
void updateStyleSheet();
static void goToInDisassembler(u32 address, bool switch_to_tab);
static void goToInMemoryView(u32 address, bool switch_to_tab);
@ -158,7 +158,9 @@ protected:
{
NO_DEBUGGER_FLAGS = 0,
// Prevent the user from opening multiple dock widgets of this type.
DISALLOW_MULTIPLE_INSTANCES = 1 << 0
DISALLOW_MULTIPLE_INSTANCES = 1 << 0,
// Apply a stylesheet that gives all the text a monospace font.
MONOSPACE_FONT = 1 << 1
};
DebuggerWidget(const DebuggerWidgetParameters& parameters, u32 flags);

297
pcsx2-qt/Debugger/DebuggerWindow.cpp
View File

@ -28,21 +28,37 @@ DebuggerWindow::DebuggerWindow(QWidget* parent)
g_debugger_window = this;
setupDefaultToolBarState();
setupFonts();
restoreWindowGeometry();
m_dock_manager->loadLayouts();
connect(m_ui.actionShutDown, &QAction::triggered, []() { g_emu_thread->shutdownVM(false); });
connect(m_ui.actionReset, &QAction::triggered, []() { g_emu_thread->resetVM(); });
connect(m_ui.actionAnalyse, &QAction::triggered, this, &DebuggerWindow::onAnalyse);
connect(m_ui.actionSettings, &QAction::triggered, this, &DebuggerWindow::onSettings);
connect(m_ui.actionGameSettings, &QAction::triggered, this, &DebuggerWindow::onGameSettings);
connect(m_ui.actionClose, &QAction::triggered, this, &DebuggerWindow::close);
connect(m_ui.actionOnTop, &QAction::triggered, this, [this](bool checked) {
if (checked)
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
else
setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
show();
});
connect(m_ui.actionRun, &QAction::triggered, this, &DebuggerWindow::onRunPause);
connect(m_ui.actionStepInto, &QAction::triggered, this, &DebuggerWindow::onStepInto);
connect(m_ui.actionStepOver, &QAction::triggered, this, &DebuggerWindow::onStepOver);
connect(m_ui.actionStepOut, &QAction::triggered, this, &DebuggerWindow::onStepOut);
connect(m_ui.actionAnalyse, &QAction::triggered, this, &DebuggerWindow::onAnalyse);
connect(m_ui.actionOnTop, &QAction::triggered, this, [this] {
setWindowFlags(this->windowFlags() ^ Qt::WindowStaysOnTopHint);
show();
connect(m_ui.actionShutDown, &QAction::triggered, [this]() {
if (currentCPU() && currentCPU()->isAlive())
g_emu_thread->shutdownVM(false);
});
connect(m_ui.actionReset, &QAction::triggered, [this]() {
if (currentCPU() && currentCPU()->isAlive())
g_emu_thread->resetVM();
});
connect(m_ui.menuTools, &QMenu::aboutToShow, this, [this]() {
@ -53,30 +69,44 @@ DebuggerWindow::DebuggerWindow(QWidget* parent)
m_dock_manager->createWindowsMenu(m_ui.menuWindows);
});
connect(m_ui.actionResetAllLayouts, &QAction::triggered, [this]() {
QMessageBox::StandardButton result = QMessageBox::question(
g_debugger_window, tr("Confirmation"), tr("Are you sure you want to reset all layouts?"));
connect(m_ui.actionResetAllLayouts, &QAction::triggered, this, [this]() {
QString text = tr("Are you sure you want to reset all layouts?");
if (QMessageBox::question(g_debugger_window, tr("Confirmation"), text) != QMessageBox::Yes)
return;
if (result == QMessageBox::Yes)
m_dock_manager->resetAllLayouts();
m_dock_manager->resetAllLayouts();
});
connect(m_ui.actionResetDefaultLayouts, &QAction::triggered, [this]() {
QMessageBox::StandardButton result = QMessageBox::question(
g_debugger_window, tr("Confirmation"), tr("Are you sure you want to reset the default layouts?"));
connect(m_ui.actionResetDefaultLayouts, &QAction::triggered, this, [this]() {
QString text = tr("Are you sure you want to reset the default layouts?");
if (QMessageBox::question(g_debugger_window, tr("Confirmation"), text) != QMessageBox::Yes)
return;
if (result == QMessageBox::Yes)
m_dock_manager->resetDefaultLayouts();
m_dock_manager->resetDefaultLayouts();
});
connect(g_emu_thread, &EmuThread::onVMPaused, this, []() {
DebuggerWidget::broadcastEvent(DebuggerEvents::VMUpdate());
});
connect(g_emu_thread, &EmuThread::onVMPaused, this, &DebuggerWindow::onVMStateChanged);
connect(g_emu_thread, &EmuThread::onVMResumed, this, &DebuggerWindow::onVMStateChanged);
connect(g_emu_thread, &EmuThread::onVMStarting, this, &DebuggerWindow::onVMStarting);
connect(g_emu_thread, &EmuThread::onVMPaused, this, &DebuggerWindow::onVMPaused);
connect(g_emu_thread, &EmuThread::onVMResumed, this, &DebuggerWindow::onVMResumed);
connect(g_emu_thread, &EmuThread::onVMStopped, this, &DebuggerWindow::onVMStopped);
onVMStateChanged(); // If we missed a state change while we weren't loaded
if (QtHost::IsVMValid())
{
onVMStarting();
if (QtHost::IsVMPaused())
onVMPaused();
else
onVMResumed();
}
else
{
onVMStopped();
}
m_dock_manager->switchToLayout(0);
@ -125,45 +155,197 @@ DockManager& DebuggerWindow::dockManager()
return *m_dock_manager;
}
void DebuggerWindow::setupDefaultToolBarState()
{
// Hiding all the toolbars lets us save the default state of the window with
// all the toolbars hidden. The DockManager will show the appropriate ones
// later anyway.
for (QToolBar* toolbar : findChildren<QToolBar*>())
toolbar->hide();
m_default_toolbar_state = saveState();
for (QToolBar* toolbar : findChildren<QToolBar*>())
connect(toolbar, &QToolBar::topLevelChanged, m_dock_manager, &DockManager::updateToolBarLockState);
}
void DebuggerWindow::clearToolBarState()
{
restoreState(m_default_toolbar_state);
}
void DebuggerWindow::onVMStateChanged()
void DebuggerWindow::setupFonts()
{
if (!QtHost::IsVMPaused())
m_font_size = Host::GetBaseIntSettingValue("Debugger/UserInterface", "FontSize", DEFAULT_FONT_SIZE);
if (m_font_size < MINIMUM_FONT_SIZE || m_font_size > MAXIMUM_FONT_SIZE)
m_font_size = DEFAULT_FONT_SIZE;
m_ui.actionIncreaseFontSize->setShortcuts(QKeySequence::ZoomIn);
connect(m_ui.actionIncreaseFontSize, &QAction::triggered, this, [this]() {
if (m_font_size >= MAXIMUM_FONT_SIZE)
return;
m_font_size++;
updateFontActions();
updateStyleSheets();
saveFontSize();
});
m_ui.actionDecreaseFontSize->setShortcut(QKeySequence::ZoomOut);
connect(m_ui.actionDecreaseFontSize, &QAction::triggered, this, [this]() {
if (m_font_size <= MINIMUM_FONT_SIZE)
return;
m_font_size--;
updateFontActions();
updateStyleSheets();
saveFontSize();
});
connect(m_ui.actionResetFontSize, &QAction::triggered, this, [this]() {
m_font_size = DEFAULT_FONT_SIZE;
updateFontActions();
updateStyleSheets();
saveFontSize();
});
updateFontActions();
updateStyleSheets();
}
void DebuggerWindow::updateFontActions()
{
m_ui.actionIncreaseFontSize->setEnabled(m_font_size < MAXIMUM_FONT_SIZE);
m_ui.actionDecreaseFontSize->setEnabled(m_font_size > MINIMUM_FONT_SIZE);
m_ui.actionResetFontSize->setEnabled(m_font_size != DEFAULT_FONT_SIZE);
}
void DebuggerWindow::saveFontSize()
{
Host::SetBaseIntSettingValue("Debugger/UserInterface", "FontSize", m_font_size);
Host::CommitBaseSettingChanges();
}
int DebuggerWindow::fontSize()
{
return m_font_size;
}
void DebuggerWindow::updateStyleSheets()
{
// TODO: Migrate away from stylesheets to improve performance.
if (m_font_size != DEFAULT_FONT_SIZE)
{
m_ui.actionRun->setText(tr("Pause"));
m_ui.actionRun->setIcon(QIcon::fromTheme(QStringLiteral("pause-line")));
m_ui.actionStepInto->setEnabled(false);
m_ui.actionStepOver->setEnabled(false);
m_ui.actionStepOut->setEnabled(false);
int size = m_font_size + QApplication::font().pointSize() - DEFAULT_FONT_SIZE;
setStyleSheet(QString("* { font-size: %1pt; } QTabBar { font-size: %2pt; }").arg(size).arg(size + 1));
}
else
{
m_ui.actionRun->setText(tr("Run"));
m_ui.actionRun->setIcon(QIcon::fromTheme(QStringLiteral("play-line")));
m_ui.actionStepInto->setEnabled(true);
m_ui.actionStepOver->setEnabled(true);
m_ui.actionStepOut->setEnabled(true);
// Switch to the CPU tab that triggered the breakpoint
// Also bold the tab text to indicate that a breakpoint was triggered
if (CBreakPoints::GetBreakpointTriggered())
{
const BreakPointCpu triggeredCpu = CBreakPoints::GetBreakpointTriggeredCpu();
m_dock_manager->switchToLayoutWithCPU(triggeredCpu);
Host::RunOnCPUThread([] {
CBreakPoints::ClearTemporaryBreakPoints();
CBreakPoints::SetBreakpointTriggered(false, BREAKPOINT_IOP_AND_EE);
// Our current PC is on a breakpoint.
// When we run the core again, we want to skip this breakpoint and run
CBreakPoints::SetSkipFirst(BREAKPOINT_EE, r5900Debug.getPC());
CBreakPoints::SetSkipFirst(BREAKPOINT_IOP, r3000Debug.getPC());
});
}
setStyleSheet(QString());
}
return;
dockManager().updateStyleSheets();
}
void DebuggerWindow::saveWindowGeometry()
{
std::string old_geometry = Host::GetBaseStringSettingValue("Debugger/UserInterface", "WindowGeometry");
std::string geometry = saveGeometry().toBase64().toStdString();
if (geometry != old_geometry)
{
Host::SetBaseStringSettingValue("Debugger/UserInterface", "WindowGeometry", geometry.c_str());
Host::CommitBaseSettingChanges();
}
}
void DebuggerWindow::restoreWindowGeometry()
{
std::string geometry = Host::GetBaseStringSettingValue("Debugger/UserInterface", "WindowGeometry");
restoreGeometry(QByteArray::fromBase64(QByteArray::fromStdString(geometry)));
}
void DebuggerWindow::onVMStarting()
{
m_ui.actionRun->setEnabled(true);
m_ui.actionStepInto->setEnabled(true);
m_ui.actionStepOver->setEnabled(true);
m_ui.actionStepOut->setEnabled(true);
m_ui.actionAnalyse->setEnabled(true);
m_ui.actionGameSettings->setEnabled(true);
m_ui.actionShutDown->setEnabled(true);
m_ui.actionReset->setEnabled(true);
}
void DebuggerWindow::onVMPaused()
{
m_ui.actionRun->setText(tr("Run"));
m_ui.actionRun->setIcon(QIcon::fromTheme(QStringLiteral("play-line")));
m_ui.actionStepInto->setEnabled(true);
m_ui.actionStepOver->setEnabled(true);
m_ui.actionStepOut->setEnabled(true);
// Switch to the CPU tab that triggered the breakpoint.
// Also blink the tab text to indicate that a breakpoint was triggered.
if (CBreakPoints::GetBreakpointTriggered())
{
const BreakPointCpu triggeredCpu = CBreakPoints::GetBreakpointTriggeredCpu();
m_dock_manager->switchToLayoutWithCPU(triggeredCpu, true);
Host::RunOnCPUThread([] {
CBreakPoints::ClearTemporaryBreakPoints();
CBreakPoints::SetBreakpointTriggered(false, BREAKPOINT_IOP_AND_EE);
// Our current PC is on a breakpoint.
// When we run the core again, we want to skip this breakpoint and run.
CBreakPoints::SetSkipFirst(BREAKPOINT_EE, r5900Debug.getPC());
CBreakPoints::SetSkipFirst(BREAKPOINT_IOP, r3000Debug.getPC());
});
}
}
void DebuggerWindow::onVMResumed()
{
m_ui.actionRun->setText(tr("Pause"));
m_ui.actionRun->setIcon(QIcon::fromTheme(QStringLiteral("pause-line")));
m_ui.actionStepInto->setEnabled(false);
m_ui.actionStepOver->setEnabled(false);
m_ui.actionStepOut->setEnabled(false);
}
void DebuggerWindow::onVMStopped()
{
m_ui.actionRun->setEnabled(false);
m_ui.actionStepInto->setEnabled(false);
m_ui.actionStepOver->setEnabled(false);
m_ui.actionStepOut->setEnabled(false);
m_ui.actionAnalyse->setEnabled(false);
m_ui.actionGameSettings->setEnabled(false);
m_ui.actionShutDown->setEnabled(false);
m_ui.actionReset->setEnabled(false);
}
void DebuggerWindow::onAnalyse()
{
AnalysisOptionsDialog* dialog = new AnalysisOptionsDialog(this);
dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->show();
}
void DebuggerWindow::onSettings()
{
g_main_window->doSettings("Debug");
}
void DebuggerWindow::onGameSettings()
{
g_main_window->doGameSettings("Debug");
}
void DebuggerWindow::onRunPause()
@ -309,15 +491,10 @@ void DebuggerWindow::onStepOut()
this->repaint();
}
void DebuggerWindow::onAnalyse()
{
AnalysisOptionsDialog* dialog = new AnalysisOptionsDialog(this);
dialog->show();
}
void DebuggerWindow::closeEvent(QCloseEvent* event)
{
dockManager().saveCurrentLayout();
saveWindowGeometry();
Host::RunOnCPUThread([]() {
R5900SymbolImporter.OnDebuggerClosed();
@ -337,17 +514,3 @@ DebugInterface* DebuggerWindow::currentCPU()
return &DebugInterface::get(*maybe_cpu);
}
void DebuggerWindow::setupDefaultToolBarState()
{
// Hiding all the toolbars lets us save the default state of the window with
// all the toolbars hidden. The DockManager will show the appropriate ones
// later anyway.
for (QToolBar* toolbar : findChildren<QToolBar*>())
toolbar->hide();
m_default_toolbar_state = saveState();
for (QToolBar* toolbar : findChildren<QToolBar*>())
connect(toolbar, &QToolBar::topLevelChanged, m_dock_manager, &DockManager::updateToolBarLockState);
}

26
pcsx2-qt/Debugger/DebuggerWindow.h
View File

@ -24,15 +24,30 @@ public:
DockManager& dockManager();
void setupDefaultToolBarState();
void clearToolBarState();
void setupFonts();
void updateFontActions();
void saveFontSize();
int fontSize();
void updateStyleSheets();
void saveWindowGeometry();
void restoreWindowGeometry();
public slots:
void onVMStateChanged();
void onVMStarting();
void onVMPaused();
void onVMResumed();
void onVMStopped();
void onAnalyse();
void onSettings();
void onGameSettings();
void onRunPause();
void onStepInto();
void onStepOver();
void onStepOut();
void onAnalyse();
protected:
void closeEvent(QCloseEvent* event);
@ -40,13 +55,16 @@ protected:
private:
DebugInterface* currentCPU();
void setupDefaultToolBarState();
Ui::DebuggerWindow m_ui;
DockManager* m_dock_manager;
QByteArray m_default_toolbar_state;
int m_font_size;
static const constexpr int DEFAULT_FONT_SIZE = 10;
static const constexpr int MINIMUM_FONT_SIZE = 5;
static const constexpr int MAXIMUM_FONT_SIZE = 30;
};
extern DebuggerWindow* g_debugger_window;

129
pcsx2-qt/Debugger/DebuggerWindow.ui
View File

@ -18,24 +18,6 @@
<normalon>:/icons/AppIcon64.png</normalon>
</iconset>
</property>
<widget class="QToolBar" name="toolBarDebug">
<property name="windowTitle">
<string>Debug</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionRun"/>
<addaction name="actionStepInto"/>
<addaction name="actionStepOver"/>
<addaction name="actionStepOut"/>
</widget>
<widget class="QMenuBar" name="menuBar">
<property name="geometry">
<rect>
@ -50,6 +32,9 @@
<string>File</string>
</property>
<addaction name="actionAnalyse"/>
<addaction name="actionSettings"/>
<addaction name="actionGameSettings"/>
<addaction name="separator"/>
<addaction name="actionClose"/>
</widget>
<widget class="QMenu" name="menuDebug">
@ -71,6 +56,10 @@
<string>View</string>
</property>
<addaction name="actionOnTop"/>
<addaction name="separator"/>
<addaction name="actionIncreaseFontSize"/>
<addaction name="actionDecreaseFontSize"/>
<addaction name="actionResetFontSize"/>
</widget>
<widget class="QMenu" name="menuLayouts">
<property name="title">
@ -91,9 +80,9 @@
<addaction name="menuWindows"/>
<addaction name="menuLayouts"/>
</widget>
<widget class="QToolBar" name="toolBarView">
<widget class="QToolBar" name="toolBarDebug">
<property name="windowTitle">
<string>View</string>
<string>Debug</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
@ -104,7 +93,27 @@
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionOnTop"/>
<addaction name="actionRun"/>
<addaction name="actionStepInto"/>
<addaction name="actionStepOver"/>
<addaction name="actionStepOut"/>
</widget>
<widget class="QToolBar" name="toolBarFile">
<property name="windowTitle">
<string>File</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionAnalyse"/>
<addaction name="actionSettings"/>
<addaction name="actionGameSettings"/>
</widget>
<widget class="QToolBar" name="toolBarSystem">
<property name="windowTitle">
@ -122,6 +131,24 @@
<addaction name="actionShutDown"/>
<addaction name="actionReset"/>
</widget>
<widget class="QToolBar" name="toolBarView">
<property name="windowTitle">
<string>View</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionOnTop"/>
<addaction name="actionIncreaseFontSize"/>
<addaction name="actionDecreaseFontSize"/>
<addaction name="actionResetFontSize"/>
</widget>
<action name="actionRun">
<property name="icon">
<iconset theme="play-line"/>
@ -224,7 +251,7 @@
</action>
<action name="actionClose">
<property name="icon">
<iconset theme="door-open-line"/>
<iconset theme="close-line"/>
</property>
<property name="text">
<string>Close</string>
@ -233,6 +260,64 @@
<enum>QAction::NoRole</enum>
</property>
</action>
<action name="actionIncreaseFontSize">
<property name="icon">
<iconset theme="zoom-in-line"/>
</property>
<property name="text">
<string>Increase Font Size</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action>
<action name="actionDecreaseFontSize">
<property name="icon">
<iconset theme="zoom-out-line"/>
</property>
<property name="text">
<string>Decrease Font Size</string>
</property>
<property name="shortcut">
<string>Ctrl+-</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action>
<action name="actionResetFontSize">
<property name="icon">
<iconset theme="refresh-line"/>
</property>
<property name="text">
<string>Reset Font Size</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action>
<action name="actionSettings">
<property name="icon">
<iconset theme="settings-3-line"/>
</property>
<property name="text">
<string>Settings</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action>
<action name="actionGameSettings">
<property name="icon">
<iconset theme="file-settings-line"/>
</property>
<property name="text">
<string>Game Settings</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action>
</widget>
<resources/>
<connections/>

60
pcsx2-qt/Debugger/DisassemblyWidget.cpp
View File

@ -3,6 +3,8 @@
#include "DisassemblyWidget.h"
#include "Debugger/JsonValueWrapper.h"
#include "DebugTools/DebugInterface.h"
#include "DebugTools/DisassemblyManager.h"
#include "DebugTools/Breakpoints.h"
@ -20,7 +22,7 @@
using namespace QtUtils;
DisassemblyWidget::DisassemblyWidget(const DebuggerWidgetParameters& parameters)
: DebuggerWidget(parameters, NO_DEBUGGER_FLAGS)
: DebuggerWidget(parameters, MONOSPACE_FONT)
{
m_ui.setupUi(this);
@ -31,8 +33,6 @@ DisassemblyWidget::DisassemblyWidget(const DebuggerWidgetParameters& parameters)
setContextMenuPolicy(Qt::CustomContextMenu);
connect(this, &DisassemblyWidget::customContextMenuRequested, this, &DisassemblyWidget::openContextMenu);
applyMonospaceFont();
connect(g_emu_thread, &EmuThread::onVMPaused, this, &DisassemblyWidget::gotoProgramCounterOnPause);
receiveEvent<DebuggerEvents::Refresh>([this](const DebuggerEvents::Refresh& event) -> bool {
@ -56,6 +56,37 @@ DisassemblyWidget::DisassemblyWidget(const DebuggerWidgetParameters& parameters)
DisassemblyWidget::~DisassemblyWidget() = default;
void DisassemblyWidget::toJson(JsonValueWrapper& json)
{
DebuggerWidget::toJson(json);
json.value().AddMember("startAddress", m_visibleStart, json.allocator());
json.value().AddMember("goToPCOnPause", m_goToProgramCounterOnPause, json.allocator());
json.value().AddMember("showInstructionBytes", m_showInstructionBytes, json.allocator());
}
bool DisassemblyWidget::fromJson(const JsonValueWrapper& json)
{
if (!DebuggerWidget::fromJson(json))
return false;
auto start_address = json.value().FindMember("startAddress");
if (start_address != json.value().MemberEnd() && start_address->value.IsUint())
m_visibleStart = start_address->value.GetUint() & ~3;
auto go_to_pc_on_pause = json.value().FindMember("goToPCOnPause");
if (go_to_pc_on_pause != json.value().MemberEnd() && go_to_pc_on_pause->value.IsBool())
m_goToProgramCounterOnPause = go_to_pc_on_pause->value.GetBool();
auto show_instruction_bytes = json.value().FindMember("showInstructionBytes");
if (show_instruction_bytes != json.value().MemberEnd() && show_instruction_bytes->value.IsBool())
m_showInstructionBytes = show_instruction_bytes->value.GetBool();
repaint();
return true;
}
void DisassemblyWidget::contextCopyAddress()
{
QGuiApplication::clipboard()->setText(FetchSelectionInfo(SelectionInfo::ADDRESS));
@ -210,6 +241,7 @@ void DisassemblyWidget::contextGoToAddress()
void DisassemblyWidget::contextAddFunction()
{
NewFunctionDialog* dialog = new NewFunctionDialog(cpu(), this);
dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->setName(QString("func_%1").arg(m_selectedAddressStart, 8, 16, QChar('0')));
dialog->setAddress(m_selectedAddressStart);
if (m_selectedAddressEnd != m_selectedAddressStart)
@ -307,9 +339,9 @@ void DisassemblyWidget::contextRestoreFunction()
}
}
void DisassemblyWidget::contextShowOpcode()
void DisassemblyWidget::contextShowInstructionBytes()
{
m_showInstructionOpcode = !m_showInstructionOpcode;
m_showInstructionBytes = !m_showInstructionBytes;
this->repaint();
}
@ -392,7 +424,7 @@ void DisassemblyWidget::paintEvent(QPaintEvent* event)
s32 branchCount = 0;
for (const auto& branchLine : branchLines)
{
if (branchCount == (m_showInstructionOpcode ? 3 : 5))
if (branchCount == (m_showInstructionBytes ? 3 : 5))
break;
const int winBottom = this->height();
@ -621,8 +653,8 @@ void DisassemblyWidget::keyPressEvent(QKeyEvent* event)
case Qt::Key_Left:
gotoAddressAndSetFocus(cpu().getPC());
break;
case Qt::Key_O:
m_showInstructionOpcode = !m_showInstructionOpcode;
case Qt::Key_I:
m_showInstructionBytes = !m_showInstructionBytes;
break;
}
@ -727,11 +759,11 @@ void DisassemblyWidget::openContextMenu(QPoint pos)
menu->addSeparator();
QAction* show_opcode_action = menu->addAction(tr("Show &Opcode"));
show_opcode_action->setShortcut(QKeySequence(Qt::Key_O));
show_opcode_action->setCheckable(true);
show_opcode_action->setChecked(m_showInstructionOpcode);
connect(show_opcode_action, &QAction::triggered, this, &DisassemblyWidget::contextShowOpcode);
QAction* show_instruction_bytes_action = menu->addAction(tr("Show &Instruction Bytes"));
show_instruction_bytes_action->setShortcut(QKeySequence(Qt::Key_I));
show_instruction_bytes_action->setCheckable(true);
show_instruction_bytes_action->setChecked(m_showInstructionBytes);
connect(show_instruction_bytes_action, &QAction::triggered, this, &DisassemblyWidget::contextShowInstructionBytes);
menu->popup(this->mapToGlobal(pos));
}
@ -751,7 +783,7 @@ inline QString DisassemblyWidget::DisassemblyStringFromAddress(u32 address, QFon
FunctionInfo function = cpu().GetSymbolGuardian().FunctionStartingAtAddress(address);
SymbolInfo symbol = cpu().GetSymbolGuardian().SymbolStartingAtAddress(address);
const bool showOpcode = m_showInstructionOpcode && cpu().isAlive();
const bool showOpcode = m_showInstructionBytes && cpu().isAlive();
QString lineString;
if (showOpcode)

20
pcsx2-qt/Debugger/DisassemblyWidget.h
View File

@ -7,7 +7,6 @@
#include "DebuggerWidget.h"
#include "pcsx2/DebugTools/DebugInterface.h"
#include "pcsx2/DebugTools/DisassemblyManager.h"
#include <QtWidgets/QMenu>
@ -21,15 +20,18 @@ public:
DisassemblyWidget(const DebuggerWidgetParameters& parameters);
~DisassemblyWidget();
void toJson(JsonValueWrapper& json) override;
bool fromJson(const JsonValueWrapper& json) override;
// Required for the breakpoint list (ugh wtf)
QString GetLineDisasm(u32 address);
protected:
void paintEvent(QPaintEvent* event);
void mousePressEvent(QMouseEvent* event);
void mouseDoubleClickEvent(QMouseEvent* event);
void wheelEvent(QWheelEvent* event);
void keyPressEvent(QKeyEvent* event);
void paintEvent(QPaintEvent* event) override;
void mousePressEvent(QMouseEvent* event) override;
void mouseDoubleClickEvent(QMouseEvent* event) override;
void wheelEvent(QWheelEvent* event) override;
void keyPressEvent(QKeyEvent* event) override;
public slots:
void openContextMenu(QPoint pos);
@ -54,7 +56,7 @@ public slots:
void contextRemoveFunction();
void contextStubFunction();
void contextRestoreFunction();
void contextShowOpcode();
void contextShowInstructionBytes();
void gotoAddressAndSetFocus(u32 address);
void gotoProgramCounterOnPause();
@ -63,7 +65,7 @@ public slots:
private:
Ui::DisassemblyWidget m_ui;
u32 m_visibleStart = 0x00336318; // The address of the first opcode shown(row 0)
u32 m_visibleStart = 0x100000; // The address of the first instruction shown.
u32 m_visibleRows;
u32 m_selectedAddressStart = 0;
u32 m_selectedAddressEnd = 0;
@ -72,7 +74,7 @@ private:
std::map<u32, u32> m_nopedInstructions;
std::map<u32, std::tuple<u32, u32>> m_stubbedFunctions;
bool m_showInstructionOpcode = true;
bool m_showInstructionBytes = true;
bool m_goToProgramCounterOnPause = true;
DisassemblyManager m_disassemblyManager;

105
pcsx2-qt/Debugger/Docking/DockLayout.cpp
View File

@ -35,39 +35,22 @@ const u32 DEBUGGER_LAYOUT_FILE_VERSION_MAJOR = 1;
const u32 DEBUGGER_LAYOUT_FILE_VERSION_MINOR = 0;
DockLayout::DockLayout(
std::string name,
QString name,
BreakPointCpu cpu,
bool is_default,
const DockTables::DefaultDockLayout& default_layout,
const std::string& base_name,
DockLayout::Index index)
: m_name(name)
, m_cpu(cpu)
, m_is_default(is_default)
, m_base_layout(default_layout.name)
, m_base_layout(base_name)
{
for (size_t i = 0; i < default_layout.widgets.size(); i++)
{
auto iterator = DockTables::DEBUGGER_WIDGETS.find(default_layout.widgets[i].type);
pxAssertRel(iterator != DockTables::DEBUGGER_WIDGETS.end(), "Invalid default layout.");
const DockTables::DebuggerWidgetDescription& dock_description = iterator->second;
DebuggerWidgetParameters parameters;
parameters.unique_name = generateNewUniqueName(default_layout.widgets[i].type.c_str());
parameters.cpu = &DebugInterface::get(cpu);
if (parameters.unique_name.isEmpty())
continue;
DebuggerWidget* widget = dock_description.create_widget(parameters);
widget->setPrimary(true);
m_widgets.emplace(parameters.unique_name, widget);
}
reset();
save(index);
}
DockLayout::DockLayout(
std::string name,
QString name,
BreakPointCpu cpu,
bool is_default,
DockLayout::Index index)
@ -79,7 +62,7 @@ DockLayout::DockLayout(
}
DockLayout::DockLayout(
std::string name,
QString name,
BreakPointCpu cpu,
bool is_default,
const DockLayout& layout_to_clone,
@ -131,12 +114,12 @@ DockLayout::~DockLayout()
}
}
const std::string& DockLayout::name() const
const QString& DockLayout::name() const
{
return m_name;
}
void DockLayout::setName(std::string name)
void DockLayout::setName(QString name)
{
m_name = std::move(name);
}
@ -263,6 +246,50 @@ void DockLayout::thaw()
updateDockWidgetTitles();
}
bool DockLayout::canReset()
{
return DockTables::defaultLayout(m_base_layout) != nullptr;
}
void DockLayout::reset()
{
pxAssert(!m_is_active);
for (auto& [unique_name, widget] : m_widgets)
{
pxAssert(widget.get());
delete widget;
}
m_next_unique_name = 0;
m_toolbars.clear();
m_widgets.clear();
m_geometry.clear();
const DockTables::DefaultDockLayout* base_layout = DockTables::defaultLayout(m_base_layout);
if (!base_layout)
return;
for (size_t i = 0; i < base_layout->widgets.size(); i++)
{
auto iterator = DockTables::DEBUGGER_WIDGETS.find(base_layout->widgets[i].type);
pxAssertRel(iterator != DockTables::DEBUGGER_WIDGETS.end(), "Invalid default layout.");
const DockTables::DebuggerWidgetDescription& dock_description = iterator->second;
DebuggerWidgetParameters parameters;
parameters.unique_name = generateNewUniqueName(base_layout->widgets[i].type.c_str());
parameters.cpu = &DebugInterface::get(m_cpu);
if (parameters.unique_name.isEmpty())
continue;
DebuggerWidget* widget = dock_description.create_widget(parameters);
widget->setPrimary(true);
m_widgets.emplace(parameters.unique_name, widget);
}
}
KDDockWidgets::Core::DockWidget* DockLayout::createDockWidget(const QString& name)
{
pxAssert(m_is_active);
@ -273,7 +300,9 @@ KDDockWidgets::Core::DockWidget* DockLayout::createDockWidget(const QString& nam
return nullptr;
DebuggerWidget* widget = widget_iterator->second;
pxAssert(widget);
if (!widget)
return nullptr;
pxAssert(widget->uniqueName() == name);
auto view = static_cast<KDDockWidgets::QtWidgets::DockWidget*>(
@ -384,17 +413,13 @@ void DockLayout::createDebuggerWidget(const std::string& type)
void DockLayout::recreateDebuggerWidget(const QString& unique_name)
{
pxAssert(m_is_active);
auto [controller, view] = DockUtils::dockWidgetFromName(unique_name);
pxAssert(controller);
pxAssert(view);
if (!g_debugger_window)
return;
auto debugger_widget_iterator = m_widgets.find(unique_name);
pxAssert(debugger_widget_iterator != m_widgets.end());
DebuggerWidget* old_debugger_widget = debugger_widget_iterator->second;
pxAssert(old_debugger_widget == view->widget());
auto description_iterator = DockTables::DEBUGGER_WIDGETS.find(old_debugger_widget->metaObject()->className());
pxAssert(description_iterator != DockTables::DEBUGGER_WIDGETS.end());
@ -411,7 +436,12 @@ void DockLayout::recreateDebuggerWidget(const QString& unique_name)
new_debugger_widget->setPrimary(old_debugger_widget->isPrimary());
debugger_widget_iterator->second = new_debugger_widget;
view->setWidget(new_debugger_widget);
if (m_is_active)
{
auto [controller, view] = DockUtils::dockWidgetFromName(unique_name);
if (view)
view->setWidget(new_debugger_widget);
}
delete old_debugger_widget;
}
@ -527,7 +557,8 @@ bool DockLayout::save(DockLayout::Index layout_index)
version_hash.SetString(default_layouts_hash.c_str(), default_layouts_hash.size());
json.AddMember("version_hash", version_hash, json.GetAllocator());
json.AddMember("name", rapidjson::Value().SetString(m_name.c_str(), m_name.size()), json.GetAllocator());
std::string name_str = m_name.toStdString();
json.AddMember("name", rapidjson::Value().SetString(name_str.c_str(), name_str.size()), json.GetAllocator());
json.AddMember("target", rapidjson::Value().SetString(cpu_name, strlen(cpu_name)), json.GetAllocator());
json.AddMember("index", static_cast<int>(layout_index), json.GetAllocator());
json.AddMember("isDefault", m_is_default, json.GetAllocator());
@ -588,7 +619,7 @@ bool DockLayout::save(DockLayout::Index layout_index)
rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(string_buffer);
json.Accept(writer);
std::string safe_name = Path::SanitizeFileName(m_name);
std::string safe_name = Path::SanitizeFileName(m_name.toStdString());
// Create a temporary file first so that we don't corrupt an existing file
// in the case that we succeed in opening the file but fail to write our
@ -693,7 +724,9 @@ void DockLayout::load(
if (name != json.MemberEnd() && name->value.IsString())
m_name = name->value.GetString();
else
m_name = QCoreApplication::translate("DockLayout", "Unnamed").toStdString();
m_name = QCoreApplication::translate("DockLayout", "Unnamed");
m_name.truncate(DockUtils::MAX_LAYOUT_NAME_SIZE);
auto target = json.FindMember("target");
m_cpu = BREAKPOINT_EE;

17
pcsx2-qt/Debugger/Docking/DockLayout.h
View File

@ -41,22 +41,22 @@ public:
// Create a layout based on a default layout.
DockLayout(
std::string name,
QString name,
BreakPointCpu cpu,
bool is_default,
const DockTables::DefaultDockLayout& default_layout,
const std::string& base_name,
DockLayout::Index index);
// Create a new blank layout.
DockLayout(
std::string name,
QString name,
BreakPointCpu cpu,
bool is_default,
DockLayout::Index index);
// Clone an existing layout.
DockLayout(
std::string name,
QString name,
BreakPointCpu cpu,
bool is_default,
const DockLayout& layout_to_clone,
@ -77,8 +77,8 @@ public:
DockLayout(DockLayout&& rhs) = default;
DockLayout& operator=(DockLayout&&) = default;
const std::string& name() const;
void setName(std::string name);
const QString& name() const;
void setName(QString name);
BreakPointCpu cpu() const;
void setCpu(BreakPointCpu cpu);
@ -91,6 +91,9 @@ public:
// Restore the state of all the dock widgets from this layout.
void thaw();
bool canReset();
void reset();
KDDockWidgets::Core::DockWidget* createDockWidget(const QString& name);
void updateDockWidgetTitles();
@ -121,7 +124,7 @@ private:
// The name displayed in the user interface. Also used to determine the
// file name for the layout file.
std::string m_name;
QString m_name;
// The default target for dock widgets in this layout. This can be
// overriden on a per-widget basis.

280
pcsx2-qt/Debugger/Docking/DockManager.cpp
View File

@ -25,14 +25,15 @@
#include <QtWidgets/QMessageBox>
#include <QtWidgets/QPushButton>
#include "fmt/format.h"
DockManager::DockManager(QObject* parent)
: QObject(parent)
{
QTimer* autosave_timer = new QTimer(this);
connect(autosave_timer, &QTimer::timeout, this, &DockManager::saveCurrentLayout);
autosave_timer->start(60 * 1000);
m_blink_timer = new QTimer(this);
connect(m_blink_timer, &QTimer::timeout, this, &DockManager::layoutSwitcherUpdateBlink);
}
void DockManager::configureDockingSystem()
@ -41,6 +42,8 @@ void DockManager::configureDockingSystem()
if (done)
return;
KDDockWidgets::initFrontend(KDDockWidgets::FrontendType::QtWidgets);
KDDockWidgets::Config::self().setFlags(
KDDockWidgets::Config::Flag_HideTitleBarWhenTabsVisible |
KDDockWidgets::Config::Flag_AlwaysShowTabs |
@ -93,40 +96,59 @@ bool DockManager::deleteLayout(DockLayout::Index layout_index)
return true;
}
void DockManager::switchToLayout(DockLayout::Index layout_index)
void DockManager::switchToLayout(DockLayout::Index layout_index, bool blink_tab)
{
if (layout_index == m_current_layout)
return;
if (m_current_layout != DockLayout::INVALID_INDEX)
if (layout_index != m_current_layout)
{
DockLayout& layout = m_layouts.at(m_current_layout);
layout.freeze();
layout.save(m_current_layout);
if (m_current_layout != DockLayout::INVALID_INDEX)
{
DockLayout& layout = m_layouts.at(m_current_layout);
layout.freeze();
layout.save(m_current_layout);
}
// Clear out the existing positions of toolbars so they don't affect
// where new toolbars appear for other layouts.
if (g_debugger_window)
g_debugger_window->clearToolBarState();
updateToolBarLockState();
m_current_layout = layout_index;
if (m_current_layout != DockLayout::INVALID_INDEX)
{
DockLayout& layout = m_layouts.at(m_current_layout);
layout.thaw();
int tab_index = static_cast<int>(layout_index);
if (m_switcher && tab_index >= 0 && tab_index < m_plus_tab_index)
{
m_ignore_current_tab_changed = true;
m_switcher->setCurrentIndex(tab_index);
m_ignore_current_tab_changed = false;
}
}
}
// Clear out the existing positions of toolbars so they don't affect where
// new toolbars appear for other layouts.
if (g_debugger_window)
g_debugger_window->clearToolBarState();
updateToolBarLockState();
m_current_layout = layout_index;
if (m_current_layout != DockLayout::INVALID_INDEX)
{
DockLayout& layout = m_layouts.at(m_current_layout);
layout.thaw();
}
if (blink_tab)
layoutSwitcherStartBlink();
}
bool DockManager::switchToLayoutWithCPU(BreakPointCpu cpu)
bool DockManager::switchToLayoutWithCPU(BreakPointCpu cpu, bool blink_tab)
{
// Don't interrupt the user if the current layout already has the right CPU.
if (m_current_layout != DockLayout::INVALID_INDEX && m_layouts.at(m_current_layout).cpu() == cpu)
{
switchToLayout(m_current_layout, blink_tab);
return true;
}
for (DockLayout::Index i = 0; i < m_layouts.size(); i++)
{
if (m_layouts[i].cpu() == cpu)
{
switchToLayout(i);
switchToLayout(i, blink_tab);
return true;
}
}
@ -160,8 +182,8 @@ void DockManager::loadLayouts()
DockLayout& layout = m_layouts.at(index);
// Try to make sure the layout has a unique name.
const std::string& name = layout.name();
std::string new_name = name;
const QString& name = layout.name();
QString new_name = name;
if (result == DockLayout::SUCCESS || result == DockLayout::DEFAULT_LAYOUT_HASH_MISMATCH)
{
for (int i = 2; hasNameConflict(new_name, index) && i < 100; i++)
@ -172,7 +194,7 @@ void DockManager::loadLayouts()
break;
}
new_name = fmt::format("{} #{}", name, i);
new_name = QString("%1 #%2").arg(name).arg(i);
}
}
@ -181,10 +203,12 @@ void DockManager::loadLayouts()
if (result != DockLayout::SUCCESS && result != DockLayout::DEFAULT_LAYOUT_HASH_MISMATCH)
{
deleteLayout(index);
// Only delete the file if we've identified that it's actually a
// layout file.
if (result == DockLayout::MAJOR_VERSION_MISMATCH || result == DockLayout::CONFLICTING_NAME)
FileSystem::DeleteFilePath(ffd.FileName.c_str());
continue;
}
@ -258,7 +282,7 @@ void DockManager::resetAllLayouts()
m_layouts.clear();
for (const DockTables::DefaultDockLayout& layout : DockTables::DEFAULT_DOCK_LAYOUTS)
createLayout(tr(layout.name.c_str()).toStdString(), layout.cpu, true, layout);
createLayout(tr(layout.name.c_str()), layout.cpu, true, layout.name);
switchToLayout(0);
updateLayoutSwitcher();
@ -273,7 +297,7 @@ void DockManager::resetDefaultLayouts()
m_layouts = std::vector<DockLayout>();
for (const DockTables::DefaultDockLayout& layout : DockTables::DEFAULT_DOCK_LAYOUTS)
createLayout(tr(layout.name.c_str()).toStdString(), layout.cpu, true, layout);
createLayout(tr(layout.name.c_str()), layout.cpu, true, layout.name);
for (DockLayout& layout : old_layouts)
if (!layout.isDefault())
@ -464,19 +488,19 @@ QWidget* DockManager::createLayoutSwitcher(QWidget* menu_bar)
spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
layout->addWidget(spacer);
bool layout_locked = Host::GetBaseBoolSettingValue("Debugger/UserInterface", "LayoutLocked", true);
QPushButton* lock_layout_toggle = new QPushButton;
connect(lock_layout_toggle, &QPushButton::toggled, this, [this, lock_layout_toggle](bool checked) {
setLayoutLocked(checked);
if (m_layout_locked)
lock_layout_toggle->setText(tr("Layout Locked"));
else
lock_layout_toggle->setText(tr("Layout Unlocked"));
});
lock_layout_toggle->setCheckable(true);
lock_layout_toggle->setChecked(m_layout_locked);
lock_layout_toggle->setChecked(layout_locked);
lock_layout_toggle->setFlat(true);
connect(lock_layout_toggle, &QPushButton::toggled, this, [this, lock_layout_toggle](bool checked) {
setLayoutLocked(checked, lock_layout_toggle, true);
});
layout->addWidget(lock_layout_toggle);
setLayoutLocked(layout_locked, lock_layout_toggle, false);
return container;
}
@ -493,7 +517,7 @@ void DockManager::updateLayoutSwitcher()
for (DockLayout& layout : m_layouts)
{
const char* cpu_name = DebugInterface::cpuName(layout.cpu());
QString tab_name = QString("%1 (%2)").arg(layout.name().c_str()).arg(cpu_name);
QString tab_name = QString("%1 (%2)").arg(layout.name()).arg(cpu_name);
m_switcher->addTab(tab_name);
}
@ -509,33 +533,45 @@ void DockManager::updateLayoutSwitcher()
m_tab_connection = connect(m_switcher, &QTabBar::currentChanged, this, &DockManager::layoutSwitcherTabChanged);
else
m_tab_connection = connect(m_switcher, &QTabBar::tabBarClicked, this, &DockManager::layoutSwitcherTabChanged);
layoutSwitcherStopBlink();
}
void DockManager::layoutSwitcherTabChanged(int index)
{
// Prevent recursion.
if (m_ignore_current_tab_changed)
return;
if (index == m_plus_tab_index)
{
if (m_current_tab_index >= 0 && m_current_tab_index < m_plus_tab_index)
{
m_ignore_current_tab_changed = true;
m_switcher->setCurrentIndex(m_current_tab_index);
m_ignore_current_tab_changed = false;
}
auto name_validator = [this](const std::string& name) {
auto name_validator = [this](const QString& name) {
return !hasNameConflict(name, DockLayout::INVALID_INDEX);
};
bool can_clone_current_layout = m_current_layout != DockLayout::INVALID_INDEX;
LayoutEditorDialog* dialog = new LayoutEditorDialog(
QPointer<LayoutEditorDialog> dialog = new LayoutEditorDialog(
name_validator, can_clone_current_layout, g_debugger_window);
if (dialog->exec() == QDialog::Accepted && name_validator(dialog->name()))
{
DockLayout::Index new_layout = DockLayout::INVALID_INDEX;
const auto [mode, index] = dialog->initial_state();
const auto [mode, index] = dialog->initialState();
switch (mode)
{
case LayoutEditorDialog::DEFAULT_LAYOUT:
{
const DockTables::DefaultDockLayout& default_layout = DockTables::DEFAULT_DOCK_LAYOUTS.at(index);
new_layout = createLayout(dialog->name(), dialog->cpu(), false, default_layout);
new_layout = createLayout(dialog->name(), dialog->cpu(), false, default_layout.name);
break;
}
case LayoutEditorDialog::BLANK_LAYOUT:
@ -558,9 +594,11 @@ void DockManager::layoutSwitcherTabChanged(int index)
}
}
switchToLayout(new_layout);
updateLayoutSwitcher();
switchToLayout(new_layout);
}
delete dialog.get();
}
else
{
@ -602,66 +640,142 @@ void DockManager::layoutSwitcherTabMoved(int from, int to)
void DockManager::layoutSwitcherContextMenu(QPoint pos)
{
int tab_index = m_switcher->tabAt(pos);
if (tab_index < 0 || tab_index >= m_plus_tab_index)
DockLayout::Index layout_index = static_cast<DockLayout::Index>(m_switcher->tabAt(pos));
if (layout_index >= m_layouts.size())
return;
DockLayout& layout = m_layouts[layout_index];
QMenu* menu = new QMenu(m_switcher);
menu->setAttribute(Qt::WA_DeleteOnClose);
QAction* edit_action = menu->addAction(tr("Edit Layout"));
connect(edit_action, &QAction::triggered, [this, tab_index]() {
DockLayout::Index layout_index = static_cast<DockLayout::Index>(tab_index);
connect(edit_action, &QAction::triggered, [this, layout_index]() {
if (layout_index >= m_layouts.size())
return;
DockLayout& layout = m_layouts[layout_index];
auto name_validator = [this, layout_index](const std::string& name) {
auto name_validator = [this, layout_index](const QString& name) {
return !hasNameConflict(name, layout_index);
};
LayoutEditorDialog* dialog = new LayoutEditorDialog(
QPointer<LayoutEditorDialog> dialog = new LayoutEditorDialog(
layout.name(), layout.cpu(), name_validator, g_debugger_window);
if (dialog->exec() == QDialog::Accepted && name_validator(dialog->name()))
{
layout.setName(dialog->name());
layout.setCpu(dialog->cpu());
if (dialog->exec() != QDialog::Accepted || !name_validator(dialog->name()))
return;
layout.save(layout_index);
layout.setName(dialog->name());
layout.setCpu(dialog->cpu());
updateLayoutSwitcher();
}
layout.save(layout_index);
delete dialog.get();
updateLayoutSwitcher();
});
QAction* reset_action = menu->addAction(tr("Reset Layout"));
reset_action->setEnabled(layout.canReset());
reset_action->connect(reset_action, &QAction::triggered, [this, layout_index]() {
if (layout_index >= m_layouts.size())
return;
DockLayout& layout = m_layouts[layout_index];
if (!layout.canReset())
return;
QString text = tr("Are you sure you want to reset layout '%1'?").arg(layout.name());
if (QMessageBox::question(g_debugger_window, tr("Confirmation"), text) != QMessageBox::Yes)
return;
bool current_layout = layout_index == m_current_layout;
if (current_layout)
switchToLayout(DockLayout::INVALID_INDEX);
layout.reset();
layout.save(layout_index);
if (current_layout)
switchToLayout(layout_index);
});
QAction* delete_action = menu->addAction(tr("Delete Layout"));
connect(delete_action, &QAction::triggered, [this, tab_index]() {
DockLayout::Index layout_index = static_cast<DockLayout::Index>(tab_index);
connect(delete_action, &QAction::triggered, [this, layout_index]() {
if (layout_index >= m_layouts.size())
return;
DockLayout& layout = m_layouts[layout_index];
QString text = tr("Are you sure you want to delete layout '%1'?").arg(layout.name().c_str());
QMessageBox::StandardButton result = QMessageBox::question(g_debugger_window, tr("Confirmation"), text);
QString text = tr("Are you sure you want to delete layout '%1'?").arg(layout.name());
if (QMessageBox::question(g_debugger_window, tr("Confirmation"), text) != QMessageBox::Yes)
return;
if (result == QMessageBox::Yes)
{
deleteLayout(layout_index);
updateLayoutSwitcher();
}
deleteLayout(layout_index);
updateLayoutSwitcher();
});
menu->popup(m_switcher->mapToGlobal(pos));
}
bool DockManager::hasNameConflict(const std::string& name, DockLayout::Index layout_index)
void DockManager::layoutSwitcherStartBlink()
{
std::string safe_name = Path::SanitizeFileName(name);
if (!m_switcher)
return;
layoutSwitcherStopBlink();
if (m_current_layout == DockLayout::INVALID_INDEX)
return;
m_blink_tab = m_current_layout;
m_blink_stage = 0;
m_blink_timer->start(500);
layoutSwitcherUpdateBlink();
}
void DockManager::layoutSwitcherUpdateBlink()
{
if (!m_switcher)
return;
if (m_blink_tab < m_switcher->count())
{
if (m_blink_stage % 2 == 0)
m_switcher->setTabTextColor(m_blink_tab, Qt::red);
else
m_switcher->setTabTextColor(m_blink_tab, m_switcher->palette().text().color());
}
m_blink_stage++;
if (m_blink_stage > 7)
m_blink_timer->stop();
}
void DockManager::layoutSwitcherStopBlink()
{
if (m_blink_timer->isActive())
{
if (m_blink_tab < m_switcher->count())
m_switcher->setTabTextColor(m_blink_tab, m_switcher->palette().text().color());
m_blink_timer->stop();
}
}
bool DockManager::hasNameConflict(const QString& name, DockLayout::Index layout_index)
{
std::string safe_name = Path::SanitizeFileName(name.toStdString());
for (DockLayout::Index i = 0; i < m_layouts.size(); i++)
if (i != layout_index && StringUtil::compareNoCase(m_layouts[i].name(), safe_name))
{
std::string other_safe_name = Path::SanitizeFileName(m_layouts[i].name().toStdString());
if (i != layout_index && StringUtil::compareNoCase(other_safe_name, safe_name))
return true;
}
return false;
}
@ -731,16 +845,36 @@ void DockManager::switchToDebuggerWidget(DebuggerWidget* widget)
}
}
void DockManager::updateStyleSheets()
{
for (DockLayout& layout : m_layouts)
for (const auto& [unique_name, widget] : layout.debuggerWidgets())
widget->updateStyleSheet();
}
bool DockManager::isLayoutLocked()
{
return m_layout_locked;
}
void DockManager::setLayoutLocked(bool locked)
void DockManager::setLayoutLocked(bool locked, QPushButton* lock_layout_toggle, bool write_back)
{
m_layout_locked = locked;
if (lock_layout_toggle)
{
if (m_layout_locked)
{
lock_layout_toggle->setText(tr("Layout Locked"));
lock_layout_toggle->setIcon(QIcon::fromTheme(QString::fromUtf8("padlock-lock")));
}
else
{
lock_layout_toggle->setText(tr("Layout Unlocked"));
lock_layout_toggle->setIcon(QIcon::fromTheme(QString::fromUtf8("padlock-unlock")));
}
}
updateToolBarLockState();
for (KDDockWidgets::Core::Group* group : KDDockWidgets::DockRegistry::self()->groups())
@ -752,6 +886,12 @@ void DockManager::setLayoutLocked(bool locked)
if (stack->tabBar()->count() > 0)
stack->tabBar()->setTabText(0, stack->tabBar()->tabText(0));
}
if (write_back)
{
Host::SetBaseBoolSettingValue("Debugger/UserInterface", "LayoutLocked", m_layout_locked);
Host::CommitBaseSettingChanges();
}
}
void DockManager::updateToolBarLockState()

25
pcsx2-qt/Debugger/Docking/DockManager.h
View File

@ -12,6 +12,7 @@
#include <kddockwidgets/core/Draggable_p.h>
#include <QtCore/QPointer>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QTabBar>
class DockManager : public QObject
@ -50,15 +51,19 @@ public:
bool deleteLayout(DockLayout::Index layout_index);
void switchToLayout(DockLayout::Index layout_index);
bool switchToLayoutWithCPU(BreakPointCpu cpu);
void switchToLayout(DockLayout::Index layout_index, bool blink_tab = false);
bool switchToLayoutWithCPU(BreakPointCpu cpu, bool blink_tab = false);
void loadLayouts();
bool saveLayouts();
bool saveCurrentLayout();
void resetAllLayouts();
QString currentLayoutName();
bool canResetCurrentLayout();
void resetCurrentLayout();
void resetDefaultLayouts();
void resetAllLayouts();
void createToolsMenu(QMenu* menu);
void createWindowsMenu(QMenu* menu);
@ -68,8 +73,11 @@ public:
void layoutSwitcherTabChanged(int index);
void layoutSwitcherTabMoved(int from, int to);
void layoutSwitcherContextMenu(QPoint pos);
void layoutSwitcherStartBlink();
void layoutSwitcherUpdateBlink();
void layoutSwitcherStopBlink();
bool hasNameConflict(const std::string& name, DockLayout::Index layout_index);
bool hasNameConflict(const QString& name, DockLayout::Index layout_index);
void updateDockWidgetTitles();
@ -80,8 +88,10 @@ public:
void setPrimaryDebuggerWidget(DebuggerWidget* widget, bool is_primary);
void switchToDebuggerWidget(DebuggerWidget* widget);
void updateStyleSheets();
bool isLayoutLocked();
void setLayoutLocked(bool locked);
void setLayoutLocked(bool locked, QPushButton* lock_layout_toggle, bool write_back);
void updateToolBarLockState();
std::optional<BreakPointCpu> cpu();
@ -96,8 +106,13 @@ private:
QTabBar* m_switcher = nullptr;
int m_plus_tab_index = -1;
int m_current_tab_index = -1;
bool m_ignore_current_tab_changed = false;
QMetaObject::Connection m_tab_connection;
bool m_layout_locked = true;
QTimer* m_blink_timer = nullptr;
int m_blink_tab = 0;
int m_blink_stage = 0;
};

25
pcsx2-qt/Debugger/Docking/DockTables.cpp
View File

@ -79,6 +79,7 @@ const std::vector<DockTables::DefaultDockLayout> DockTables::DEFAULT_DOCK_LAYOUT
},
.toolbars = {
"toolBarDebug",
"toolBarFile",
},
},
{
@ -108,6 +109,7 @@ const std::vector<DockTables::DefaultDockLayout> DockTables::DEFAULT_DOCK_LAYOUT
},
.toolbars = {
"toolBarDebug",
"toolBarFile",
},
},
};
@ -183,7 +185,28 @@ void DockTables::hashDefaultLayout(const DefaultDockLayout& layout, MD5Digest& m
void DockTables::hashDefaultGroup(const DefaultDockGroupDescription& group, MD5Digest& md5)
{
const char* location = DockUtils::locationToString(group.location);
// This is inline here so that it's obvious that changing it will affect the
// result of the hash.
const char* location = "";
switch (group.location)
{
case KDDockWidgets::Location_None:
location = "none";
break;
case KDDockWidgets::Location_OnLeft:
location = "left";
break;
case KDDockWidgets::Location_OnTop:
location = "top";
break;
case KDDockWidgets::Location_OnRight:
location = "right";
break;
case KDDockWidgets::Location_OnBottom:
location = "bottom";
break;
}
u32 location_size = static_cast<u32>(strlen(location));
md5.Update(&location_size, sizeof(location_size));
md5.Update(location, location_size);

19
pcsx2-qt/Debugger/Docking/DockUtils.cpp
View File

@ -95,22 +95,3 @@ void DockUtils::insertDockWidgetAtPreferredLocation(
window->addDockWidget(dock_view, KDDockWidgets::Location_OnTop);
}
}
const char* DockUtils::locationToString(KDDockWidgets::Location location)
{
switch (location)
{
case KDDockWidgets::Location_None:
return "none";
case KDDockWidgets::Location_OnLeft:
return "left";
case KDDockWidgets::Location_OnTop:
return "top";
case KDDockWidgets::Location_OnRight:
return "right";
case KDDockWidgets::Location_OnBottom:
return "bottom";
}
return "";
}

5
pcsx2-qt/Debugger/Docking/DockUtils.h
View File

@ -9,6 +9,9 @@
namespace DockUtils
{
inline const constexpr int MAX_LAYOUT_NAME_SIZE = 40;
inline const constexpr int MAX_DOCK_WIDGET_NAME_SIZE = 40;
struct DockWidgetPair
{
KDDockWidgets::Core::DockWidget* controller = nullptr;
@ -34,6 +37,4 @@ namespace DockUtils
KDDockWidgets::Core::DockWidget* dock_widget,
PreferredLocation location,
KDDockWidgets::QtWidgets::MainWindow* window);
const char* locationToString(KDDockWidgets::Location location);
} // namespace DockUtils

10
pcsx2-qt/Debugger/Docking/DockViews.cpp
View File

@ -14,6 +14,7 @@
#include <QtGui/QActionGroup>
#include <QtWidgets/QInputDialog>
#include <QtWidgets/QMessageBox>
#include <QtWidgets/QMenu>
KDDockWidgets::Core::View* DockViewFactory::createDockWidget(
@ -134,7 +135,7 @@ void DockTabBar::openContextMenu(QPoint pos)
size_t dock_widgets_of_type = g_debugger_window->dockManager().countDebuggerWidgetsOfType(
widget->metaObject()->className());
QMenu* menu = new QMenu(tr("Dock Widget Context Menu"), this);
QMenu* menu = new QMenu(this);
menu->setAttribute(Qt::WA_DeleteOnClose);
QAction* rename_action = menu->addAction(tr("Rename"));
@ -152,7 +153,12 @@ void DockTabBar::openContextMenu(QPoint pos)
if (!ok)
return;
widget->setCustomDisplayName(new_name);
if (!widget->setCustomDisplayName(new_name))
{
QMessageBox::warning(this, tr("Invalid Name"), tr("The specified name is too long."));
return;
}
g_debugger_window->dockManager().updateDockWidgetTitles();
});

16
pcsx2-qt/Debugger/Docking/LayoutEditorDialog.cpp
View File

@ -23,7 +23,7 @@ LayoutEditorDialog::LayoutEditorDialog(NameValidator name_validator, bool can_cl
}
LayoutEditorDialog::LayoutEditorDialog(
const std::string& name, BreakPointCpu cpu, NameValidator name_validator, QWidget* parent)
const QString& name, BreakPointCpu cpu, NameValidator name_validator, QWidget* parent)
: QDialog(parent)
, m_name_validator(name_validator)
{
@ -31,7 +31,7 @@ LayoutEditorDialog::LayoutEditorDialog(
setWindowTitle(tr("Edit Layout"));
m_ui.nameEditor->setText(QString::fromStdString(name));
m_ui.nameEditor->setText(name);
setupInputWidgets(cpu, {});
@ -41,9 +41,9 @@ LayoutEditorDialog::LayoutEditorDialog(
onNameChanged();
}
std::string LayoutEditorDialog::name()
QString LayoutEditorDialog::name()
{
return m_ui.nameEditor->text().toStdString();
return m_ui.nameEditor->text();
}
BreakPointCpu LayoutEditorDialog::cpu()
@ -51,7 +51,7 @@ BreakPointCpu LayoutEditorDialog::cpu()
return static_cast<BreakPointCpu>(m_ui.cpuEditor->currentData().toInt());
}
LayoutEditorDialog::InitialState LayoutEditorDialog::initial_state()
LayoutEditorDialog::InitialState LayoutEditorDialog::initialState()
{
return m_ui.initialStateEditor->currentData().value<InitialState>();
}
@ -93,7 +93,11 @@ void LayoutEditorDialog::onNameChanged()
{
error_message = tr("Name is empty.");
}
else if (!m_name_validator(m_ui.nameEditor->text().toStdString()))
else if (m_ui.nameEditor->text().size() > DockUtils::MAX_LAYOUT_NAME_SIZE)
{
error_message = tr("Name too long.");
}
else if (!m_name_validator(m_ui.nameEditor->text()))
{
error_message = tr("A layout with that name already exists.");
}

8
pcsx2-qt/Debugger/Docking/LayoutEditorDialog.h
View File

@ -14,7 +14,7 @@ class LayoutEditorDialog : public QDialog
Q_OBJECT
public:
using NameValidator = std::function<bool(const std::string&)>;
using NameValidator = std::function<bool(const QString&)>;
enum CreationMode
{
@ -30,11 +30,11 @@ public:
LayoutEditorDialog(NameValidator name_validator, bool can_clone_current_layout, QWidget* parent = nullptr);
// Create a "Edit Layout" dialog.
LayoutEditorDialog(const std::string& name, BreakPointCpu cpu, NameValidator name_validator, QWidget* parent = nullptr);
LayoutEditorDialog(const QString& name, BreakPointCpu cpu, NameValidator name_validator, QWidget* parent = nullptr);
std::string name();
QString name();
BreakPointCpu cpu();
InitialState initial_state();
InitialState initialState();
private:
void setupInputWidgets(BreakPointCpu cpu, bool can_clone_current_layout);

5
pcsx2-qt/Debugger/JsonValueWrapper.h
View File

@ -23,6 +23,11 @@ public:
return m_value;
}
const rapidjson::Value& value() const
{
return m_value;
}
rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator>& allocator()
{
return m_allocator;

2
pcsx2-qt/Debugger/Memory/MemorySearchWidget.cpp
View File

@ -24,7 +24,7 @@ using SearchResult = MemorySearchWidget::SearchResult;
using namespace QtUtils;
MemorySearchWidget::MemorySearchWidget(const DebuggerWidgetParameters& parameters)
: DebuggerWidget(parameters, NO_DEBUGGER_FLAGS)
: DebuggerWidget(parameters, MONOSPACE_FONT)
{
m_ui.setupUi(this);
this->repaint();

5
pcsx2-qt/Debugger/Memory/MemorySearchWidget.ui
View File

@ -10,11 +10,6 @@
<height>300</height>
</rect>
</property>
<property name="font">
<font>
<family>Monospace</family>
</font>
</property>
<property name="windowTitle">
<string/>
</property>

59
pcsx2-qt/Debugger/Memory/MemoryViewWidget.cpp
View File

@ -2,15 +2,17 @@
// SPDX-License-Identifier: GPL-3.0+
#include "MemoryViewWidget.h"
#include "common/Console.h"
#include "Debugger/JsonValueWrapper.h"
#include "QtHost.h"
#include "QtUtils.h"
#include <QtGui/QMouseEvent>
#include <QtCore/QObject>
#include <QtGui/QActionGroup>
#include <QtGui/QClipboard>
#include <QtGui/QMouseEvent>
#include <QtWidgets/QInputDialog>
#include <QtWidgets/QMessageBox>
#include <QtGui/QClipboard>
using namespace QtUtils;
@ -452,7 +454,7 @@ bool MemoryViewTable::KeyPress(int key, QChar keychar, DebugInterface& cpu)
MemoryViewWidget
*/
MemoryViewWidget::MemoryViewWidget(const DebuggerWidgetParameters& parameters)
: DebuggerWidget(parameters, NO_DEBUGGER_FLAGS)
: DebuggerWidget(parameters, MONOSPACE_FONT)
, m_table(this)
{
ui.setupUi(this);
@ -462,9 +464,7 @@ MemoryViewWidget::MemoryViewWidget(const DebuggerWidgetParameters& parameters)
setContextMenuPolicy(Qt::CustomContextMenu);
connect(this, &MemoryViewWidget::customContextMenuRequested, this, &MemoryViewWidget::openContextMenu);
m_table.UpdateStartAddress(0x480000);
applyMonospaceFont();
m_table.UpdateStartAddress(0x100000);
receiveEvent<DebuggerEvents::Refresh>([this](const DebuggerEvents::Refresh& event) -> bool {
update();
@ -487,6 +487,44 @@ MemoryViewWidget::MemoryViewWidget(const DebuggerWidgetParameters& parameters)
MemoryViewWidget::~MemoryViewWidget() = default;
void MemoryViewWidget::toJson(JsonValueWrapper& json)
{
DebuggerWidget::toJson(json);
json.value().AddMember("startAddress", m_table.startAddress, json.allocator());
json.value().AddMember("viewType", static_cast<int>(m_table.GetViewType()), json.allocator());
json.value().AddMember("littleEndian", m_table.GetLittleEndian(), json.allocator());
}
bool MemoryViewWidget::fromJson(const JsonValueWrapper& json)
{
if (!DebuggerWidget::fromJson(json))
return false;
auto start_address = json.value().FindMember("startAddress");
if (start_address != json.value().MemberEnd() && start_address->value.IsUint())
m_table.UpdateStartAddress(start_address->value.GetUint());
auto view_type = json.value().FindMember("viewType");
if (view_type != json.value().MemberEnd() && view_type->value.IsInt())
{
MemoryViewType type = static_cast<MemoryViewType>(view_type->value.GetInt());
if (type == MemoryViewType::BYTE ||
type == MemoryViewType::BYTEHW ||
type == MemoryViewType::WORD ||
type == MemoryViewType::DWORD)
m_table.SetViewType(type);
}
auto little_endian = json.value().FindMember("littleEndian");
if (little_endian != json.value().MemberEnd() && little_endian->value.IsBool())
m_table.SetLittleEndian(little_endian->value.GetBool());
repaint();
return true;
}
void MemoryViewWidget::paintEvent(QPaintEvent* event)
{
QPainter painter(this);
@ -542,25 +580,32 @@ void MemoryViewWidget::openContextMenu(QPoint pos)
const MemoryViewType current_view_type = m_table.GetViewType();
// View Types
QActionGroup* view_type_group = new QActionGroup(menu);
view_type_group->setExclusive(true);
QAction* byte_action = menu->addAction(tr("Show as 1 byte"));
byte_action->setCheckable(true);
byte_action->setChecked(current_view_type == MemoryViewType::BYTE);
connect(byte_action, &QAction::triggered, this, [this]() { m_table.SetViewType(MemoryViewType::BYTE); });
view_type_group->addAction(byte_action);
QAction* bytehw_action = menu->addAction(tr("Show as 2 bytes"));
bytehw_action->setCheckable(true);
bytehw_action->setChecked(current_view_type == MemoryViewType::BYTEHW);
connect(bytehw_action, &QAction::triggered, this, [this]() { m_table.SetViewType(MemoryViewType::BYTEHW); });
view_type_group->addAction(bytehw_action);
QAction* word_action = menu->addAction(tr("Show as 4 bytes"));
word_action->setCheckable(true);
word_action->setChecked(current_view_type == MemoryViewType::WORD);
connect(word_action, &QAction::triggered, this, [this]() { m_table.SetViewType(MemoryViewType::WORD); });
view_type_group->addAction(word_action);
QAction* dword_action = menu->addAction(tr("Show as 8 bytes"));
dword_action->setCheckable(true);
dword_action->setChecked(current_view_type == MemoryViewType::DWORD);
connect(dword_action, &QAction::triggered, this, [this]() { m_table.SetViewType(MemoryViewType::DWORD); });
view_type_group->addAction(dword_action);
menu->addSeparator();

13
pcsx2-qt/Debugger/Memory/MemoryViewWidget.h
View File

@ -112,12 +112,15 @@ public:
MemoryViewWidget(const DebuggerWidgetParameters& parameters);
~MemoryViewWidget();
void toJson(JsonValueWrapper& json) override;
bool fromJson(const JsonValueWrapper& json) override;
protected:
void paintEvent(QPaintEvent* event);
void mousePressEvent(QMouseEvent* event);
void mouseDoubleClickEvent(QMouseEvent* event);
void wheelEvent(QWheelEvent* event);
void keyPressEvent(QKeyEvent* event);
void paintEvent(QPaintEvent* event) override;
void mousePressEvent(QMouseEvent* event) override;
void mouseDoubleClickEvent(QMouseEvent* event) override;
void wheelEvent(QWheelEvent* event) override;
void keyPressEvent(QKeyEvent* event) override;
public slots:
void openContextMenu(QPoint pos);

10
pcsx2-qt/Debugger/Memory/SavedAddressesWidget.cpp
View File

@ -18,11 +18,8 @@ SavedAddressesWidget::SavedAddressesWidget(const DebuggerWidgetParameters& param
m_ui.savedAddressesList->setModel(m_model);
m_ui.savedAddressesList->setContextMenuPolicy(Qt::CustomContextMenu);
connect(
m_ui.savedAddressesList,
&QTableView::customContextMenuRequested,
this,
&SavedAddressesWidget::openContextMenu);
connect(m_ui.savedAddressesList, &QTableView::customContextMenuRequested,
this, &SavedAddressesWidget::openContextMenu);
connect(g_emu_thread, &EmuThread::onGameChanged, this, [this](const QString& title) {
if (title.isEmpty())
@ -34,12 +31,11 @@ SavedAddressesWidget::SavedAddressesWidget(const DebuggerWidgetParameters& param
DebuggerSettingsManager::loadGameSettings(m_model);
for (std::size_t i = 0; auto mode : SavedAddressesModel::HeaderResizeModes)
{
m_ui.savedAddressesList->horizontalHeader()->setSectionResizeMode(i++, mode);
}
QTableView* savedAddressesTableView = m_ui.savedAddressesList;
connect(m_model, &QAbstractItemModel::dataChanged, [savedAddressesTableView](const QModelIndex& topLeft) {
savedAddressesTableView->resizeColumnToContents(topLeft.column());

42
pcsx2-qt/Debugger/RegisterWidget.cpp
View File

@ -3,6 +3,8 @@
#include "RegisterWidget.h"
#include "Debugger/JsonValueWrapper.h"
#include "QtUtils.h"
#include <QtGui/QMouseEvent>
#include <QtWidgets/QTabBar>
@ -20,7 +22,7 @@
using namespace QtUtils;
RegisterWidget::RegisterWidget(const DebuggerWidgetParameters& parameters)
: DebuggerWidget(parameters, NO_DEBUGGER_FLAGS)
: DebuggerWidget(parameters, MONOSPACE_FONT)
{
this->setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
@ -37,8 +39,6 @@ RegisterWidget::RegisterWidget(const DebuggerWidgetParameters& parameters)
connect(ui.registerTabs, &QTabBar::currentChanged, [this]() { this->repaint(); });
applyMonospaceFont();
receiveEvent<DebuggerEvents::Refresh>([this](const DebuggerEvents::Refresh& event) -> bool {
update();
return true;
@ -49,6 +49,32 @@ RegisterWidget::~RegisterWidget()
{
}
void RegisterWidget::toJson(JsonValueWrapper& json)
{
DebuggerWidget::toJson(json);
json.value().AddMember("showVU0FFloat", m_showVU0FFloat, json.allocator());
json.value().AddMember("showFPRFloat", m_showFPRFloat, json.allocator());
}
bool RegisterWidget::fromJson(const JsonValueWrapper& json)
{
if (!DebuggerWidget::fromJson(json))
return false;
auto show_vu0f_float = json.value().FindMember("showVU0FFloat");
if (show_vu0f_float != json.value().MemberEnd() && show_vu0f_float->value.IsBool())
m_showVU0FFloat = show_vu0f_float->value.GetBool();
auto show_fpr_float = json.value().FindMember("showFPRFloat");
if (show_fpr_float != json.value().MemberEnd() && show_fpr_float->value.IsBool())
m_showFPRFloat = show_fpr_float->value.GetBool();
repaint();
return true;
}
void RegisterWidget::tabCurrentChanged(int cur)
{
m_rowStart = 0;
@ -232,7 +258,10 @@ void RegisterWidget::customMenuRequested(QPoint pos)
QAction* action = menu->addAction(tr("Show as Float"));
action->setCheckable(true);
action->setChecked(m_showFPRFloat);
connect(action, &QAction::triggered, this, [this]() { m_showFPRFloat = !m_showFPRFloat; });
connect(action, &QAction::triggered, this, [this]() {
m_showFPRFloat = !m_showFPRFloat;
repaint();
});
menu->addSeparator();
}
@ -242,7 +271,10 @@ void RegisterWidget::customMenuRequested(QPoint pos)
QAction* action = menu->addAction(tr("Show as Float"));
action->setCheckable(true);
action->setChecked(m_showVU0FFloat);
connect(action, &QAction::triggered, this, [this]() { m_showVU0FFloat = !m_showVU0FFloat; });
connect(action, &QAction::triggered, this, [this]() {
m_showVU0FFloat = !m_showVU0FFloat;
repaint();
});
menu->addSeparator();
}

12
pcsx2-qt/Debugger/RegisterWidget.h
View File

@ -22,11 +22,14 @@ public:
RegisterWidget(const DebuggerWidgetParameters& parameters);
~RegisterWidget();
void toJson(JsonValueWrapper& json) override;
bool fromJson(const JsonValueWrapper& json) override;
protected:
void paintEvent(QPaintEvent* event);
void mousePressEvent(QMouseEvent* event);
void mouseDoubleClickEvent(QMouseEvent* event);
void wheelEvent(QWheelEvent* event);
void paintEvent(QPaintEvent* event) override;
void mousePressEvent(QMouseEvent* event) override;
void mouseDoubleClickEvent(QMouseEvent* event) override;
void wheelEvent(QWheelEvent* event) override;
public slots:
void customMenuRequested(QPoint pos);
@ -63,7 +66,6 @@ private:
s32 m_selectedRow = 0; // Index
s32 m_selected128Field = 0; // Values are from 0 to 3
// TODO: Save this configuration ??
bool m_showVU0FFloat = false;
bool m_showFPRFloat = false;
};

65
pcsx2-qt/Debugger/RegisterWidget.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
<height>316</height>
</rect>
</property>
<property name="sizePolicy">
@ -25,31 +25,46 @@
<property name="windowTitle">
<string>Register View</string>
</property>
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>411</width>
<height>301</height>
</rect>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<item alignment="Qt::AlignLeft|Qt::AlignTop">
<widget class="QTabBar" name="registerTabs" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QTabBar" name="registerTabs" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>289</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>

140
pcsx2-qt/Debugger/SymbolTree/SymbolTreeWidgets.cpp
View File

@ -3,22 +3,23 @@
#include "SymbolTreeWidgets.h"
#include "Debugger/JsonValueWrapper.h"
#include "Debugger/SymbolTree/NewSymbolDialogs.h"
#include "Debugger/SymbolTree/SymbolTreeDelegates.h"
#include <QtGui/QClipboard>
#include <QtWidgets/QInputDialog>
#include <QtWidgets/QMenu>
#include <QtWidgets/QMessageBox>
#include <QtWidgets/QScrollBar>
#include "NewSymbolDialogs.h"
#include "SymbolTreeDelegates.h"
static bool testName(const QString& name, const QString& filter);
SymbolTreeWidget::SymbolTreeWidget(
u32 flags,
s32 symbol_address_alignment,
const DebuggerWidgetParameters& parameters)
: DebuggerWidget(parameters, NO_DEBUGGER_FLAGS)
: DebuggerWidget(parameters, MONOSPACE_FONT)
, m_flags(flags)
, m_symbol_address_alignment(symbol_address_alignment)
, m_group_by_module(cpu().getCpuType() == BREAKPOINT_IOP)
@ -64,6 +65,78 @@ void SymbolTreeWidget::resizeEvent(QResizeEvent* event)
updateVisibleNodes(false);
}
void SymbolTreeWidget::toJson(JsonValueWrapper& json)
{
DebuggerWidget::toJson(json);
json.value().AddMember("showSizeColumn", m_show_size_column, json.allocator());
if (m_flags & ALLOW_GROUPING)
{
json.value().AddMember("groupByModule", m_group_by_module, json.allocator());
json.value().AddMember("groupBySection", m_group_by_section, json.allocator());
json.value().AddMember("groupBySourceFile", m_group_by_source_file, json.allocator());
}
if (m_flags & ALLOW_SORTING_BY_IF_TYPE_IS_KNOWN)
{
json.value().AddMember("sortByIfTypeIsKnown", m_sort_by_if_type_is_known, json.allocator());
}
}
bool SymbolTreeWidget::fromJson(const JsonValueWrapper& json)
{
if (!DebuggerWidget::fromJson(json))
return false;
bool needs_reset = false;
auto show_size_column = json.value().FindMember("showSizeColumn");
if (show_size_column != json.value().MemberEnd() && show_size_column->value.IsBool())
{
needs_reset |= show_size_column->value.GetBool() != m_show_size_column;
m_show_size_column = show_size_column->value.GetBool();
}
if (m_flags & ALLOW_GROUPING)
{
auto group_by_module = json.value().FindMember("groupByModule");
if (group_by_module != json.value().MemberEnd() && group_by_module->value.IsBool())
{
needs_reset |= group_by_module->value.GetBool() != m_group_by_module;
m_group_by_module = group_by_module->value.GetBool();
}
auto group_by_section = json.value().FindMember("groupBySection");
if (group_by_section != json.value().MemberEnd() && group_by_section->value.IsBool())
{
needs_reset |= group_by_section->value.GetBool() != m_group_by_section;
m_group_by_section = group_by_section->value.GetBool();
}
auto group_by_source_file = json.value().FindMember("groupBySourceFile");
if (group_by_source_file != json.value().MemberEnd() && group_by_source_file->value.IsBool())
{
needs_reset |= group_by_source_file->value.GetBool() != m_group_by_source_file;
m_group_by_source_file = group_by_source_file->value.GetBool();
}
}
if (m_flags & ALLOW_SORTING_BY_IF_TYPE_IS_KNOWN)
{
auto sort_by_if_type_is_known = json.value().FindMember("sortByIfTypeIsKnown");
if (sort_by_if_type_is_known != json.value().MemberEnd() && sort_by_if_type_is_known->value.IsBool())
{
needs_reset |= sort_by_if_type_is_known->value.GetBool() != m_sort_by_if_type_is_known;
m_sort_by_if_type_is_known = sort_by_if_type_is_known->value.GetBool();
}
}
if (needs_reset)
reset();
return true;
}
void SymbolTreeWidget::updateModel()
{
if (needsReset())
@ -79,15 +152,9 @@ void SymbolTreeWidget::reset()
m_ui.treeView->setColumnHidden(SymbolTreeModel::SIZE, !m_show_size_column);
SymbolFilters filters;
std::unique_ptr<SymbolTreeNode> root;
cpu().GetSymbolGuardian().Read([&](const ccc::SymbolDatabase& database) -> void {
filters.group_by_module = m_group_by_module;
filters.group_by_section = m_group_by_section;
filters.group_by_source_file = m_group_by_source_file;
filters.string = m_ui.filterBox->text();
root = buildTree(filters, database);
root = buildTree(database);
});
if (root)
@ -98,7 +165,7 @@ void SymbolTreeWidget::reset()
// Read the initial values for visible nodes.
updateVisibleNodes(true);
if (!filters.string.isEmpty())
if (!m_ui.filterBox->text().isEmpty())
expandGroups(QModelIndex());
}
}
@ -173,9 +240,9 @@ void SymbolTreeWidget::setupTree()
connect(m_ui.treeView, &QTreeView::pressed, this, &SymbolTreeWidget::onTreeViewClicked);
}
std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::buildTree(const SymbolFilters& filters, const ccc::SymbolDatabase& database)
std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::buildTree(const ccc::SymbolDatabase& database)
{
std::vector<SymbolWork> symbols = getSymbols(filters.string, database);
std::vector<SymbolWork> symbols = getSymbols(m_ui.filterBox->text(), database);
auto source_file_comparator = [](const SymbolWork& lhs, const SymbolWork& rhs) -> bool {
if (lhs.source_file)
@ -200,13 +267,13 @@ std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::buildTree(const SymbolFilters&
// Sort all of the symbols so that we can iterate over them in order and
// build a tree.
if (filters.group_by_source_file)
if (m_group_by_source_file)
std::stable_sort(symbols.begin(), symbols.end(), source_file_comparator);
if (filters.group_by_section)
if (m_group_by_section)
std::stable_sort(symbols.begin(), symbols.end(), section_comparator);
if (filters.group_by_module)
if (m_group_by_module)
std::stable_sort(symbols.begin(), symbols.end(), module_comparator);
std::unique_ptr<SymbolTreeNode> root = std::make_unique<SymbolTreeNode>();
@ -227,23 +294,23 @@ std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::buildTree(const SymbolFilters&
{
std::unique_ptr<SymbolTreeNode> node = buildNode(work, database);
if (filters.group_by_source_file)
if (m_group_by_source_file)
{
node = groupBySourceFile(std::move(node), work, source_file_node, source_file_work, filters);
node = groupBySourceFile(std::move(node), work, source_file_node, source_file_work);
if (!node)
continue;
}
if (filters.group_by_section)
if (m_group_by_section)
{
node = groupBySection(std::move(node), work, section_node, section_work, filters);
node = groupBySection(std::move(node), work, section_node, section_work);
if (!node)
continue;
}
if (filters.group_by_module)
if (m_group_by_module)
{
node = groupByModule(std::move(node), work, module_node, module_work, filters);
node = groupByModule(std::move(node), work, module_node, module_work);
if (!node)
continue;
}
@ -258,14 +325,13 @@ std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::groupBySourceFile(
std::unique_ptr<SymbolTreeNode> child,
const SymbolWork& child_work,
SymbolTreeNode*& prev_group,
const SymbolWork*& prev_work,
const SymbolFilters& filters)
const SymbolWork*& prev_work)
{
bool group_exists =
prev_group &&
child_work.source_file == prev_work->source_file &&
(!filters.group_by_section || child_work.section == prev_work->section) &&
(!filters.group_by_module || child_work.module_symbol == prev_work->module_symbol);
(!m_group_by_section || child_work.section == prev_work->section) &&
(!m_group_by_module || child_work.module_symbol == prev_work->module_symbol);
if (group_exists)
{
prev_group->emplaceChild(std::move(child));
@ -302,13 +368,12 @@ std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::groupBySection(
std::unique_ptr<SymbolTreeNode> child,
const SymbolWork& child_work,
SymbolTreeNode*& prev_group,
const SymbolWork*& prev_work,
const SymbolFilters& filters)
const SymbolWork*& prev_work)
{
bool group_exists =
prev_group &&
child_work.section == prev_work->section &&
(!filters.group_by_module || child_work.module_symbol == prev_work->module_symbol);
(!m_group_by_module || child_work.module_symbol == prev_work->module_symbol);
if (group_exists)
{
prev_group->emplaceChild(std::move(child));
@ -342,8 +407,7 @@ std::unique_ptr<SymbolTreeNode> SymbolTreeWidget::groupByModule(
std::unique_ptr<SymbolTreeNode> child,
const SymbolWork& child_work,
SymbolTreeNode*& prev_group,
const SymbolWork*& prev_work,
const SymbolFilters& filters)
const SymbolWork*& prev_work)
{
bool group_exists =
prev_group &&
@ -621,7 +685,13 @@ void SymbolTreeWidget::onChangeTypeTemporarily()
void SymbolTreeWidget::onTreeViewClicked(const QModelIndex& index)
{
if (!index.isValid() || (m_flags & CLICK_TO_GO_TO_IN_DISASSEMBLER) == 0)
if (!index.isValid())
return;
if ((m_flags & CLICK_TO_GO_TO_IN_DISASSEMBLER) == 0)
return;
if ((QGuiApplication::mouseButtons() & Qt::LeftButton) == 0)
return;
SymbolTreeNode* node = m_model->nodeFromIndex(index);
@ -723,6 +793,7 @@ void FunctionTreeWidget::configureColumns()
void FunctionTreeWidget::onNewButtonPressed()
{
NewFunctionDialog* dialog = new NewFunctionDialog(cpu(), this);
dialog->setAttribute(Qt::WA_DeleteOnClose);
if (dialog->exec() == QDialog::Accepted)
reset();
}
@ -865,6 +936,7 @@ void GlobalVariableTreeWidget::configureColumns()
void GlobalVariableTreeWidget::onNewButtonPressed()
{
NewGlobalVariableDialog* dialog = new NewGlobalVariableDialog(cpu(), this);
dialog->setAttribute(Qt::WA_DeleteOnClose);
if (dialog->exec() == QDialog::Accepted)
reset();
}
@ -993,6 +1065,7 @@ void LocalVariableTreeWidget::configureColumns()
void LocalVariableTreeWidget::onNewButtonPressed()
{
NewLocalVariableDialog* dialog = new NewLocalVariableDialog(cpu(), this);
dialog->setAttribute(Qt::WA_DeleteOnClose);
if (dialog->exec() == QDialog::Accepted)
reset();
}
@ -1119,6 +1192,7 @@ void ParameterVariableTreeWidget::configureColumns()
void ParameterVariableTreeWidget::onNewButtonPressed()
{
NewParameterVariableDialog* dialog = new NewParameterVariableDialog(cpu(), this);
dialog->setAttribute(Qt::WA_DeleteOnClose);
if (dialog->exec() == QDialog::Accepted)
reset();
}

28
pcsx2-qt/Debugger/SymbolTree/SymbolTreeWidgets.h
View File

@ -3,12 +3,10 @@
#pragma once
#include "Debugger/DebuggerWidget.h"
#include "SymbolTreeModel.h"
#include "ui_SymbolTreeWidget.h"
struct SymbolFilters;
#include "Debugger/DebuggerWidget.h"
#include "Debugger/SymbolTree/SymbolTreeModel.h"
// A symbol tree widget with its associated refresh button, filter box and
// right-click menu. Supports grouping, sorting and various other settings.
@ -42,29 +40,29 @@ protected:
void resizeEvent(QResizeEvent* event) override;
void toJson(JsonValueWrapper& json) override;
bool fromJson(const JsonValueWrapper& json) override;
void setupTree();
std::unique_ptr<SymbolTreeNode> buildTree(const SymbolFilters& filters, const ccc::SymbolDatabase& database);
std::unique_ptr<SymbolTreeNode> buildTree(const ccc::SymbolDatabase& database);
std::unique_ptr<SymbolTreeNode> groupBySourceFile(
std::unique_ptr<SymbolTreeNode> child,
const SymbolWork& child_work,
SymbolTreeNode*& prev_group,
const SymbolWork*& prev_work,
const SymbolFilters& filters);
const SymbolWork*& prev_work);
std::unique_ptr<SymbolTreeNode> groupBySection(
std::unique_ptr<SymbolTreeNode> child,
const SymbolWork& child_work,
SymbolTreeNode*& prev_group,
const SymbolWork*& prev_work,
const SymbolFilters& filters);
const SymbolWork*& prev_work);
std::unique_ptr<SymbolTreeNode> groupByModule(
std::unique_ptr<SymbolTreeNode> child,
const SymbolWork& child_work,
SymbolTreeNode*& prev_group,
const SymbolWork*& prev_work,
const SymbolFilters& filters);
const SymbolWork*& prev_work);
void openContextMenu(QPoint pos);
@ -201,11 +199,3 @@ protected:
ccc::FunctionHandle m_function;
std::optional<u32> m_caller_stack_pointer;
};
struct SymbolFilters
{
bool group_by_module = false;
bool group_by_section = false;
bool group_by_source_file = false;
QString string;
};

116
pcsx2-qt/MainWindow.cpp
View File

@ -113,7 +113,7 @@ MainWindow::MainWindow()
// DisplayWidget.
// Additionally, alien widget rendering is much more performant, so we
// should have a nice responsiveness boost in our UI :)
// QTBUG-133919, reported upstream by govanify
// QTBUG-133919, reported upstream by govanify
QGuiApplication::setAttribute(Qt::AA_NativeWindows, false);
QGuiApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
@ -790,7 +790,7 @@ void MainWindow::onVideoCaptureToggled(bool checked)
return;
}
if (s_record_on_start && !s_path_to_recording_for_record_on_start.isEmpty())
if (s_record_on_start && !s_path_to_recording_for_record_on_start.isEmpty())
{
// We can't start recording immediately, this is called before full GS init (specifically the fps amount)
// and GSCapture ends up unhappy.
@ -1427,7 +1427,7 @@ void MainWindow::onGameListEntryContextMenuRequested(const QPoint& point)
{
connect(action, &QAction::triggered, [entry]() {
SettingsWindow::openGamePropertiesDialog(entry,
entry->title, entry->serial, entry->crc, entry->type == GameList::EntryType::ELF);
entry->title, entry->serial, entry->crc, entry->type == GameList::EntryType::ELF, nullptr);
});
}
@ -1631,41 +1631,7 @@ void MainWindow::onViewSystemDisplayTriggered()
void MainWindow::onViewGamePropertiesActionTriggered()
{
if (!s_vm_valid)
return;
// prefer to use a game list entry, if we have one, that way the summary is populated
if (!s_current_disc_path.isEmpty() || !s_current_elf_override.isEmpty())
{
auto lock = GameList::GetLock();
const QString& path = (s_current_elf_override.isEmpty() ? s_current_disc_path : s_current_elf_override);
const GameList::Entry* entry = GameList::GetEntryForPath(path.toUtf8().constData());
if (entry)
{
SettingsWindow::openGamePropertiesDialog(
entry, entry->title, entry->serial, entry->crc, !s_current_elf_override.isEmpty());
return;
}
}
// open properties for the current running file (isn't in the game list)
if (s_current_disc_crc == 0)
{
QMessageBox::critical(this, tr("Game Properties"), tr("Game properties is unavailable for the current game."));
return;
}
// can't use serial for ELFs, because they might have a disc set
if (s_current_elf_override.isEmpty())
{
SettingsWindow::openGamePropertiesDialog(
nullptr, s_current_title.toStdString(), s_current_disc_serial.toStdString(), s_current_disc_crc, false);
}
else
{
SettingsWindow::openGamePropertiesDialog(
nullptr, s_current_title.toStdString(), std::string(), s_current_disc_crc, true);
}
doGameSettings(nullptr);
}
void MainWindow::onGitHubRepositoryActionTriggered()
@ -1811,35 +1777,11 @@ void MainWindow::onCreateMemoryCardOpenRequested()
void MainWindow::updateTheme()
{
// The debugger hates theme changes.
// We have unfortunately to destroy it and recreate it.
const bool debugger_is_open = g_debugger_window ? g_debugger_window->isVisible() : false;
const QSize debugger_size = g_debugger_window ? g_debugger_window->size() : QSize();
const QPoint debugger_pos = g_debugger_window ? g_debugger_window->pos() : QPoint();
if (g_debugger_window)
{
if (QMessageBox::question(this, tr("Theme Change"),
tr("Changing the theme will close the debugger window. Any unsaved data will be lost. Do you want to continue?"),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)
{
return;
}
}
QtHost::UpdateApplicationTheme();
reloadThemeSpecificImages();
if (g_debugger_window)
{
DebuggerWindow::destroyInstance();
DebuggerWindow::createInstance();
g_debugger_window->resize(debugger_size);
g_debugger_window->move(debugger_pos);
if (debugger_is_open)
{
g_debugger_window->show();
}
}
g_debugger_window->updateStyleSheets();
}
void MainWindow::reloadThemeSpecificImages()
@ -2654,13 +2596,12 @@ QWidget* MainWindow::getDisplayContainer() const
void MainWindow::setupMouseMoveHandler()
{
auto mouse_cb_fn = [](int x, int y)
{
if(g_main_window)
auto mouse_cb_fn = [](int x, int y) {
if (g_main_window)
g_main_window->checkMousePosition(x, y);
};
if(!Common::AttachMousePositionCb(mouse_cb_fn))
if (!Common::AttachMousePositionCb(mouse_cb_fn))
{
Console.Warning("Unable to setup mouse position cb!");
}
@ -2770,6 +2711,45 @@ void MainWindow::doSettings(const char* category /* = nullptr */)
dlg->setCategory(category);
}
void MainWindow::doGameSettings(const char* category)
{
if (!s_vm_valid)
return;
// prefer to use a game list entry, if we have one, that way the summary is populated
if (!s_current_disc_path.isEmpty() || !s_current_elf_override.isEmpty())
{
auto lock = GameList::GetLock();
const QString& path = (s_current_elf_override.isEmpty() ? s_current_disc_path : s_current_elf_override);
const GameList::Entry* entry = GameList::GetEntryForPath(path.toUtf8().constData());
if (entry)
{
SettingsWindow::openGamePropertiesDialog(
entry, entry->title, entry->serial, entry->crc, !s_current_elf_override.isEmpty(), category);
return;
}
}
// open properties for the current running file (isn't in the game list)
if (s_current_disc_crc == 0)
{
QMessageBox::critical(this, tr("Game Properties"), tr("Game properties is unavailable for the current game."));
return;
}
// can't use serial for ELFs, because they might have a disc set
if (s_current_elf_override.isEmpty())
{
SettingsWindow::openGamePropertiesDialog(
nullptr, s_current_title.toStdString(), s_current_disc_serial.toStdString(), s_current_disc_crc, false, category);
}
else
{
SettingsWindow::openGamePropertiesDialog(
nullptr, s_current_title.toStdString(), std::string(), s_current_disc_crc, true, category);
}
}
void MainWindow::openDebugger()
{
DebuggerWindow* dwnd = DebuggerWindow::getInstance();

4
pcsx2-qt/MainWindow.h
View File

@ -103,6 +103,9 @@ public:
/// Rescans a single file. NOTE: Happens on UI thread.
void rescanFile(const std::string& path);
void doSettings(const char* category = nullptr);
void doGameSettings(const char* category = nullptr);
void openDebugger();
void checkMousePosition(int x, int y);
public Q_SLOTS:
@ -255,7 +258,6 @@ private:
void updateDisplayWidgetCursor();
SettingsWindow* getSettingsWindow();
void doSettings(const char* category = nullptr);
InputRecordingViewer* getInputRecordingViewer();
void updateInputRecordingActions(bool started);

6
pcsx2-qt/Settings/SettingsWindow.cpp
View File

@ -655,7 +655,7 @@ void SettingsWindow::saveAndReloadGameSettings()
g_emu_thread->reloadGameSettings();
}
void SettingsWindow::openGamePropertiesDialog(const GameList::Entry* game, const std::string_view title, std::string serial, u32 disc_crc, bool is_elf)
void SettingsWindow::openGamePropertiesDialog(const GameList::Entry* game, const std::string_view title, std::string serial, u32 disc_crc, bool is_elf, const char* category)
{
std::string filename = VMManager::GetGameSettingsPath(!is_elf ? serial : std::string_view(), disc_crc);
@ -664,6 +664,8 @@ void SettingsWindow::openGamePropertiesDialog(const GameList::Entry* game, const
{
if (dialog->isPerGameSettings() && static_cast<INISettingsInterface*>(dialog->m_sif.get())->GetFileName() == filename)
{
if (category)
dialog->setCategory(category);
dialog->show();
dialog->raise();
dialog->activateWindow();
@ -678,6 +680,8 @@ void SettingsWindow::openGamePropertiesDialog(const GameList::Entry* game, const
SettingsWindow* dialog = new SettingsWindow(std::move(sif), game, std::move(serial), disc_crc, QtUtils::StringViewToQString(Path::GetFileName(filename)));
dialog->setWindowTitle(QtUtils::StringViewToQString(title));
if (category)
dialog->setCategory(category);
dialog->show();
}

2
pcsx2-qt/Settings/SettingsWindow.h
View File

@ -45,7 +45,7 @@ public:
u32 disc_crc, QString filename = QString());
~SettingsWindow();
static void openGamePropertiesDialog(const GameList::Entry* game, const std::string_view title, std::string serial, u32 disc_crc, bool is_elf);
static void openGamePropertiesDialog(const GameList::Entry* game, const std::string_view title, std::string serial, u32 disc_crc, bool is_elf, const char* category);
static void closeGamePropertiesDialogs();
SettingsInterface* getSettingsInterface() const;

5
pcsx2-qt/resources/icons/black/svg/padlock-lock.svg Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="800px" height="800px" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="m8.1816 10.703s4e-5 -2.5676 0-4.1081c-4e-5 -1.8489 1.527-3.5946 3.8182-3.5946 2.2912 0 3.8181 1.7457 3.8181 3.5946v4.1081" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
<path d="m4.5 11.393c-4e-5 1.7387-1e-4 5.3708 2e-5 7.8056 1.3e-4 2.6923 4.1637 3.3012 7.5 3.3012 3.3363 0 7.4999-0.6089 7.4999-3.3012v-7.8056c0-0.5523-0.4477-0.9975-1-0.9975h-13c-0.55227 0-0.99998 0.4452-0.99999 0.9975zm6 4.6096c0 0.476 0.2069 0.9037 0.5357 1.198v1.5521c0 0.5522 0.4477 1 1 1h0.1429c0.5523 0 1-0.4478 1-1v-1.5521c0.3288-0.2943 0.5357-0.722 0.5357-1.198 0-0.8876-0.7195-1.6071-1.6071-1.6071-0.8877 0-1.6072 0.7195-1.6072 1.6071z" clip-rule="evenodd" fill="#000" fill-rule="evenodd"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 876 B

5
pcsx2-qt/resources/icons/black/svg/padlock-unlock.svg Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="800px" height="800px" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="m4.5 11.393c-4e-5 1.7387-1e-4 5.3708 2e-5 7.8056 1.3e-4 2.6923 4.1637 3.3012 7.5 3.3012 3.3363 0 7.4999-0.6089 7.4999-3.3012v-7.8056c0-0.5523-0.4477-0.9975-1-0.9975h-13c-0.55227 0-0.99998 0.4452-0.99999 0.9975zm6 4.6096c0 0.476 0.2069 0.9037 0.5357 1.198v1.5521c0 0.5522 0.4477 1 1 1h0.1429c0.5523 0 1-0.4478 1-1v-1.5521c0.3288-0.2943 0.5357-0.722 0.5357-1.198 0-0.8876-0.7195-1.6071-1.6071-1.6071-0.8877 0-1.6072 0.7195-1.6072 1.6071z" clip-rule="evenodd" fill="#000" fill-rule="evenodd"/>
<path d="m8.1816 10.703s4e-5 -2.5676 0-4.1081c-4e-5 -1.8489 1.527-3.5946 3.8182-3.5946 2.2912 0 3.8181 1.7457 3.8181 3.5946" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 869 B

5
pcsx2-qt/resources/icons/white/svg/padlock-lock.svg Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="800px" height="800px" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="m8.1816 10.703s4e-5 -2.5676 0-4.1081c-4e-5 -1.8489 1.527-3.5946 3.8182-3.5946 2.2912 0 3.8181 1.7457 3.8181 3.5946v4.1081" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
<path d="m4.5 11.393c-4e-5 1.7387-1e-4 5.3708 2e-5 7.8056 1.3e-4 2.6923 4.1637 3.3012 7.5 3.3012 3.3363 0 7.4999-0.6089 7.4999-3.3012v-7.8056c0-0.5523-0.4477-0.9975-1-0.9975h-13c-0.55227 0-0.99998 0.4452-0.99999 0.9975zm6 4.6096c0 0.476 0.2069 0.9037 0.5357 1.198v1.5521c0 0.5522 0.4477 1 1 1h0.1429c0.5523 0 1-0.4478 1-1v-1.5521c0.3288-0.2943 0.5357-0.722 0.5357-1.198 0-0.8876-0.7195-1.6071-1.6071-1.6071-0.8877 0-1.6072 0.7195-1.6072 1.6071z" clip-rule="evenodd" fill="#fff" fill-rule="evenodd"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 876 B

5
pcsx2-qt/resources/icons/white/svg/padlock-unlock.svg Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="800px" height="800px" fill="none" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="m4.5 11.393c-4e-5 1.7387-1e-4 5.3708 2e-5 7.8056 1.3e-4 2.6923 4.1637 3.3012 7.5 3.3012 3.3363 0 7.4999-0.6089 7.4999-3.3012v-7.8056c0-0.5523-0.4477-0.9975-1-0.9975h-13c-0.55227 0-0.99998 0.4452-0.99999 0.9975zm6 4.6096c0 0.476 0.2069 0.9037 0.5357 1.198v1.5521c0 0.5522 0.4477 1 1 1h0.1429c0.5523 0 1-0.4478 1-1v-1.5521c0.3288-0.2943 0.5357-0.722 0.5357-1.198 0-0.8876-0.7195-1.6071-1.6071-1.6071-0.8877 0-1.6072 0.7195-1.6072 1.6071z" clip-rule="evenodd" fill="#fff" fill-rule="evenodd"/>
<path d="m8.1816 10.703s4e-5 -2.5676 0-4.1081c-4e-5 -1.8489 1.527-3.5946 3.8182-3.5946 2.2912 0 3.8181 1.7457 3.8181 3.5946" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 869 B

8
pcsx2-qt/resources/resources.qrc
View File

@ -7,8 +7,8 @@
<file>icons/black/svg/artboard-2-line.svg</file>
<file>icons/black/svg/at.svg</file>
<file>icons/black/svg/band-aid-line.svg</file>
<file>icons/black/svg/book.svg</file>
<file>icons/black/svg/booklet.svg</file>
<file>icons/black/svg/book.svg</file>
<file>icons/black/svg/brush-line.svg</file>
<file>icons/black/svg/buzz-controller-line.svg</file>
<file>icons/black/svg/camera-video.svg</file>
@ -72,6 +72,8 @@
<file>icons/black/svg/mouse-line.svg</file>
<file>icons/black/svg/msd-line.svg</file>
<file>icons/black/svg/negcon-line.svg</file>
<file>icons/black/svg/padlock-lock.svg</file>
<file>icons/black/svg/padlock-unlock.svg</file>
<file>icons/black/svg/pause-line.svg</file>
<file>icons/black/svg/pencil-line.svg</file>
<file>icons/black/svg/pin-filled.svg</file>
@ -113,8 +115,8 @@
<file>icons/white/svg/artboard-2-line.svg</file>
<file>icons/white/svg/at.svg</file>
<file>icons/white/svg/band-aid-line.svg</file>
<file>icons/white/svg/book.svg</file>
<file>icons/white/svg/booklet.svg</file>
<file>icons/white/svg/book.svg</file>
<file>icons/white/svg/brush-line.svg</file>
<file>icons/white/svg/buzz-controller-line.svg</file>
<file>icons/white/svg/camera-video.svg</file>
@ -178,6 +180,8 @@
<file>icons/white/svg/mouse-line.svg</file>
<file>icons/white/svg/msd-line.svg</file>
<file>icons/white/svg/negcon-line.svg</file>
<file>icons/white/svg/padlock-lock.svg</file>
<file>icons/white/svg/padlock-unlock.svg</file>
<file>icons/white/svg/pause-line.svg</file>
<file>icons/white/svg/pencil-line.svg</file>
<file>icons/white/svg/pin-filled.svg</file>