Merge pull request 'devel' (#22) from devel into master

Reviewed-on: YanTheKaller/ubl-settings-manager#22

.gitignore

@@ -6,6 +6,7 @@ msgformat.py
 calendarApp.glade
 calendarApp.glade~
 ubl-settings-manager.glade~
+*ubl-settings-manager.glade#
 ubl-settings-manager
 **base.mo
 home/
@@ -14,3 +15,4 @@ css/
 images/
 locale/
 ui/
+ubl-settings-manager_ru.pos

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}"
@@ -140,7 +138,13 @@ clean:
 	    echo "Clean: error, compile directory exist ${CMAKE_BUILD_DIR}"; \
 	else \
 	    echo "Clean: OK"; \
-	fi
+	fi; \
+  	version="$$(cat VERSION.md)"; \
+	version=$${version:8}; \
+	search="s/string version_application.*"; \
+	echo $$search; \
+	replace="string version_application = ;"; \
+	sed -i -e "$$search/$$replace/gi" source/ubl-settings-manager.h; \
 
 help:
 	@echo "The following are some of the valid targets for this Makefile:"

source/ubl-settings-manager.c

@@ -122,7 +122,6 @@ void on_gnome_Item_activated(GtkIconView* self, GtkTreePath* path, actionWidgets
             }
         }
         else {
-            on_about_system(NULL,applist);
             launch_app(tempapp[0].Exec);
             gtk_widget_destroy(applist->socketbutton);
         }
@@ -178,7 +177,6 @@ int on_settings_accept(GtkWidget *button, dictionary **widgetsDs){
     else if (main_config.WindowTheme==1)
         main_config.curThemeName="Gnome";
     dictionary *widgetsD=yon_dictionary_find(widgetsDs,main_config.curThemeName);
-    // printf("Saving config...\n");
     actionWidgets *widgets=(actionWidgets*)widgetsD->data;
     int theme=gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->settingsThemeChooser));
     gtk_window_get_position(GTK_WINDOW(widgets->window),&main_config.windowPosX,&main_config.windowPosY);
@@ -275,8 +273,7 @@ void on_paned_move(GtkPaned* self, GtkScrollType* scroll_type, actionWidgets *wi
     int position=gtk_paned_get_position(GTK_PANED(widgets->GnomePaned));
     if (position<200) {position=200;  gtk_paned_set_position(GTK_PANED(widgets->GnomePaned),200);}
     main_config.iconSegmentSize=position;
-    if (position <70) {position=70;}
-    double pos=((double)position);
+    double pos=((double)position-20);
     if (pos<70) pos=70;
     for (dictionary *dict=widgets->ICSys;dict!=NULL;dict=dict->next){
         IVGraphicals *IV=(IVGraphicals*)dict->data;
@@ -368,7 +365,7 @@ void on_section_settings_open(GtkButton* self,dictionary *cWidgets){
         dict=dict->prev;
         dict->next=NULL;
     }
-    gtk_widget_show(widgets->SectionSettingsWindow);
+    gtk_window_present(GTK_WINDOW(widgets->SectionSettingsWindow));
 }
 
 void on_sections_edit(GtkWidget *button, actionWidgets *widgets){
@@ -644,11 +641,6 @@ void on_resized (GtkWidget *window, GdkEventConfigure *event, dictionary *widget
                 gtk_window_get_size(GTK_WINDOW(window),&main_config.windowWidth,&main_config.windowHeight);
                 yon_switch_theme(&widgetsD,yon_dictionary_find(&widgetsD,"Main"));
                 *main_config.currentThemeIconSize=24;
-
-                // for (dictionary *dict=widgets->ICSys->first;dict!=NULL;dict=dict->next){
-                //     IVGraphicals *IV=(IVGraphicals*)dict->data;
-                //     load_apps_with_clear(IV,widgets->applist,widgets->appssize);
-                // }
                 gtk_window_resize(GTK_WINDOW(widgets->window),main_config.windowWidth,main_config.windowHeight);
                 gtk_widget_hide(widgets->window);
             }
@@ -672,23 +664,11 @@ void on_resized_done (GtkWidget *window, GdkEvent *event, dictionary *widgetsD){
     }
 }
 
-void on_about_system(GtkWidget *button, actionWidgets *widgets){
-    char arg[100];
-    memset(arg,0,100);
-    gtk_widget_show(widgets->socketbuttonplace);
-    if (button){
-        gtk_widget_hide(widgets->appSettings); 
-        sprintf(arg,"--socket-id=%d --socket-ext-id=%d",gtk_socket_get_id(GTK_SOCKET(widgets->socket)),gtk_socket_get_id(GTK_SOCKET(widgets->socketbutton)));
-    }else{
-        sprintf(arg,"--socket-id=%d",gtk_socket_get_id(GTK_SOCKET(widgets->socket)));
-    }
-    launch_app_with_arguments("ubl-settings-info",arg);
-}
+
 
 void on_theme_selection_changed(GtkWidget *self, actionWidgets *widgets){
     int *icsize;
     int curthm=gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->settingsThemeChooser));
-    // main_config.changed=1;
     if (curthm==0){
         main_config.currentThemeIconSize=&main_config.Mainiconsize;
         main_config.currentThemeLabelSize=&main_config.MainlabelSize;
@@ -723,7 +703,17 @@ 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_widget_set_visible(AboutButtons,0);
+}
 
 int launch(thread_output *thread){
     int a=0;
@@ -784,12 +774,12 @@ int load_apps(IVGraphicals *section, apps *applist, int size){
             GError *err=NULL;
             GtkTreeIter iter;
             gtk_list_store_append(section->LV,&iter);
-            int sz= *main_config.currentThemeIconSize+10;
-            if (sz<50) sz=50;
+            int sz= yon_get_icon_size(*main_config.currentThemeIconSize)+3;
+            if (sz<34) sz=34;
             GtkIconTheme *icthm=gtk_icon_theme_get_default();
-            GdkPixbuf *pixbuf=gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, applist[i].Icon,yon_get_icon_size(*main_config.currentThemeIconSize),1,GTK_ICON_LOOKUP_FORCE_SVG),NULL);
+            GdkPixbuf *pixbuf=gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, applist[i].Icon,yon_get_icon_size(*main_config.currentThemeIconSize),1,GTK_ICON_LOOKUP_FORCE_SIZE),NULL);
             GtkTreePath *pth = gtk_tree_model_get_path(GTK_TREE_MODEL(section->LV),&iter);
-            gtk_list_store_set(section->LV,&iter,0,applist[i].Name,1,0.0,2,0.5, 3, sz+8, 4, pixbuf, 5,yon_get_icon_size(*main_config.currentThemeIconSize), -1);
+            gtk_list_store_set(section->LV,&iter,0,applist[i].Name,1,0.0,2,0.5, 3, sz+5, 4, pixbuf, 5,yon_get_icon_size(*main_config.currentThemeIconSize)+10, -1);
             int cols = gtk_icon_view_get_columns(GTK_ICON_VIEW(section->IV));
             gtk_icon_view_set_columns(GTK_ICON_VIEW(section->IV), -1);
             gtk_icon_view_set_columns(GTK_ICON_VIEW(section->IV), cols);
@@ -937,7 +927,8 @@ int check_categories(apps app, char *catstocheck){
         if (!found) return 0;
         n_found++;
         while (cat){
-            char *fcat=strstr(app.Categories,";");
+            left_cats=cat+1;
+            char *fcat=app.Categories;//strstr(app.Categories,";");
             cat=strstr(cat+1,";");
             if (!cat) break;
             find_it=yon_cut(left_cats,(strlen(left_cats)-strlen(cat)),0);
@@ -946,7 +937,7 @@ int check_categories(apps app, char *catstocheck){
             if (!found) break;
             n_found++;
             left_cats=cat+1;
-            if (strlen(left_cats)==0 ||strcmp(left_cats,'\0')==0) break;
+            if (strlen(left_cats)==0 ||strcmp(left_cats,"")==0) break;
         }
         if (to_find==n_found) return 1; else return 0;
     }
@@ -987,6 +978,7 @@ int setup_config(){
     main_config.GnomelabelSize=g_key_file_get_integer(configfile,"window","GnomeLabelSize",NULL);
     main_config.labelDensity=g_key_file_get_integer(configfile,"window","LabelDensity",NULL);
     main_config.lastUser=g_key_file_get_string(configfile,"window","User",NULL);
+    main_config.fullscreen=g_key_file_get_boolean(configfile,"window","fullscreen",NULL);
     if (main_config.MainlabelSize==0) main_config.MainlabelSize=12;
     if (main_config.labelDensity==0) main_config.labelDensity=0;
     main_config.MainlabelSize=main_config.MainlabelSize*1000;
@@ -1065,6 +1057,7 @@ void save_config(actionWidgets *widgets){
         sprintf(fromint,"%d",main_config.windowHeight);
         g_key_file_set_string(gfile,"window","WindowHeight",fromint);
     }
+    g_key_file_set_boolean(gfile,"window","fullscreen",main_config.fullscreen);
     sprintf(fromint,"%d",main_config.WindowTheme);
     g_key_file_set_string(gfile,"window","WindowTheme",fromint);
     sprintf(fromint,"%d",sz);
@@ -1144,10 +1137,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);
@@ -1168,8 +1157,6 @@ IVGraphicals *yon_create_single_section_IV(char *name,char *cats){
     gtk_widget_set_margin_end(label,6);
     gtk_widget_set_margin_start(label,6);
     gtk_widget_set_margin_bottom(label,2);
-    // gtk_widget_set_name(label,"workingbg");
-    // gtk_widget_set_name(box,"workingbg");
     gtk_icon_view_set_spacing(GTK_ICON_VIEW(iv),20);
     if (main_config.WindowTheme==1) {
         gtk_icon_view_set_columns(GTK_ICON_VIEW(iv),1);
@@ -1178,10 +1165,9 @@ IVGraphicals *yon_create_single_section_IV(char *name,char *cats){
         gtk_icon_view_set_item_orientation(GTK_ICON_VIEW(iv),GTK_ORIENTATION_HORIZONTAL);
     } else {
         gtk_icon_view_set_item_padding(GTK_ICON_VIEW(iv),3);
-        //gtk_widget_set_name(iv,"workingbg");
         gtk_icon_view_set_item_orientation(GTK_ICON_VIEW(iv),GTK_ORIENTATION_HORIZONTAL);
+        gtk_icon_view_set_row_spacing(GTK_ICON_VIEW(iv),2);
     }
-    gtk_icon_view_set_text_column(GTK_ICON_VIEW(iv),0);
     GtkWidget *sep=gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
     GtkListStore *lv=GTK_LIST_STORE(gtk_builder_get_object(builder,"liststoreTemplate"));
     gtk_widget_set_name(sep,"SepIcon");
@@ -1267,7 +1253,7 @@ void yon_icv_resize_item(dictionary *icdict, GtkWidget *paned){
     for (dictionary *dict=icdict->first;dict!=NULL;dict=dict->next){
         IVGraphicals *icv=(IVGraphicals*)dict->data;
         int width=gtk_paned_get_position(GTK_PANED(paned));
-        int pos=(int)((double)width);
+        int pos=(int)((double)width-20);
         if (pos < 100) pos=100;
         
         gtk_icon_view_set_item_width(GTK_ICON_VIEW(icv->IV),pos);
@@ -1372,7 +1358,7 @@ void yon_switch_theme(dictionary **dict, dictionary *newone){
 int yon_get_icon_size(int size){
     if (size==1||size==24) return 24;
     if (size==2||size==32) return 32;
-    if (size==3||size==48) return 51;
+    if (size==3||size==48) return 48;
     if (size==4||size==64) return 64;
 }
 
@@ -1603,7 +1589,6 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
     
     gtk_style_context_add_class(gtk_widget_get_style_context(curWidgets->icvpack),"iconview");
     curWidgets->socket=GTK_WIDGET(create_socket(curWidgets));
-    g_signal_connect(G_OBJECT(curWidgets->MenuItemAboutSystem), "activate", G_CALLBACK(on_about_system),curWidgets);
     if (curWidgets->ButtonBackToMain!=NULL)
         gtk_button_set_label(GTK_BUTTON(curWidgets->ButtonBackToMain),_("Back to all settings"));
     gtk_window_set_title(GTK_WINDOW(curWidgets->window),_("UBLinux Settings Manager"));
@@ -1614,7 +1599,6 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
     }
     g_signal_connect(G_OBJECT(curWidgets->window), "configure-event", G_CALLBACK(on_resized), widgets);
     if (strcmp(theme_id,"Gnome")==0){
-        on_about_system(NULL,curWidgets);
     g_signal_connect(G_OBJECT(curWidgets->window), "event-after", G_CALLBACK(on_resized_done), widgets);
     
     }
@@ -1642,6 +1626,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
     curWidgets->settingsCancel=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsCancel"));
     curWidgets->settingsSubmenuLabelSize=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsSubmenuLabelSize"));
     curWidgets->settingsSubmenuLabelTheme=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsSubmenuLabelTheme"));
+    curWidgets->settingsSectionsSettingsButton=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsSectionsSettingsButton"));
     curWidgets->SectionSettingAddButton=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"SectionSettingsAddButton"));
     curWidgets->SectionSettingAddNameEntry=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"SectionSettingsAddNameEntry"));
     curWidgets->SectionSettingAddCategoriesEntry=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"SectionSettingsAddCategoriesEntry"));
@@ -1651,6 +1636,8 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
     curWidgets->CautionWindow=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"CautionWindow"));
     curWidgets->CautionUnderstandButton=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"CautionUnderstandButton"));
     curWidgets->infoWarningWindow=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"windowSettings-infoWarning"));
+    curWidgets->infoWarningButton=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"buttonSettings-infoWarning"));
+    curWidgets->infoWarningLabel=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"labelSettings-infoWarning"));
     curWidgets->applist=applist;
     curWidgets->appssize=appsize;
     GtkIconTheme *icthm=gtk_icon_theme_get_default();
@@ -1658,7 +1645,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){
@@ -1674,6 +1661,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
         g_signal_connect(G_OBJECT(curWidgets->SectionSettingsCloseButton), "clicked", G_CALLBACK(on_sections_close), curWidgets);
         g_signal_connect(G_OBJECT(curWidgets->SectionSettingsSaveButton), "clicked", G_CALLBACK(on_sections_save), curWidgets);
         g_signal_connect(G_OBJECT(curWidgets->CautionUnderstandButton), "clicked", G_CALLBACK(on_caution_understand), curWidgets);
+        g_signal_connect(G_OBJECT(curWidgets->settingsSectionsSettingsButton), "clicked", G_CALLBACK(on_section_settings_open), widgets);
     }
     g_signal_connect(G_OBJECT(curWidgets->window), "destroy", G_CALLBACK(yon_main_quit), curWidgets);
     gtk_label_set_text(GTK_LABEL(curWidgets->LabelTitle),_("UBLinux Settings Manager"));
@@ -1688,8 +1676,8 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
     gtk_button_set_label(GTK_BUTTON(curWidgets->AlwaysOpenDocumentation),_("Always redirect"));
     gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemSettings),_("Settings"));
     gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemDocumentation),_("About..."));
-    gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemAboutSystem),_("About system"));
     gtk_button_set_label(GTK_BUTTON(curWidgets->CautionUnderstandButton),_("Understood"));
+    gtk_button_set_label(GTK_BUTTON(curWidgets->settingsSectionsSettingsButton),_("Sections management"));
     return widgets;
 }
 
@@ -1701,7 +1689,8 @@ int main(int argc, char *argv[]){
     }
     local=setlocale(LC_ALL, "");
     textdomain (LocaleName);
-    actionWidgets *widget=malloc(sizeof(actionWidgets));
+    actionWidgets *widget=NULL;
+    widget=malloc(sizeof(actionWidgets));
     dictionary *widgets=yon_dictionary_create_empty();
     widgets->data=widget;
     int *size=malloc(sizeof(int));
@@ -1776,6 +1765,7 @@ int main(int argc, char *argv[]){
     gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widg->settingsThemeChooser),NULL,_("Standard theme"));
     gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widg->settingsThemeChooser),NULL,_("GNOME theme"));
     widg=(actionWidgets*)widgets->data;
+    if (main_config.fullscreen==1)
         gtk_window_maximize(GTK_WINDOW(widg->window));
     gtk_widget_show(widg->window);
     hide_if_unfound(widgets);

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 = ;
 
 typedef struct apps{
         char *Name;
@@ -135,7 +136,7 @@ typedef struct {
     GtkWidget *GnomePaned;
     GtkWidget *GnomeInfoLabel;
     GtkWidget *workingwindow;
-    // GtkWidget *settingsSectionsSettingsButton;
+    GtkWidget *settingsSectionsSettingsButton;
     GtkWidget *SectionSettingsWindow;
     GtkWidget *SectionSettingsPack;
     dictionary *SettingsSections;
@@ -157,6 +158,8 @@ typedef struct {
     apps *applist;
     GtkWidget *icvpack;
     GtkWidget *infoWarningWindow;
+    GtkWidget *infoWarningButton;
+    GtkWidget *infoWarningLabel;
     
 } actionWidgets;
 
@@ -214,7 +217,6 @@ void yon_dictionary_make_first(dictionary *dict);
 dictionary *yon_create_icon_section_list(dictionary *sections);
 int yon_show_icon_views(dictionary *IVS,actionWidgets *widgets);
 void yon_icon_size_convert(int mode);
-void on_about_system(GtkWidget *button, actionWidgets *widgets);
 char *yon_char_new(char *chr);
 int launch(thread_output *thread);
 float yon_time_average(dictionary *times);

ubl-settings-manager.css

@@ -4,6 +4,7 @@ background-color: #404040;
 
 
 #GnomeIcon{
+  border-radius: 0px;
 	border-style:solid;
 	border-bottom-width: 1px;
 	border-image: linear-gradient(90deg, alpha(@theme_text_color,0.4) 55%, alpha(@theme_bg_color, 0) 100%);

ubl-settings-manager.glade

@@ -123,17 +123,6 @@
         </style>
       </object>
     </child>
-    <child>
-      <object class="GtkMenuItem" id="GnomeMenuItemAboutSystem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">About system</property>
-        <property name="use-underline">True</property>
-        <style>
-          <class name="menuitembottom"/>
-        </style>
-      </object>
-    </child>
     <style>
       <class name="menu"/>
     </style>
@@ -353,17 +342,6 @@
         </style>
       </object>
     </child>
-    <child>
-      <object class="GtkMenuItem" id="MainMenuItemAboutSystem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">About system</property>
-        <property name="use-underline">True</property>
-        <style>
-          <class name="menuitembottom"/>
-        </style>
-      </object>
-    </child>
     <style>
       <class name="menu"/>
     </style>
@@ -563,6 +541,23 @@
             <property name="position">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkButton" id="settingsSectionsSettingsButton">
+            <property name="label" translatable="yes">button</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-top">5</property>
+            <property name="margin-bottom">5</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
@@ -674,7 +669,6 @@
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="halign">center</property>
-                    <property name="icon-name">ubl-settings-manager-banner</property>
                     <property name="icon_size">3</property>
                     <style>
                       <class name="noborder"/>
@@ -905,7 +899,8 @@
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="stock">gtk-undelete</property>
+    <property name="pixel-size">16</property>
+    <property name="icon-name">software-remove-symbolic</property>
   </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
@@ -956,6 +951,7 @@
   <object class="GtkImage" id="image4">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
+    <property name="pixel-size">16</property>
     <property name="icon-name">object-select-symbolic</property>
   </object>
   <object class="GtkWindow" id="SectionSettingsWindow">
@@ -1468,10 +1464,8 @@
             <property name="can-focus">True</property>
             <property name="focus-on-click">False</property>
             <property name="receives-default">False</property>
-            <property name="double-buffered">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="margin-right">10</property>
             <property name="margin-end">10</property>
             <property name="image">image5</property>
           </object>
@@ -1574,8 +1568,8 @@
       <column type="gint"/>
       <!-- column-name GdkPixbuf1 -->
       <column type="GdkPixbuf"/>
-      <!-- column-name GtkIconSize1 -->
-      <column type="GtkIconSize"/>
+      <!-- column-name gint2 -->
+      <column type="gint"/>
     </columns>
   </object>
   <object class="GtkIconView" id="iconTemplate">
@@ -1586,7 +1580,7 @@
     <property name="item-orientation">horizontal</property>
     <property name="model">liststoreTemplate</property>
     <property name="item-width">135</property>
-    <property name="row-spacing">2</property>
+    <property name="row-spacing">0</property>
     <property name="column-spacing">2</property>
     <property name="item-padding">5</property>
     <property name="activate-on-single-click">True</property>
@@ -1595,11 +1589,22 @@
         <property name="xpad">2</property>
       </object>
       <attributes>
+        <attribute name="width">5</attribute>
         <attribute name="height">3</attribute>
         <attribute name="xalign">1</attribute>
         <attribute name="yalign">2</attribute>
         <attribute name="pixbuf">4</attribute>
-        <attribute name="stock-size">5</attribute>
+      </attributes>
+    </child>
+    <child>
+      <object class="GtkCellRendererText">
+        <property name="xalign">0</property>
+        <property name="wrap-mode">word</property>
+        <property name="wrap-width">18</property>
+      </object>
+      <attributes>
+        <attribute name="height">3</attribute>
+        <attribute name="text">0</attribute>
       </attributes>
     </child>
     <style>
@@ -1948,6 +1953,47 @@
       </object>
     </child>
   </object>
+  <object class="GtkAboutDialog" id="ublAbloutWindow">
+    <property name="can-focus">False</property>
+    <property name="title" translatable="yes">About</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window-position">center</property>
+    <property name="icon-name">ubl-settings-manager</property>
+    <property name="type-hint">dialog</property>
+    <property name="urgency-hint">True</property>
+    <property name="program-name">UBLinux Settings Manager</property>
+    <property name="version">1.6</property>
+    <property name="copyright" translatable="yes">Copyright © 2022 - 2023 - UBSoft Software LLC</property>
+    <property name="comments" translatable="yes">Settings manager for UBLinux</property>
+    <property name="website">https://ublinux.ru/</property>
+    <property name="website-label" translatable="yes">Project Home Page</property>
+    <property name="authors">UBGroup</property>
+    <property name="artists">UBGroup</property>
+    <property name="logo-icon-name">ubl-settings-manager</property>
+    <property name="license-type">gpl-2-0</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="AboutButtons">
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+  </object>
   <object class="GtkWindow" id="windowSettings-infoWarning">
     <property name="can-focus">False</property>
     <child>
@@ -1979,15 +2025,15 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel">
+              <object class="GtkLabel" id="labelSettings-infoWarning">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="valign">start</property>
                 <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
+                <property name="margin-end">15</property>
                 <property name="margin-top">20</property>
                 <property name="margin-bottom">20</property>
-                <property name="label" translatable="yes">Looks like you don't have ubl-settings-info installed on your PC</property>
+                <property name="label" translatable="yes">Looks like you don't have ubl-settings-info installed on your PC.</property>
                 <property name="wrap">True</property>
                 <property name="xalign">0</property>
               </object>

ubl-settings-manager_ru.po

@@ -6,88 +6,101 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: 1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-09 16:45+0600\n"
+"POT-Creation-Date: 2023-03-13 10:24+0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ubl-settings-manager.c:1338
-msgid "Back to all settings"
-msgstr "Назад ко всем настройкам"
+#: source/ubl-settings-manager.c:730
+msgid "Settings manager for UBLinux"
+msgstr "Менеджер настроек для UBLinux"
 
-#: ubl-settings-manager.c:1418
+#: source/ubl-settings-manager.c:731 source/ubl-settings-manager.c:1615
+#: source/ubl-settings-manager.c:1630 source/ubl-settings-manager.c:1685
 msgid "UBLinux Settings Manager"
 msgstr "Настройки UBLinux"
 
-#: ubl-settings-manager.c:1419
+#: source/ubl-settings-manager.c:733
+msgid "Project Home Page"
+msgstr "Домашняя станица проекта"
+
+#: source/ubl-settings-manager.c:1614
+msgid "Back to all settings"
+msgstr "Назад ко всем настройкам"
+
+#: source/ubl-settings-manager.c:1686
 msgid "Icon size"
 msgstr "Размер иконок"
 
-#: ubl-settings-manager.c:1420
+#: source/ubl-settings-manager.c:1687
 msgid "Window theme"
 msgstr "Выбор темы"
 
-#: ubl-settings-manager.c:1421
+#: source/ubl-settings-manager.c:1688
 msgid "Would you like to read documentation in the Web?"
 msgstr "Вы хотите прочитать руководство в сети?"
 
-#: ubl-settings-manager.c:1422
+#: source/ubl-settings-manager.c:1689
 msgid ""
 "You will be redirected to documentation site, where user help pages are "
 "translated and supported by community."
 msgstr "Вы будете перенаправлены на сайт с документацией, где страницы помощи переводятся и поддерживаются сообществом."
 
-#: ubl-settings-manager.c:1423
+#: source/ubl-settings-manager.c:1690
 msgid "Read online"
 msgstr "Прочитать онлайн"
 
-#: ubl-settings-manager.c:1424
+#: source/ubl-settings-manager.c:1691
 msgid "Cancel"
 msgstr "Отменить"
 
-#: ubl-settings-manager.c:1425
+#: source/ubl-settings-manager.c:1692
 msgid "Close"
 msgstr "Закрыть"
 
-#: ubl-settings-manager.c:1426
+#: source/ubl-settings-manager.c:1693
 msgid "Save and apply"
 msgstr "Сохранить и применить"
 
-#: ubl-settings-manager.c:1427
+#: source/ubl-settings-manager.c:1694
 msgid "Always redirect"
 msgstr "Всегда перенаправлять"
 
-#: ubl-settings-manager.c:1428
+#: source/ubl-settings-manager.c:1695
 msgid "Settings"
 msgstr "Настройки"
 
-#: ubl-settings-manager.c:1429
+#: source/ubl-settings-manager.c:1696
 msgid "About..."
 msgstr "О программе"
 
-#: ubl-settings-manager.c:1430
+#: source/ubl-settings-manager.c:1697
+msgid "Looks like you don't have ubl-settings-info installed on your PC."
+msgstr "В вашей системе не обнаружен UBLinux Settings Info."
+
+#: source/ubl-settings-manager.c:1697
 msgid "About system"
 msgstr "О системе"
 
-#: ubl-settings-manager.c:1431
+#: source/ubl-settings-manager.c:1719
+msgid "Sections management"
+msgstr "Настройка разделов"
+
+#: source/ubl-settings-manager.c:1698
 msgid "Understood"
 msgstr "Понятно"
 
-#: ubl-settings-manager.c:1432
-msgid "Section management"
-msgstr "Точная настройка"
-
-#: ubl-settings-manager.c:1508
+#: source/ubl-settings-manager.c:1782
 msgid "Standard theme"
-msgstr "Основная тема"
+msgstr "Стандартная тема"
 
-#: ubl-settings-manager.c:1509
+#: source/ubl-settings-manager.c:1783
 msgid "GNOME theme"
 msgstr "GNOME тема"