diff --git a/Makefile b/Makefile index 5dcd1b2..21263cf 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,6 @@ DEPENDS = /bin/cmake PREFIX ?= /usr/local PKGNAME = $(MAKEFILE_DIR) FILE_VER = source/${PKGNAME}.h -PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX})) default_target: all @@ -22,9 +21,9 @@ all: init build init: @echo "Initialize ..."; \ - if [ -d ".git" ]; then \ + if [[ -d ".git" ]]; then \ LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \ - if [ -z "$${LATEST_TAG}" ]; \ + if [[ -z "$${LATEST_TAG}" ]]; \ then \ LATEST_TAG=$$"0.0"; \ echo "$${LATEST_TAG} is empty"; \ @@ -38,7 +37,7 @@ init: depend: @echo "Check depends ..." @for FILE_DEPEND in $(DEPENDS); do \ - if [ ! -f $${FILE_DEPEND} ]; then \ + if [[ ! -f "$${FILE_DEPEND}" ]]; then \ echo "ERROR: Depend '$${FILE_DEPEND}' not found !"; \ exit 1; \ fi; \ @@ -48,21 +47,21 @@ depend: debug: @echo "Debug ..." - if [ ! -d ${CMAKE_BUILD_DIR} ]; then \ + if [[ ! -d "${CMAKE_BUILD_DIR}" ]]; then \ $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \ fi; \ echo "Debug: OK" prepare: @echo "Prepare ..."; \ - if [ ! -d ${CMAKE_BUILD_DIR} ]; then \ + if [[ ! -d "${CMAKE_BUILD_DIR}" ]]; then \ $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \ fi; \ echo "Prepare: OK" check: @echo "Check ..."; \ - if [ -f ${CMAKE_BUILD_DIR}/${PKGNAME} ]; then \ + if [[ -f "${CMAKE_BUILD_DIR}/${PKGNAME}" ]]; then \ echo "Check: OK"; \ else \ echo "Check: ${CMAKE_BUILD_DIR}/${PKGNAME} not found !"; \ @@ -77,10 +76,9 @@ build: depend prepare uninstall: @echo "Uninstall ..." - @for FILE_PO in $(wildcard *.po); do \ - LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ - FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + @for LANG in $$(find ./locale -iname "*.po" -print | sed -En "s/.+_([[:alpha:]]+)\.po/\1/p" | sort -u); do \ +# PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ + PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ $(RM) "$${PATH_FILE_MO}"; \ done @for SIZE in 16x16 32x32 48x48 scalable; do \ @@ -92,70 +90,64 @@ uninstall: $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \ done; \ done + @for FILE_ICON in $(wildcard icons/*/*.svg); do \ + SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \ + $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}/$${FILE_ICON}"; \ + done @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" - @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" - @$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy" - @if [ -z ${DESTDIR} ]; then \ - [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ + @if [[ "${PREFIX}" == @("/usr"|"/usr/") ]]; then \ + $(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy"; \ + else \ +# $(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ + $(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ + fi + @if [[ -z "${DESTDIR}" ]]; then \ + [[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ]] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ - [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \ + [[ -d "${DESTDIR}${PREFIX}/share/applications" ]] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \ fi @echo "Uninstall: OK" install: check uninstall @echo "Install ..." - @for FILE_PO in $(wildcard *.po); do \ - LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ - install -dm755 "${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES"; \ - FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ - echo "$${FILE_PO}"; \ - msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \ + @for LANG in $$(find ./locale -iname "*.po" -print | sed -En "s/.+_([[:alpha:]]+)\.po/\1/p" | sort -u); do \ + install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \ +# PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ + PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ + PKGNAME_PO="./locale/${PKGNAME}_$${LANG}.po"; [[ -f "$${PKGNAME_PO}" ]] || PKGNAME_PO= ; \ + msgfmt --verbose --use-fuzzy --output-file "$${PATH_FILE_MO}" - < <(msgcat --use-first --no-wrap $${PKGNAME_PO} ./locale/*_$${LANG}.po); \ done @for SIZE in 16 32 48; do \ - 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"; \ + install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ + rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "icons/apps/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}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}" $${FILE_ICON}; \ done - @install -Dm644 -t "${DESTDIR}${PREFIX}/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}/usr/share/icons/hicolor/scalable/status/" "icons/com.ublinux.${PKGNAME}.checked.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "icons/com.ublinux.${PKGNAME}.warning.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.sync-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.zoom-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.cancel-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.cancel-uncolored-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.check-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.play-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.stop-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.uncheck-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.launch-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.important-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.lookup-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.edit-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.lock-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.sync-time-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.menu-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.properties-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.source-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.save-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.update-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.arrow-round-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy" - @if [ -z ${DESTDIR} ]; then \ - [ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \ + @if [[ "${PREFIX}" == @("/usr"|"/usr/") ]]; then \ + install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"; \ + else \ +# install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ + install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ +# sed -e "s+/usr/bin+${PREFIX}/bin+" -e "s+\.run+$${PREFIX//\//-}\.run+g" -i "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ + sed -e "s+/usr/bin+${PREFIX}/bin+" -e "s+\.run+$${PREFIX//\//-}\.run+g" -i "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ + fi + @if [[ -z "${DESTDIR}" ]]; then \ + ldconfig -n ${DESTDIR}${PREFIX}/lib; \ + [[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ]] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ - [ -d "${DESTDIR}/usr/share/applications" ] && touch "${DESTDIR}/usr/share/applications" &>/dev/null || true; \ + [[ -d "${DESTDIR}${PREFIX}/share/applications" ]] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \ fi @echo "Install: OK" clean: @echo "Clean ..." @$(RM) -rd ${CMAKE_BUILD_DIR} - @if [ -d ${CMAKE_BUILD_DIR} ]; then \ + @if [[ -d "${CMAKE_BUILD_DIR}" ]]; then \ echo "Clean: error, compile directory exist ${CMAKE_BUILD_DIR}"; \ else \ echo "Clean: OK"; \ @@ -167,7 +159,7 @@ help: echo "... init"; \ echo "... debug"; \ echo "... prepare"; \ - echo "... build"; \ + echo "... compile"; \ echo "... install"; \ echo "... uninstall"; \ echo "... clean" \ No newline at end of file diff --git a/gresource.xml b/gresource.xml index 3cbac51..c26d84b 100644 --- a/gresource.xml +++ b/gresource.xml @@ -10,7 +10,4 @@ systemd_conf.csv - - ubl-settings-services-banner.png - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-services.arrow-round-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.arrow-round-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.arrow-round-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.arrow-round-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.cancel-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.cancel-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.cancel-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.cancel-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.cancel-uncolored-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.cancel-uncolored-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.cancel-uncolored-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.cancel-uncolored-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.check-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.check-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.check-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.check-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.checked.svg b/icons/actions/com.ublinux.ubl-settings-services.checked.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.checked.svg rename to icons/actions/com.ublinux.ubl-settings-services.checked.svg diff --git a/icons/com.ublinux.ubl-settings-services.edit-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.edit-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.edit-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.edit-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.important-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.important-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.important-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.important-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.launch-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.launch-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.launch-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.launch-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.lock-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.lock-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.lock-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.lock-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.lookup-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.lookup-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.lookup-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.lookup-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.menu-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.menu-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.menu-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.menu-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.play-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.play-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.play-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.play-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.properties-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.properties-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.properties-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.properties-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.save-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.save-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.save-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.save-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.source-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.source-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.source-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.source-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.stop-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.stop-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.stop-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.stop-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.sync-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.sync-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.sync-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.sync-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.sync-time-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.sync-time-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.sync-time-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.sync-time-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.uncheck-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.uncheck-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.uncheck-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.uncheck-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.update-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.update-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.update-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.update-symbolic.svg diff --git a/icons/com.ublinux.ubl-settings-services.warning.svg b/icons/actions/com.ublinux.ubl-settings-services.warning.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.warning.svg rename to icons/actions/com.ublinux.ubl-settings-services.warning.svg diff --git a/icons/com.ublinux.ubl-settings-services.zoom-symbolic.svg b/icons/actions/com.ublinux.ubl-settings-services.zoom-symbolic.svg similarity index 100% rename from icons/com.ublinux.ubl-settings-services.zoom-symbolic.svg rename to icons/actions/com.ublinux.ubl-settings-services.zoom-symbolic.svg diff --git a/com.ublinux.ubl-settings-services.svg b/icons/apps/com.ublinux.ubl-settings-services.svg similarity index 100% rename from com.ublinux.ubl-settings-services.svg rename to icons/apps/com.ublinux.ubl-settings-services.svg diff --git a/locale/systemd_conf.pot b/locale/systemd_conf.pot new file mode 100644 index 0000000..7ee7491 --- /dev/null +++ b/locale/systemd_conf.pot @@ -0,0 +1,82 @@ +# Language translations for ubl-settings-services package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ubl-settings-services package. +# UBLinux Team , 2022 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: ubl-settings-services 1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-05-22 16:12+0600\n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ./systemd_conf.csv:2 +msgid "UBLinux OS configuration files" +msgstr "" + +#: ./systemd_conf.csv:3 +msgid "System Debug Dump Configuration" +msgstr "" + +#: ./systemd_conf.csv:4 +msgid "Configuring various systemd log service options" +msgstr "" + +#: ./systemd_conf.csv:5 +msgid "Configuring various systemd-journal-upload.service parameters" +msgstr "" + +#: ./systemd_conf.csv:6 +msgid "Configuring Global Network Settings" +msgstr "" + +#: ./systemd_conf.csv:7 +msgid "Configuration file for systemd-pstore, a tool for archiving the contents of the pstore persistent storage file system" +msgstr "" + +#: ./systemd_conf.csv:8 +msgid "Workstation hibernation options" +msgstr "" + +#: ./systemd_conf.csv:9 +msgid "Systemd configuration" +msgstr "" + +#: ./systemd_conf.csv:10 +msgid "User Configuration" +msgstr "" + +#: ./systemd_conf.csv:11 +msgid "Settings management configuration for user account home directories created and managed by systemd-homed.service" +msgstr "" + +#: ./systemd_conf.csv:12 +msgid "Configuration files for various systemd-journal-remote.service parameters" +msgstr "" + +#: ./systemd_conf.csv:13 +msgid "Configuration files for various systemd login manager options" +msgstr "" + +#: ./systemd_conf.csv:14 +msgid "Configuration files for various out-of-memory (OOM) killer parameters in systemd user space" +msgstr "" + +#: ./systemd_conf.csv:15 +msgid "Local DNS and LLMNR name resolution management configuration files" +msgstr "" + +#: ./systemd_conf.csv:16 +msgid "System swap file management configuration files" +msgstr "" + +#: ./systemd_conf.csv:17 +msgid "Configuration file controlling NTP network time synchronization" +msgstr "" diff --git a/locale/systemd_conf_ru.po b/locale/systemd_conf_ru.po new file mode 100644 index 0000000..cdaa684 --- /dev/null +++ b/locale/systemd_conf_ru.po @@ -0,0 +1,82 @@ +# Russian translations for ubl-settings-services package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ubl-settings-services package. +# UBLinux Team , 2022 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: ubl-settings-services 1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-05-22 16:12+0600\n" +"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"Last-Translator: UBLinux Team \n" +"Language-Team: Russian - UBLinux Team \n" +"Language: Russian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ./systemd_conf.csv:2 +msgid "UBLinux OS configuration files" +msgstr "Конфигурационные файлы ОС UBLinux" + +#: ./systemd_conf.csv:3 +msgid "System Debug Dump Configuration" +msgstr "Конфигурация сбора отладочных дампов системы" + +#: ./systemd_conf.csv:4 +msgid "Configuring various systemd log service options" +msgstr "Настройка различных параметров службы журналирования systemd" + +#: ./systemd_conf.csv:5 +msgid "Configuring various systemd-journal-upload.service parameters" +msgstr "Настройка различных параметров службы systemd-journal-upload.service" + +#: ./systemd_conf.csv:6 +msgid "Configuring Global Network Settings" +msgstr "Настройка глобальных сетевых параметров" + +#: ./systemd_conf.csv:7 +msgid "Configuration file for systemd-pstore, a tool for archiving the contents of the pstore persistent storage file system" +msgstr "Конфигурационный файл для systemd-pstore - инструмента архивирования содержимого файловой системы постоянного хранилища pstore" + +#: ./systemd_conf.csv:8 +msgid "Workstation hibernation options" +msgstr "Параметры гибернации рабочей станции" + +#: ./systemd_conf.csv:9 +msgid "Systemd configuration" +msgstr "Конфигурация systemd" + +#: ./systemd_conf.csv:10 +msgid "User Configuration" +msgstr "Конфигурация пользователя" + +#: ./systemd_conf.csv:11 +msgid "Settings management configuration for user account home directories created and managed by systemd-homed.service" +msgstr "Настройка управления параметрами домашних каталогов пользователей, создаваемых и управляемых службой systemd-homed.service" + +#: ./systemd_conf.csv:12 +msgid "Configuration files for various systemd-journal-remote.service parameters" +msgstr "Конфигурационные файлы для различных параметров службы systemd-journal-remote.service" + +#: ./systemd_conf.csv:13 +msgid "Configuration files for various systemd login manager options" +msgstr "Конфигурационные файлы для различных параметров менеджера входа systemd" + +#: ./systemd_conf.csv:14 +msgid "Configuration files for various out-of-memory (OOM) killer parameters in systemd user space" +msgstr "Конфигурационные файлы для параметров механизма завершения процессов при нехватке памяти (OOM) в пользовательском пространстве systemd" + +#: ./systemd_conf.csv:15 +msgid "Local DNS and LLMNR name resolution management configuration files" +msgstr "Конфигурация управления локальным DNS и разрешением имён LLMNR" + +#: ./systemd_conf.csv:16 +msgid "System swap file management configuration files" +msgstr "Конфигурационные файлы управления файлами подкачки системы" + +#: ./systemd_conf.csv:17 +msgid "Configuration file controlling NTP network time synchronization" +msgstr "Конфигурационный файл управления синхронизацией времени по сети (NTP)" diff --git a/ubl-settings-services.pot b/locale/ubl-settings-services.pot similarity index 100% rename from ubl-settings-services.pot rename to locale/ubl-settings-services.pot diff --git a/ubl-settings-services_ru.po b/locale/ubl-settings-services_ru.po similarity index 100% rename from ubl-settings-services_ru.po rename to locale/ubl-settings-services_ru.po diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 154f798..28207ca 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -20,12 +20,13 @@ add_definitions(${JSON_CFLAGS_OTHER}) find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) +option(WEBKIT_FOUND "No" OFF) if(WEBKIT_LIBRARIES_FOUND) + option(WEBKIT_FOUND "Yes" ON) PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0) include_directories(${WEBKIT_INCLUDE_DIRS}) link_directories(${WEBKIT_LIBRARY_DIRS}) add_definitions(${WEBKIT_CFLAGS_OTHER}) - add_definitions(-DWEBKIT_FOUND) endif() set(GRESOURCE_C resources.c) @@ -39,44 +40,42 @@ set(DEPENDFILES ../systemd_conf.csv ../ubl-settings-services-terminal.glade ../gresource.xml - ../ubl-settings-services-banner.png ../ubl-settings-services.css ) file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) add_custom_command( - OUTPUT ${GRESOURCE_C} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${GLIB_COMPILE_RESOURCES} - ARGS + OUTPUT ${GRESOURCE_C} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${GLIB_COMPILE_RESOURCES} + ARGS --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C} ${GRESOURCE_XML} - VERBATIM - MAIN_DEPENDENCY ${GRESOURCE_XML} - DEPENDS + VERBATIM + MAIN_DEPENDENCY ${GRESOURCE_XML} + DEPENDS ${GLADE} ) add_custom_target( - dummy-resource - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C} + dummy-resource + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C} ) add_definitions(-DVTE_INCLUDE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ - -O2 -pipe -fno-plt -fexceptions \ + -O2 -pipe -fno-plt -fexceptions \ -Wformat -Werror=format-security \ -fstack-clash-protection -fcf-protection") - string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND) - - if(FORTIFY_FOUND EQUAL -1) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wp,-D_FORTIFY_SOURCE=2") - endif() - +string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND) +if(FORTIFY_FOUND EQUAL -1) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wp,-D_FORTIFY_SOURCE=2") +endif() + set(SOURCE_FILES ubl-settings-services.c ubl-settings-services.h @@ -102,8 +101,8 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${GRE target_link_libraries(${PROJECT_NAME} PUBLIC ${LIBRARIES}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_BINARY_DIR}) set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C} - PROPERTIES GENERATED TRUE + ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C} + PROPERTIES GENERATED TRUE ) install(TARGETS ${PROJECT_NAME} DESTINATION bin) add_dependencies(${PROJECT_NAME} dummy-resource) \ No newline at end of file diff --git a/ubl-settings-services-banner.png b/ubl-settings-services-banner.png deleted file mode 100644 index 8eb67cb..0000000 Binary files a/ubl-settings-services-banner.png and /dev/null differ