Merge pull request 'master' (#62) from YanTheKaller/ubl-settings-manager:master into master

Reviewed-on: #62

.gitignore

@@ -16,4 +16,6 @@ images/
 locale/
 ui/
 ubl-settings-manager_ru.pos
-deleted
+ubl-settings-manager_ru.po~
+deleted
+compile/

Makefile

@@ -9,8 +9,10 @@ CMAKE_COMMAND = cmake
 CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
 CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
 DEPENDS = /bin/cmake
-PREFIX ?= /usr
+PREFIX ?= /usr/local
 PKGNAME = $(MAKEFILE_DIR)
+FILE_VER = source/${PKGNAME}.h
+PKGIDENT=$(subst /,-,${PREFIX})
 
 default_target: all
 
@@ -21,11 +23,11 @@ all: init build
 init:
 	@echo "Initialize ..."; \
 	if [ -d ".git" ]; then \
-	    LATEST_TAG=$$(git describe --tags | sed 's/^v//'); \
+	    LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \
 	else \
-	    LATEST_TAG="0.0"; \
+	    LATEST_TAG="Development"; \
 	fi; \
-	sed -r "s/^(string version_application = ).*/\1\"$${LATEST_TAG}\";/" -i source/${PKGNAME}.h; \
+	sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \
 	echo "-- Build path: ${CMAKE_BUILD_DIR}"
 
 depend:
@@ -64,7 +66,8 @@ check:
 
 build: depend prepare
 	@echo "Build ..."; \
-	make --directory=${CMAKE_BUILD_DIR}; \
+	$(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \
+	sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \
 	echo "Build: OK"
 
 uninstall:
@@ -72,7 +75,7 @@ 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}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+	    PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
 	    $(RM) "$${PATH_FILE_MO}"; \
 	done
 	@for SIZE in 16x16 32x32 48x48 scalable; do \
@@ -85,10 +88,9 @@ uninstall:
 	    done; \
 	done
 	@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
-	@$(RM) "${DESTDIR}/etc/xdg/${PKGNAME}/${PKGNAME}.conf"
 	@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
 	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
-	@$(RM) -rd "${DESTDIR}${PREFIX}/share/${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; \
 	    update-desktop-database --quiet &>/dev/null || true; \
@@ -100,9 +102,9 @@ install: check uninstall
 	@echo "Install ..."
 	@for FILE_PO in $(wildcard *.po); do \
 		LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
-		install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \
+		install -dm755 "${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES"; \
 		FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
-		PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_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}"; \
 	done
@@ -110,18 +112,12 @@ 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
-	@install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps"
 	@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 -dm755 "${DESTDIR}/etc/xdg"
-	@install -Dm644 -t "${DESTDIR}/etc/xdg/${PKGNAME}/" "${PKGNAME}.conf"
-	@install -dm755 "${DESTDIR}${PREFIX}/share/applications"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
-	@install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images}
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade"
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css"
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "ublinux-logo.svg"
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "${PKGNAME}-banner.png"
+	@install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/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; \
@@ -147,4 +143,4 @@ help:
 	echo "... compile"; \
 	echo "... install"; \
 	echo "... uninstall"; \
-	echo "... clean"
+	echo "... clean"

com.ublinux.ubl-settings-manager.policy

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <vendor>UBLinux</vendor>
+  <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>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ubl-settings-manager</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+
+</policyconfig>

gresource.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/com/ublinux/ui">
+    <file>ubl-settings-manager.glade</file>
+  </gresource>
+  <gresource prefix="/com/ublinux/css">
+    <file>ubl-settings-manager.css</file>
+  </gresource>
+  <gresource prefix="/com/ublinux/images">
+    <file>ubl-settings-manager-banner.png</file>
+  </gresource>
+</gresources>

source/CMakeLists.txt

@@ -1,12 +1,17 @@
-cmake_minimum_required(VERSION 3.23)
+cmake_minimum_required(VERSION 3.7)
 project(ubl-settings-manager)
 
 find_package(PkgConfig REQUIRED)
 
-pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
-include_directories(${GTK3_INCLUDE_DIRS})
-link_directories(${GTK3_LIBRARY_DIRS})
-add_definitions(${GTK3_CFLAGS_OTHER})
+pkg_check_modules(GTK REQUIRED gtk+-3.0)
+include_directories(${GTK_INCLUDE_DIRS})
+link_directories(${GTK_LIBRARY_DIRS})
+add_definitions(${GTK_CFLAGS_OTHER})
+
+pkg_check_modules(VTE291 REQUIRED vte-2.91)
+include_directories(${VTE291_INCLUDE_DIRS})
+link_directories(${VTE291_LIBRARY_DIRS})
+add_definitions(${VTE291_CFLAGS_OTHER})
 
 find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
 
@@ -19,7 +24,42 @@ if(WEBKIT_LIBRARIES_FOUND)
         add_definitions(${WEBKIT_CFLAGS_OTHER})
 endif()
 
-configure_file(ubl-settings-manager.h.in ubl-settings-manager-cm.h)
+configure_file(ubl-cmake.in ubl-cmake.h)
+
+file(COPY ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h DESTINATION ./)
+
+set(GRESOURCE_C   resources.c)
+set(GRESOURCE_XML gresource.xml)
+
+find_program(GLIB_COMPILE_RESOURCES NAMES glib-compile-resources REQUIRED)  
+add_custom_target(GLADE ubl-settings-manager.glade)
+
+set(DEPENDFILES 
+                ../ubl-settings-manager.glade
+                ../gresource.xml
+                ../ubl-settings-manager-banner.png
+                ../ubl-settings-manager.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
+        --generate-source
+        --target=${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
+        ${GRESOURCE_XML}
+    VERBATIM
+    MAIN_DEPENDENCY ${GRESOURCE_XML}
+    DEPENDS
+        ${GLADE}
+)
+add_custom_target(
+    dummy-resource
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
+)
 
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a")
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm")
@@ -27,18 +67,27 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin
 	-O2 -pipe -fno-plt -fexceptions \
         -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection")
+      
 
 set(SOURCE_FILES
         ubl-settings-manager.c
         ubl-settings-manager.h
-        ubl-settings-manager-cm.h)
+        ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h
+        )
 
 set(LIBRARIES
-        ${GTK3_LIBRARIES}
+        ${GTK_LIBRARIES}
         ${WEBKIT_LIBRARIES}
+        ${VTE291_LIBRARIES}
         pthread)
 
-add_executable(${PROJECT_NAME} ${SOURCE_FILES})
+
+add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C})
 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
+)
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+add_dependencies(${PROJECT_NAME} dummy-resource)

source/ubl-settings-manager-cm.h

@@ -1 +0,0 @@
-#define WEBKIT_FOUND

source/ubl-settings-manager.c

@@ -140,7 +140,7 @@ void on_ButtonOpenHelp_activated(GtkWidget *button, GtkBuilder *builder){
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,"AlwaysOpenHelpCheckbox"))))
     {
         #ifdef WEBKIT_FOUND
-            GtkBuilder *web_builder=gtk_builder_new_from_file(GladePath);
+            GtkBuilder *web_builder=gtk_builder_new_from_resource(GladePath);
             GtkWidget *browser=GTK_WIDGET(gtk_builder_get_object(web_builder,"Web_Window"));
             GtkWidget *web_place=GTK_WIDGET(gtk_builder_get_object(web_builder,"Web_Place"));
             GtkWidget *WebView=webkit_web_view_new();
@@ -173,7 +173,7 @@ void on_CancelHelpButton_activated(GtkWidget *button,GtkBuilder *builder){
 
 void on_ReadHelpButton_activated(GtkWidget *button, GtkBuilder *builder){
         #ifdef WEBKIT_FOUND
-        GtkBuilder *web_builder=gtk_builder_new_from_file(GladePath);
+        GtkBuilder *web_builder=gtk_builder_new_from_resource(GladePath);
         GtkWidget *browser=GTK_WIDGET(gtk_builder_get_object(web_builder,"Web_Window"));
         GtkWidget *web_place=GTK_WIDGET(gtk_builder_get_object(web_builder,"Web_Place"));
         GtkWidget *WebView=webkit_web_view_new();
@@ -657,7 +657,7 @@ void on_double_click_changed(GtkWidget *Switch, gboolean state, dictionary *widg
 }
 
 void on_about(GtkWidget *button, GtkBuilder *buildr){
-    GtkBuilder *builder = gtk_builder_new_from_file(GladePath);
+    GtkBuilder *builder = gtk_builder_new_from_resource(GladePath);
     GtkWidget *AboutButtons = GTK_WIDGET(gtk_builder_get_object(builder,"AboutButtons"));
     GtkWidget *AboutHeadLabel = GTK_WIDGET(gtk_builder_get_object(builder,"aboutHeadLabel"));
     GtkWidget *About = GTK_WIDGET(gtk_builder_get_object(builder, "ublAbloutWindow"));
@@ -1142,7 +1142,7 @@ void yon_set_default_sections(dictionary *section){
 IVGraphicals *yon_create_single_section_IV(char *name,char *cats){
     IVGraphicals *IVG = malloc(sizeof(IVGraphicals));
     GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-    GtkBuilder *builder = gtk_builder_new_from_file(GladePath);
+    GtkBuilder *builder = gtk_builder_new_from_resource(GladePath);
     GtkWidget *iv = GTK_WIDGET(gtk_builder_get_object(builder,"iconTemplate"));
     gtk_widget_show(iv);
     GtkWidget *label = gtk_label_new(_(name));
@@ -1808,29 +1808,6 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
     }
     gtk_widget_hide_on_delete(curWidgets->window);
     g_signal_connect(G_OBJECT(curWidgets->window), "destroy", G_CALLBACK(yon_main_quit), curWidgets);
-    gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"MainHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE);
-    gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"sectionsHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE);
-    gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"GnomeHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE);
-    gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"settingsHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE);
-    gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"webHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE);
-    gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"warningHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE);
-    gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"LoaderHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE);
-    gtk_label_set_text(GTK_LABEL(curWidgets->settingsSubmenuLabelSize),ICON_SIZE_LABEL);
-    gtk_label_set_text(GTK_LABEL(curWidgets->settingsSubmenuLabelTheme),WINDOW_THEME_LABEL);
-    gtk_label_set_text(GTK_LABEL(curWidgets->helpHeader),REDIRECTION_LABEL);
-    gtk_label_set_text(GTK_LABEL(curWidgets->helpText),REDIRECTION_COMMENT_LABEL);
-    gtk_button_set_label(GTK_BUTTON(curWidgets->ReadHelpButton),READ_ONLINE_LABEL);
-    gtk_button_set_label(GTK_BUTTON(curWidgets->CancelHelpButton),CANCEL_LABEL);
-    gtk_button_set_label(GTK_BUTTON(curWidgets->settingsCancel),CLOSE_LABEL);
-    gtk_button_set_label(GTK_BUTTON(curWidgets->settingsAccept),SAVE_AND_APPLY_LABEL);
-    gtk_button_set_label(GTK_BUTTON(curWidgets->SectionSettingsSaveButton),APPLY_LABEL);
-    gtk_button_set_label(GTK_BUTTON(curWidgets->AlwaysOpenDocumentation),ALWAYS_REDIRECT_LABEL);
-    gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemSettings),SETTINGS_LABEL);
-    gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemDocumentation),DOCUMENTATION_LABEL);
-    gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemAboutSystem),ABOUT_LABEL);
-    gtk_button_set_label(GTK_BUTTON(curWidgets->CautionUnderstandButton),UNDERSTOOD_LABEL);
-    gtk_button_set_label(GTK_BUTTON(curWidgets->settingsSectionsSettingsButton),SECTIONS_MANAGEMENT_LABEL);
-    gtk_label_set_text(GTK_LABEL(curWidgets->settingsDoubleClickLabel),DOUBLE_CLICK_SELECTION_LABEL);
     return widgets;
 }
 
@@ -1869,7 +1846,7 @@ int main(int argc, char *argv[]){
     int *size=malloc(sizeof(int));
     apps *applist=find_apps(size);
     sort_apps(applist,*size);
-    GtkBuilder *builder=gtk_builder_new_from_file(GladePath);
+    GtkBuilder *builder=gtk_builder_new_from_resource(GladePath);
     actionWidgets *widg=(actionWidgets*)widgets->first->data;
     char *theme;
     if (main_config.WindowTheme==1){ theme="Gnome";
@@ -1945,18 +1922,18 @@ int main(int argc, char *argv[]){
     if (main_config.WindowTheme==1)
         gtk_widget_hide(widg->MenuItemAboutSystem);
     GtkWidget *banner = GTK_WIDGET(gtk_builder_get_object(widg->builder,"MainBanner"));
-    gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_file(AppBannerPath,NULL));
+    gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_resource(AppBannerPath,NULL));
     banner = GTK_WIDGET(gtk_builder_get_object(widg->builder,"GnomeBanner"));
-    gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_file(AppBannerPath,NULL));
+    gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_resource(AppBannerPath,NULL));
     banner = GTK_WIDGET(gtk_builder_get_object(widg->builder,"loaderBanner"));
-    gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_file(AppBannerPath,NULL));
+    gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_resource(AppBannerPath,NULL));
     banner = GTK_WIDGET(gtk_builder_get_object(widg->builder,"GnomeInfoLogo"));
-    gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_file_at_scale(ublinux_logo,512,512,1,NULL));
+    gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(gtk_icon_theme_get_default(), AppIconPath,512,1,GTK_ICON_LOOKUP_FORCE_SVG),NULL));
     banner = GTK_WIDGET(gtk_builder_get_object(widg->builder,"settingsIcon"));
     GtkIconTheme *icthm=gtk_icon_theme_get_default();
     gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, AppIconPath,yon_get_icon_size(*main_config.currentThemeIconSize),1,GTK_ICON_LOOKUP_FORCE_SVG),NULL));
     GtkCssProvider *css=gtk_css_provider_new();
-    gtk_css_provider_load_from_path(css,CssPath,NULL);
+    gtk_css_provider_load_from_resource(css,CssPath);
     gtk_style_context_add_provider_for_screen(gdk_screen_get_default(),
                                GTK_STYLE_PROVIDER(css),
                                -1);

source/ubl-settings-manager.h

@@ -5,7 +5,7 @@
 #include <time.h>
 #include <getopt.h>
 #include <dlfcn.h>
-#include "ubl-settings-manager-cm.h"
+#include "ubl-cmake.h"
 #ifdef WEBKIT_FOUND
 #include <webkit2/webkit2.h>
 #endif
@@ -17,21 +17,20 @@
 
 #define cmdVersionText yon_char_get_augumented(yon_char_get_augumented(_("Version: "),version_application),"\n")
 #define cmdHelpText yon_char_get_augumented(yon_char_get_augumented(_("ubl-settings-manager version: "),version_application),_("\nGTK settings manager for UBLinux\nUsage:  ubl-settings-manager [OPTIONS...]\nOptions:\n  -h, --help		  Show this help\n  -V, --version	  	  Show package version\n      --lock-settings Lock menu settings\n"))
-#define GladePath "/usr/share/ubl-settings-manager/ui/ubl-settings-manager.glade"
-#define CssPath "/usr/share/ubl-settings-manager/css/ubl-settings-manager.css"
+#define GladePath "/com/ublinux/ui/ubl-settings-manager.glade"
+#define CssPath "/com/ublinux/css/ubl-settings-manager.css"
 #define GlobalConfigPath "/etc/xdg/ubl-settings-manager/ubl-settings-manager.conf"
 #define UserConfigPath "/.config/ubl-settings-manager/ubl-settings-manager.conf"
 #define AppIconPath "com.ublinux.ubl-settings-manager"
-#define AppBannerPath "/usr/share/ubl-settings-manager/images/ubl-settings-manager-banner.png"
+#define AppBannerPath "/com/ublinux/images/ubl-settings-manager-banner.png"
 #define DesktopPath "/usr/share/applications/"
 #define IconPicturesPath "/usr/share/icons/hicolor/scalable/apps/"
-#define ublinux_logo "/usr/share/ubl-settings-manager/images/ublinux-logo.svg"
 #define LocalePath "/usr/share/locale" 
 #define LocaleName "ubl-settings-manager"
 #define ubl_settings_infoPath "ubl-settings-info"
 #define ubl_settings_infoPathLaunch "ubl-settings-info --socket-id="
 typedef char* string;
-string version_application = "2.2";
+string version_application;
 
 #define UBL_SETTINGS_MANAGER_TITLE _("UBLinux Settings Manager")
 #define UBL_SETTINGS_MANAGER_ABOUT_TITLE _("About UBLinux Settings Manager")

ubl-settings-manager.desktop

@@ -1,11 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=ubl-settings-manager
-Name[ru]=Менеджер настроек UBLinux
+Name[ru]=Диспетчер настроек UBLinux
 GenericName=ubl-settings-manager
-GenericName[ru]=Менеджер настроек UBLinux
+GenericName[ru]=Диспетчер настроек UBLinux
 Comment=ubl-settings-manager
-Comment[ru]=Менеджер управления настройками UBLinux
+Comment[ru]=Графический диспетчер настроек UBLinux
 Type=Application
 Exec=ubl-settings-manager
 Icon=com.ublinux.ubl-settings-manager

ubl-settings-manager.glade

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.38.2 -->
-<interface>
+<interface domain="ubl-settings-manager">
   <requires lib="gtk+" version="3.24"/>
   <!-- interface-css-provider-path ubl-settings-manager.css -->
   <object class="GtkWindow" id="CautionWindow">
@@ -46,7 +46,7 @@
                 <property name="margin-end">25</property>
                 <property name="margin-top">20</property>
                 <property name="margin-bottom">20</property>
-                <property name="label">Changing the theme is not available due to the small screen resolution!</property>
+                <property name="label" translatable="yes">Changing the theme is not available due to the small screen resolution!</property>
                 <property name="wrap">True</property>
                 <property name="xalign">0</property>
               </object>
@@ -90,7 +90,7 @@
           <object class="GtkLabel" id="warningHeaderNameLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">UBLinux Settings</property>
+            <property name="label" translatable="yes">UBLinux Settings Manager</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -151,7 +151,6 @@
     <property name="can-focus">False</property>
     <property name="resizable">False</property>
     <property name="default-width">450</property>
-    <property name="default-height">250</property>
     <property name="icon-name">dialog-question-symbolic</property>
     <child>
       <object class="GtkBox">
@@ -190,7 +189,7 @@
                     <property name="halign">start</property>
                     <property name="margin-top">10</property>
                     <property name="margin-bottom">5</property>
-                    <property name="label" context="Would you like to read documentation in the Net?" comments="Would you like to read documentation in the Net?">Would you like to read documentation in the Web?</property>
+                    <property name="label" translatable="yes">Would you like to read documentation in the Web?</property>
                     <property name="wrap">True</property>
                     <property name="xalign">0</property>
                     <attributes>
@@ -211,10 +210,10 @@
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="halign">start</property>
-                    <property name="valign">start</property>
                     <property name="margin-right">15</property>
                     <property name="margin-end">10</property>
-                    <property name="label" context="You will be redirected to documentation web site, where documentation are translated and supported by community." comments="You will be redirected to documentation web site, where documentation are translated and supported by community.">You will be redirected to documentation website where documentation is translated and supported by community.</property>
+                    <property name="label" translatable="yes">You will be redirected to documentation site, where user help pages are
+translated and supported by community.</property>
                     <property name="wrap">True</property>
                     <property name="xalign">0</property>
                     <style>
@@ -222,20 +221,18 @@
                     </style>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
+                    <property name="expand">False</property>
                     <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="AlwaysOpenHelpCheckbox">
-                    <property name="label" translatable="yes">Always redirect to online documentation</property>
+                    <property name="label" translatable="yes">Always redirect</property>
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">False</property>
                     <property name="halign">end</property>
-                    <property name="margin-right">5</property>
-                    <property name="margin-bottom">10</property>
                     <property name="draw-indicator">True</property>
                     <style>
                       <class name="label"/>
@@ -244,6 +241,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
+                    <property name="pack-type">end</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -279,7 +277,7 @@
             <property name="homogeneous">True</property>
             <child>
               <object class="GtkButton" id="CancelHelpButton">
-                <property name="label">Cancel</property>
+                <property name="label" translatable="yes">Cancel</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">True</property>
@@ -296,7 +294,7 @@
             </child>
             <child>
               <object class="GtkButton" id="ReadHelpButton">
-                <property name="label">Read Online</property>
+                <property name="label" translatable="yes">Read online</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">True</property>
@@ -328,7 +326,7 @@
           <object class="GtkLabel" id="webHeaderNameLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">UBLinux Settings</property>
+            <property name="label" translatable="yes">UBLinux Settings Manager</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -731,7 +729,7 @@
           <object class="GtkLabel" id="MainHeaderNameLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">UBLinux Settings</property>
+            <property name="label" translatable="yes">UBLinux Settings Manager</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -1066,7 +1064,7 @@
           <object class="GtkLabel" id="GnomeHeaderNameLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">UBLinux Settings</property>
+            <property name="label" translatable="yes">UBLinux Settings Manager</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -1539,7 +1537,7 @@
           <object class="GtkLabel" id="sectionsHeaderNameLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">UBLinux Settings</property>
+            <property name="label" translatable="yes">UBLinux Settings Manager</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -1666,7 +1664,7 @@
                 <property name="can-focus">False</property>
                 <property name="margin-start">5</property>
                 <property name="margin-end">5</property>
-                <property name="label" translatable="yes">Icons size</property>
+                <property name="label" translatable="yes">Icon size</property>
               </object>
             </child>
           </object>
@@ -1723,7 +1721,7 @@
                 <property name="can-focus">False</property>
                 <property name="margin-start">5</property>
                 <property name="margin-end">5</property>
-                <property name="label" translatable="yes">Choose theme</property>
+                <property name="label" translatable="yes">Window theme</property>
               </object>
             </child>
           </object>
@@ -1778,7 +1776,7 @@
         </child>
         <child>
           <object class="GtkButton" id="settingsSectionsSettingsButton">
-            <property name="label" translatable="yes">Section management</property>
+            <property name="label" translatable="yes">Sections management</property>
             <property name="visible">True</property>
             <property name="can-focus">True</property>
             <property name="receives-default">True</property>
@@ -1874,7 +1872,7 @@
           <object class="GtkLabel" id="settingsHeaderNameLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">UBLinux Settings</property>
+            <property name="label" translatable="yes">UBLinux Settings Manager</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -2200,7 +2198,7 @@
               <object class="GtkLabel" id="LoaderHeaderNameLabel">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">UBLinux Settings</property>
+                <property name="label" translatable="yes">UBLinux Settings Manager</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -2351,7 +2349,7 @@
           <object class="GtkLabel" id="aboutHeadLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">About UBLinux Settings Manager</property>
+            <property name="label" translatable="yes">UBLinux Settings Manager</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>

ubl-settings-manager.pot

@@ -155,7 +155,7 @@ msgstr ""
 #: source/ubl-settings-manager.h:43 source/ubl-settings-manager.h:42
 #: source/ubl-settings-manager.c:1678
 msgid ""
-"You will be redirected to documentation site, where user help pages are "
+"You will be redirected to documentation site, where user help pages are\n"
 "translated and supported by community."
 msgstr ""
 

ubl-settings-manager_ru.po

@@ -36,9 +36,8 @@ msgstr ""
 "      --lock-settings  \t  Заблокировать окно настроек\n"
 
 #: source/ubl-settings-manager.h:27
-#, fuzzy
 msgid "About UBLinux Settings Manager"
-msgstr "О приложении Настройки UBLinux"
+msgstr "О приложении Диспетчер настроек UBLinux"
 
 #: source/ubl-settings-manager.h:34 source/ubl-settings-manager.c:1685
 msgid "About..."
@@ -71,7 +70,7 @@ msgstr "Закрыть"
 
 #: source/ubl-settings-manager.h:30
 msgid "Config loading failed!\n"
-msgstr ""
+msgstr "Ошибка загрузки конфигурации!\n"
 
 #: source/ubl-settings-manager.h:35
 msgid "Documentation"
@@ -125,7 +124,7 @@ msgstr "Настройки"
 
 #: source/ubl-settings-manager.h:29 source/ubl-settings-manager.c:632
 msgid "Settings manager for UBLinux"
-msgstr "Менеджер настроек для UBLinux"
+msgstr "Диспетчер настроек UBLinux"
 
 #: source/ubl-settings-manager.c:1912 source/ubl-settings-manager.c:1911
 #: source/ubl-settings-manager.c:1792
@@ -139,7 +138,7 @@ msgstr "Система"
 #: source/ubl-settings-manager.c:1601 source/ubl-settings-manager.c:1615
 #: source/ubl-settings-manager.c:1674
 msgid "UBLinux Settings Manager"
-msgstr "Настройки UBLinux"
+msgstr "Диспетчер настроек UBLinux"
 
 #: source/ubl-settings-manager.h:33 source/ubl-settings-manager.c:1686
 msgid "Understood"
@@ -162,10 +161,10 @@ msgstr "Вы хотите прочитать справку в Сети?"
 #: source/ubl-settings-manager.h:43 source/ubl-settings-manager.h:42
 #: source/ubl-settings-manager.c:1678
 msgid ""
-"You will be redirected to documentation site, where user help pages are "
+"You will be redirected to documentation site, where user help pages are\n"
 "translated and supported by community."
 msgstr ""
-"Вы будете перенаправлены на сайт с документацией где страницы помощи "
+"Вы будете перенаправлены на сайт с документацией где страницы помощи\n"
 "переводятся и поддерживаются сообществом."
 
 #: source/ubl-settings-manager.h:9