From b08074e15bfbdf529ff275da6975f768e55bec4d Mon Sep 17 00:00:00 2001 From: Roy-043 Date: Thu, 4 Jul 2024 23:56:24 +0200 Subject: [PATCH] Gui: fix icon name conflict related to Std_ViewScreenShot The image Std_ViewScreenShot.svg was not used in the GUI. The command Std_ViewScreenShot used a different icon. This caused a name conflict in the Wiki. --- src/Gui/CommandView.cpp | 2 +- src/Gui/Icons/Std_ViewScreenShot.svg | 1020 +++++++++++++++++--------- src/Gui/Icons/camera-photo.svg | 696 ------------------ src/Gui/Icons/resource.qrc | 4 - 4 files changed, 673 insertions(+), 1049 deletions(-) delete mode 100644 src/Gui/Icons/camera-photo.svg diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index a3ab08a899..c68ceeb23e 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -1928,7 +1928,7 @@ StdViewScreenShot::StdViewScreenShot() sToolTipText= QT_TR_NOOP("Creates a screenshot of the active view"); sWhatsThis = "Std_ViewScreenShot"; sStatusTip = QT_TR_NOOP("Creates a screenshot of the active view"); - sPixmap = "camera-photo"; + sPixmap = "Std_ViewScreenShot"; eType = Alter3DView; } diff --git a/src/Gui/Icons/Std_ViewScreenShot.svg b/src/Gui/Icons/Std_ViewScreenShot.svg index dc1a00612c..600cb808dc 100644 --- a/src/Gui/Icons/Std_ViewScreenShot.svg +++ b/src/Gui/Icons/Std_ViewScreenShot.svg @@ -1,372 +1,696 @@ - + image/svg+xmlGeneric ImageJakub Steinerimagepicturesnapshotphoto + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file + x1="342.33884" + y1="504.50803" + x2="633.7428" + y2="619.53943" + gradientTransform="translate(0,-5.3104642)" /> + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + camera + photo + SLR + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Gui/Icons/camera-photo.svg b/src/Gui/Icons/camera-photo.svg deleted file mode 100644 index 600cb808dc..0000000000 --- a/src/Gui/Icons/camera-photo.svg +++ /dev/null @@ -1,696 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - camera - photo - SLR - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc index 1d4e6e059c..fad9ea8dae 100644 --- a/src/Gui/Icons/resource.qrc +++ b/src/Gui/Icons/resource.qrc @@ -102,7 +102,6 @@ preferences-system.svg process-stop.svg window-new.svg - camera-photo.svg applications-accessories.svg applications-python.svg accessories-text-editor.svg @@ -283,9 +282,6 @@ index.theme - - Std_ViewScreenShot.svg - ../../Doc/CONTRIBUTORS ../../../PRIVACY_POLICY.md