From 90f48777fa18111c11e7ca3d5d2efd3840495dbb Mon Sep 17 00:00:00 2001 From: Nav Date: Sat, 15 Apr 2023 12:38:33 +0100 Subject: [PATCH] Tidying --- .../InsightWindow/Widgets/Dialog/UiFiles/Dialog.ui | 2 +- .../HexViewerWidget/ItemGraphicsScene.cpp | 4 +++- .../SnapshotManager/SnapshotManager.cpp | 5 ++--- .../SnapshotManager/SnapshotViewer/SnapshotViewer.cpp | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/Dialog/UiFiles/Dialog.ui b/src/Insight/UserInterfaces/InsightWindow/Widgets/Dialog/UiFiles/Dialog.ui index 395d46ae..a6e409e8 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/Dialog/UiFiles/Dialog.ui +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/Dialog/UiFiles/Dialog.ui @@ -54,7 +54,7 @@ - 20 + 15 diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ItemGraphicsScene.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ItemGraphicsScene.cpp index 1fb12d51..0a07cec3 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ItemGraphicsScene.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ItemGraphicsScene.cpp @@ -197,7 +197,9 @@ namespace Bloom::Widgets this, [this] (TopLevelGroupItem* item) { this->topLevelGroup.reset(item); - this->topLevelGroup->setPosition(QPoint(ByteAddressContainer::WIDTH + this->margins.left(), this->margins.top())); + this->topLevelGroup->setPosition( + QPoint(ByteAddressContainer::WIDTH + this->margins.left(), this->margins.top()) + ); this->flattenedItems = this->topLevelGroup->flattenedItems(); emit this->ready(); } diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/SnapshotManager/SnapshotManager.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/SnapshotManager/SnapshotManager.cpp index f924d9f2..d3d39f0c 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/SnapshotManager/SnapshotManager.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/SnapshotManager/SnapshotManager.cpp @@ -14,7 +14,6 @@ #include "src/Insight/InsightWorker/InsightWorker.hpp" #include "src/Services/PathService.hpp" -#include "src/Helpers/EnumToStringMappings.hpp" #include "src/Exceptions/Exception.hpp" #include "src/Logger/Logger.hpp" @@ -44,7 +43,7 @@ namespace Bloom::Widgets auto widgetUiFile = QFile( QString::fromStdString(Services::PathService::compiledResourcesPath() + "/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane" - + "/SnapshotManager/UiFiles/SnapshotManager.ui" + + "/SnapshotManager/UiFiles/SnapshotManager.ui" ) ); @@ -367,7 +366,7 @@ namespace Bloom::Widgets "Restore snapshot", "This operation will overwrite the entire address range of the target's " + QString(this->memoryDescriptor.type == Targets::TargetMemoryType::EEPROM ? "EEPROM" : "RAM") - + " with the contents of the selected snapshot.

Do you wish to proceed?", + + " with the contents of the selected snapshot.

Are you sure you want to proceed?", "Proceed", std::nullopt, this diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/SnapshotManager/SnapshotViewer/SnapshotViewer.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/SnapshotManager/SnapshotViewer/SnapshotViewer.cpp index 6865a4b4..9da75448 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/SnapshotManager/SnapshotViewer/SnapshotViewer.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/SnapshotManager/SnapshotViewer/SnapshotViewer.cpp @@ -63,7 +63,7 @@ namespace Bloom::Widgets } // Set ideal window size - this->setFixedSize(1200, 850); + this->setFixedSize(1205, 850); this->setMinimumSize(700, 600); this->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX); @@ -215,7 +215,7 @@ namespace Bloom::Widgets "This operation will write " + QString::number(sortedByteItemsByAddress.size()) + " byte(s) to the target's " + QString(this->memoryDescriptor.type == Targets::TargetMemoryType::EEPROM ? "EEPROM" : "RAM") - + ".

Do you wish to proceed?", + + ".

Are you sure you want to proceed?", "Proceed", std::nullopt, this