diff --git a/Makefile b/Makefile index 7b6ebf9..320fafa 100644 --- a/Makefile +++ b/Makefile @@ -118,6 +118,13 @@ install: check uninstall install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ 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 + @for FILE_ICON in $(wildcard icons/*/*.svg); do \ + SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \ + install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/$${SUB_NAME}" $${FILE_ICON}; \ + done + @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" + @cp ./com.ublinux.${PKGNAME}.policy ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy + @sed -e 's+/usr/bin+${PREFIX}/bin+' -e 's+.run+${PKGIDENT}.run+g' ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy -i @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" diff --git a/icons/com.ublinux.ubl-settings-logging.generic3-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-logging.generic3-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-logging.generic3-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-logging.generic3-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-logging.back-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.back-symbolic.svg deleted file mode 100644 index 3e0225a..0000000 --- a/icons/com.ublinux.ubl-settings-logging.back-symbolic.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - diff --git a/icons/com.ublinux.ubl-settings-logging.check-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.check-symbolic.svg deleted file mode 100644 index 5d9f3a3..0000000 --- a/icons/com.ublinux.ubl-settings-logging.check-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.decrease-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.decrease-symbolic.svg deleted file mode 100644 index 1413e10..0000000 --- a/icons/com.ublinux.ubl-settings-logging.decrease-symbolic.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - diff --git a/icons/com.ublinux.ubl-settings-logging.edit-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.edit-symbolic.svg deleted file mode 100644 index baba3f9..0000000 --- a/icons/com.ublinux.ubl-settings-logging.edit-symbolic.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/icons/com.ublinux.ubl-settings-logging.funnel-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.funnel-symbolic.svg deleted file mode 100644 index 4aec04a..0000000 --- a/icons/com.ublinux.ubl-settings-logging.funnel-symbolic.svg +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - diff --git a/icons/com.ublinux.ubl-settings-logging.generic1-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.generic1-symbolic.svg deleted file mode 100644 index 356b2c6..0000000 --- a/icons/com.ublinux.ubl-settings-logging.generic1-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.generic2-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.generic2-symbolic.svg deleted file mode 100644 index 3d21313..0000000 --- a/icons/com.ublinux.ubl-settings-logging.generic2-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.generic4-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.generic4-symbolic.svg deleted file mode 100644 index cdebe7c..0000000 --- a/icons/com.ublinux.ubl-settings-logging.generic4-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.generic5-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.generic5-symbolic.svg deleted file mode 100644 index 1f56c8a..0000000 --- a/icons/com.ublinux.ubl-settings-logging.generic5-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.generic6-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.generic6-symbolic.svg deleted file mode 100644 index 6454053..0000000 --- a/icons/com.ublinux.ubl-settings-logging.generic6-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.generic7-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.generic7-symbolic.svg deleted file mode 100644 index bf05260..0000000 --- a/icons/com.ublinux.ubl-settings-logging.generic7-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.increase-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.increase-symbolic.svg deleted file mode 100644 index 800b264..0000000 --- a/icons/com.ublinux.ubl-settings-logging.increase-symbolic.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - diff --git a/icons/com.ublinux.ubl-settings-logging.play-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.play-symbolic.svg deleted file mode 100644 index 146bda8..0000000 --- a/icons/com.ublinux.ubl-settings-logging.play-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.profile-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.profile-symbolic.svg deleted file mode 100644 index 4bc7b0c..0000000 --- a/icons/com.ublinux.ubl-settings-logging.profile-symbolic.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - diff --git a/icons/com.ublinux.ubl-settings-logging.reset-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.reset-symbolic.svg deleted file mode 100644 index e6b0263..0000000 --- a/icons/com.ublinux.ubl-settings-logging.reset-symbolic.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - diff --git a/icons/com.ublinux.ubl-settings-logging.settings-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.settings-symbolic.svg deleted file mode 100644 index 67d3487..0000000 --- a/icons/com.ublinux.ubl-settings-logging.settings-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.sort-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.sort-symbolic.svg deleted file mode 100644 index 0e4bd61..0000000 --- a/icons/com.ublinux.ubl-settings-logging.sort-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.stop-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.stop-symbolic.svg deleted file mode 100644 index ef24159..0000000 --- a/icons/com.ublinux.ubl-settings-logging.stop-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.sync-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.sync-symbolic.svg deleted file mode 100644 index 13651dd..0000000 --- a/icons/com.ublinux.ubl-settings-logging.sync-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.trash-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.trash-symbolic.svg deleted file mode 100644 index 03ca715..0000000 --- a/icons/com.ublinux.ubl-settings-logging.trash-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.uncheck-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.uncheck-symbolic.svg deleted file mode 100644 index c55bf8e..0000000 --- a/icons/com.ublinux.ubl-settings-logging.uncheck-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.view-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.view-symbolic.svg deleted file mode 100644 index 8e6a1ed..0000000 --- a/icons/com.ublinux.ubl-settings-logging.view-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-logging.zoom-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.zoom-symbolic.svg deleted file mode 100644 index c5011ec..0000000 --- a/icons/com.ublinux.ubl-settings-logging.zoom-symbolic.svg +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/icons/com.ublinux.ubl-settings-logging.checked.svg b/icons/status/com.ublinux.ubl-settings-logging.checked.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-logging.checked.svg rename to icons/status/com.ublinux.ubl-settings-logging.checked.svg diff --git a/icons/com.ublinux.ubl-settings-logging.warning.svg b/icons/status/com.ublinux.ubl-settings-logging.warning.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-logging.warning.svg rename to icons/status/com.ublinux.ubl-settings-logging.warning.svg diff --git a/source/ubl-settings-logging.h b/source/ubl-settings-logging.h index 1cbf9bf..8408391 100644 --- a/source/ubl-settings-logging.h +++ b/source/ubl-settings-logging.h @@ -79,17 +79,17 @@ #define group_list_path "/etc/group" -#define edit_icon_name "document-edit-symbolic" -#define add_icon_name "com.ublinux.ubl-settings-logging.increase-symbolic" +#define edit_icon_name "com.ublinux.libublsettings-ui.edit-symbolic" +#define add_icon_name "com.ublinux.libublsettingsui-gtk3.increase-symbolic" #define remove_icon_name "com.ublinux.libublsettingsui-gtk3.trash-symbolic" -#define minus_icon_name "com.ublinux.ubl-settings-logging.decrease-symbolic" - -#define import_icon_name "com.ublinux.ubl-settings-logging.back-symbolic" -#define settings_icon_name "com.ublinux.ubl-settings-logging.settings-symbolic" -#define start_icon_name "com.ublinux.ubl-settings-logging.play-symbolic" -#define stop_icon_name "com.ublinux.ubl-settings-logging.stop-symbolic" -#define enable_icon_name "com.ublinux.ubl-settings-logging.check-symbolic" -#define disable_icon_name "com.ublinux.ubl-settings-logging.uncheck-symbolic" +#define minus_icon_name "com.ublinux.libublsettingsui-gtk3.decrease-symbolic" + +#define import_icon_name "com.ublinux.libublsettingsui-gtk3.back-symbolic" +#define settings_icon_name "com.ublinux.libublsettingsui-gtk3.settings-symbolic" +#define start_icon_name "com.ublinux.libublsettingsui-gtk3.play-symbolic" +#define stop_icon_name "com.ublinux.libublsettingsui-gtk3.stop-symbolic" +#define enable_icon_name "com.ublinux.libublsettingsui-gtk3.flag-symbolic" +#define disable_icon_name "com.ublinux.libublsettingsui-gtk3.flag-empy-symbolic" #define check_command_is_legit(command) !system(yon_char_unite("bash -c \"set -u; command -v ",command,"\"",NULL)) diff --git a/ubl-settings-logging-add-path.glade b/ubl-settings-logging-add-path.glade index 80f6586..878e47a 100644 --- a/ubl-settings-logging-add-path.glade +++ b/ubl-settings-logging-add-path.glade @@ -5,17 +5,17 @@ True False - com.ublinux.ubl-settings-logging.increase-symbolic + com.ublinux.libublsettingsui-gtk3.increase-symbolic True False - com.ublinux.ubl-settings-logging.zoom-symbolic + com.ublinux.libublsettingsui-gtk3.zoom-symbolic True False - com.ublinux.ubl-settings-logging.decrease-symbolic + com.ublinux.libublsettingsui-gtk3.decrease-symbolic True diff --git a/ubl-settings-logging-add.glade b/ubl-settings-logging-add.glade index d6c5e32..f0c53c3 100644 --- a/ubl-settings-logging-add.glade +++ b/ubl-settings-logging-add.glade @@ -31,22 +31,22 @@ True False - com.ublinux.ubl-settings-logging.sort-symbolic + com.ublinux.libublsettingsui-gtk3.sort-symbolic True False - com.ublinux.ubl-settings-logging.sort-symbolic + com.ublinux.libublsettingsui-gtk3.sort-symbolic True False - com.ublinux.ubl-settings-logging.sort-symbolic + com.ublinux.libublsettingsui-gtk3.sort-symbolic True False - com.ublinux.ubl-settings-logging.sort-symbolic + com.ublinux.libublsettingsui-gtk3.sort-symbolic 450 diff --git a/ubl-settings-logging-inspector.glade b/ubl-settings-logging-inspector.glade index 9232a8b..ea64411 100644 --- a/ubl-settings-logging-inspector.glade +++ b/ubl-settings-logging-inspector.glade @@ -16,12 +16,12 @@ True False - com.ublinux.ubl-settings-logging.generic1-symbolic + com.ublinux.libublsettingsui-gtk3.flag-finish-symbolic True False - com.ublinux.ubl-settings-logging.generic2-symbolic + com.ublinux.libublsettingsui-gtk3.dialog-symbolic True @@ -31,27 +31,27 @@ True False - com.ublinux.ubl-settings-logging.generic4-symbolic + com.ublinux.libublsettingsui-gtk3.warning-symbolic True False - com.ublinux.ubl-settings-logging.sync-symbolic + com.ublinux.libublsettingsui-gtk3.sync-symbolic True False - com.ublinux.ubl-settings-logging.generic6-symbolic + com.ublinux.libublsettingsui-gtk3.list-symbolic True False - com.ublinux.ubl-settings-logging.generic5-symbolic + com.ublinux.libublsettingsui-gtk3.dots-symbolic True False - com.ublinux.ubl-settings-logging.generic7-symbolic + com.ublinux.libublsettingsui-gtk3.fork-symbolic diff --git a/ubl-settings-logging-journald.glade b/ubl-settings-logging-journald.glade index ddfbc81..1be68c3 100644 --- a/ubl-settings-logging-journald.glade +++ b/ubl-settings-logging-journald.glade @@ -67,7 +67,7 @@ True False - emblem-ok-symbolic + com.ublinux.libublsettingsui-gtk3.accept-symbolic True @@ -82,7 +82,7 @@ True False - com.ublinux.ubl-settings-logging.reset-symbolic + com.ublinux.libublsettingsui-gtk3.reset-symbolic 800 diff --git a/ubl-settings-logging-logrotate-table.glade b/ubl-settings-logging-logrotate-table.glade index 6dcbca0..a8b2084 100644 --- a/ubl-settings-logging-logrotate-table.glade +++ b/ubl-settings-logging-logrotate-table.glade @@ -27,27 +27,27 @@ True False - emblem-ok-symbolic + com.ublinux.libublsettingsui-gtk3.accept-symbolic True False - com.ublinux.ubl-settings-logging.settings-symbolic + com.ublinux.libublsettingsui-gtk3.settings-symbolic True False - com.ublinux.ubl-settings-logging.decrease-symbolic + com.ublinux.libublsettingsui-gtk3.decrease-symbolic True False - com.ublinux.ubl-settings-logging.increase-symbolic + com.ublinux.libublsettingsui-gtk3.increase-symbolic True False - com.ublinux.ubl-settings-logging.back-symbolic + com.ublinux.libublsettingsui-gtk3.back-symbolic 450 diff --git a/ubl-settings-logging-logrotate.glade b/ubl-settings-logging-logrotate.glade index c72d20c..8b731dc 100644 --- a/ubl-settings-logging-logrotate.glade +++ b/ubl-settings-logging-logrotate.glade @@ -57,27 +57,27 @@ True False - com.ublinux.ubl-settings-logging.edit-symbolic + com.ublinux.libublsettingsui-gtk3.edit-symbolic True False - com.ublinux.ubl-settings-logging.zoom-symbolic + com.ublinux.libublsettingsui-gtk3.zoom-symbolic True False - com.ublinux.ubl-settings-logging.profile-symbolic + com.ublinux.libublsettingsui-gtk3.avatar-symbolic True False - com.ublinux.ubl-settings-logging.decrease-symbolic + com.ublinux.libublsettingsui-gtk3.decrease-symbolic True False - com.ublinux.ubl-settings-logging.increase-symbolic + com.ublinux.libublsettingsui-gtk3.increase-symbolic True @@ -87,7 +87,7 @@ True False - emblem-ok-symbolic + com.ublinux.libublsettingsui-gtk3.accept-symbolic diff --git a/ubl-settings-logging-rules.glade b/ubl-settings-logging-rules.glade index 6bc1560..3aaee7c 100644 --- a/ubl-settings-logging-rules.glade +++ b/ubl-settings-logging-rules.glade @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ True False - emblem-ok-symbolic + com.ublinux.libublsettingsui-gtk3.accept-symbolic False @@ -28,32 +28,10 @@ False end - - Cancel - True - True - True - image1 - - - False - True - 0 - + - - Accept - True - True - True - image2 - - - False - True - 1 - + @@ -357,7 +335,6 @@ True False - True True @@ -387,6 +364,31 @@ com.ublinux.ubl-settings-logging + + + Cancel + True + True + True + image1 + + + 1 + + + + + Accept + True + True + True + image2 + + + end + 2 + + diff --git a/ubl-settings-logging.glade b/ubl-settings-logging.glade index b719f30..3d3ffbb 100644 --- a/ubl-settings-logging.glade +++ b/ubl-settings-logging.glade @@ -66,12 +66,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - com.ublinux.ubl-settings-logging.view-symbolic + com.ublinux.libublsettingsui-gtk3.view-symbolic True False - com.ublinux.ubl-settings-logging.settings-symbolic + com.ublinux.libublsettingsui-gtk3.settings-symbolic True @@ -81,7 +81,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - com.ublinux.ubl-settings-logging.trash-symbolic + com.ublinux.libublsettingsui-gtk3.trash-symbolic True @@ -91,7 +91,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - com.ublinux.ubl-settings-logging.settings-symbolic + com.ublinux.libublsettingsui-gtk3.settings-symbolic @@ -256,11 +256,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True fixed 130 - 50 Path end + 30 100