Merge branch 'master' into master

Makefile

@@ -12,7 +12,7 @@ DEPENDS = /bin/cmake
 PREFIX ?= /usr/local
 PKGNAME = $(MAKEFILE_DIR)
 FILE_VER = source/${PKGNAME}.h
-PKGIDENT=$(subst /,-,${PREFIX})
+PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX}))
 
 default_target: all
 
@@ -92,9 +92,11 @@ uninstall:
 	        $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
 	    done; \
 	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}${PREFIX}/share/${PKGNAME}"
+	@$(RM) "${DESTDIR}/etc/xdg/${PKGNAME}/${PKGNAME}.conf"
+	@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
+	@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
 	@$(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; \
@@ -118,11 +120,12 @@ install: check uninstall
 		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}${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/${PKGNAME}/images/" "ublinux-logo.svg"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
-	@install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
+	@install -Dm644 -t "${DESTDIR}/etc/xdg/${PKGNAME}/" "${PKGNAME}.conf"
+	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
+	@install -Dm644  "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
+	@sed -e '\|annotate key=|s|/usr/bin|${PREFIX}/bin|' -e '/action id=/s/\.run/${PKGIDENT}\.run/' -i ${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; \
 	    update-desktop-database --quiet &>/dev/null || true; \
@@ -145,7 +148,7 @@ help:
 	echo "... init"; \
 	echo "... debug"; \
 	echo "... prepare"; \
-	echo "... compile"; \
+	echo "... build"; \
 	echo "... install"; \
 	echo "... uninstall"; \
 	echo "... clean"

com.ublinux.ubl-settings-manager.policy

@@ -8,10 +8,10 @@
   <vendor_url>https://ublinux.ru</vendor_url>
 
   <action id="com.ublinux.ubl-settings-manager.run">
-    <description>Run ubl-settings-manager as root</description>
-    <description xml:lang="ru">Запуск утилиты ubl-settings-manager с правами root</description>
-    <message>Authentication is required to run ubl-settings-manager</message>
-    <message xml:lang="ru">Требуется авторизация для запуска утилиты ubl-settings-manager с правами root</message>
+    <description>Run settings manager as root</description>
+    <description xml:lang="ru">Запустить диспетчер настроек от имени пользователя root</description>
+    <message>Authentication is required to run settings manager as root</message>
+    <message xml:lang="ru">Требуется аутентификация для запуска диспетчер настроек от имени пользователя root</message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>

ubl-settings-manager.desktop

@@ -1,14 +1,19 @@
 [Desktop Entry]
+Version=1.0
 Encoding=UTF-8
-Name=ubl-settings-manager
-Name[ru]=Диспетчер настроек UBLinux
-GenericName=ubl-settings-manager
-GenericName[ru]=Диспетчер настроек UBLinux
-Comment=ubl-settings-manager
-Comment[ru]=Графический диспетчер настроек UBLinux
+Name=Settings manager for the system
+Name[ru]=Диспетчер настроек
+GenericName=Settings manager for the system
+GenericName[ru]=Диспетчер настроек системы
+Comment=Graphical settings manager for the system
+Comment[ru]=Графический диспетчер настроек для системы
+Keywords=settings;manager;system;
+Keywords[ru]=настройки;диспетчер;система;
 Type=Application
 Exec=ubl-settings-manager
 Icon=com.ublinux.ubl-settings-manager
 Terminal=false
+StartupNotify=true
+StartupWMClass=ubl-settings-manager
 X-XfcePluggable=false
 Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;