Исправлена логика дочерних окон

source/ubl-settings-resourcequota.c

@@ -809,7 +809,7 @@ char* save_format_value(int index) {
         split_simvol[1] = '\0';
     }
     if (strstr(main_config.cpu_limit[index], "-") == NULL) {
-        value = yon_char_unite(value ,split_simvol, philos_format_cfg_str_size_memory("CPUQuota", main_config.cpu_limit[index],main_config.cpu_limit_size[index]), NULL);
+        value = yon_char_unite(value ,split_simvol,"CPUQuota=", main_config.cpu_limit[index], NULL);
         split_simvol[0] = ',';
         split_simvol[1] = '\0';
     }
@@ -872,18 +872,18 @@ void template_format_str_save(dictionary* load_cfg, char* source_cmd) {
         char* value = NULL;
         key = save_format_key(index);
         value = save_format_value(index);
+        puts(value);
         main_config.save_cfg_gui = yon_dictionary_create_with_data_connected(main_config.save_cfg_gui, key, yon_char_new(value));
         check_save(load_cfg);
         if (key != NULL && value != NULL) {
             cmd = yon_char_unite(cmd, " " , key, "=" , value, " ", NULL);
             flag_save = 1;
         }
-        puts(key);
+        // puts(key);
         free(key);
         free(value);
     }
     if (flag_save) {
-        puts(cmd);
         yon_config_save(cmd);
     }
     free(cmd);

source/ubl-utils.c

@@ -628,7 +628,7 @@ char* philos_format_cfg_str_size_memory(char* str_key, char* str_source_value, i
         return yon_char_unite(str_key, "=" , str_value, "T" ,NULL);
     }
     else if (pow_size_memory== -1) {
-        return yon_char_unite(str_key, "=" , str_value, "%%" ,NULL);
+        return yon_char_unite(str_key, "=" , str_value, "%" ,NULL);
     }
     else {
         return yon_char_unite(str_key, "=" , str_value, "error" ,NULL);

source/view_add.c

@@ -53,8 +53,8 @@ void add_init_windows() {
     add_set_active_widgets(add_widgets->chkSevereRestrictionAdd, add_widgets->spinSevereRestrictionAdd, add_widgets->cmbSevereRestrictionAdd);
     add_set_active_widgets(add_widgets->chkPaddingFLAdd, add_widgets->spinPaddingFLAdd, add_widgets->cmbPaddingFLAdd);
     add_set_active_widgets(add_widgets->chkCPULimitAdd, add_widgets->spinCPULimitAdd, add_widgets->lblCPULimitAdd);
-    add_set_active_widgets(add_widgets->chbAddWrite, add_widgets->spinAddWrite, add_widgets->cbtAddWrite);
+    add_set_active_widgets_device_io(add_widgets->chbAddWrite, add_widgets->spinAddWrite, add_widgets->cbtAddWrite);
-    add_set_active_widgets(add_widgets->chbAddRead, add_widgets->spinAddRead, add_widgets->cbtAddRead);
+    add_set_active_widgets_device_io(add_widgets->chbAddRead, add_widgets->spinAddRead, add_widgets->cbtAddRead);
     add_generate_cmd();
 }
 
@@ -95,12 +95,25 @@ void add_destroy(GtkWidget *self) {
     add_widgets = NULL;
 }
 
+void add_set_active_widgets_device_io(GtkWidget *self, GtkWidget *entry, GtkWidget *label) {
+    int menu_id = gtk_combo_box_get_active(GTK_COMBO_BOX(add_widgets->cbtAddDevice));
+    if (menu_id != -1) {
+        gboolean active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self));
+        gtk_widget_set_sensitive(entry, active);
+        gtk_widget_set_sensitive(label, active);
+    }
+    else {
+        gtk_widget_set_sensitive(entry, 0);
+        gtk_widget_set_sensitive(label, 0);
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self), 0);
+    }
+    
+}
 void add_set_active_widgets(GtkWidget *self, GtkWidget *entry, GtkWidget *label) {
     gboolean active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self));
     gtk_widget_set_sensitive(entry, active);
     gtk_widget_set_sensitive(label, active);
 }
-
 void add_localization(add_window *widgets) {
     
 }
@@ -272,7 +285,7 @@ void add_generate_cmd() {
         str_cmd = yon_char_unite(str_cmd, split_simvol, 
                                         "CPUQuota=",
                                         yon_char_from_int(size_bite),
-                                        "%%", NULL);
+                                        "%", NULL);
         split_simvol[0] = ',';
         split_simvol[1] = '\0';
     }

source/view_add.h

@@ -79,6 +79,7 @@ int add_get_limit_cpu_size();
 int add_get_limit_swap_size();
 int add_get_quota_object_size();
 
+void add_set_active_widgets_device_io(GtkWidget *self, GtkWidget *entry, GtkWidget *label);
 void add_get_cmd_group(char* cmd_get_group);
 char* add_get_select_device_to_level_2();
 void add_generate_cmd();

source/view_edit.c

@@ -100,8 +100,8 @@ void edit_init_windows() {
     edit_set_active_widgets(edit_widgets->chkSevereRestrictionEdit, edit_widgets->spinSevereRestrictionEdit, edit_widgets->cmbSevereRestrictionEdit);
     edit_set_active_widgets(edit_widgets->chkPaddingFLEdit, edit_widgets->spinPaddingFLEdit, edit_widgets->cmbPaddingFLEdit);
     edit_set_active_widgets(edit_widgets->chkCPULimitEdit, edit_widgets->spinCPULimitEdit, edit_widgets->lblCPULimitEdit);
-    edit_set_active_widgets(edit_widgets->chbEditWrite, edit_widgets->spinEditWrite, edit_widgets->cbtEditWrite);
+    edit_set_active_widgets_device_io(edit_widgets->chbEditWrite, edit_widgets->spinEditWrite, edit_widgets->cbtEditWrite);
-    edit_set_active_widgets(edit_widgets->chbEditRead, edit_widgets->spinEditRead, edit_widgets->cbtEditRead);
+    edit_set_active_widgets_device_io(edit_widgets->chbEditRead, edit_widgets->spinEditRead, edit_widgets->cbtEditRead);
 }
 
 void edit_set_active_widgets(GtkWidget *self, GtkWidget *entry, GtkWidget *label) {
@@ -110,6 +110,20 @@ void edit_set_active_widgets(GtkWidget *self, GtkWidget *entry, GtkWidget *label
     gtk_widget_set_sensitive(label, active);
 }
 
+void edit_set_active_widgets_device_io(GtkWidget *self, GtkWidget *entry, GtkWidget *label) {
+    int menu_id = gtk_combo_box_get_active(GTK_COMBO_BOX(edit_widgets->cbtEditDevice));
+    if (menu_id != -1) {
+        gboolean active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self));
+        gtk_widget_set_sensitive(entry, active);
+        gtk_widget_set_sensitive(label, active);
+    }
+    else {
+        gtk_widget_set_sensitive(entry, 0);
+        gtk_widget_set_sensitive(label, 0);
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self), 0);
+    }
+    
+}
 char* edit_get_select_device() {
     char* text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(edit_widgets->cbtEditDevice));
     if (text != NULL) {
@@ -160,7 +174,7 @@ char* edit_get_hard() {
 char* edit_get_limit_cpu() {
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(edit_widgets->chkCPULimitEdit))) {
         int size_bite = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(edit_widgets->spinCPULimitEdit));
-        return yon_char_from_int(size_bite);
+        return yon_char_unite(yon_char_from_int(size_bite), "%" ,NULL);
     }
     else {
         char* str = (char*)malloc(sizeof(char*)*2);
@@ -217,8 +231,7 @@ void edit_temp_set(char* str_value, int pow_mem, GtkWidget* cheek, GtkWidget* sp
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cheek), 1);
         if (combo_box_text != NULL) {
             // Todo: add code
-            gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box_text), pow_mem);
+            gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box_text), pow_mem);  
-            
         }
     }
     else {
@@ -261,7 +274,7 @@ void edit_generate_cmd() {
         str_cmd = yon_char_unite(str_cmd, split_simvol, 
                                         "CPUQuota=",
                                         yon_char_from_int(size_bite),
-                                        "%%", NULL);
+                                        "%", NULL);
         split_simvol[0] = ',';
         split_simvol[1] = '\0';
     }

source/view_edit.h

@@ -80,4 +80,5 @@ int edit_get_soft_size();
 int edit_get_hard_size();
 int edit_get_limit_cpu_size();
 int edit_get_limit_swap_size();
+void edit_set_active_widgets_device_io(GtkWidget *self, GtkWidget *entry, GtkWidget *label);
 #endif