Исправлено отображение статуса квот

pull/24/head
Igor Belitskiy 2 years ago
parent b934444173
commit 41bbe79d6f

@ -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);

@ -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);

Loading…
Cancel
Save