From 8643957c5b3652194bb1e8be5663a538bdb751b3 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 20 Jun 2023 17:18:34 +0600 Subject: [PATCH] fix --- source/ubl-settings-resourcequota.c | 4 +-- source/ubl-settings-resourcequota.h | 2 +- source/view_add.c | 49 +++++++++++++++++++++-------- 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/source/ubl-settings-resourcequota.c b/source/ubl-settings-resourcequota.c index 76ce027..8b52f4a 100644 --- a/source/ubl-settings-resourcequota.c +++ b/source/ubl-settings-resourcequota.c @@ -614,8 +614,7 @@ void tree_view_select(GtkWidget *self, main_window *widgets) { gtk_widget_set_sensitive(widgets->btnDelQuotas,0); gtk_widget_set_sensitive(widgets->btnEdit,0); gtk_widget_set_sensitive(widgets->btnInfo,0); - } - + } } void tree_view_add(int index) { @@ -690,7 +689,6 @@ void fill_tree_view(int start, int size, int flag_gui_add) { if (flag_gui_add != 0) { gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->treeViewMain), model); } - } char* format_io_limit_in_tree_view(config_str* disk, config_str* i_o_limit, int** i_o_limit_size, int index) { diff --git a/source/ubl-settings-resourcequota.h b/source/ubl-settings-resourcequota.h index 2baa964..630fd5f 100755 --- a/source/ubl-settings-resourcequota.h +++ b/source/ubl-settings-resourcequota.h @@ -43,7 +43,7 @@ #define CMD_GET_GROUP "cut -d: -f1 /etc/group" typedef char *string; -string version_application = "1.2-36-gcc0d328"; +string version_application = "1.2-37-g328deff"; static char *local; diff --git a/source/view_add.c b/source/view_add.c index 7e0ceca..0e82948 100644 --- a/source/view_add.c +++ b/source/view_add.c @@ -52,6 +52,13 @@ add_window *add_setup_window(char* glade_path) { } return add_widgets; } +void update_device_to_entry(GtkWidget *combo_box, GtkWidget *check_button_read, GtkWidget *check_button_write) { + int disk_id = gtk_combo_box_get_active(GTK_COMBO_BOX(combo_box)); + if (disk_id != -1) { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button_read), 0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button_write), 0); + } +} void add_config_init() { if (obj_add_config.size != 0) { @@ -136,6 +143,7 @@ char* pard_array_add_cmd(char* cmd, char* key, char** array_io, int* array_io_po char* cmd_old = yon_char_new(cmd); if (obj_add_config.disk && obj_add_config.size && array_io && array_io_pow_size) { int index_find = 0; + printf("\n%i\n", obj_add_config.size); for (int index = 0; index < obj_add_config.size; index++) { if (index==0) { if (strlen(cmd)>1) { @@ -146,6 +154,8 @@ char* pard_array_add_cmd(char* cmd, char* key, char** array_io, int* array_io_po } } + printf("\n%i\n", array_io_pow_size[index]); + puts(key); if (array_io_pow_size[index] != -1) { cmd = yon_char_unite(cmd, split_simvol, @@ -157,6 +167,7 @@ char* pard_array_add_cmd(char* cmd, char* key, char** array_io, int* array_io_po } } } + puts("================================================"); free(split_simvol); if (flag_format) { return cmd; @@ -184,12 +195,16 @@ void add_disk_all(){ } if (index_find == -1) { // Добавление - obj_add_config.disk = yon_char_parsed_append(obj_add_config.disk,&obj_add_config.size, disk); - obj_add_config.size--; + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(add_widgets->chbAddRead)) || + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(add_widgets->chbAddWrite))) { + obj_add_config.disk = yon_char_parsed_append(obj_add_config.disk,&obj_add_config.size, disk); + obj_add_config.size--; + } if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(add_widgets->chbAddRead))) { obj_add_config.i_o_limit_read_size = philos_int_append(obj_add_config.i_o_limit_read_size,&obj_add_config.size,(int)gtk_combo_box_get_active(GTK_COMBO_BOX(add_widgets->cbtAddRead))); obj_add_config.size--; - obj_add_config.i_o_limit_read = yon_char_parsed_append(obj_add_config.i_o_limit_read,&obj_add_config.size,yon_char_from_int(gtk_spin_button_get_digits(GTK_SPIN_BUTTON(add_widgets->spinAddRead)))); + obj_add_config.i_o_limit_read = yon_char_parsed_append(obj_add_config.i_o_limit_read,&obj_add_config.size,yon_char_from_int(gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(add_widgets->spinAddRead)))); obj_add_config.size--; } else { @@ -201,7 +216,7 @@ void add_disk_all(){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(add_widgets->chbAddWrite))) { obj_add_config.i_o_limit_write_size = philos_int_append(obj_add_config.i_o_limit_write_size,&obj_add_config.size,(int)gtk_combo_box_get_active(GTK_COMBO_BOX(add_widgets->cbtAddWrite))); obj_add_config.size--; - obj_add_config.i_o_limit_write = yon_char_parsed_append(obj_add_config.i_o_limit_write,&obj_add_config.size,yon_char_from_int(gtk_spin_button_get_digits(GTK_SPIN_BUTTON(add_widgets->spinAddWrite)))); + obj_add_config.i_o_limit_write = yon_char_parsed_append(obj_add_config.i_o_limit_write,&obj_add_config.size,yon_char_from_int(gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(add_widgets->spinAddWrite)))); obj_add_config.size--; } else { @@ -219,7 +234,6 @@ void add_disk_all(){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(add_widgets->chbAddRead))) { obj_add_config.i_o_limit_read_size[index_find] =(int)gtk_combo_box_get_active(GTK_COMBO_BOX(add_widgets->cbtAddRead)); obj_add_config.i_o_limit_read[index_find] = yon_char_from_int(gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(add_widgets->spinAddRead))); - } else { obj_add_config.i_o_limit_read_size[index_find] = -1; @@ -233,19 +247,19 @@ void add_disk_all(){ obj_add_config.i_o_limit_write_size[index_find] = -1; obj_add_config.i_o_limit_write[index_find] = "-"; } - - - } } else { if (bool_read == 1 || bool_write == 1) { - obj_add_config.disk = yon_char_parsed_append(obj_add_config.disk,&obj_add_config.size, disk); - obj_add_config.size--; + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(add_widgets->chbAddRead)) || + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(add_widgets->chbAddWrite))) { + obj_add_config.disk = yon_char_parsed_append(obj_add_config.disk,&obj_add_config.size, disk); + obj_add_config.size--; + } if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(add_widgets->chbAddRead))) { obj_add_config.i_o_limit_read_size = philos_int_append(obj_add_config.i_o_limit_read_size,&obj_add_config.size,(int)gtk_combo_box_get_active(GTK_COMBO_BOX(add_widgets->cbtAddRead))); obj_add_config.size--; - obj_add_config.i_o_limit_read = yon_char_parsed_append(obj_add_config.i_o_limit_read,&obj_add_config.size,yon_char_from_int(gtk_spin_button_get_digits(GTK_SPIN_BUTTON(add_widgets->spinAddRead)))); + obj_add_config.i_o_limit_read = yon_char_parsed_append(obj_add_config.i_o_limit_read,&obj_add_config.size,yon_char_from_int(gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(add_widgets->spinAddRead)))); obj_add_config.size--; } else { @@ -257,7 +271,7 @@ void add_disk_all(){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(add_widgets->chbAddWrite))) { obj_add_config.i_o_limit_write_size = philos_int_append(obj_add_config.i_o_limit_write_size,&obj_add_config.size,(int)gtk_combo_box_get_active(GTK_COMBO_BOX(add_widgets->cbtAddWrite))); obj_add_config.size--; - obj_add_config.i_o_limit_write = yon_char_parsed_append(obj_add_config.i_o_limit_write,&obj_add_config.size,yon_char_from_int(gtk_spin_button_get_digits(GTK_SPIN_BUTTON(add_widgets->spinAddWrite)))); + obj_add_config.i_o_limit_write = yon_char_parsed_append(obj_add_config.i_o_limit_write,&obj_add_config.size,yon_char_from_int(gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(add_widgets->spinAddWrite)))); obj_add_config.size--; } else { @@ -268,6 +282,9 @@ void add_disk_all(){ } obj_add_config.size++; } + else { + puts("222sdvdfvdvfv\n"); + } } } @@ -279,6 +296,11 @@ void event_check_io_device() { add_init_windows(); } +void combo_box_device() { + update_device_to_entry(add_widgets->cbtAddDevice, add_widgets->chbAddRead, add_widgets->chbAddWrite); + update_device_to_entry(add_widgets->cbtAddDevice, add_widgets->chbAddRead, add_widgets->chbAddWrite); +} + void add_event(add_window *widgets) { g_signal_connect(G_OBJECT(widgets->btnAddCancel),"clicked",G_CALLBACK(add_on_destroy_subwindow),NULL); g_signal_connect(G_OBJECT(widgets->Window), "destroy", G_CALLBACK(add_destroy), NULL); @@ -303,10 +325,11 @@ void add_event(add_window *widgets) { g_signal_connect(G_OBJECT(widgets->cmbPaddingFLAdd),"changed",G_CALLBACK(add_init_windows), NULL); g_signal_connect(G_OBJECT(widgets->cbtAddRead),"changed",G_CALLBACK(event_check_io_device), NULL); g_signal_connect(G_OBJECT(widgets->cbtAddWrite),"changed",G_CALLBACK(event_check_io_device), NULL); - g_signal_connect(G_OBJECT(widgets->cbtAddDevice),"changed",G_CALLBACK(event_check_io_device), NULL); + g_signal_connect(G_OBJECT(widgets->cbtAddDevice),"changed",G_CALLBACK(combo_box_device), NULL); } + void add_get_cmd_group(char* cmd_get_group) { CMD_GET_GROUP = cmd_get_group; }