From 41bbe79d6f6d2e18c270392934227bcaa5c7eb9f Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 2 Aug 2023 13:12:29 +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=D0=BE=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81?= =?UTF-8?q?=D0=B0=20=D0=BA=D0=B2=D0=BE=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/controler.c | 4 ++-- source/view_temp_u_g_p.c | 31 ++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/source/controler.c b/source/controler.c index 4187182..5516a82 100644 --- a/source/controler.c +++ b/source/controler.c @@ -121,8 +121,8 @@ void wrapper_edit_user_show() { set_temp_menu("usrquota", "edit"); temp_set_index(index); set_all_config(&all_config); - temp_show(NULL, glade_path); set_vector(&all_config.v_user); + temp_show(NULL, glade_path); set_edit_gui_data_base(&all_config, index); int i = 0; g_signal_connect(G_OBJECT(get_widget_temp()->btnSaveTempSave),"clicked",G_CALLBACK(entry_user_disk),&i); @@ -164,8 +164,8 @@ void wrapper_edit_project_show(GtkWidget* self, vector* vec_temp) { set_temp_menu("prjquota", "edit"); temp_set_index(index); set_all_config(&all_config); - temp_show(NULL, glade_path); set_vector(&all_config.v_project); + temp_show(NULL, glade_path); set_edit_gui_data_base(&all_config, index); int i = 0; g_signal_connect(G_OBJECT(get_widget_temp()->btnSaveTempSave),"clicked",G_CALLBACK(entry_project_disk),&i); diff --git a/source/view_temp_u_g_p.c b/source/view_temp_u_g_p.c index c5153dd..b031d42 100644 --- a/source/view_temp_u_g_p.c +++ b/source/view_temp_u_g_p.c @@ -313,7 +313,7 @@ void update_max_size_spin(GtkWidget *self, int* flag) { str_disk = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(temp_widgets->UserDeviceCombo)); } else { - str_disk = (char*)gtk_label_get_label(GTK_LABEL(temp_widgets->lblSetQuotasStatus)); + str_disk = (char*)gtk_label_get_label(GTK_LABEL(temp_widgets->lblSetNameDevice)); } if (!str_disk) { return; @@ -442,14 +442,27 @@ void set_edit_gui_data_base(config_all* all_config, int index) { ); for (int i = 0; i < _all_config_temp->v_disk_status.vectorList.total; i++) { disk_status* _config_disk = (disk_status*)_all_config_temp->v_disk_status.pfVectorGet(&_all_config_temp->v_disk_status, i); - if (strstr(_config_disk->device, _config->UNIX_file)) { - if (_config_disk->status == 1) { - gtk_label_set_label(GTK_LABEL(temp_widgets->lblSetQuotasStatus), _("Off")); + if (strstr(_config->type_arr, "prjquota")) { + if (strstr(_config_disk->device, model_find_path_to_disk(&all_config->v_disk_status, _config->UNIX_file))) { + if (_config_disk->status == 1) { + gtk_label_set_label(GTK_LABEL(temp_widgets->lblSetQuotasStatus), _("Off")); + } + else if (_config_disk->status == 2) { + gtk_label_set_label(GTK_LABEL(temp_widgets->lblSetQuotasStatus), _("On")); + } } - else if (_config_disk->status == 2) { - gtk_label_set_label(GTK_LABEL(temp_widgets->lblSetQuotasStatus), _("On")); + } + else { + if (strstr(_config_disk->device, _config->UNIX_file)) { + if (_config_disk->status == 1) { + gtk_label_set_label(GTK_LABEL(temp_widgets->lblSetQuotasStatus), _("Off")); + } + else if (_config_disk->status == 2) { + gtk_label_set_label(GTK_LABEL(temp_widgets->lblSetQuotasStatus), _("On")); + } } } + } if (strstr(flag_temp_u_g_p,"prjquota")) { if (strstr(set_add_edit, "add")) { @@ -462,7 +475,7 @@ void set_edit_gui_data_base(config_all* all_config, int index) { if (strcmp(actors,"-")!=0) { gtk_entry_set_text(GTK_ENTRY(temp_widgets->entryProjectName), actors); } - gtk_label_set_label(GTK_LABEL(temp_widgets->lblSetNameDevice), _config->UNIX_file); + gtk_label_set_label(GTK_LABEL(temp_widgets->lblSetNameDevice), model_find_path_to_disk(&all_config->v_disk_status, _config->UNIX_file)); } } @@ -682,7 +695,7 @@ config_u_g_p* get_temp_gui_data_base(config_u_g_p* _config) { str_disk = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(temp_widgets->UserDeviceCombo)); } else { - str_disk = (char*)gtk_label_get_label(GTK_LABEL(temp_widgets->lblSetQuotasStatus)); + str_disk = (char*)gtk_label_get_label(GTK_LABEL(temp_widgets->lblSetNameDevice)); } for (int i = 0; i < _all_config_temp->v_disk_status.vectorList.total; i++) { disk_status* _config_disk = (disk_status*)_all_config_temp->v_disk_status.pfVectorGet(&_all_config_temp->v_disk_status, i); @@ -730,7 +743,7 @@ config_u_g_p* get_temp_gui_data_base(config_u_g_p* _config) { activ_disk = yon_char_new(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(temp_widgets->UserDeviceCombo))); } else { - activ_disk = yon_char_new((char*)gtk_label_get_label(GTK_LABEL(temp_widgets->lblSetQuotasStatus))); + activ_disk = yon_char_new((char*)gtk_label_get_label(GTK_LABEL(temp_widgets->lblSetNameDevice))); } activ_disk = yon_char_divide_search(activ_disk, " ", -1);