From b4c4ce63c7cac16f54f482ebfdcfcfd1a0778bcc Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 20 Jun 2023 09:48:06 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20spinButton=20?= =?UTF-8?q?=D0=B2=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=83=D1=81=D1=82=D1=80=D0=BE=D0=B9=D1=81=D1=82=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-resourcequota.h | 2 +- source/view_add.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/source/ubl-settings-resourcequota.h b/source/ubl-settings-resourcequota.h index d5e7258..7d22657 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 = ""; +string version_application = "1.2-34-g126f61d"; static char *local; diff --git a/source/view_add.c b/source/view_add.c index 489e698..b3ce912 100644 --- a/source/view_add.c +++ b/source/view_add.c @@ -110,9 +110,6 @@ void add_del_disk() { char* disk_cfg = yon_char_new(obj_add_config.disk[index]); if (strstr(disk_cfg, disk) != NULL) { index_find = index; - printf("%d\n", index_find); - puts(disk_cfg); - puts(disk); break; } } @@ -172,6 +169,7 @@ void add_disk_all(){ } if (index_find == -1) { // Добавление + puts("111"); obj_add_config.disk = yon_char_parsed_append(obj_add_config.disk,&obj_add_config.size, disk); obj_add_config.size--; 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))); @@ -184,16 +182,18 @@ void add_disk_all(){ } else { // Редактирование + puts("2222"); obj_add_config.disk[index_find] = yon_char_new(disk); 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_write_size[index_find] = (int)gtk_combo_box_get_active(GTK_COMBO_BOX(add_widgets->cbtAddWrite)); - obj_add_config.i_o_limit_read[index_find] = yon_char_from_int(gtk_spin_button_get_digits(GTK_SPIN_BUTTON(add_widgets->spinAddRead))); - obj_add_config.i_o_limit_write[index_find] = yon_char_from_int(gtk_spin_button_get_digits(GTK_SPIN_BUTTON(add_widgets->spinAddWrite))); - + 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))); + obj_add_config.i_o_limit_write[index_find] = yon_char_from_int(gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(add_widgets->spinAddWrite))); + puts(yon_char_from_int(gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(add_widgets->spinAddRead)))); } } else { if (bool_read == 1 || bool_write == 1) { + puts("3333"); obj_add_config.disk = yon_char_parsed_append(obj_add_config.disk,&obj_add_config.size, disk); obj_add_config.size--; 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))); @@ -206,6 +206,7 @@ void add_disk_all(){ 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)))); } + puts("44444"); } }