diff --git a/.gitignore b/.gitignore
index 42fe714..7eb13de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@ css/
.config/
images/
locale/
-ui/
\ No newline at end of file
+ui/
+ubl-settings-manager_ru.pos
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 32ef201..cc5f38d 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,6 @@ CMAKE_BUILD_DIR = ./compile
DEPENDS = cmake
PKGNAME = $(MAKEFILE_DIR)
#PKGNAME = ubl-settings-manager
-pkgdir =
default_target: all
@@ -23,8 +22,9 @@ init:
@echo "Initialize ..."; \
version="$$(cat VERSION.md)"; \
version=$${version:8}; \
- search="s/char *version_application.*$&"; \
- replace="char *version_application = \"$${version}\";"; \
+ search="s/string version_application.*$&"; \
+ echo $$search; \
+ replace="string version_application = \"$${version}\";"; \
sed -i -e "$$search/$$replace/gi" source/ubl-settings-manager.h; \
echo "-- Build path: ${CMAKE_BUILD_DIR}"
@@ -91,9 +91,7 @@ uninstall:
@$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}.glade"
@$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
@$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}-banner.png"
- @$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
- @$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
- @$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
+ @$(RM) "/usr/share/${PKGNAME}/ui/ublinux-logo.svg"
@$(RM) -d "/usr/share/${PKGNAME}/css"
@$(RM) -d "/usr/share/${PKGNAME}/ui"
@$(RM) -d "/usr/share/${PKGNAME}"
diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c
index 37d7c97..4060fbd 100644
--- a/source/ubl-settings-manager.c
+++ b/source/ubl-settings-manager.c
@@ -723,7 +723,18 @@ void on_theme_selection_changed(GtkWidget *self, actionWidgets *widgets){
}
}
-
+void on_about(GtkWidget *button){
+ GtkBuilder *builder = gtk_builder_new_from_file(GladePath);
+ GtkWidget *AboutButtons = GTK_WIDGET(gtk_builder_get_object(builder,"AboutButtons"));
+ GtkWidget *About = GTK_WIDGET(gtk_builder_get_object(builder, "ublAbloutWindow"));
+ gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(About),_("Settings manager for UBLinux"));
+ gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(About),_("UBLinux Settings Manager"));
+ gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(About),version_application);
+ gtk_widget_show(About);
+ gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(About),_("Project Home Page"));
+ // gtk_label_set_text(GTK_LABEL(HeaderAboutTopic),_("About UBLinux Settings Manager"));
+ gtk_widget_set_visible(AboutButtons,0);
+}
int launch(thread_output *thread){
int a=0;
@@ -1144,10 +1155,6 @@ void yon_set_default_sections(dictionary **section){
*section=(*section)->first;
}
-void yon_check_for_space_near_eol(){
-
-}
-
IVGraphicals *yon_create_single_section_IV(char *name,char *cats){
IVGraphicals *IVG = malloc(sizeof(IVGraphicals));
GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
@@ -1658,7 +1665,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
gtk_window_resize(GTK_WINDOW(curWidgets->window),main_config.windowWidth,main_config.windowHeight);
gtk_window_set_icon(GTK_WINDOW(curWidgets->window),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, AppIconPath,yon_get_icon_size(32),1,GTK_ICON_LOOKUP_FORCE_SVG),NULL));
gtk_window_set_icon(GTK_WINDOW(curWidgets->SectionSettingsWindow),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, AppIconPath,yon_get_icon_size(32),1,GTK_ICON_LOOKUP_FORCE_SVG),NULL));
- g_signal_connect(G_OBJECT(curWidgets->MenuItemDocumentation), "activate", G_CALLBACK(on_ButtonOpenHelp_activated), curWidgets->builder);
+ g_signal_connect(G_OBJECT(curWidgets->MenuItemDocumentation), "activate", G_CALLBACK(on_about), curWidgets->builder); //on_ButtonOpenHelp_activated
g_signal_connect(G_OBJECT(curWidgets->MenuItemSettings), "activate", G_CALLBACK(on_settingsOpen), curWidgets);
if (gnld==0){
diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h
index d10ecef..65ee9a7 100644
--- a/source/ubl-settings-manager.h
+++ b/source/ubl-settings-manager.h
@@ -18,7 +18,8 @@
#define LocaleName "ubl-settings-manager"
#define ubl_settings_infoPath "ubl-settings-info"
#define ubl_settings_infoPathLaunch "ubl-settings-info --socket-id="
-char *version_application = "1.3";
+typedef char* string;
+string version_application = "1.1";
typedef struct apps{
char *Name;
diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade
index 43378f6..df36fbb 100644
--- a/ubl-settings-manager.glade
+++ b/ubl-settings-manager.glade
@@ -1281,6 +1281,7 @@
+