Исправил изменение статуса дисков

pull/24/head
Igor Belitskiy 2 years ago
parent e492020c20
commit 9aa612ba32

@ -175,6 +175,7 @@ void wrapper_edit_view_device_show(GtkWidget* self) {
view_device_set_vector_device(&all_config.v_disk_status);
view_device_set_index(index_selected);
set_view_device_menu("edit");
view_device_all_config(&all_config);
view_device_show(NULL, glade_path);
int i = 0;
g_signal_connect(G_OBJECT(get_widget_view_device()->btnSaveTempSave),"clicked",G_CALLBACK(entry_device_disk),&i);
@ -184,6 +185,7 @@ void wrapper_add_view_device_show(GtkWidget* self) {
view_device_set_vector_device(&all_config.v_disk_status);
view_device_set_index(-1);
set_view_device_menu("add");
view_device_all_config(&all_config);
view_device_show(NULL, glade_path);
int i = 0;
g_signal_connect(G_OBJECT(get_widget_view_device()->btnSaveTempSave),"clicked",G_CALLBACK(entry_device_disk),&i);
@ -256,11 +258,11 @@ void device_remove() {
if (index!=-1) {
index_selected = -1;
disk_status* _config = (disk_status*)all_config.v_disk_status.pfVectorGet(&all_config.v_disk_status, index);
all_config.v_disk_remove.pfVectorAdd(&all_config.v_disk_status, yon_char_new(_config->device));
all_config.v_disk_remove.pfVectorAdd(&all_config.v_disk_remove, yon_char_new(_config->device));
del_disk_to_vector_device(&all_config.v_user, _config->device);
del_disk_to_vector_device(&all_config.v_group, _config->device);
del_disk_to_vector_device(&all_config.v_general, _config->device);
//model_clear_cfg_device(_config);
model_clear_cfg_device(_config);
all_config.v_disk_status.pfVectorDelete(&all_config.v_disk_status, index);
all_config.flag_save = 1;
}

@ -5,6 +5,7 @@ char* view_device_glade_path = NULL;
int view_device_index = 0;
char* view_device_set_add_edit = NULL;
vector* vec_device = NULL;
config_all* view_device_all_config_temp = NULL;
void set_view_device_menu(char* _set_add_edit) {
view_device_set_add_edit = _set_add_edit;
@ -16,6 +17,10 @@ view_device_set_window* get_widget_view_device() {
return obj_view_device_widgets;
}
void view_device_all_config(config_all* _all_config) {
view_device_all_config_temp = _all_config;
}
void view_device_set_index(int _index) {
view_device_index = _index;
}
@ -148,8 +153,9 @@ void view_device_get_spin_time(size_t* second_file, size_t* second_size) {
void view_device_get_gui_data() {
char* disk = NULL;
int status_id = gtk_combo_box_get_active(GTK_COMBO_BOX(obj_view_device_widgets->cmbDeviceSetStatus));
disk_status* _config = NULL;
int status_id = gtk_combo_box_get_active(GTK_COMBO_BOX(obj_view_device_widgets->cmbDeviceSetStatus));
if (status_id != 0) {
size_t second_file = 0;
size_t second_size = 0;
view_device_get_spin_time(&second_file, &second_size);
@ -180,6 +186,17 @@ void view_device_get_gui_data() {
if (view_device_index == -1) {
vec_device->pfVectorAdd(vec_device, _config);
}
}
else {
disk = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(obj_view_device_widgets->DeviceCombo));
view_device_all_config_temp->v_disk_remove.pfVectorAdd(&view_device_all_config_temp->v_disk_remove, yon_char_new(disk));
if (view_device_index != -1) {
_config = (disk_status*)vec_device->pfVectorGet(vec_device, view_device_index);
model_clear_cfg_device(_config);
vec_device->pfVectorDelete(vec_device, view_device_index);
}
}
}
void view_device_set_time_spin(size_t seconds_file, size_t seconds_size) {

@ -38,6 +38,7 @@ typedef struct {
view_device_set_window* get_widget_view_device();
void view_device_get_gui_data();
void view_device_all_config(config_all* _all_config);
void view_device_get_vector_u_g_p(vector* _vec_u_g_p);
void view_device_set_time_spin(size_t seconds_file, size_t seconds_size);
void view_device_update_gui_spin_time();

Loading…
Cancel
Save