From 7be0d72587343745a4a41871f13efb3b394d5548 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 12 Apr 2024 11:16:58 +0600 Subject: [PATCH 1/2] Added icons --- Makefile | 23 +-- ...blinux.libublsettingsui-gtk3.important.svg | 55 ------ gresource.xml | 2 - ...inux.libublsettingsui-gtk3.CC-symbolic.svg | 1 + ....libublsettingsui-gtk3.accept-symbolic.svg | 0 ...ingsui-gtk3.arrows-left-right-symbolic.svg | 1 + ....libublsettingsui-gtk3.avatar-symbolic.svg | 3 + ...ux.libublsettingsui-gtk3.back-symbolic.svg | 47 +++++ ...ibublsettingsui-gtk3.calendar-symbolic.svg | 47 +++++ ....libublsettingsui-gtk3.cancel-symbolic.svg | 0 ...tingsui-gtk3.cancel-uncolored-symbolic.svg | 1 + ...ettingsui-gtk3.cloud-arrow-up-symbolic.svg | 1 + ...ibublsettingsui-gtk3.database-symbolic.svg | 1 + ...ibublsettingsui-gtk3.decrease-symbolic.svg | 40 +++++ ....libublsettingsui-gtk3.dialog-symbolic.svg | 1 + ...ux.libublsettingsui-gtk3.dots-symbolic.svg | 1 + ...bublsettingsui-gtk3.flag-empy-symbolic.svg | 1 + ...blsettingsui-gtk3.flag-finish-symbolic.svg | 1 + ...ux.libublsettingsui-gtk3.flag-symbolic.svg | 1 + ...ux.libublsettingsui-gtk3.fork-symbolic.svg | 1 + ....libublsettingsui-gtk3.funnel-symbolic.svg | 45 +++++ ...x.libublsettingsui-gtk3.group-symbolic.svg | 47 +++++ ...ibublsettingsui-gtk3.increase-symbolic.svg | 40 +++++ ...nux.libublsettingsui-gtk3.key-symbolic.svg | 60 +++++++ ...ux.libublsettingsui-gtk3.list-symbolic.svg | 1 + ...ux.libublsettingsui-gtk3.lock-symbolic.svg | 1 + ....libublsettingsui-gtk3.lookup-symbolic.svg | 1 + ...ux.libublsettingsui-gtk3.menu-symbolic.svg | 1 + ...inux.libublsettingsui-gtk3.ok-symbolic.svg | 4 + ...ux.libublsettingsui-gtk3.play-symbolic.svg | 1 + ...tingsui-gtk3.profile-settings-symbolic.svg | 53 ++++++ ...ublsettingsui-gtk3.properties-symbolic.svg | 1 + ...x.libublsettingsui-gtk3.reset-symbolic.svg | 39 +++++ ...ux.libublsettingsui-gtk3.save-symbolic.svg | 1 + ...ibublsettingsui-gtk3.settings-symbolic.svg | 1 + ...ux.libublsettingsui-gtk3.sort-symbolic.svg | 1 + ....libublsettingsui-gtk3.source-symbolic.svg | 1 + ...ux.libublsettingsui-gtk3.stop-symbolic.svg | 1 + ...ux.libublsettingsui-gtk3.sync-symbolic.svg | 8 + ...bublsettingsui-gtk3.sync-time-symbolic.svg | 1 + ...x.libublsettingsui-gtk3.trash-symbolic.svg | 1 + ...ux.libublsettingsui-gtk3.view-symbolic.svg | 1 + ...ux.libublsettingsui-gtk3.zoom-symbolic.svg | 160 ++++++++++++++++++ ....libublsettingsui-gtk3.folder-symbolic.svg | 1 + ....ublinux.libublsettingsui-gtk3.checked.svg | 0 ...ettingsui-gtk3.config-changes-symbolic.svg | 0 ...settingsui-gtk3.config-module-symbolic.svg | 0 ...-gtk3.config-sandbox-hdd-home-symbolic.svg | 0 ...ngsui-gtk3.config-sandbox-hdd-symbolic.svg | 0 ...-gtk3.config-sandbox-ram-home-symbolic.svg | 0 ...ettingsui-gtk3.config-sandbox-symbolic.svg | 0 ...bublsettingsui-gtk3.important-symbolic.svg | 1 + ...libublsettingsui-gtk3.warning-symbolic.svg | 1 + ....ublinux.libublsettingsui-gtk3.warning.svg | 0 54 files changed, 633 insertions(+), 68 deletions(-) delete mode 100644 com.ublinux.libublsettingsui-gtk3.important.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.CC-symbolic.svg rename com.ublinux.libublsettingsui-gtk3.accept-symbolic.svg => icons/actions/com.ublinux.libublsettingsui-gtk3.accept-symbolic.svg (100%) create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.arrows-left-right-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.avatar-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.back-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.calendar-symbolic.svg rename com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg => icons/actions/com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg (100%) create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.cancel-uncolored-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.cloud-arrow-up-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.database-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.decrease-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.dialog-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.dots-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.flag-empy-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.flag-finish-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.flag-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.fork-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.funnel-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.group-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.increase-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.key-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.list-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.lock-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.lookup-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.menu-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.ok-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.play-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.profile-settings-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.properties-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.reset-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.save-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.settings-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.sort-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.source-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.stop-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.sync-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.sync-time-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.trash-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.view-symbolic.svg create mode 100644 icons/actions/com.ublinux.libublsettingsui-gtk3.zoom-symbolic.svg create mode 100644 icons/places/com.ublinux.libublsettingsui-gtk3.folder-symbolic.svg rename com.ublinux.libublsettingsui-gtk3.checked.svg => icons/status/com.ublinux.libublsettingsui-gtk3.checked.svg (100%) rename com.ublinux.libublsettingsui-gtk3.config-changes-symbolic.svg => icons/status/com.ublinux.libublsettingsui-gtk3.config-changes-symbolic.svg (100%) rename com.ublinux.libublsettingsui-gtk3.config-module-symbolic.svg => icons/status/com.ublinux.libublsettingsui-gtk3.config-module-symbolic.svg (100%) rename com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-home-symbolic.svg => icons/status/com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-home-symbolic.svg (100%) rename com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-symbolic.svg => icons/status/com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-symbolic.svg (100%) rename com.ublinux.libublsettingsui-gtk3.config-sandbox-ram-home-symbolic.svg => icons/status/com.ublinux.libublsettingsui-gtk3.config-sandbox-ram-home-symbolic.svg (100%) rename com.ublinux.libublsettingsui-gtk3.config-sandbox-symbolic.svg => icons/status/com.ublinux.libublsettingsui-gtk3.config-sandbox-symbolic.svg (100%) create mode 100644 icons/status/com.ublinux.libublsettingsui-gtk3.important-symbolic.svg create mode 100644 icons/status/com.ublinux.libublsettingsui-gtk3.warning-symbolic.svg rename com.ublinux.libublsettingsui-gtk3.warning.svg => icons/status/com.ublinux.libublsettingsui-gtk3.warning.svg (100%) diff --git a/Makefile b/Makefile index 2aa17b3..5ece831 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,10 @@ PKGNAME = $(MAKEFILE_DIR) FILE_VER = source/CMakeLists.txt PKGIDENT=$(subst /,-,${PREFIX}) +ICONS_DIR = icons/ +ICONS_DEST = /usr/share/icons/hicolor/scalable/ +ICONS := $(shell find $(ICONS_DIR) -name "*.svg") + default_target: all .PHONY: all init depend debug prepare check build uninstall install clean help @@ -93,6 +97,10 @@ uninstall: $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \ done; \ done + @for icon in $(ICONS); do \ + dest=$$(echo $$icon | sed 's|$(ICONS_DIR)|$(ICONS_DEST)|g'); \ + $(RM) $$dest; \ + done @$(RM) "${DESTDIR}${PREFIX}/lib/${PKGNAME}".so* @$(RM) "${DESTDIR}${PREFIX}/include/${PKGNAME}".h* @if [ -z ${DESTDIR} ]; then \ @@ -119,17 +127,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" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.important.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-changes-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-module-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-sandbox-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-sandbox-ram-home-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-sandbox-hdd-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-sandbox-hdd-home-symbolic.svg" + @for icon in $(ICONS); do \ + dest=$$(echo $$icon | sed 's|$(ICONS_DIR)|$(ICONS_DEST)|g'|cut -d'/' -f1-7); \ + install -Dm644 -t $$dest/ $$icon; \ + done @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ diff --git a/com.ublinux.libublsettingsui-gtk3.important.svg b/com.ublinux.libublsettingsui-gtk3.important.svg deleted file mode 100644 index ff8d4b3..0000000 --- a/com.ublinux.libublsettingsui-gtk3.important.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/gresource.xml b/gresource.xml index 5ca4637..5a3a1a3 100644 --- a/gresource.xml +++ b/gresource.xml @@ -12,7 +12,5 @@ libublsettingsui-gtk3-banner.png - com.ublinux.libublsettingsui-gtk3.checked.svg - com.ublinux.libublsettingsui-gtk3.warning.svg \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.CC-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.CC-symbolic.svg new file mode 100644 index 0000000..08ac435 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.CC-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com.ublinux.libublsettingsui-gtk3.accept-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.accept-symbolic.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.accept-symbolic.svg rename to icons/actions/com.ublinux.libublsettingsui-gtk3.accept-symbolic.svg diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.arrows-left-right-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.arrows-left-right-symbolic.svg new file mode 100644 index 0000000..417cf03 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.arrows-left-right-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.avatar-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.avatar-symbolic.svg new file mode 100644 index 0000000..ec0905d --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.avatar-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.back-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.back-symbolic.svg new file mode 100644 index 0000000..3e0225a --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.back-symbolic.svg @@ -0,0 +1,47 @@ + + + + + + + + + diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.calendar-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.calendar-symbolic.svg new file mode 100644 index 0000000..78715dc --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.calendar-symbolic.svg @@ -0,0 +1,47 @@ + + + + + + + + + + diff --git a/com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg rename to icons/actions/com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.cancel-uncolored-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.cancel-uncolored-symbolic.svg new file mode 100644 index 0000000..cd84b0e --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.cancel-uncolored-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.cloud-arrow-up-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.cloud-arrow-up-symbolic.svg new file mode 100644 index 0000000..da555b9 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.cloud-arrow-up-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.database-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.database-symbolic.svg new file mode 100644 index 0000000..2218f6a --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.database-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.decrease-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.decrease-symbolic.svg new file mode 100644 index 0000000..1413e10 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.decrease-symbolic.svg @@ -0,0 +1,40 @@ + + + + + + diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.dialog-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.dialog-symbolic.svg new file mode 100644 index 0000000..3d21313 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.dialog-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.dots-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.dots-symbolic.svg new file mode 100644 index 0000000..1f56c8a --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.dots-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.flag-empy-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.flag-empy-symbolic.svg new file mode 100644 index 0000000..c55bf8e --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.flag-empy-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.flag-finish-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.flag-finish-symbolic.svg new file mode 100644 index 0000000..356b2c6 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.flag-finish-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.flag-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.flag-symbolic.svg new file mode 100644 index 0000000..5d9f3a3 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.flag-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.fork-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.fork-symbolic.svg new file mode 100644 index 0000000..bf05260 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.fork-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.funnel-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.funnel-symbolic.svg new file mode 100644 index 0000000..4aec04a --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.funnel-symbolic.svg @@ -0,0 +1,45 @@ + + + + + + + + + + diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.group-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.group-symbolic.svg new file mode 100644 index 0000000..7cd4139 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.group-symbolic.svg @@ -0,0 +1,47 @@ + + + + + + + + + + diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.increase-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.increase-symbolic.svg new file mode 100644 index 0000000..800b264 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.increase-symbolic.svg @@ -0,0 +1,40 @@ + + + + + + diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.key-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.key-symbolic.svg new file mode 100644 index 0000000..a11cbf1 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.key-symbolic.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.list-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.list-symbolic.svg new file mode 100644 index 0000000..6454053 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.list-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.lock-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.lock-symbolic.svg new file mode 100644 index 0000000..a481870 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.lock-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.lookup-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.lookup-symbolic.svg new file mode 100644 index 0000000..163827f --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.lookup-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.menu-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.menu-symbolic.svg new file mode 100644 index 0000000..f8e628f --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.menu-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.ok-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.ok-symbolic.svg new file mode 100644 index 0000000..79e0fdc --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.ok-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.play-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.play-symbolic.svg new file mode 100644 index 0000000..146bda8 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.play-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.profile-settings-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.profile-settings-symbolic.svg new file mode 100644 index 0000000..1879618 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.profile-settings-symbolic.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.properties-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.properties-symbolic.svg new file mode 100644 index 0000000..93afc13 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.properties-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.reset-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.reset-symbolic.svg new file mode 100644 index 0000000..e6b0263 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.reset-symbolic.svg @@ -0,0 +1,39 @@ + + + + + + + diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.save-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.save-symbolic.svg new file mode 100644 index 0000000..69b2ef5 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.save-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.settings-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.settings-symbolic.svg new file mode 100644 index 0000000..67d3487 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.settings-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.sort-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.sort-symbolic.svg new file mode 100644 index 0000000..0e4bd61 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.sort-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.source-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.source-symbolic.svg new file mode 100644 index 0000000..b509606 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.source-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.stop-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.stop-symbolic.svg new file mode 100644 index 0000000..ef24159 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.stop-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.sync-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.sync-symbolic.svg new file mode 100644 index 0000000..e81e0f7 --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.sync-symbolic.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.sync-time-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.sync-time-symbolic.svg new file mode 100644 index 0000000..87adb7a --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.sync-time-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.trash-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.trash-symbolic.svg new file mode 100644 index 0000000..734827e --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.trash-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.view-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.view-symbolic.svg new file mode 100644 index 0000000..8e6a1ed --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.view-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/actions/com.ublinux.libublsettingsui-gtk3.zoom-symbolic.svg b/icons/actions/com.ublinux.libublsettingsui-gtk3.zoom-symbolic.svg new file mode 100644 index 0000000..c5011ec --- /dev/null +++ b/icons/actions/com.ublinux.libublsettingsui-gtk3.zoom-symbolic.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/icons/places/com.ublinux.libublsettingsui-gtk3.folder-symbolic.svg b/icons/places/com.ublinux.libublsettingsui-gtk3.folder-symbolic.svg new file mode 100644 index 0000000..cd44e48 --- /dev/null +++ b/icons/places/com.ublinux.libublsettingsui-gtk3.folder-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com.ublinux.libublsettingsui-gtk3.checked.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.checked.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.checked.svg rename to icons/status/com.ublinux.libublsettingsui-gtk3.checked.svg diff --git a/com.ublinux.libublsettingsui-gtk3.config-changes-symbolic.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.config-changes-symbolic.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.config-changes-symbolic.svg rename to icons/status/com.ublinux.libublsettingsui-gtk3.config-changes-symbolic.svg diff --git a/com.ublinux.libublsettingsui-gtk3.config-module-symbolic.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.config-module-symbolic.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.config-module-symbolic.svg rename to icons/status/com.ublinux.libublsettingsui-gtk3.config-module-symbolic.svg diff --git a/com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-home-symbolic.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-home-symbolic.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-home-symbolic.svg rename to icons/status/com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-home-symbolic.svg diff --git a/com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-symbolic.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-symbolic.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-symbolic.svg rename to icons/status/com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-symbolic.svg diff --git a/com.ublinux.libublsettingsui-gtk3.config-sandbox-ram-home-symbolic.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.config-sandbox-ram-home-symbolic.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.config-sandbox-ram-home-symbolic.svg rename to icons/status/com.ublinux.libublsettingsui-gtk3.config-sandbox-ram-home-symbolic.svg diff --git a/com.ublinux.libublsettingsui-gtk3.config-sandbox-symbolic.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.config-sandbox-symbolic.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.config-sandbox-symbolic.svg rename to icons/status/com.ublinux.libublsettingsui-gtk3.config-sandbox-symbolic.svg diff --git a/icons/status/com.ublinux.libublsettingsui-gtk3.important-symbolic.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.important-symbolic.svg new file mode 100644 index 0000000..1ba5b9e --- /dev/null +++ b/icons/status/com.ublinux.libublsettingsui-gtk3.important-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/status/com.ublinux.libublsettingsui-gtk3.warning-symbolic.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.warning-symbolic.svg new file mode 100644 index 0000000..cdebe7c --- /dev/null +++ b/icons/status/com.ublinux.libublsettingsui-gtk3.warning-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com.ublinux.libublsettingsui-gtk3.warning.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.warning.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.warning.svg rename to icons/status/com.ublinux.libublsettingsui-gtk3.warning.svg From 9994e9fd5c05883a17961f96b20c1865e6aa5f29 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 12 Apr 2024 18:07:47 +0600 Subject: [PATCH 2/2] Fixes --- libublsettingsui-gtk3.glade | 247 +++++++++++++++++++----------------- source/CMakeLists.txt | 10 +- 2 files changed, 138 insertions(+), 119 deletions(-) diff --git a/libublsettingsui-gtk3.glade b/libublsettingsui-gtk3.glade index 4eff111..892fd09 100644 --- a/libublsettingsui-gtk3.glade +++ b/libublsettingsui-gtk3.glade @@ -234,150 +234,163 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 600 com.ublinux.libublsettingsui-gtk3 - + True - False - vertical + True + in - + True False - vertical - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 25 - - - False - True - 0 - - - - - True - False - start - 5 - 5 - 5 - 5 - 6 - 6 - True - 0 - - - - - - - False - True - 1 - - - - - True - False - 5 - 5 - 5 - 5 - 25 - com.ublinux.libublsettingsui-gtk3.statemode-yellow-symbolic - 6 - - - False - True - end - 2 - - - - - False - True - 0 - - - - + True False vertical - - 81 + True False + vertical + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 25 + + + False + True + 0 + + + + + True + False + start + 5 + 5 + 5 + 5 + 6 + 6 + True + 0 + + + + + + + False + True + 1 + + + + + True + False + 5 + 5 + 5 + 5 + 25 + com.ublinux.libublsettingsui-gtk3.statemode-yellow-symbolic + 6 + + + False + True + end + 2 + + + + + False + True + 0 + + - + True False - start + vertical + + + 81 + True + False + + + True + False + start + + + -1 + + + + + False + True + 0 + + - -1 + False + True + 1 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + True + True + vertical + + + + + + False + True + 2 - False + True True 0 - - False - True - 1 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - True - True - vertical - - - - - - False - True - 2 - - - True - True - 0 - diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 94043ac..8fdee64 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -14,6 +14,11 @@ include_directories(${VTE291_INCLUDE_DIRS}) link_directories(${VTE291_LIBRARY_DIRS}) add_definitions(${VTE291_CFLAGS_OTHER}) +pkg_check_modules(POLKIT REQUIRED polkit-agent-1) +include_directories(${POLKIT_INCLUDE_DIRS}) +link_directories(${POLKIT_LIBRARY_DIRS}) +add_definitions(${POLKIT_CFLAGS_OTHER}) + find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) option(WEBKIT_FOUND "No" OFF) @@ -40,8 +45,6 @@ set(DEPENDFILES ../gresource.xml ../libublsettingsui-gtk3-banner.png ../libublsettingsui-gtk3.css - ../com.ublinux.libublsettingsui-gtk3.checked.svg - ../com.ublinux.libublsettingsui-gtk3.warning.svg ) file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) @@ -80,11 +83,14 @@ set(LIBRARIES ${GTK_LIBRARIES} ${WEBKIT_LIBRARIES} ${VTE291_LIBRARIES} + ${POLKIT_LIBRARIES} ublsettings ublsettings-gtk3 pthread) add_definitions(-DVTE_INCLUDE) +add_definitions(-DLIBUBLSETTINGSUI_VERSION=${VERSION}) +message(STATUS ${VERSION}) message(${CMAKE_INSTALL_LIBDIR}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_BINARY_DIR})