This commit is contained in:
Nav
2023-04-15 12:38:33 +01:00
parent c63501ff11
commit 90f48777fa
4 changed files with 8 additions and 7 deletions

View File

@@ -54,7 +54,7 @@
<spacer name="vertical-spacer"> <spacer name="vertical-spacer">
<property name="sizeHint"> <property name="sizeHint">
<size> <size>
<height>20</height> <height>15</height>
</size> </size>
</property> </property>
<property name="sizeType"> <property name="sizeType">

View File

@@ -197,7 +197,9 @@ namespace Bloom::Widgets
this, this,
[this] (TopLevelGroupItem* item) { [this] (TopLevelGroupItem* item) {
this->topLevelGroup.reset(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(); this->flattenedItems = this->topLevelGroup->flattenedItems();
emit this->ready(); emit this->ready();
} }

View File

@@ -14,7 +14,6 @@
#include "src/Insight/InsightWorker/InsightWorker.hpp" #include "src/Insight/InsightWorker/InsightWorker.hpp"
#include "src/Services/PathService.hpp" #include "src/Services/PathService.hpp"
#include "src/Helpers/EnumToStringMappings.hpp"
#include "src/Exceptions/Exception.hpp" #include "src/Exceptions/Exception.hpp"
#include "src/Logger/Logger.hpp" #include "src/Logger/Logger.hpp"
@@ -44,7 +43,7 @@ namespace Bloom::Widgets
auto widgetUiFile = QFile( auto widgetUiFile = QFile(
QString::fromStdString(Services::PathService::compiledResourcesPath() QString::fromStdString(Services::PathService::compiledResourcesPath()
+ "/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane" + "/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane"
+ "/SnapshotManager/UiFiles/SnapshotManager.ui" + "/SnapshotManager/UiFiles/SnapshotManager.ui"
) )
); );
@@ -367,7 +366,7 @@ namespace Bloom::Widgets
"Restore snapshot", "Restore snapshot",
"This operation will overwrite the entire address range of the target's " "This operation will overwrite the entire address range of the target's "
+ QString(this->memoryDescriptor.type == Targets::TargetMemoryType::EEPROM ? "EEPROM" : "RAM") + QString(this->memoryDescriptor.type == Targets::TargetMemoryType::EEPROM ? "EEPROM" : "RAM")
+ " with the contents of the selected snapshot.<br/><br/>Do you wish to proceed?", + " with the contents of the selected snapshot.<br/><br/>Are you sure you want to proceed?",
"Proceed", "Proceed",
std::nullopt, std::nullopt,
this this

View File

@@ -63,7 +63,7 @@ namespace Bloom::Widgets
} }
// Set ideal window size // Set ideal window size
this->setFixedSize(1200, 850); this->setFixedSize(1205, 850);
this->setMinimumSize(700, 600); this->setMinimumSize(700, 600);
this->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX); this->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
@@ -215,7 +215,7 @@ namespace Bloom::Widgets
"This operation will write " + QString::number(sortedByteItemsByAddress.size()) "This operation will write " + QString::number(sortedByteItemsByAddress.size())
+ " byte(s) to the target's " + " byte(s) to the target's "
+ QString(this->memoryDescriptor.type == Targets::TargetMemoryType::EEPROM ? "EEPROM" : "RAM") + QString(this->memoryDescriptor.type == Targets::TargetMemoryType::EEPROM ? "EEPROM" : "RAM")
+ ".<br/><br/>Do you wish to proceed?", + ".<br/><br/>Are you sure you want to proceed?",
"Proceed", "Proceed",
std::nullopt, std::nullopt,
this this