diff --git a/source/controler.c b/source/controler.c index 0a2eb9e..49bd85a 100644 --- a/source/controler.c +++ b/source/controler.c @@ -27,6 +27,7 @@ void wrapper_filters_project_show() { } void wrapper_add_user_show() { + /* char* activ_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(cfg_custom_gui.user.comboBox)); activ_text = yon_char_divide_search(activ_text, " ", -1); set_disk(activ_text); @@ -36,9 +37,10 @@ void wrapper_add_user_show() { temp_show(NULL, glade_path); int i = 0; g_signal_connect(G_OBJECT(get_widget_temp()->btnSaveTempSave),"clicked",G_CALLBACK(entry_user_disk),&i); - + */ } void wrapper_edit_user_show() { + /* int index = wrapper_select_tree_view(&cfg_custom_gui.user); char* activ_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(cfg_custom_gui.user.comboBox)); activ_text= yon_char_divide_search(activ_text, " ", -1); @@ -51,9 +53,11 @@ void wrapper_edit_user_show() { 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); +*/ } void wrapper_add_group_show() { + /* char* activ_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(cfg_custom_gui.group.comboBox)); activ_text = yon_char_divide_search(activ_text, " ", -1); set_disk(activ_text); @@ -63,8 +67,10 @@ void wrapper_add_group_show() { temp_show(NULL, glade_path); int i = 0; g_signal_connect(G_OBJECT(get_widget_temp()->btnSaveTempSave),"clicked",G_CALLBACK(entry_groups_disk),&i); + */ } void wrapper_edit_group_show() { + /* int index = wrapper_select_tree_view(&cfg_custom_gui.group); char* activ_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(cfg_custom_gui.group.comboBox)); activ_text= yon_char_divide_search(activ_text, " ", -1); @@ -77,6 +83,7 @@ void wrapper_edit_group_show() { set_edit_gui_data_base(&all_config, index); int i = 0; g_signal_connect(G_OBJECT(get_widget_temp()->btnSaveTempSave),"clicked",G_CALLBACK(entry_groups_disk),&i); + */ } void wrapper_add_project_show() { set_temp_menu("prjquota", "add"); @@ -104,7 +111,7 @@ void block_tree_view(hotebook* widgets,void (*f)()) { void unlock_tree_view(hotebook* widgets,void (*f)()) { g_signal_handlers_unblock_by_func(G_OBJECT(widgets->tree_view), G_CALLBACK(f), NULL); } - +/* void block_button_add_edit_del(hotebook* obj_note) { int menu_id = gtk_combo_box_get_active(GTK_COMBO_BOX(obj_note->comboBox)); int flag_block = 0; @@ -120,8 +127,9 @@ void block_button_add_edit_del(hotebook* obj_note) { if (index_selected==-1) { } } - +*/ void entry_user_disk(GtkWidget *self, int* flag_update) { + /* if (flag_update) { all_config.flag_set_data = 1; all_config.flag_save = 3; @@ -136,34 +144,21 @@ void entry_user_disk(GtkWidget *self, int* flag_update) { gtk_list_store_clear(cfg_custom_gui.user.liststore); } wrapper_fill_tree_view_generate(&all_config, &cfg_custom_gui); + */ } void entry_groups_disk(GtkWidget *self,int* flag_update) { - if (flag_update) { - all_config.flag_set_data = 1; - all_config.flag_save = 3; - temp_on_destroy_subwindow(self); - } - get_status_disk(&cfg_custom_gui.group); - char* activ_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(cfg_custom_gui.group.comboBox)); - activ_text= yon_char_divide_search(activ_text, " ", -1); - int find = fill_tree_view_user_group(&all_config, activ_text, &cfg_custom_gui.group,"grpquota", 0); - if (find == 0) { - g_object_ref(cfg_custom_gui.group.liststore); - gtk_list_store_clear(cfg_custom_gui.group.liststore); - } - wrapper_fill_tree_view_generate(&all_config, &cfg_custom_gui); } void wrapper_entry_groups_disk(GtkWidget *self) { - block_button_add_edit_del(&cfg_custom_gui.group); + //block_button_add_edit_del(&cfg_custom_gui.group); entry_groups_disk(0,0); } void wrapper_entry_user_disk(GtkWidget *self) { - block_button_add_edit_del(&cfg_custom_gui.user); + //block_button_add_edit_del(&cfg_custom_gui.user); entry_user_disk(0,0); } @@ -361,8 +356,6 @@ void control_event(main_window* _config_main_gui, custom_window* _config_custom_ g_signal_connect(G_OBJECT(_config_custom_gui->user.btnFilter),"clicked",G_CALLBACK(wrapper_filters_user_show), glade_path); g_signal_connect(G_OBJECT(_config_custom_gui->group.btnFilter),"clicked",G_CALLBACK(wrapper_filters_group_show), glade_path); g_signal_connect(G_OBJECT(_config_custom_gui->project.btnFilter),"clicked",G_CALLBACK(wrapper_filters_project_show), glade_path); - g_signal_connect(G_OBJECT(_config_custom_gui->user.comboBox),"changed",G_CALLBACK(wrapper_entry_user_disk), NULL); - g_signal_connect(G_OBJECT(_config_custom_gui->group.comboBox),"changed",G_CALLBACK(wrapper_entry_groups_disk), NULL); //g_signal_connect(G_OBJECT(_config_custom_gui->user.tree_view), "cursor-changed", G_CALLBACK(tree_view_select_user), NULL); //g_signal_connect(G_OBJECT(_config_custom_gui->group.tree_view), "cursor-changed", G_CALLBACK(tree_view_select_group), NULL); @@ -372,70 +365,6 @@ void control_event(main_window* _config_main_gui, custom_window* _config_custom_ } -void template_set_status_disk(GtkWidget* self,hotebook* widgets) { - int menu_id_disk = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->comboBox)); - int menu_id = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->cmbSetStatusDisk)); - char* activ_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(widgets->comboBox)); - activ_text = yon_char_divide_search(activ_text, " ", -1); - vector* v_disk_status = &all_config.v_disk_status; - int flag = 0; - if (v_disk_status->vectorList.total> 0 && menu_id_disk >= 0 && menu_id >= 0) { - for (int i = 0; i < v_disk_status->pfVectorTotal(v_disk_status); i++) { - disk_status* _config = (disk_status*)v_disk_status->pfVectorGet(v_disk_status, i); - if (strstr(_config->device, activ_text) && strstr(_config->device,widgets->name)) { - flag = 1; - _config->status = menu_id; - all_config.flag_set_data = 1; - } - } - } - if (flag == 0) { - disk_status* disk_cfg = malloc(sizeof(disk_status)); - disk_cfg->device = yon_char_unite("DISK_QUOTA[",widgets->name,":",activ_text, "]",NULL); - // disk_cfg->device = yon_char_new(activ_text); - disk_cfg->status = menu_id; - v_disk_status->pfVectorAdd(v_disk_status, disk_cfg); - all_config.flag_set_data = 1; - } -} - -void get_status_disk(hotebook* widgets) { - int menu_id_disk = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->comboBox)); - vector* v_disk_status = &all_config.v_disk_status; - if (v_disk_status->vectorList.total> 0 && menu_id_disk>=0) { - char* activ_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(widgets->comboBox)); - activ_text = yon_char_divide_search(activ_text, " ", -1); - int status = 0; - for (int i = 0; i < v_disk_status->pfVectorTotal(v_disk_status); i++) { - disk_status* _config = (disk_status*)v_disk_status->pfVectorGet(v_disk_status, i); - if (strstr(_config->device, activ_text) && strstr(_config->device,widgets->name)) { - status = 1; - gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->cmbSetStatusDisk), _config->status); - } - if (!status) { - gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->cmbSetStatusDisk), -1); - } - } - } - else { - gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->cmbSetStatusDisk), -1); - } -} - -/* -void main_visible_columns(GtkWidget *self) { - gboolean *flags_filters = filters_get_flag(); - gtk_tree_view_column_set_visible(widgets->tvc0, flags_filters[0]); - gtk_tree_view_column_set_visible(widgets->tvc1, flags_filters[1]); - gtk_tree_view_column_set_visible(widgets->tvc2, flags_filters[2]); - gtk_tree_view_column_set_visible(widgets->tvc3, flags_filters[3]); - gtk_tree_view_column_set_visible(widgets->tvc4, flags_filters[4]); - gtk_tree_view_column_set_visible(widgets->tvc5, flags_filters[5]); - gtk_tree_view_column_set_visible(widgets->tvc6, flags_filters[6]); - gtk_tree_view_column_set_visible(widgets->tvc7, flags_filters[7]); - filters_on_hide_subwindow(self); -} -*/ @@ -558,8 +487,8 @@ int main(int argc, char *argv[]){ gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(css), -1); - block_button_add_edit_del(&cfg_custom_gui.user); - block_button_add_edit_del(&cfg_custom_gui.group); + //block_button_add_edit_del(&cfg_custom_gui.user); + //block_button_add_edit_del(&cfg_custom_gui.group); tree_view_select(NULL,&all_config.v_project , &cfg_custom_gui.project); gtk_main(); } \ No newline at end of file diff --git a/source/view_set_disk.c b/source/view_set_disk.c index 7a653f9..27c7bb4 100644 --- a/source/view_set_disk.c +++ b/source/view_set_disk.c @@ -6,58 +6,13 @@ int view_device_index = 0; char* view_device_set_add_edit = NULL; -void get_spin_time_gui(vector* vec_u_g_p, hotebook* view_device_widgets) { - if (index_selected != -1) { - config_u_g_p* _config = (config_u_g_p*)vec_u_g_p->pfVectorGet(vec_u_g_p, index_selected); - int spin_week_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinWeeksSize)); - int spin_days_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinDaysSize)); - int spin_hours_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinHoursSize)); - int spin_minutes_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinMinutesSize)); - size_t second_size = spin_week_size*7*24*3600+spin_days_size*24*3600+spin_hours_size*3600+spin_minutes_size*60; - int spin_week_file = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinWeeksFile)); - int spin_days_file = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinDaysFile)); - int spin_hours_file = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinHoursFile)); - int spin_minutes_file = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinMinutesFile)); - size_t second_file = spin_week_file*7*24*3600+spin_days_file*24*3600+spin_hours_file*3600+spin_minutes_file*60; - set_time_spin(second_file, second_size); - _config->deferring_size = second_size; - _config->deferring_file = second_file; - vec_u_g_p->pfVectorSet(vec_u_g_p, index_selected, _config); - } -} + void set_view_device_menu(char* _set_add_edit) { view_device_set_add_edit = _set_add_edit; } -void set_time_spin(size_t seconds_file, size_t seconds_size) { - me_time t_file = time_convert(seconds_file); - me_time t_size = time_convert(seconds_size); - if (seconds_file!=-1) { - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinWeeksFile), t_file.weeks); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinDaysFile), t_file.days); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinHoursFile), t_file.hours); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinMinutesFile), t_file.minutes); - } - else { - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinWeeksFile), 0); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinDaysFile), 0); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinHoursFile), 0); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinMinutesFile), 0); - } - if (seconds_size!=-1) { - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinWeeksSize), t_size.weeks); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinDaysSize), t_size.days); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinHoursSize), t_size.hours); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinMinutesSize), t_size.minutes); - } - else { - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinWeeksSize), 0); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinDaysSize), 0); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinHoursSize), 0); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinMinutesSize), 0); - } -} + view_device_set_window* get_widget_view_device() { return obj_view_device_widgets; } @@ -130,8 +85,106 @@ void view_device_destroy(GtkWidget *self) { } void view_device_get_gui() { - char* disk = yon_char_new(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(obj_view_device_widgets->DeviceCombo))); - disk = yon_char_divide_search(disk, " ", -1); - int status = gtk_combo_box_get_active_id(GTK_COMBO_BOX(obj_view_device_widgets->cmbDeviceSetStatus)); + //char* disk = yon_char_new(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(obj_view_device_widgets->DeviceCombo))); + //disk = yon_char_divide_search(disk, " ", -1); + //int status = gtk_combo_box_get_active_id(GTK_COMBO_BOX(obj_view_device_widgets->cmbDeviceSetStatus)); -} \ No newline at end of file +} +/* +void get_status_disk(hotebook* widgets) { + int menu_id_disk = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->comboBox)); + vector* v_disk_status = &all_config.v_disk_status; + if (v_disk_status->vectorList.total> 0 && menu_id_disk>=0) { + char* activ_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(widgets->comboBox)); + activ_text = yon_char_divide_search(activ_text, " ", -1); + int status = 0; + for (int i = 0; i < v_disk_status->pfVectorTotal(v_disk_status); i++) { + disk_status* _config = (disk_status*)v_disk_status->pfVectorGet(v_disk_status, i); + if (strstr(_config->device, activ_text) && strstr(_config->device,widgets->name)) { + status = 1; + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->cmbSetStatusDisk), _config->status); + } + if (!status) { + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->cmbSetStatusDisk), -1); + } + } + } + else { + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->cmbSetStatusDisk), -1); + } +} +void template_set_status_disk(GtkWidget* self,hotebook* widgets) { + int menu_id_disk = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->comboBox)); + int menu_id = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->cmbSetStatusDisk)); + char* activ_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(widgets->comboBox)); + activ_text = yon_char_divide_search(activ_text, " ", -1); + vector* v_disk_status = &all_config.v_disk_status; + int flag = 0; + if (v_disk_status->vectorList.total> 0 && menu_id_disk >= 0 && menu_id >= 0) { + for (int i = 0; i < v_disk_status->pfVectorTotal(v_disk_status); i++) { + disk_status* _config = (disk_status*)v_disk_status->pfVectorGet(v_disk_status, i); + if (strstr(_config->device, activ_text) && strstr(_config->device,widgets->name)) { + flag = 1; + _config->status = menu_id; + all_config.flag_set_data = 1; + } + } + } + if (flag == 0) { + disk_status* disk_cfg = malloc(sizeof(disk_status)); + disk_cfg->device = yon_char_unite("DISK_QUOTA[",widgets->name,":",activ_text, "]",NULL); + // disk_cfg->device = yon_char_new(activ_text); + disk_cfg->status = menu_id; + v_disk_status->pfVectorAdd(v_disk_status, disk_cfg); + all_config.flag_set_data = 1; + } +} +void get_spin_time_gui(vector* vec_u_g_p, hotebook* view_device_widgets) { + if (index_selected != -1) { + config_u_g_p* _config = (config_u_g_p*)vec_u_g_p->pfVectorGet(vec_u_g_p, index_selected); + int spin_week_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinWeeksSize)); + int spin_days_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinDaysSize)); + int spin_hours_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinHoursSize)); + int spin_minutes_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinMinutesSize)); + size_t second_size = spin_week_size*7*24*3600+spin_days_size*24*3600+spin_hours_size*3600+spin_minutes_size*60; + int spin_week_file = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinWeeksFile)); + int spin_days_file = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinDaysFile)); + int spin_hours_file = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinHoursFile)); + int spin_minutes_file = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(obj_view_device_widgets->spinMinutesFile)); + size_t second_file = spin_week_file*7*24*3600+spin_days_file*24*3600+spin_hours_file*3600+spin_minutes_file*60; + set_time_spin(second_file, second_size); + _config->deferring_size = second_size; + _config->deferring_file = second_file; + vec_u_g_p->pfVectorSet(vec_u_g_p, index_selected, _config); + } +} + +void set_time_spin(size_t seconds_file, size_t seconds_size) { + me_time t_file = time_convert(seconds_file); + me_time t_size = time_convert(seconds_size); + if (seconds_file!=-1) { + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinWeeksFile), t_file.weeks); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinDaysFile), t_file.days); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinHoursFile), t_file.hours); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinMinutesFile), t_file.minutes); + } + else { + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinWeeksFile), 0); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinDaysFile), 0); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinHoursFile), 0); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinMinutesFile), 0); + } + if (seconds_size!=-1) { + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinWeeksSize), t_size.weeks); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinDaysSize), t_size.days); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinHoursSize), t_size.hours); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinMinutesSize), t_size.minutes); + } + else { + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinWeeksSize), 0); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinDaysSize), 0); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinHoursSize), 0); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(obj_view_device_widgets->spinMinutesSize), 0); + } +} +*/ \ No newline at end of file