From 6cd39f829f5eeb28906901fe35a5ef2118b9d19d Mon Sep 17 00:00:00 2001
From: two <two@envs.net>
Date: Tue, 22 Nov 2022 20:50:49 +0000
Subject: [PATCH] status/system: Use a better icon in screenshot button

The screenshot button could be mistaken for one that opens a
program for taking photos and videos. Change it to one that
is less ambiguous.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5993

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2553>
---
 data/gnome-shell-icons.gresource.xml                   | 5 +++--
 data/icons/scalable/actions/screenshooter-symbolic.svg | 9 +++++++++
 js/ui/status/system.js                                 | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 data/icons/scalable/actions/screenshooter-symbolic.svg

diff --git a/data/gnome-shell-icons.gresource.xml b/data/gnome-shell-icons.gresource.xml
index 9b4e6f361..d808c9be6 100644
--- a/data/gnome-shell-icons.gresource.xml
+++ b/data/gnome-shell-icons.gresource.xml
@@ -10,12 +10,13 @@
     <file>scalable/actions/pointer-primary-click-symbolic.svg</file>
     <file>scalable/actions/pointer-secondary-click-symbolic.svg</file>
     <file>scalable/actions/preview-close-symbolic.svg</file>
+    <file>scalable/actions/record-screen-symbolic.svg</file>
+    <file>scalable/actions/screencast-recorded-symbolic.svg</file>
+    <file>scalable/actions/screenshooter-symbolic.svg</file>
     <file>scalable/actions/screenshot-ui-area-symbolic.svg</file>
     <file>scalable/actions/screenshot-ui-display-symbolic.svg</file>
     <file>scalable/actions/screenshot-ui-show-pointer-symbolic.svg</file>
     <file>scalable/actions/screenshot-ui-window-symbolic.svg</file>
-    <file>scalable/actions/record-screen-symbolic.svg</file>
-    <file>scalable/actions/screencast-recorded-symbolic.svg</file>
     <file>scalable/actions/screenshot-recorded-symbolic.svg</file>
     <file>scalable/status/keyboard-caps-lock-symbolic.svg</file>
     <file>scalable/status/keyboard-enter-symbolic.svg</file>
diff --git a/data/icons/scalable/actions/screenshooter-symbolic.svg b/data/icons/scalable/actions/screenshooter-symbolic.svg
new file mode 100644
index 000000000..3fa5eb207
--- /dev/null
+++ b/data/icons/scalable/actions/screenshooter-symbolic.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#222222">
+        <path d="m 10.042969 6 c -0.566407 0 -1.019531 0.425781 -1.039063 0.964844 h -0.992187 c -1.113281 0 -2.011719 0.898437 -2.011719 2.011718 v 4.011719 c 0 1.113281 0.898438 2.011719 2.011719 2.011719 h 5.976562 c 1.113281 0 2.011719 -0.898438 2.011719 -2.011719 v -4.011719 c 0 -1.113281 -0.898438 -2.011718 -2.011719 -2.011718 h -0.988281 c -0.019531 -0.539063 -0.476562 -0.964844 -1.042969 -0.964844 z m 0.957031 3 c 1.105469 0 2 0.894531 2 2 s -0.894531 2 -2 2 s -2 -0.894531 -2 -2 s 0.894531 -2 2 -2 z m 0 0"/>
+        <path d="m 3.007812 11.984375 h -0.316406 c -1.507812 0 -2.722656 -1.210937 -2.722656 -2.722656 v -0.269531 c 0 -0.550782 0.445312 -1 1 -1 c 0.550781 0 1 0.449218 1 1 v 0.269531 c 0 0.394531 0.328125 0.722656 0.722656 0.722656 h 0.316406 c 0.550782 0 1 0.449219 1 1 c 0 0.554687 -0.449218 1 -1 1 z m 0 0"/>
+        <path d="m 14 3.039062 v -0.316406 c 0 -0.394531 -0.328125 -0.722656 -0.722656 -0.722656 h -0.269532 c -0.554687 0 -1 -0.449219 -1 -1 s 0.445313 -1 1 -1 h 0.269532 c 1.507812 0 2.722656 1.214844 2.722656 2.722656 v 0.316406 c 0 0.554688 -0.449219 1 -1 1 s -1 -0.445312 -1 -1 z m 0 0"/>
+        <path d="m 0 3.039062 v -0.316406 c 0 -1.507812 1.214844 -2.722656 2.722656 -2.722656 h 0.269532 c 0.554687 0 1 0.449219 1 1 s -0.445313 1 -1 1 h -0.269532 c -0.394531 0 -0.722656 0.328125 -0.722656 0.722656 v 0.316406 c 0 0.554688 -0.449219 1 -1 1 s -1 -0.445312 -1 -1 z m 0 0"/>
+    </g>
+</svg>
diff --git a/js/ui/status/system.js b/js/ui/status/system.js
index 308f4772a..25521125f 100644
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -100,7 +100,7 @@ class ScreenshotItem extends QuickSettingsItem {
         super._init({
             style_class: 'icon-button',
             can_focus: true,
-            icon_name: 'camera-photo-symbolic',
+            icon_name: 'screenshooter-symbolic',
             visible: !Main.sessionMode.isGreeter,
             accessible_name: _('Take Screenshot'),
         });