From 4fa7cd454bb2e28a67d5140e44c002d763be236c Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 9 Jan 2024 14:09:34 +0600
Subject: [PATCH] Added accept and cancel icons

---
 Makefile                                      |  4 ++
 ....libublsettingsui-gtk3.accept-symbolic.svg |  4 ++
 ....libublsettingsui-gtk3.cancel-symbolic.svg | 50 +++++++++++++++++++
 libublsettingsui-gtk3-saving.glade            |  4 +-
 source/CMakeLists.txt                         |  1 +
 5 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 com.ublinux.libublsettingsui-gtk3.accept-symbolic.svg
 create mode 100644 com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg

diff --git a/Makefile b/Makefile
index b21e3ae..cb37ba2 100644
--- a/Makefile
+++ b/Makefile
@@ -119,6 +119,10 @@ install: check
 		rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
 	done
 	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
+	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.accept-symbolic.svg"
+	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.cancel-symbolic.svg"
+	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
+	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
 	@if [ -z ${DESTDIR} ]; then \
 	    [ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
diff --git a/com.ublinux.libublsettingsui-gtk3.accept-symbolic.svg b/com.ublinux.libublsettingsui-gtk3.accept-symbolic.svg
new file mode 100644
index 0000000..79e0fdc
--- /dev/null
+++ b/com.ublinux.libublsettingsui-gtk3.accept-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 15 3.484375 l -1 -1 l -7.46875 7.515625 l -3.414062 -3.476562 l -2 2 l 5.414062 5.476562 l 9.46875 -9.515625 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg b/com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg
new file mode 100644
index 0000000..c045b0b
--- /dev/null
+++ b/com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="3.175mm"
+   height="3.175mm"
+   viewBox="0 0 3.175 3.175"
+   version="1.1"
+   id="svg36"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
+   sodipodi:docname="com.ublinux.ubl-settings-usergroups.cancel-symbolic.svg"
+   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">
+  <sodipodi:namedview
+     id="namedview38"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="29.309298"
+     inkscape:cx="17.74181"
+     inkscape:cy="7.3867343"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs33" />
+  <g
+     inkscape:label="Слой 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-75.62433,-104.22131)">
+    <path
+       style="fill:#d40000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       d="m 77.21183,104.22131 c -0.8763,0 -1.5875,0.7112 -1.5875,1.5875 0,0.8763 0.7112,1.5875 1.5875,1.5875 0.8763,0 1.5875,-0.7112 1.5875,-1.5875 0,-0.8763 -0.7112,-1.5875 -1.5875,-1.5875 z m 0,0.56696 c 0.563335,0 1.020535,0.4572 1.020535,1.02054 0,0.15224 -0.03405,0.2963 -0.0939,0.42611 l -1.353627,-1.35275 c 0.129997,-0.0601 0.274468,-0.0939 0.426995,-0.0939 z m -0.91423,0.56874 1.366915,1.36603 c -0.136513,0.0678 -0.290022,0.1063 -0.452685,0.1063 -0.563336,0 -1.020536,-0.4572 -1.020536,-1.02053 0,-0.16238 0.03874,-0.31547 0.106306,-0.4518 z"
+       id="Symbol"
+       inkscape:label="#path2424"
+       class="error"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/libublsettingsui-gtk3-saving.glade b/libublsettingsui-gtk3-saving.glade
index 3c5a65e..cd08459 100644
--- a/libublsettingsui-gtk3-saving.glade
+++ b/libublsettingsui-gtk3-saving.glade
@@ -13,12 +13,12 @@
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="icon-name">process-stop-symbolic</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.cancel-symbolic</property>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="icon-name">emblem-ok-symbolic</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.accept-symbolic</property>
   </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index a985bc6..6d9cd96 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -64,6 +64,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin
         -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection")
 
+
 add_library(${PROJECT_NAME} SHARED
         libublsettingsui-gtk3.c
         libublsettingsui-gtk3.h