Fixed config algorythms

source/ubl-settings-manager.c

@@ -636,16 +636,18 @@ void on_double_click_changed(GtkWidget *Switch, gboolean state, dictionary *widg
 void on_about(GtkWidget *button){
     GtkBuilder *builder = gtk_builder_new_from_file(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"));
     gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(About),_(ABOUT_PROJECT_COMMENTS_LABEL));
     gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(About),_(UBL_SETTINGS_MANAGER_TITLE));
-    gtk_window_set_title(GTK_WINDOW(About),UBL_SETTINGS_MANAGER_ABOUT_TITLE);
+    gtk_label_set_text(GTK_LABEL(AboutHeadLabel),UBL_SETTINGS_MANAGER_ABOUT_TITLE);
     gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(About),version_application);
     gtk_widget_show(About);
     GList *list = gtk_container_get_children(GTK_CONTAINER(AboutButtons));
-    gtk_widget_destroy(GTK_WIDGET(g_list_first(list)));
+    gtk_widget_destroy(AboutButtons);
-    gtk_widget_destroy(GTK_WIDGET(g_list_first(list)->next));
+    // gtk_widget_destroy(GTK_WIDGET(g_list_first(list)->next->next));
-    gtk_widget_destroy(GTK_WIDGET(g_list_first(list)->next->next));
+    // gtk_widget_destroy(GTK_WIDGET(g_list_first(list)->next));
+    // gtk_widget_destroy(GTK_WIDGET(g_list_first(list)));
     gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(About),_(ABOUT_PROJECT_HOME_PAGE_LABEL));
     // gtk_widget_set_visible(AboutButtons,0);
 }
@@ -901,16 +903,13 @@ int setup_config(){
     GKeyFile *configfile = g_key_file_new();
     char *pth=malloc(7+strlen(UserConfigPath)+strlen(getlogin()));
     sprintf(pth,"%s%s%s","/home/",getlogin(),UserConfigPath);
-    g_key_file_load_from_file(configfile,pth,G_KEY_FILE_KEEP_TRANSLATIONS,&err);
+    
-    if (err||main_config.lock_settings==1){
+    g_key_file_load_from_file(configfile,GlobalConfigPath,G_KEY_FILE_KEEP_TRANSLATIONS,&err);
+    if (err){
         g_error_free(err);
-        err=NULL;
+        return 0;
-        g_key_file_load_from_file(configfile,GlobalConfigPath,G_KEY_FILE_KEEP_TRANSLATIONS,&err);
+    } else {
-        if (err){
+
-            g_error_free(err);
-            return 0;
-        }
-    }
     char *foroutput=NULL;
     char *line=NULL;
     main_config.GnomeDoubleClick=g_key_file_get_boolean(configfile,"window", "GnomeDoubleClick",NULL);
@@ -929,6 +928,51 @@ int setup_config(){
     main_config.lastUser=g_key_file_get_string(configfile,"window","User",NULL);
     main_config.fullscreen=g_key_file_get_boolean(configfile,"window","fullscreen",NULL);
     main_config.BannerHidden=g_key_file_get_boolean(configfile,"window","BannerHidden",NULL);
+    }
+
+    g_key_file_load_from_file(configfile,pth,G_KEY_FILE_KEEP_TRANSLATIONS,&err);
+    if (err||main_config.lock_settings==1){
+        g_error_free(err);
+        err=NULL;
+        g_key_file_load_from_file(configfile,GlobalConfigPath,G_KEY_FILE_KEEP_TRANSLATIONS,&err);
+        
+    } else {
+
+    int GnomeDoubleClick=g_key_file_get_boolean(configfile,"window", "GnomeDoubleClick",NULL);
+    int MainDoubleClick=g_key_file_get_boolean(configfile,"window", "MainDoubleClick",NULL);
+    int windowPosX=g_key_file_get_integer(configfile,"window","WindowPosX",NULL);
+    int windowPosY=g_key_file_get_integer(configfile,"window","WindowPosY",NULL);
+    int windowWidth=g_key_file_get_integer(configfile,"window","WindowWidth",NULL);
+    int windowHeight=g_key_file_get_integer(configfile,"window","WindowHeight",NULL);
+    int WindowTheme=g_key_file_get_integer(configfile,"window","WindowTheme",NULL);
+    int Mainiconsize=g_key_file_get_integer(configfile,"window","MainIconSize",NULL);
+    int Gnomeiconsize=g_key_file_get_integer(configfile,"window","GnomeIconSize",NULL);
+    int iconSegmentSize=g_key_file_get_integer(configfile,"window","IconSegmentSize",NULL);
+    int MainlabelSize=g_key_file_get_integer(configfile,"window","MainLabelSize",NULL);
+    int GnomelabelSize=g_key_file_get_integer(configfile,"window","GnomeLabelSize",NULL);
+    int labelDensity=g_key_file_get_integer(configfile,"window","LabelDensity",NULL);
+    char *lastUser=g_key_file_get_string(configfile,"window","User",NULL);
+    int fullscreen=g_key_file_get_boolean(configfile,"window","fullscreen",NULL);
+    int BannerHidden=g_key_file_get_boolean(configfile,"window","BannerHidden",NULL);
+    main_config.GnomeDoubleClick=GnomeDoubleClick;
+    main_config.MainDoubleClick=MainDoubleClick;
+    main_config.windowPosX=windowPosX;
+    main_config.windowPosY=windowPosY;
+    main_config.windowWidth=windowWidth;
+    main_config.windowHeight=windowHeight;
+    main_config.WindowTheme=WindowTheme;
+    main_config.Mainiconsize=Mainiconsize;
+    main_config.Gnomeiconsize=Gnomeiconsize;
+    main_config.iconSegmentSize=iconSegmentSize;
+    main_config.MainlabelSize=MainlabelSize;
+    main_config.GnomelabelSize=GnomelabelSize;
+    main_config.labelDensity=labelDensity;
+    if (lastUser)
+    main_config.lastUser=lastUser;
+    main_config.fullscreen=fullscreen;
+    main_config.BannerHidden=BannerHidden;
+    }
+
     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;
@@ -1015,6 +1059,8 @@ void save_config(actionWidgets *widgets){
     }
     g_key_file_set_boolean(gfile,"window","fullscreen",main_config.fullscreen);
     g_key_file_set_boolean(gfile,"window","BannerHidden",main_config.BannerHidden);
+    g_key_file_set_boolean(gfile,"window","MainDoubleClick",main_config.MainDoubleClick);
+    g_key_file_set_boolean(gfile,"window","GnomeDoubleClick",main_config.GnomeDoubleClick);
     sprintf(fromint,"%d",main_config.WindowTheme);
     g_key_file_set_string(gfile,"window","WindowTheme",fromint);
     sprintf(fromint,"%d",sz);
@@ -1643,7 +1689,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
     curWidgets->ThirdSocketPlace=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"ThirdSocketPlace")));
     curWidgets->MenuItemSettings=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"MenuItemSettings")));
     curWidgets->MenuItemDocumentation=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"MenuItemDocumentation")));
-    curWidgets->MenuItemAboutSystem=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"MenuItemAboutSystem")));
+    curWidgets->MenuItemAboutSystem=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"MenuItemAbout")));
     curWidgets->BannerRevealer=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"RevealButton")));
     curWidgets->Revealer=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"Revealer")));
     curWidgets->BackToSettingsLabel=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"BackToSettingsLabel")));
@@ -1754,7 +1800,8 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
     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),ABOUT_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);

source/ubl-settings-manager.h

@@ -32,6 +32,7 @@ string version_application = "1.3";
 #define SECTIONS_MANAGEMENT_LABEL _("Sections management")
 #define UNDERSTOOD_LABEL _("Understood")
 #define ABOUT_LABEL _("About...")
+#define DOCUMENTATION_LABEL _("Documentation")
 #define SETTINGS_LABEL _("Settings")
 #define ALWAYS_REDIRECT_LABEL _("Always redirect")
 #define APPLY_LABEL _("Apply")