Исправлен баг при открытие окна редактирования

pull/4/head
Igor Belitskiy 2 years ago
parent a9ac7370c6
commit 1dfc1c2d78

@ -834,7 +834,14 @@ void wrapper_edit_show() {
if(gtk_tree_selection_get_selected(selection, &model, &iter)) { if(gtk_tree_selection_get_selected(selection, &model, &iter)) {
char* str_iter = gtk_tree_model_get_string_from_iter(model, &iter); char* str_iter = gtk_tree_model_get_string_from_iter(model, &iter);
int index = atoi(str_iter); int index = atoi(str_iter);
size_t size_disk_array = 0;
if (main_config.disk) {
for (size_disk_array; main_config.disk[index][size_disk_array]; size_disk_array++) {
puts(main_config.disk[index][size_disk_array]);
}
}
edit_show(NULL, glade_path); edit_show(NULL, glade_path);
edit_set_size_arrays(size_disk_array);
edit_set_select_device(&main_config.disk[index]); edit_set_select_device(&main_config.disk[index]);
edit_set_write_device(main_config.i_o_limit_write[index], main_config.i_o_limit_write_size[index]); edit_set_write_device(main_config.i_o_limit_write[index], main_config.i_o_limit_write_size[index]);
edit_set_read_device(main_config.i_o_limit_read[index], main_config.i_o_limit_read_size[index]); edit_set_read_device(main_config.i_o_limit_read[index], main_config.i_o_limit_read_size[index]);
@ -842,6 +849,7 @@ void wrapper_edit_show() {
edit_set_limit_cpu(main_config.cpu_limit[index], main_config.cpu_limit_size[index]); edit_set_limit_cpu(main_config.cpu_limit[index], main_config.cpu_limit_size[index]);
edit_set_soft(main_config.soft_raw_limit[index], main_config.soft_raw_limit_size[index]); edit_set_soft(main_config.soft_raw_limit[index], main_config.soft_raw_limit_size[index]);
edit_set_limit_swap(main_config.swap[index], main_config.swap_size[index]); edit_set_limit_swap(main_config.swap[index], main_config.swap_size[index]);
edit_event(get_widget_edit()); edit_event(get_widget_edit());
g_signal_connect(G_OBJECT(get_widget_edit()->btnSaveTempSave), "clicked", G_CALLBACK(main_edit_btn_save), NULL); g_signal_connect(G_OBJECT(get_widget_edit()->btnSaveTempSave), "clicked", G_CALLBACK(main_edit_btn_save), NULL);
edit_init_windows(); edit_init_windows();

@ -43,7 +43,7 @@
#define CMD_GET_GROUP "cut -d: -f1 /etc/group" #define CMD_GET_GROUP "cut -d: -f1 /etc/group"
typedef char *string; typedef char *string;
string version_application = "1.2-46-gfe494e3"; string version_application = "1.2-47-ga9ac737";
static char *local; static char *local;

@ -39,7 +39,6 @@ temp_set_window *edit_setup_window(char* glade_path){
edit_widgets->chbTempWrite = yon_gtk_builder_get_widget(builder,"chbEditWrite"); edit_widgets->chbTempWrite = yon_gtk_builder_get_widget(builder,"chbEditWrite");
edit_widgets->cbtTempWrite = yon_gtk_builder_get_widget(builder,"cbtEditWrite"); edit_widgets->cbtTempWrite = yon_gtk_builder_get_widget(builder,"cbtEditWrite");
edit_widgets->entryTempCmd = yon_gtk_builder_get_widget(builder,"entryEditCmd"); edit_widgets->entryTempCmd = yon_gtk_builder_get_widget(builder,"entryEditCmd");
edit_config_init();
device_fill_disk(edit_widgets->cbtTempDevice); device_fill_disk(edit_widgets->cbtTempDevice);
// edit_event(edit_widgets); // edit_event(edit_widgets);
edit_localization(edit_widgets); edit_localization(edit_widgets);
@ -246,6 +245,7 @@ void edit_set_select_device(char*** str_value) {
if ((*str_value)[0] == NULL) { if ((*str_value)[0] == NULL) {
return; return;
} }
yon_char_parsed_copy(&obj_edit_config.disk, str_value);
int index = yon_gtk_combo_box_text_find(edit_widgets->cbtTempDevice, (*str_value)[0]); int index = yon_gtk_combo_box_text_find(edit_widgets->cbtTempDevice, (*str_value)[0]);
gtk_combo_box_set_active(GTK_COMBO_BOX(edit_widgets->cbtTempDevice), index); gtk_combo_box_set_active(GTK_COMBO_BOX(edit_widgets->cbtTempDevice), index);
@ -264,6 +264,8 @@ void edit_set_read_device(int* str_value, int* pow_mem) {
edit_widgets->cbtTempRead); edit_widgets->cbtTempRead);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(edit_widgets->chbTempRead), 1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(edit_widgets->chbTempRead), 1);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(edit_widgets->chbTempWrite), 1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(edit_widgets->chbTempWrite), 1);
philos_array_int_copy(&obj_edit_config.i_o_limit_read, &str_value);
philos_array_int_copy(&obj_edit_config.i_o_limit_read_size, &pow_mem);
} }
void edit_set_write_device(int* str_value, int* pow_mem) { void edit_set_write_device(int* str_value, int* pow_mem) {
if (str_value == NULL || pow_mem == NULL) { if (str_value == NULL || pow_mem == NULL) {
@ -278,6 +280,11 @@ void edit_set_write_device(int* str_value, int* pow_mem) {
edit_temp_set(str_value[0],pow_mem[0], edit_widgets->chbTempWrite, edit_temp_set(str_value[0],pow_mem[0], edit_widgets->chbTempWrite,
edit_widgets->spinTempWrite, edit_widgets->spinTempWrite,
edit_widgets->cbtTempWrite); edit_widgets->cbtTempWrite);
philos_array_int_copy(&obj_edit_config.i_o_limit_write, &str_value);
philos_array_int_copy(&obj_edit_config.i_o_limit_write_size, &pow_mem);
}
void edit_set_size_arrays(size_t size_array) {
obj_edit_config.size = size_array;
} }
void edit_set_soft(int value, int pow_mem) { void edit_set_soft(int value, int pow_mem) {
edit_temp_set(value,pow_mem, edit_widgets->chkSoftRestrictionTemp, edit_temp_set(value,pow_mem, edit_widgets->chkSoftRestrictionTemp,

@ -48,6 +48,7 @@ void edit_temp_set(int value, int pow_mem, GtkWidget* cheek, GtkWidget* spin, Gt
int** edit_get_read_device_size_pow(); int** edit_get_read_device_size_pow();
int** edit_get_write_device_size_pow(); int** edit_get_write_device_size_pow();
void edit_set_size_arrays(size_t size_array);
int edit_get_soft_size(); int edit_get_soft_size();
int edit_get_hard_size(); int edit_get_hard_size();
int edit_get_limit_cpu_size(); int edit_get_limit_cpu_size();

Loading…
Cancel
Save