From b4b5f88effa51819678c7c4308892dc2286a4336 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 15 Dec 2023 14:16:35 +0600 Subject: [PATCH 1/4] Fixed cutting header description --- ublsettingsui-gtk3.glade | 1 + 1 file changed, 1 insertion(+) diff --git a/ublsettingsui-gtk3.glade b/ublsettingsui-gtk3.glade index a4f118f..e64135c 100644 --- a/ublsettingsui-gtk3.glade +++ b/ublsettingsui-gtk3.glade @@ -91,6 +91,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False start TEMPLATE management app + True 0 From 8d8a65639147250d155d511bfadb4736a245504b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 18 Dec 2023 11:43:06 +0600 Subject: [PATCH 2/4] Library rename --- Makefile | 15 ++--- ....ublinux.libublsettingsui-gtk3.checked.svg | 0 ...g => com.ublinux.libublsettingsui-gtk3.svg | 0 ....ublinux.libublsettingsui-gtk3.warning.svg | 0 gresource.xml | 16 ++--- ...glade => libublsettingsui-gtk3-about.glade | 10 +-- ...er.png => libublsettingsui-gtk3-banner.png | Bin ... libublsettingsui-gtk3-documentation.glade | 2 +- ...lade => libublsettingsui-gtk3-saving.glade | 8 +-- ...gsui-gtk3.css => libublsettingsui-gtk3.css | 0 ...-gtk3.glade => libublsettingsui-gtk3.glade | 14 ++-- ...gsui-gtk3.pot => libublsettingsui-gtk3.pot | 62 +++++++++--------- ...-gtk3_ru.po => libublsettingsui-gtk3_ru.po | 62 +++++++++--------- source/CMakeLists.txt | 25 +++---- ...tingsui-gtk3.c => libublsettingsui-gtk3.c} | 4 +- ...tingsui-gtk3.h => libublsettingsui-gtk3.h} | 19 +++--- 16 files changed, 120 insertions(+), 117 deletions(-) rename com.ublinux.ublsettingsui-gtk3.checked.svg => com.ublinux.libublsettingsui-gtk3.checked.svg (100%) rename com.ublinux.ublsettingsui-gtk3.svg => com.ublinux.libublsettingsui-gtk3.svg (100%) rename com.ublinux.ublsettingsui-gtk3.warning.svg => com.ublinux.libublsettingsui-gtk3.warning.svg (100%) rename ublsettingsui-gtk3-about.glade => libublsettingsui-gtk3-about.glade (90%) rename ublsettingsui-gtk3-banner.png => libublsettingsui-gtk3-banner.png (100%) rename ublsettingsui-gtk3-documentation.glade => libublsettingsui-gtk3-documentation.glade (99%) rename ublsettingsui-gtk3-saving.glade => libublsettingsui-gtk3-saving.glade (97%) rename ublsettingsui-gtk3.css => libublsettingsui-gtk3.css (100%) rename ublsettingsui-gtk3.glade => libublsettingsui-gtk3.glade (98%) rename ublsettingsui-gtk3.pot => libublsettingsui-gtk3.pot (57%) rename ublsettingsui-gtk3_ru.po => libublsettingsui-gtk3_ru.po (72%) rename source/{ublsettingsui-gtk3.c => libublsettingsui-gtk3.c} (99%) rename source/{ublsettingsui-gtk3.h => libublsettingsui-gtk3.h} (91%) diff --git a/Makefile b/Makefile index 83014ea..dcee116 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ CMAKE_UI_BUILD_DIR = $(MAKEFILE_PATH)compile DEPENDS = /bin/cmake PREFIX ?= /usr/local PKGNAME = $(MAKEFILE_DIR) -PRJNAME = $(subst lib,,${PKGNAME}) FILE_VER = source/CMakeLists.txt PKGIDENT=$(subst /,-,${PREFIX}) @@ -33,7 +32,7 @@ init: else \ LATEST_TAG="Development"; \ fi; \ - sed -r "s/^(project\(${PRJNAME} VERSION ).*/\1$${LATEST_TAG}\)/" -i ${FILE_VER}; \ + sed -r "s/^(project\(${PKGNAME} VERSION ).*/\1$${LATEST_TAG}\)/" -i ${FILE_VER}; \ echo "-- Build path: ${CMAKE_UI_BUILD_DIR}" depend: @@ -86,8 +85,8 @@ uninstall: $(RM) "$${PATH_FILE_MO}"; \ done @for SIZE in 16x16 32x32 48x48 scalable; do \ - $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PRJNAME}.svg"; \ - $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PRJNAME}.png"; \ + $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ + $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \ done @for FILE_SVG in $(wildcard *.svg); do \ for SIZE in 16x16 32x32 48x48 scalable; do \ @@ -117,11 +116,11 @@ install: check 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.${PRJNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PRJNAME}.svg"; \ + 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.${PRJNAME}.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PRJNAME}.checked.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PRJNAME}.warning.svg" + @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.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.ublsettingsui-gtk3.checked.svg b/com.ublinux.libublsettingsui-gtk3.checked.svg similarity index 100% rename from com.ublinux.ublsettingsui-gtk3.checked.svg rename to com.ublinux.libublsettingsui-gtk3.checked.svg diff --git a/com.ublinux.ublsettingsui-gtk3.svg b/com.ublinux.libublsettingsui-gtk3.svg similarity index 100% rename from com.ublinux.ublsettingsui-gtk3.svg rename to com.ublinux.libublsettingsui-gtk3.svg diff --git a/com.ublinux.ublsettingsui-gtk3.warning.svg b/com.ublinux.libublsettingsui-gtk3.warning.svg similarity index 100% rename from com.ublinux.ublsettingsui-gtk3.warning.svg rename to com.ublinux.libublsettingsui-gtk3.warning.svg diff --git a/gresource.xml b/gresource.xml index 0fcb609..b9eb643 100644 --- a/gresource.xml +++ b/gresource.xml @@ -1,17 +1,17 @@ - ublsettingsui-gtk3.glade - ublsettingsui-gtk3-about.glade - ublsettingsui-gtk3-documentation.glade - ublsettingsui-gtk3-saving.glade + libublsettingsui-gtk3.glade + libublsettingsui-gtk3-about.glade + libublsettingsui-gtk3-documentation.glade + libublsettingsui-gtk3-saving.glade - ublsettingsui-gtk3.css + libublsettingsui-gtk3.css - ublsettingsui-gtk3-banner.png - com.ublinux.ublsettingsui-gtk3.checked.svg - com.ublinux.ublsettingsui-gtk3.warning.svg + 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/ublsettingsui-gtk3-about.glade b/libublsettingsui-gtk3-about.glade similarity index 90% rename from ublsettingsui-gtk3-about.glade rename to libublsettingsui-gtk3-about.glade index 0dae3ac..d7bf64d 100644 --- a/ublsettingsui-gtk3-about.glade +++ b/libublsettingsui-gtk3-about.glade @@ -1,26 +1,26 @@ - + False False True center - com.ublinux.ublsettingsui-gtk3 + com.ublinux.libublsettingsui-gtk3 dialog True - ublsettingsui-gtk3 + libublsettingsui-gtk3 1.1 Copyright © 2022 - 2023, UBSoft LLC TEMPLATE Manager - https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ublsettingsui-gtk3 + https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/libublsettingsui-gtk3 Project Home Page Это приложение распространяется без каких-либо гарантий. Подробнее в <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, версии 2 или позднее</a>. UBGroup UBGroup - com.ublinux.ublsettingsui-gtk3 + com.ublinux.libublsettingsui-gtk3 True gpl-2-0 diff --git a/ublsettingsui-gtk3-banner.png b/libublsettingsui-gtk3-banner.png similarity index 100% rename from ublsettingsui-gtk3-banner.png rename to libublsettingsui-gtk3-banner.png diff --git a/ublsettingsui-gtk3-documentation.glade b/libublsettingsui-gtk3-documentation.glade similarity index 99% rename from ublsettingsui-gtk3-documentation.glade rename to libublsettingsui-gtk3-documentation.glade index cc857ec..8fdfcc9 100644 --- a/ublsettingsui-gtk3-documentation.glade +++ b/libublsettingsui-gtk3-documentation.glade @@ -1,6 +1,6 @@ - + False diff --git a/ublsettingsui-gtk3-saving.glade b/libublsettingsui-gtk3-saving.glade similarity index 97% rename from ublsettingsui-gtk3-saving.glade rename to libublsettingsui-gtk3-saving.glade index befc723..4513478 100644 --- a/ublsettingsui-gtk3-saving.glade +++ b/libublsettingsui-gtk3-saving.glade @@ -1,8 +1,8 @@ - + - + Save True @@ -43,7 +43,7 @@ 500 False True - com.ublinux.ublsettingsui-gtk3 + com.ublinux.libublsettingsui-gtk3 dialog @@ -204,7 +204,7 @@ True False 32 - com.ublinux.ublsettingsui-gtk3 + com.ublinux.libublsettingsui-gtk3