This commit is contained in:
Nav
2022-07-09 14:09:05 +01:00
parent 049ccc1439
commit 78491a7874
10 changed files with 57 additions and 1676 deletions

View File

@@ -405,8 +405,9 @@ namespace Bloom
this->targetController.get()
);
auto tcStateChangeEvent =
this->applicationEventListener->waitForEvent<Events::TargetControllerThreadStateChanged>();
const auto tcStateChangeEvent = this->applicationEventListener->waitForEvent<
Events::TargetControllerThreadStateChanged
>();
if (!tcStateChangeEvent.has_value() || tcStateChangeEvent->get()->getState() != ThreadState::READY) {
throw Exception("TargetController failed to startup.");
@@ -418,7 +419,7 @@ namespace Bloom
return;
}
auto targetControllerState = this->targetController->getThreadState();
const auto targetControllerState = this->targetController->getThreadState();
if (targetControllerState == ThreadState::STARTING || targetControllerState == ThreadState::READY) {
EventManager::triggerEvent(std::make_shared<Events::ShutdownTargetController>());
this->applicationEventListener->waitForEvent<Events::TargetControllerThreadStateChanged>(
@@ -443,7 +444,9 @@ namespace Bloom
this->debugServer.get()
);
auto dsStateChangeEvent = this->applicationEventListener->waitForEvent<Events::DebugServerThreadStateChanged>();
const auto dsStateChangeEvent = this->applicationEventListener->waitForEvent<
Events::DebugServerThreadStateChanged
>();
if (!dsStateChangeEvent.has_value() || dsStateChangeEvent->get()->getState() != ThreadState::READY) {
throw Exception("DebugServer failed to startup.");
@@ -455,7 +458,7 @@ namespace Bloom
return;
}
auto debugServerState = this->debugServer->getThreadState();
const auto debugServerState = this->debugServer->getThreadState();
if (debugServerState == ThreadState::STARTING || debugServerState == ThreadState::READY) {
EventManager::triggerEvent(std::make_shared<Events::ShutdownDebugServer>());
this->applicationEventListener->waitForEvent<Events::DebugServerThreadStateChanged>(

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 60 KiB

View File

@@ -13,8 +13,8 @@
version="1.1"
id="svg8"
inkscape:version="1.0.1 (1.0.1+r75)"
sodipodi:docname="BloomIcon.svg"
inkscape:export-filename="/home/nav/Projects/Bloom/src/Insight/UserInterfaces/InsightWindow/Images/BloomIconv1.png"
sodipodi:docname="bloom-icon.svg"
inkscape:export-filename="/home/nav/Projects/Bloom/src/Insight/UserInterfaces/InsightWindow/Images/bloom-iconv1.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

@@ -84,7 +84,7 @@ namespace Bloom
QApplication::setWindowIcon(QIcon(
QString::fromStdString(Paths::compiledResourcesPath()
+ "/src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg"
+ "/src/Insight/UserInterfaces/InsightWindow/Images/bloom-icon.svg"
)
));

View File

@@ -13,7 +13,7 @@ QMainWindow {
min-width: 150px;
max-height: 150px;
max-width: 150px;
image: url(":/compiled/src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg");
image: url(":/compiled/src/Insight/UserInterfaces/InsightWindow/Images/bloom-icon.svg");
image-position: center;
}

View File

@@ -41,8 +41,6 @@ namespace Bloom::Widgets
}
void ByteItem::setValue(unsigned char value) {
this->valueChanged = this->valueInitialised && this->value != value;
this->value = value;
this->hexValue = QString::number(this->value, 16).rightJustified(2, '0').toUpper();
this->asciiValue = (this->value >= 32 && this->value <= 126)
@@ -63,7 +61,6 @@ namespace Bloom::Widgets
static const auto widgetRect = this->boundingRect();
static const auto standardTextColor = QColor(0xAF, 0xB1, 0xB3);
static const auto valueChangedTextColor = QColor(0x54, 0x7F, 0xBA);
static auto font = QFont("'Ubuntu', sans-serif");
static const auto highlightedBackgroundColor = QColor(0x3C, 0x59, 0x5C, 255);

View File

@@ -60,7 +60,6 @@ namespace Bloom::Widgets
private:
unsigned char value = 0x00;
bool valueInitialised = false;
bool valueChanged = false;
const HexViewerWidgetSettings& settings;