From 0151ae9eff79791721e78f4c51956fd2d36db4c5 Mon Sep 17 00:00:00 2001 From: Nav Date: Sun, 7 Nov 2021 20:32:32 +0000 Subject: [PATCH] First draft of tool button icons for highlighting stack memory and focused memory regions --- .../Stylesheets/InsightWindow.qss | 15 +- .../HexViewerWidget/HexViewerWidget.cpp | 2 +- .../UiFiles/HexViewerWidget.ui | 32 ++++ .../highlight-focused-memory-disabled.svg | 146 ++++++++++++++++++ .../Images/highlight-focused-memory.svg | 146 ++++++++++++++++++ .../highlight-stack-memory-disabled.svg | 146 ++++++++++++++++++ .../Images/highlight-stack-memory.svg | 146 ++++++++++++++++++ .../Images/memory-inspection-icon.svg | 6 +- 8 files changed, 634 insertions(+), 5 deletions(-) create mode 100644 src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-focused-memory-disabled.svg create mode 100644 src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-focused-memory.svg create mode 100644 src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-stack-memory-disabled.svg create mode 100644 src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-stack-memory.svg diff --git a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss index 8e078ac4..9c65f957 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss +++ b/src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss @@ -370,7 +370,7 @@ QScrollBar::sub-line:vertical { border: none; padding: 0; qproperty-buttonWidth: 24; - qproperty-buttonHeight: 20; + qproperty-buttonHeight: 21; } #hex-viewer-container #tool-bar QToolButton:hover { @@ -379,6 +379,19 @@ QScrollBar::sub-line:vertical { padding: 0; } +#hex-viewer-container #tool-bar #separator { + background-color: transparent; + border-right: 1px solid #41423f; + padding: 0; + min-width: 1px; + max-width: 1px; +} + +#hex-viewer-container #tool-bar #highlight-stack-memory-btn, +#hex-viewer-container #tool-bar #highlight-focused-memory-btn { + qproperty-buttonWidth: 25; +} + #hex-viewer-container QScrollArea, #hex-viewer-container #graphics-view-container, #hex-viewer-container #graphics-view-container #graphics-view { diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.cpp index 625050a9..ab5ab4ba 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/HexViewerWidget.cpp @@ -46,7 +46,7 @@ HexViewerWidget::HexViewerWidget( this->refreshButton = this->container->findChild("refresh-memory-btn"); this->toolBar->setContentsMargins(0, 0, 0, 0); - this->toolBar->layout()->setContentsMargins(5, 0, 5, 0); + this->toolBar->layout()->setContentsMargins(5, 0, 5, 1); this->bottomBar->setContentsMargins(0, 0, 0, 0); this->bottomBar->layout()->setContentsMargins(5, 0, 5, 0); diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/UiFiles/HexViewerWidget.ui b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/UiFiles/HexViewerWidget.ui index 63edb637..666f7cec 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/UiFiles/HexViewerWidget.ui +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/UiFiles/HexViewerWidget.ui @@ -42,6 +42,38 @@ + + + + + + + :/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-stack-memory.svg + + + :/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-stack-memory-disabled.svg + + + Highlight Stack Memory + + + + + + + :/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-focused-memory.svg + + + :/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-focused-memory-disabled.svg + + + Highlight Focused Regions + + + + + + diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-focused-memory-disabled.svg b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-focused-memory-disabled.svg new file mode 100644 index 00000000..982dfefd --- /dev/null +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-focused-memory-disabled.svg @@ -0,0 +1,146 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-focused-memory.svg b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-focused-memory.svg new file mode 100644 index 00000000..3e79bb60 --- /dev/null +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-focused-memory.svg @@ -0,0 +1,146 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-stack-memory-disabled.svg b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-stack-memory-disabled.svg new file mode 100644 index 00000000..c91674ac --- /dev/null +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-stack-memory-disabled.svg @@ -0,0 +1,146 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-stack-memory.svg b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-stack-memory.svg new file mode 100644 index 00000000..15fc9b5b --- /dev/null +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/highlight-stack-memory.svg @@ -0,0 +1,146 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/memory-inspection-icon.svg b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/memory-inspection-icon.svg index 547d50d7..30930395 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/memory-inspection-icon.svg +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/memory-inspection-icon.svg @@ -23,9 +23,9 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="11.2" - inkscape:cx="25.611036" - inkscape:cy="3.7785754" + inkscape:zoom="44.8" + inkscape:cx="19.284495" + inkscape:cy="7.1191996" inkscape:document-units="px" inkscape:current-layer="layer2" inkscape:document-rotation="0"