diff --git a/source/view_temp_u_g_p.c b/source/view_temp_u_g_p.c index e83ecfd..7b9ade3 100644 --- a/source/view_temp_u_g_p.c +++ b/source/view_temp_u_g_p.c @@ -83,8 +83,13 @@ temp_set_window *temp_setup_window_custom(temp_set_window* temp_widgets, GtkBuil temp_widgets->lblProjectIdValueEdit = yon_gtk_builder_get_widget(builder, "lblProjectIdValueEdit"); temp_widgets->boxTempDevice = yon_gtk_builder_get_widget(builder, "boxTempDevice"); temp_widgets->entryUser = yon_gtk_builder_get_widget(builder,"entryUser"); + temp_widgets->UserDeviceCombo = yon_gtk_builder_get_widget(builder,"UserDeviceCombo"); table_u_g_set_flag(flag_temp_u_g_p,set_add_edit); table_u_g_set_glade_path(_glade_path); + temp_settings(); +} +void temp_settings() { + device_fill_disk(temp_widgets->UserDeviceCombo); if (strcmp(flag_temp_u_g_p,"prjquota")==0) { gtk_widget_hide(temp_widgets->lblSetUGP); gtk_widget_hide(temp_widgets->lblSetUGPData); @@ -102,6 +107,7 @@ temp_set_window *temp_setup_window_custom(temp_set_window* temp_widgets, GtkBuil gtk_widget_hide(temp_widgets->chbAuto); gtk_widget_hide(temp_widgets->entryProjectId); gtk_widget_hide(temp_widgets->btnGenerateProject); + gtk_widget_hide(temp_widgets->UserDeviceCombo); gtk_label_set_label(GTK_LABEL(temp_widgets->lblHeadQuotasEditWindow), _("Settings disk quotas - Editing")); } } @@ -128,6 +134,7 @@ temp_set_window *temp_setup_window_custom(temp_set_window* temp_widgets, GtkBuil gtk_widget_hide(temp_widgets->boxProjectAddEdit); gtk_widget_hide(temp_widgets->btnOpenUserGroup); gtk_widget_hide(temp_widgets->entryUser); + gtk_widget_hide(temp_widgets->UserDeviceCombo); gtk_label_set_label(GTK_LABEL(temp_widgets->lblHeadQuotasEditWindow), _("Settings disk quotas - Editing")); } @@ -521,14 +528,18 @@ config_u_g_p* get_temp_gui_data_base(config_u_g_p* _config) { } if (strcmp(set_add_edit, "add")==0) { char* file_dir = (char*)gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryCatalogProject)); - _config->UNIX_file = yon_char_new(file_dir); + char* activ_disk = yon_char_new(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(temp_widgets->UserDeviceCombo))); + activ_disk = yon_char_divide_search(activ_disk, " ", -1); + _config->UNIX_file = activ_disk; _config->type_arr = yon_char_new(flag_temp_u_g_p); } } else { if (strcmp(set_add_edit, "add")==0) { table_u_g_get_actors(&_config->actors); - _config->UNIX_file = yon_char_new(disk); + char* activ_disk = yon_char_new(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(temp_widgets->UserDeviceCombo))); + activ_disk = yon_char_divide_search(activ_disk, " ", -1); + _config->UNIX_file = activ_disk; _config->type_arr = yon_char_new(flag_temp_u_g_p); } } diff --git a/source/view_temp_u_g_p.h b/source/view_temp_u_g_p.h index a95a406..3488a08 100644 --- a/source/view_temp_u_g_p.h +++ b/source/view_temp_u_g_p.h @@ -13,7 +13,6 @@ #include "model/load.h" #include "view_check_user_table.h" - void temp_set_index(int _index); temp_set_window* get_widget_temp(); void set_disk(char* _disk); @@ -42,4 +41,5 @@ void generate_id(); void set_activ_project_id(); int wrapper_check_save(); void block_btn_save(); -int table_check_save(); \ No newline at end of file +int table_check_save(); +void temp_settings(); \ No newline at end of file