Applications
/
ubl-settings-resourcequota
7
0
Fork 2
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Исправил все баги

Browse Source
pull/4/head
Igor Belitskiy 2 years ago
parent 8618ca96f1
commit bde9d0a5e4
5 changed files with 25 additions and 78 deletions
Show Stats Download Patch File Download Diff File

29
source/philos_utils.c
Unescape View File

@ -142,7 +142,7 @@ config_str philos_list_group(int* size) {
unsigned short uid_max = philos_read_uid_min_max(file_source_login_min_max, str_uid_max);
config_str str_users = malloc(1);
while (1) {
errno = 0; // so we can distinguish errors from no more entries
errno = 0;
struct passwd* entry = getpwent();
if (!entry) {
if (errno) {
@ -211,7 +211,7 @@ config_str philos_list_user(int* size) {
unsigned short uid_max = philos_read_uid_min_max(file_source_login_min_max, str_uid_max);
config_str str_users = malloc(1);
while (1) {
errno = 0; // so we can distinguish errors from no more entries
errno = 0;
struct passwd* entry = getpwent();
if (!entry) {
if (errno) {
@ -219,9 +219,7 @@ config_str philos_list_user(int* size) {
}
break;
}
//if ((entry->pw_uid >= uid_min && entry->pw_uid < uid_max) || entry->pw_uid == 0) {
str_users = yon_char_parsed_append(str_users, size, entry->pw_name);
//}
}
endpwent();
return str_users;
@ -261,7 +259,6 @@ char* philos_str_remove(char *str, const char *sub) {
void philos_split_size_memory(char* str_value, int* size, char* pow_memory) {
// pow_memory = yon_char_new(str_value);
(*size) = atoi(yon_char_divide_search(pow_memory, " ", -1));
}
@ -359,7 +356,7 @@ char* philos_pard_array_add_cmd(char* cmd, temp_config* _config, char* key, int*
if (_config->disk && _config->size && array_io && array_io_pow_size) {
int index_find = 0;
for (int index = 0; index < _config->size; index++) {
if (array_io_pow_size[index] != -1 && array_io[index]!=-2 && array_io[index]!=-1) {
if (array_io_pow_size[index] >= 0 && array_io[index]>= 0) {
char* num_and_pow_size = philos_format_cfg_str_size_memory(" ", array_io[index], array_io_pow_size[index]);
if (!strstr(num_and_pow_size, "-")) {
cmd_new = yon_char_unite(cmd_new,
@ -504,6 +501,7 @@ void philos_temp_config_init(temp_config* _config) {
_config->i_o_limit_write_size = NULL;
_config->size = 0;
}
// flag_check_array = 0 READ
// flag_check_array = 1 WRITE
void philos_update_device_to_entry(temp_set_window *widgets, temp_config* _config, int flag_check_array) {
@ -514,19 +512,19 @@ void philos_update_device_to_entry(temp_set_window *widgets, temp_config* _confi
int index_find = -1;
if (_config->disk) {
for (int index = 0; index < _config->size; index++) {
char* disk_cfg = _config->disk[index];
if (disk_cfg) {
if (strstr(disk_cfg, disk) != NULL) {
index_find = index;
break;
char* disk_cfg = _config->disk[index];
if (disk_cfg) {
if (strstr(disk_cfg, disk) != NULL) {
index_find = index;
break;
}
}
}
}
}
if (index_find != -1) {
if (flag_check_array==0) {
if (_config->i_o_limit_read[index_find]==-2 || _config->i_o_limit_read[index_find]==-1) {
if (_config->i_o_limit_read[index_find]<0 || _config->i_o_limit_read_size[index_find]<0) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->chbTempRead), 0);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(widgets->spinTempRead), 0);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->cbtTempRead), 0);
@ -539,7 +537,7 @@ void philos_update_device_to_entry(temp_set_window *widgets, temp_config* _confi
}
}
else if (flag_check_array==1) {
if (_config->i_o_limit_write[index_find]==-2 || _config->i_o_limit_write[index_find]==-1) {
if (_config->i_o_limit_write[index_find]<0 || _config->i_o_limit_write_size[index_find]<0) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->chbTempWrite), 0);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(widgets->spinTempWrite), 0);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->cbtTempWrite), 0);
@ -631,7 +629,6 @@ void philos_temp_add_disk(temp_set_window *widgets, temp_config* _config) {
}
else {
// Редактирование
//_config->disk[index_find] = yon_char_new(disk);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->chbTempRead))) {
_config->i_o_limit_read_size[index_find] =(int)gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->cbtTempRead));
_config->i_o_limit_read[index_find] = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widgets->spinTempRead));
@ -749,7 +746,7 @@ void philos_fill_combo_box_text(GtkWidget *cbt, config_str list_data, int size)
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cbt), list_data[index]);
}
}
// Mem Size pow
void philos_set_spin_adjustment(GtkWidget *check, GtkWidget *spin, GtkWidget *combo, size_t value) {
gboolean active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check));
guint value_spin = gtk_spin_button_get_digits(GTK_SPIN_BUTTON(spin));

17
source/ubl-settings-resourcequota.c
Unescape View File

@ -90,7 +90,6 @@ void on_about(){
GtkWidget *hideButtonBox=yon_gtk_builder_get_widget(builder,"buttonBoxHide");
gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(window),version_application);
gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(window),PROJECT_HOME_LABEL);
// gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(window),TITLE_LABEL);
gtk_label_set_text(GTK_LABEL(title),TITLE_LABEL);
g_signal_connect(G_OBJECT(window),"activate-link",G_CALLBACK(on_link),NULL);
gtk_widget_set_visible(hideButtonBox,0);
@ -256,7 +255,6 @@ void main_update_information() {
gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(widgets->cbtMainInfoLevel2));
philos_fill_combo_box_text(widgets->cbtMainInfoLevel2, fill_cmb_2, size);
g_signal_connect(G_OBJECT(widgets->cbtMainInfoLevel2),"changed",G_CALLBACK(main_cbx_2_event), NULL);
// yon_terminal_integrated_launch(widgets->vteProcesses, cmd, NULL, NULL);
}
}
@ -331,8 +329,6 @@ void template_load_cfg(char* cmd) {
}
void init_cfg_array(int index) {
//main_config.disk = yon_char_parsed_append(main_config.disk, &index, "-");
//index--;
philos_set_pow_size_memory("-", &main_config.type_quota_size, index, array_size_pow);
philos_set_size_memory_integer_char("-", &main_config.type_quota, index);
@ -688,9 +684,6 @@ char* format_io_limit_in_tree_view(config_str* disk, int** i_o_limit, int** i_o_
}
}
else if (strstr(disk[index][index_to_n2], "-")){
// str = yon_char_unite(str, ",", NULL);
}
else {
if (!strstr(str, "-")) {
char* num_and_pow_size = philos_format_cfg_str_size_memory(" ", i_o_limit[index][index_to_n2], i_o_limit_size[index][index_to_n2]);
@ -786,7 +779,6 @@ void info_show(GtkWidget *self) {
int index = atoi(str_iter);
char* t_quota = main_config.type_quota[index];
if (yon_char_find_count(t_quota, "-") == 0) {
// TODO: add code
}
}
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->notebookMain), 3);
@ -818,14 +810,6 @@ void main_event(main_window *widgets) {
g_signal_connect(G_OBJECT(widgets->SaveGlobalMenuItem), "activate", G_CALLBACK(wrapper_global_save), widgets);
g_signal_connect(G_OBJECT(widgets->SaveLocalMenuItem), "activate", G_CALLBACK(wrapper_system_save), widgets);
g_signal_connect(G_OBJECT(widgets->SaveMenuItem), "activate", G_CALLBACK(wrapper_all_save), widgets);
/*
g_signal_connect(G_OBJECT(widgets->LoadGlobalMenuItem),"activate",G_CALLBACK(),NULL);
g_signal_connect(G_OBJECT(widgets->LoadLocalMenuItem),"activate",G_CALLBACK(),NULL);
g_signal_connect(G_OBJECT(widgets->SaveMenuItem),"activate",G_CALLBACK(),NULL);
g_signal_connect(G_OBJECT(widgets->SaveGlobalMenuItem),"activate",G_CALLBACK(),NULL);
g_signal_connect(G_OBJECT(widgets->SaveLocalMenuItem),"activate",G_CALLBACK(),NULL);
*/
}
void wrapper_add_show(GtkWidget *self) {
add_show(NULL, glade_path);
@ -1173,7 +1157,6 @@ void main_localization(main_window *widgets) {
gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->DocumentationMenuItem),DOCUMENTATION_LABEL);
gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->AboutMenuItem),ABOUT_LABEL);
}
//functions
void yon_load_proceed(char *command){
if (yon_config_load_register(command))

8
source/ubl-settings-resourcequota.h
Unescape View File

@ -96,14 +96,8 @@ typedef struct
int** i_o_limit_write_size;
int size_tree_view;
dictionary *load_global_cfg;
dictionary *load_system_cfg;
dictionary *save_cfg_gui;
int flag_set_data;
// flag_load | 0 system
// flag_load | 1 global
int flag_load;
int flag_load; // flag_load = 0 -> system // flag_load = 1 -> global
} config;
typedef struct

1
source/view_add.c
Unescape View File

@ -297,7 +297,6 @@ void add_update_combo_box() {
if (menu_id >= 0) {
gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(add_widgets->cbxTempQuotaLevel2));
philos_fill_combo_box_text(add_widgets->cbxTempQuotaLevel2, fill_cmb_2, size);
// yon_terminal_integrated_launch(widgets->vteProcesses, cmd, NULL, NULL);
}
}

48
source/view_edit.c
Unescape View File

@ -40,7 +40,6 @@ temp_set_window *edit_setup_window(char* glade_path){
edit_widgets->cbtTempWrite = yon_gtk_builder_get_widget(builder,"cbtEditWrite");
edit_widgets->entryTempCmd = yon_gtk_builder_get_widget(builder,"entryEditCmd");
device_fill_disk(edit_widgets->cbtTempDevice);
// edit_event(edit_widgets);
edit_localization(edit_widgets);
philos_temp_config_init(&obj_edit_config);
}
@ -221,14 +220,7 @@ int edit_get_limit_swap() {
return gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(edit_widgets->spinPaddingFLTemp));
}
// =================================================================
void edit_set_select_device(char*** str_value) {
if ((*str_value) == NULL) {
return;
}
if ((*str_value)[0] == NULL) {
return;
}
if (str_value) {
if ((*str_value)) {
if ((*str_value)[0] != NULL && strstr((*str_value)[0], "-") == NULL) {
@ -243,54 +235,36 @@ void edit_set_select_device(char*** str_value) {
else {
obj_edit_config.size = 0;
}
}
else {
obj_edit_config.size = 0;
}
}
void edit_set_read_device(int* str_value, int* pow_mem) {
if (str_value == NULL || pow_mem == NULL) {
return;
}
if (str_value[0] == -2 || pow_mem[0] == -2) {
return;
}
if (str_value && pow_mem) {
if (str_value[0] != -2 && pow_mem[0] != -2 && pow_mem[0] != -3) {
philos_array_int_copy(&obj_edit_config.i_o_limit_read, &str_value);
philos_array_int_copy(&obj_edit_config.i_o_limit_read_size, &pow_mem);
if (str_value[0] >=0 && pow_mem[0] >=0) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(edit_widgets->chbTempRead), 1);
edit_temp_set(str_value[0],pow_mem[0], edit_widgets->chbTempRead,
edit_widgets->spinTempRead,
edit_widgets->cbtTempRead);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(edit_widgets->chbTempRead), 1);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(edit_widgets->chbTempWrite), 1);
}
philos_array_int_copy(&obj_edit_config.i_o_limit_read, &str_value);
philos_array_int_copy(&obj_edit_config.i_o_limit_read_size, &pow_mem);
}
}
void edit_set_write_device(int* str_value, int* pow_mem) {
if (str_value == NULL || pow_mem == NULL) {
return;
}
if (str_value[0] == -2 || pow_mem[0] == -2) {
return;
}
else {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(edit_widgets->chbTempWrite), 1);
}
if (str_value && pow_mem) {
if (str_value[0] != -2 && pow_mem[0] != -2 && pow_mem[0] != -3) {
if (str_value[0] >=0 && pow_mem[0] >=0) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(edit_widgets->chbTempWrite), 1);
edit_temp_set(str_value[0],pow_mem[0], edit_widgets->chbTempWrite,
edit_widgets->spinTempWrite,
edit_widgets->cbtTempWrite);
philos_array_int_copy(&obj_edit_config.i_o_limit_write, &str_value);
philos_array_int_copy(&obj_edit_config.i_o_limit_write_size, &pow_mem);
}
philos_array_int_copy(&obj_edit_config.i_o_limit_write, &str_value);
philos_array_int_copy(&obj_edit_config.i_o_limit_write_size, &pow_mem);
}
}
void edit_set_size_arrays(size_t size_array) {
obj_edit_config.size = size_array;
@ -316,7 +290,7 @@ void edit_set_limit_swap(int value, int pow_mem) {
edit_widgets->cmbPaddingFLTemp);
}
void edit_temp_set(int value, int pow_mem, GtkWidget* cheek, GtkWidget* spin, GtkWidget* combo_box_text) {
if (pow_mem!=-3 && pow_mem>=-1 && value>=0) {
if (pow_mem>=-1 && value>=0) {
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), value);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cheek), 1);
if (combo_box_text) {

Write Preview
Loading…
Cancel
Save