From 241c95576cb250b75705cafb1c92705a005bdcae Mon Sep 17 00:00:00 2001 From: Mathias Date: Mon, 20 May 2024 11:08:55 +0200 Subject: [PATCH 1/7] Icon redesign * New Icons, Hand drawn, not traced and Original * Removed duplicate image --- .../Assets/Images/ElectricBoiler.svg | 78 +- src/ProfHeat.AUI/Assets/Images/GasBoiler.svg | 60 +- src/ProfHeat.AUI/Assets/Images/GasMotor.svg | 94 +- .../Assets/Images/HeatingGrid.svg | 979 ------------------ src/ProfHeat.AUI/Assets/Images/OilBoiler.svg | 107 +- 5 files changed, 154 insertions(+), 1164 deletions(-) delete mode 100644 src/ProfHeat.AUI/Assets/Images/HeatingGrid.svg diff --git a/src/ProfHeat.AUI/Assets/Images/ElectricBoiler.svg b/src/ProfHeat.AUI/Assets/Images/ElectricBoiler.svg index ff8ff30..590e234 100644 --- a/src/ProfHeat.AUI/Assets/Images/ElectricBoiler.svg +++ b/src/ProfHeat.AUI/Assets/Images/ElectricBoiler.svg @@ -12,13 +12,12 @@ inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg"> - - - - - - - - - + id="layer1" + inkscape:label="Icon"> diff --git a/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg b/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg index 634b282..c16e365 100644 --- a/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg +++ b/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg @@ -8,23 +8,24 @@ height="256" viewBox="0 0 256 256" sodipodi:docname="GasBoiler.svg" - inkscape:export-filename="GasMoto.svg" + inkscape:export-filename="OilBoiler.svg" inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg"> - - - - - - - - + id="layer1" + inkscape:label="Flame"> diff --git a/src/ProfHeat.AUI/Assets/Images/GasMotor.svg b/src/ProfHeat.AUI/Assets/Images/GasMotor.svg index e453b8d..0d7d54d 100644 --- a/src/ProfHeat.AUI/Assets/Images/GasMotor.svg +++ b/src/ProfHeat.AUI/Assets/Images/GasMotor.svg @@ -12,19 +12,16 @@ inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg"> - - - - - - - - - - - - + id="layer1" + inkscape:label="Flame"> diff --git a/src/ProfHeat.AUI/Assets/Images/HeatingGrid.svg b/src/ProfHeat.AUI/Assets/Images/HeatingGrid.svg deleted file mode 100644 index 7e08601..0000000 --- a/src/ProfHeat.AUI/Assets/Images/HeatingGrid.svg +++ /dev/null @@ -1,979 +0,0 @@ - - - - diff --git a/src/ProfHeat.AUI/Assets/Images/OilBoiler.svg b/src/ProfHeat.AUI/Assets/Images/OilBoiler.svg index 3391cd7..891280b 100644 --- a/src/ProfHeat.AUI/Assets/Images/OilBoiler.svg +++ b/src/ProfHeat.AUI/Assets/Images/OilBoiler.svg @@ -9,6 +9,7 @@ id="svg1" xml:space="preserve" sodipodi:docname="OilBoiler.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -21,43 +22,77 @@ inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" - inkscape:document-units="mm" /> + sodipodi:nodetypes="cccc" + inkscape:label="Shading drop" /> From 55cfd2f6079300359bd89968ba16a435f935d68c Mon Sep 17 00:00:00 2001 From: Mathias Date: Mon, 20 May 2024 11:35:56 +0200 Subject: [PATCH 2/7] Gear added to represent motor --- .../Assets/Images/GasMotor-FlameOnly.svg | 59 ++++++++++++++++++ src/ProfHeat.AUI/Assets/Images/GasMotor.svg | 60 +++++++++++++++++-- 2 files changed, 115 insertions(+), 4 deletions(-) create mode 100644 src/ProfHeat.AUI/Assets/Images/GasMotor-FlameOnly.svg diff --git a/src/ProfHeat.AUI/Assets/Images/GasMotor-FlameOnly.svg b/src/ProfHeat.AUI/Assets/Images/GasMotor-FlameOnly.svg new file mode 100644 index 0000000..0d7d54d --- /dev/null +++ b/src/ProfHeat.AUI/Assets/Images/GasMotor-FlameOnly.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/ProfHeat.AUI/Assets/Images/GasMotor.svg b/src/ProfHeat.AUI/Assets/Images/GasMotor.svg index 0d7d54d..b1b48f5 100644 --- a/src/ProfHeat.AUI/Assets/Images/GasMotor.svg +++ b/src/ProfHeat.AUI/Assets/Images/GasMotor.svg @@ -31,17 +31,69 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:zoom="2" - inkscape:cx="130.75" - inkscape:cy="137.75" + inkscape:cx="56.25" + inkscape:cy="143.75" inkscape:window-width="2560" inkscape:window-height="1351" inkscape:window-x="-9" inkscape:window-y="-9" inkscape:window-maximized="1" - inkscape:current-layer="layer1" /> Date: Mon, 20 May 2024 11:55:26 +0200 Subject: [PATCH 3/7] Inner flame style change --- src/ProfHeat.AUI/Assets/Images/GasBoiler.svg | 34 +++++++++++--------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg b/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg index c16e365..339db41 100644 --- a/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg +++ b/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg @@ -25,6 +25,10 @@ effect="spiro" id="path-effect4-1" is_visible="true" + lpeversion="1" /> From 28386ccbc046797cea590ba4e9a9a69a5a413fbf Mon Sep 17 00:00:00 2001 From: Mathias Date: Mon, 20 May 2024 11:58:22 +0200 Subject: [PATCH 4/7] Smooth edge fix --- src/ProfHeat.AUI/Assets/Images/GasBoiler.svg | 34 +++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg b/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg index 339db41..6c2642b 100644 --- a/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg +++ b/src/ProfHeat.AUI/Assets/Images/GasBoiler.svg @@ -25,10 +25,6 @@ effect="spiro" id="path-effect4-1" is_visible="true" - lpeversion="1" /> From 297c9aafaf9bd77f474921f3414ec0401bbbeb9a Mon Sep 17 00:00:00 2001 From: Mathias Date: Mon, 20 May 2024 12:46:18 +0200 Subject: [PATCH 5/7] Margin and size fix --- src/ProfHeat.AUI/Views/DataVisualizerView.axaml | 11 ++++++----- src/ProfHeat.AUI/Views/MainWindow.axaml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ProfHeat.AUI/Views/DataVisualizerView.axaml b/src/ProfHeat.AUI/Views/DataVisualizerView.axaml index c5eb39c..9a56ea7 100644 --- a/src/ProfHeat.AUI/Views/DataVisualizerView.axaml +++ b/src/ProfHeat.AUI/Views/DataVisualizerView.axaml @@ -10,7 +10,8 @@ x:DataType="vm:DataVisualizerViewModel" xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"> - + - + Margin="20"> + Margin="20"/>