diff --git a/Makefile b/Makefile index 0ba8841..f68f4dc 100644 --- a/Makefile +++ b/Makefile @@ -21,11 +21,7 @@ all: init build init: @echo "Initialize ..."; \ - version="$$(cat VERSION.md)"; \ - version=$${version:8}; \ - search="s/string version_application.*$&"; \ - replace="string version_application = \"$${version}\";"; \ - sed -i -e "$$search/$$replace/gi" source/ubl-settings-datetime.h; \ + sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' VERSION.md | cut -d" " -f2)\";/" -i source/ubl-settings-datetime.h; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -85,6 +81,7 @@ uninstall: @$(RM) "/usr/bin/${pkgname}" @$(RM) "/usr/share/applications/${pkgname}.desktop" @$(RM) "/usr/share/polkit-1/actions/ru.ublinux.pkexec.${pkgname}.exec.policy" + @$(RM) -rd "/usr/share/${pkgname}" @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null @update-desktop-database --quiet 2>/dev/null @touch /usr/share/applications @@ -109,12 +106,10 @@ install: check uninstall @install -Dm755 -t "${pkgdir}/usr/bin/" "${CMAKE_BUILD_DIR}/${pkgname}" @install -Dm644 -t "${pkgdir}/usr/share/applications/" "${pkgname}.desktop" @install -Dm644 -t "${pkgdir}/usr/share/polkit-1/actions/" "ru.ublinux.pkexec.${pkgname}.exec.policy" - @install -dm755 "${pkgdir}/usr/share/${pkgname}"/{ui,images,css} + @install -dm755 "${pkgdir}/usr/share/${pkgname}"/{ui,css,images} @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/ui/" "${pkgname}.glade" @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/css/" style.css - @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "ru.ublinux.${pkgname}.svg" - @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "ru.ublinux.${pkgname}.png" - @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/emblems/" "bg_top.png" + @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "logo-background.png" @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-settings-datetime.checked.svg" @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-settings-datetime.warning.svg" @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null diff --git a/VERSION.md b/VERSION.md index 48eea8c..c1fc6fc 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -VERSION 1.3 +VERSION 1.4 diff --git a/bg_top.png b/logo-background.png similarity index 100% rename from bg_top.png rename to logo-background.png diff --git a/alert.svg b/ru.ublinux.ubl-settings-datetime.alert.svg similarity index 100% rename from alert.svg rename to ru.ublinux.ubl-settings-datetime.alert.svg diff --git a/ru.ublinux.ubl-settings-datetime.png b/ru.ublinux.ubl-settings-datetime.png deleted file mode 100644 index a77b93f..0000000 Binary files a/ru.ublinux.ubl-settings-datetime.png and /dev/null differ diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h old mode 100755 new mode 100644 index 9f32d1f..60c1def --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -118,7 +118,7 @@ class MainWindow : public Gtk::ApplicationWindow { unsigned int year = 0; unsigned int month = 0; unsigned int day = 0; - string version_application = "1.3"; + string version_application = "1.4"; int error_info = 0; int warning_info = 0; string cmd_error = ""; diff --git a/style.css b/style.css index 65d31d4..c1c8a2f 100644 --- a/style.css +++ b/style.css @@ -2,7 +2,7 @@ background-color: #ea9999; } .cssboxColor1{ - background: url("/usr/share/icons/hicolor/scalable/emblems/bg_top.png") no-repeat; + background: url("/usr/share/ubl-settings-datetime/images/logo-background.png") no-repeat; } .boxInfoMessOK{ background-color: #f3f0ac;